IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Withdrew the JWT changes and store the Buffer again instead of the hex key.

Browse Source
This commit is contained in:
elweyn 2021-11-11 10:09:08 +01:00
parent e97798d73c
commit a73a36b971
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
backend/src/graphql/resolver/UserResolver.ts
View File

@ -27,10 +27,10 @@ import { LoginUserRepository } from '../../typeorm/repository/LoginUser'
import { Setting } from '../enum/Setting' import { Setting } from '../enum/Setting'
import { UserRepository } from '../../typeorm/repository/User' import { UserRepository } from '../../typeorm/repository/User'
import { LoginUser } from '@entity/LoginUser' import { LoginUser } from '@entity/LoginUser'
import { LoginElopageBuys } from '@entity/LoginElopageBuys'
import { LoginUserBackup } from '@entity/LoginUserBackup' import { LoginUserBackup } from '@entity/LoginUserBackup'
import { LoginEmailOptIn } from '@entity/LoginEmailOptIn' import { LoginEmailOptIn } from '@entity/LoginEmailOptIn'
import { sendEMail } from '../../util/sendEMail' import { sendEMail } from '../../util/sendEMail'
import { LoginElopageBuysRepository } from '../../typeorm/repository/LoginElopageBuys'
// eslint-disable-next-line @typescript-eslint/no-var-requires // eslint-disable-next-line @typescript-eslint/no-var-requires
const sodium = require('sodium-native') const sodium = require('sodium-native')
@ -236,10 +236,11 @@ export class UserResolver {
user.language = loginUser.language user.language = loginUser.language
// Elopage Status & Stored PublisherId // Elopage Status & Stored PublisherId
user.hasElopage = await this.hasElopage({ pubkey: loginUser.pubKey }) user.hasElopage = await this.hasElopage({ pubKey: loginUser.pubKey })
if (!user.hasElopage && publisherId) { if (!user.hasElopage && publisherId) {
user.publisherId = publisherId user.publisherId = publisherId
await this.updateUserInfos({ publisherId }, { pubKey: loginUser.pubKey }) // TODO: Merge login_call_updateUserInfos
// await this.updateUserInfos({ publisherId }, { pubKey: loginUser.pubKey })
} }
// coinAnimation // coinAnimation
@ -589,12 +590,14 @@ export class UserResolver {
@Query(() => Boolean) @Query(() => Boolean)
async hasElopage(@Ctx() context: any): Promise<boolean> { async hasElopage(@Ctx() context: any): Promise<boolean> {
const userRepository = getCustomRepository(UserRepository) const userRepository = getCustomRepository(UserRepository)
const userEntity = await userRepository.findByPubkeyHex(context.pubKey).catch() const pubKey = Buffer.from(context.pubKey).toString('hex')
const userEntity = await userRepository.findByPubkeyHex(pubKey).catch()
if (!userEntity) { if (!userEntity) {
return false return false
} }
const elopageBuyCount = await LoginElopageBuys.count({ payerEmail: userEntity.email }) const loginElopageBuysRepository = getCustomRepository(LoginElopageBuysRepository)
const elopageBuyCount = await loginElopageBuysRepository.count({ payerEmail: userEntity.email })
return elopageBuyCount > 0 return elopageBuyCount > 0
} }
} }