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

Merge branch 'login_call_getUserInfos' into login_call_updateUserInfos

Browse Source 
# Conflicts:
#	backend/src/graphql/resolver/TransactionResolver.ts
This commit is contained in:
Ulf Gebhardt 2021-11-17 00:50:18 +01:00
commit 415b9254e4
Signed by: ulfgebhardt
GPG Key ID: DA6B843E748679C9
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
backend/src/graphql/resolver/TransactionResolver.ts
View File

@ -33,6 +33,7 @@ import { calculateDecay, calculateDecayWithInterval } from '../../util/decay'
import { TransactionTypeId } from '../enum/TransactionTypeId'
import { TransactionType } from '../enum/TransactionType'
import { hasUserAmount, isHexPublicKey } from '../../util/validate'
import { LoginUserRepository } from '../../typeorm/repository/LoginUser'
/*
# Test
@ -451,15 +452,15 @@ async function addUserTransaction(
})
}
async function getPublicKey(email: string, sessionId: number): Promise<string | undefined> {
const result = await apiPost(CONFIG.LOGIN_API_URL + 'getUserInfos', {
session_id: sessionId,
email,
ask: ['user.pubkeyhex'],
})
if (result.success) {
return result.data.userData.pubkeyhex
async function getPublicKey(email: string): Promise<string | null> {
const loginUserRepository = getCustomRepository(LoginUserRepository)
const loginUser = await loginUserRepository.findOne({ email: email })
// User not found
if (!loginUser) {
return null
}
return loginUser.pubKey.toString('hex')
}
@Resolver()
@ -516,8 +517,8 @@ export class TransactionResolver {
}
// validate recipient user
// TODO: the detour over the public key is unnecessary sessionId is removed
const recipiantPublicKey = await getPublicKey(email, context.sessionId)
// TODO: the detour over the public key is unnecessary
const recipiantPublicKey = await getPublicKey(email)
if (!recipiantPublicKey) {
throw new Error('recipiant not known')
}