From 264270524b2b3361b3dca4c44a805d98ffc96476 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Fri, 18 Feb 2022 13:26:57 +0100 Subject: [PATCH] some small refactors for the user resolver: - stop using repositories where its not needed - removed unused function --- backend/src/graphql/resolver/UserResolver.ts | 17 ++++++----------- backend/src/typeorm/repository/User.ts | 5 ----- 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index 5bc30f6b4..32b5d4ab5 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -152,8 +152,7 @@ const createEmailOptIn = async ( loginUserId: number, queryRunner: QueryRunner, ): Promise => { - const loginEmailOptInRepository = await getRepository(LoginEmailOptIn) - let emailOptIn = await loginEmailOptInRepository.findOne({ + let emailOptIn = await LoginEmailOptIn.findOne({ userId: loginUserId, emailOptInTypeId: EMAIL_OPT_IN_REGISTER, }) @@ -182,8 +181,7 @@ const createEmailOptIn = async ( } const getOptInCode = async (loginUserId: number): Promise => { - const loginEmailOptInRepository = await getRepository(LoginEmailOptIn) - let optInCode = await loginEmailOptInRepository.findOne({ + let optInCode = await LoginEmailOptIn.findOne({ userId: loginUserId, emailOptInTypeId: EMAIL_OPT_IN_RESET_PASSWORD, }) @@ -205,7 +203,7 @@ const getOptInCode = async (loginUserId: number): Promise => { optInCode.userId = loginUserId optInCode.emailOptInTypeId = EMAIL_OPT_IN_RESET_PASSWORD } - await loginEmailOptInRepository.save(optInCode) + await LoginEmailOptIn.save(optInCode) return optInCode } @@ -487,12 +485,9 @@ export class UserResolver { } // Load code - const loginEmailOptInRepository = await getRepository(LoginEmailOptIn) - const optInCode = await loginEmailOptInRepository - .findOneOrFail({ verificationCode: code }) - .catch(() => { - throw new Error('Could not login with emailVerificationCode') - }) + const optInCode = await LoginEmailOptIn.findOneOrFail({ verificationCode: code }).catch(() => { + throw new Error('Could not login with emailVerificationCode') + }) // Code is only valid for 10minutes const timeElapsed = Date.now() - new Date(optInCode.updatedAt).getTime() diff --git a/backend/src/typeorm/repository/User.ts b/backend/src/typeorm/repository/User.ts index 59d6ff465..bd9291eae 100644 --- a/backend/src/typeorm/repository/User.ts +++ b/backend/src/typeorm/repository/User.ts @@ -9,11 +9,6 @@ export class UserRepository extends Repository { .getOneOrFail() } - async findByPubkeyHexBuffer(pubkeyHexBuffer: Buffer): Promise { - const pubKeyString = pubkeyHexBuffer.toString('hex') - return await this.findByPubkeyHex(pubKeyString) - } - async findByEmail(email: string): Promise { return this.createQueryBuilder('user').where('user.email = :email', { email }).getOneOrFail() }