From d938814f1a50f804ae47b9b6a1994d212816e04d Mon Sep 17 00:00:00 2001 From: elweyn Date: Thu, 27 Jan 2022 10:24:03 +0100 Subject: [PATCH] Check if user account is not disabled to make a creation. --- backend/src/graphql/resolver/AdminResolver.ts | 30 +++++++++++-------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index 8a7e034a5..7e61b4c1d 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -61,21 +61,25 @@ export class AdminResolver { const userRepository = getCustomRepository(UserRepository) const user = await userRepository.findByEmail(email) - const creations = await getUserCreations(user.id) - const creationDateObj = new Date(creationDate) - if (isCreationValid(creations, amount, creationDateObj)) { - const loginPendingTasksAdminRepository = getCustomRepository(LoginPendingTasksAdminRepository) - const loginPendingTaskAdmin = loginPendingTasksAdminRepository.create() - loginPendingTaskAdmin.userId = user.id - loginPendingTaskAdmin.amount = BigInt(amount * 10000) - loginPendingTaskAdmin.created = new Date() - loginPendingTaskAdmin.date = creationDateObj - loginPendingTaskAdmin.memo = memo - loginPendingTaskAdmin.moderator = moderator + if (!user.disabled) { + const creations = await getUserCreations(user.id) + const creationDateObj = new Date(creationDate) + if (isCreationValid(creations, amount, creationDateObj)) { + const loginPendingTasksAdminRepository = getCustomRepository(LoginPendingTasksAdminRepository) + const loginPendingTaskAdmin = loginPendingTasksAdminRepository.create() + loginPendingTaskAdmin.userId = user.id + loginPendingTaskAdmin.amount = BigInt(amount * 10000) + loginPendingTaskAdmin.created = new Date() + loginPendingTaskAdmin.date = creationDateObj + loginPendingTaskAdmin.memo = memo + loginPendingTaskAdmin.moderator = moderator - await loginPendingTasksAdminRepository.save(loginPendingTaskAdmin) + await loginPendingTasksAdminRepository.save(loginPendingTaskAdmin) + } + return getUserCreations(user.id) + } else { + throw new Error('Creation could not be saved, Email is not activated') } - return getUserCreations(user.id) } @Authorized([RIGHTS.CREATE_PENDING_CREATION])