diff --git a/backend/src/event/Event.ts b/backend/src/event/Event.ts index 196e997e2..e2ae5863a 100644 --- a/backend/src/event/Event.ts +++ b/backend/src/event/Event.ts @@ -186,6 +186,9 @@ export const EVENT_SEND_ACCOUNT_MULTIREGISTRATION_EMAIL = async ( export const EVENT_SEND_CONFIRMATION_EMAIL = async (userId: number): Promise => EVENT(EventProtocolType.SEND_CONFIRMATION_EMAIL, userId).save() +export const EVENT_ADMIN_SEND_CONFIRMATION_EMAIL = async (userId: number): Promise => + EVENT(EventProtocolType.ADMIN_SEND_CONFIRMATION_EMAIL, userId).save() + /* export const EVENT_REDEEM_REGISTER = async ( userId: number, transactionId: number | null = null, diff --git a/backend/src/event/EventProtocolType.ts b/backend/src/event/EventProtocolType.ts index b3ade4c5c..4df32aa53 100644 --- a/backend/src/event/EventProtocolType.ts +++ b/backend/src/event/EventProtocolType.ts @@ -6,6 +6,7 @@ export enum EventProtocolType { // VERIFY_REDEEM = 'VERIFY_REDEEM', // INACTIVE_ACCOUNT = 'INACTIVE_ACCOUNT', SEND_CONFIRMATION_EMAIL = 'SEND_CONFIRMATION_EMAIL', + ADMIN_SEND_CONFIRMATION_EMAIL = 'ADMIN_SEND_CONFIRMATION_EMAIL', SEND_ACCOUNT_MULTIREGISTRATION_EMAIL = 'SEND_ACCOUNT_MULTIREGISTRATION_EMAIL', // CONFIRM_EMAIL = 'CONFIRM_EMAIL', // REGISTER_EMAIL_KLICKTIPP = 'REGISTER_EMAIL_KLICKTIPP', diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index 2aba1c538..d3397c720 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -55,6 +55,7 @@ import { EVENT_SEND_CONFIRMATION_EMAIL, EVENT_REGISTER, EVENT_ACTIVATE_ACCOUNT, + EVENT_ADMIN_SEND_CONFIRMATION_EMAIL, } from '@/event/Event' import { getUserCreations } from './util/creations' import { isValidPassword } from '@/password/EncryptorUtils' @@ -328,7 +329,6 @@ export class UserResolver { }) logger.info(`sendAccountActivationEmail of ${firstName}.${lastName} to ${email}`) - // TODO: this event is used twice, why? await EVENT_SEND_CONFIRMATION_EMAIL(dbUser.id) if (!emailSent) { @@ -809,8 +809,7 @@ export class UserResolver { if (!emailSent) { logger.info(`Account confirmation link: ${activationLink}`) } else { - // TODO: this event is used twice, why? - await EVENT_SEND_CONFIRMATION_EMAIL(user.id) + await EVENT_ADMIN_SEND_CONFIRMATION_EMAIL(user.id) } return true