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 comments.

Browse Source
This commit is contained in:
elweyn 2021-11-11 06:42:27 +01:00
parent e976c6854d
commit e97798d73c
1 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,7 +31,6 @@ 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')
@ -235,24 +234,13 @@ export class UserResolver {
user.description = loginUser.description user.description = loginUser.description
user.pubkey = loginUserPubKeyString user.pubkey = loginUserPubKeyString
user.language = loginUser.language user.language = loginUser.language
// 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 }) await this.updateUserInfos({ publisherId }, { pubKey: loginUser.pubKey })
} }
// TODO: Get Method from PR (publisherId)
// Hack: Database Field is not validated properly and not nullable
// if (user.publisherId === 0) {
// user.publisherId = undefined
// }
// Save publisherId if Elopage is not yet registered
// if (!user.hasElopage && publisherId) {
// user.publisherId = publisherId
// await this.updateUserInfos(
// { publisherId },
// { sessionId: result.data.session_id, pubKey: result.data.user.public_hex },
// )
// }
// coinAnimation // coinAnimation
const userSettingRepository = getCustomRepository(UserSettingRepository) const userSettingRepository = getCustomRepository(UserSettingRepository)
@ -600,7 +588,6 @@ export class UserResolver {
@Authorized() @Authorized()
@Query(() => Boolean) @Query(() => Boolean)
async hasElopage(@Ctx() context: any): Promise<boolean> { async hasElopage(@Ctx() context: any): Promise<boolean> {
// const result = await apiGet(CONFIG.LOGIN_API_URL + 'hasElopage?session_id=' + context.sessionId)
const userRepository = getCustomRepository(UserRepository) const userRepository = getCustomRepository(UserRepository)
const userEntity = await userRepository.findByPubkeyHex(context.pubKey).catch() const userEntity = await userRepository.findByPubkeyHex(context.pubKey).catch()
if (!userEntity) { if (!userEntity) {