diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts index 5c1fa04d3..0fb78747b 100644 --- a/backend/src/graphql/resolver/TransactionResolver.ts +++ b/backend/src/graphql/resolver/TransactionResolver.ts @@ -304,7 +304,7 @@ export class TransactionResolver { @Args() { identifier, amount, memo }: TransactionSendArgs, @Ctx() context: Context, ): Promise { - logger.info(`sendCoins(email=${email}, amount=${amount}, memo=${memo})`) + logger.info(`sendCoins(identifier=${identifier}, amount=${amount}, memo=${memo})`) if (amount.lte(0)) { throw new LogError('Amount to send must be positive', amount) } diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index 71dc440de..5ed9e0c52 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -823,10 +823,9 @@ export class UserResolver { } @Authorized([RIGHTS.USER]) - @Query(() => User, { nullable: true }) - async user(@Arg('identifier') identifier: string): Promise { - const user = await findUserByIdentifier(identifier) - return user ? new User(user) : null + @Query(() => User) + async user(@Arg('identifier') identifier: string): Promise { + return new User(await findUserByIdentifier(identifier)) } } diff --git a/backend/src/graphql/resolver/util/findUserByIdentifier.ts b/backend/src/graphql/resolver/util/findUserByIdentifier.ts index e5907552e..1bb6b3b95 100644 --- a/backend/src/graphql/resolver/util/findUserByIdentifier.ts +++ b/backend/src/graphql/resolver/util/findUserByIdentifier.ts @@ -3,7 +3,7 @@ import { UserContact as DbUserContact } from '@entity/UserContact' import LogError from '@/server/LogError' import { validate, version } from 'uuid' -export const findUserByIdentifier = async (identifier: string): Promise => { +export const findUserByIdentifier = async (identifier: string): Promise => { let user: DbUser | undefined if (validate(identifier) && version(identifier) === 4) { user = await DbUser.findOne({ where: { gradidoID: identifier }, relations: ['emailContact'] })