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

removed todos, separated events

Browse Source
This commit is contained in:
Ulf Gebhardt 2023-02-13 12:14:00 +01:00
parent fb84abeb83
commit 8424417cde
Signed by: ulfgebhardt
GPG Key ID: DA6B843E748679C9
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
backend/src/event/Event.ts
View File

@ -186,6 +186,9 @@ export const EVENT_SEND_ACCOUNT_MULTIREGISTRATION_EMAIL = async (
export const EVENT_SEND_CONFIRMATION_EMAIL = async (userId: number): Promise<DbEvent> => export const EVENT_SEND_CONFIRMATION_EMAIL = async (userId: number): Promise<DbEvent> =>
EVENT(EventProtocolType.SEND_CONFIRMATION_EMAIL, userId).save() EVENT(EventProtocolType.SEND_CONFIRMATION_EMAIL, userId).save()
export const EVENT_ADMIN_SEND_CONFIRMATION_EMAIL = async (userId: number): Promise<DbEvent> =>
EVENT(EventProtocolType.ADMIN_SEND_CONFIRMATION_EMAIL, userId).save()
/* export const EVENT_REDEEM_REGISTER = async ( /* export const EVENT_REDEEM_REGISTER = async (
userId: number, userId: number,
transactionId: number | null = null, transactionId: number | null = null,

1
backend/src/event/EventProtocolType.ts
View File

@ -6,6 +6,7 @@ export enum EventProtocolType {
// VERIFY_REDEEM = 'VERIFY_REDEEM', // VERIFY_REDEEM = 'VERIFY_REDEEM',
// INACTIVE_ACCOUNT = 'INACTIVE_ACCOUNT', // INACTIVE_ACCOUNT = 'INACTIVE_ACCOUNT',
SEND_CONFIRMATION_EMAIL = 'SEND_CONFIRMATION_EMAIL', SEND_CONFIRMATION_EMAIL = 'SEND_CONFIRMATION_EMAIL',
ADMIN_SEND_CONFIRMATION_EMAIL = 'ADMIN_SEND_CONFIRMATION_EMAIL',
SEND_ACCOUNT_MULTIREGISTRATION_EMAIL = 'SEND_ACCOUNT_MULTIREGISTRATION_EMAIL', SEND_ACCOUNT_MULTIREGISTRATION_EMAIL = 'SEND_ACCOUNT_MULTIREGISTRATION_EMAIL',
// CONFIRM_EMAIL = 'CONFIRM_EMAIL', // CONFIRM_EMAIL = 'CONFIRM_EMAIL',
// REGISTER_EMAIL_KLICKTIPP = 'REGISTER_EMAIL_KLICKTIPP', // REGISTER_EMAIL_KLICKTIPP = 'REGISTER_EMAIL_KLICKTIPP',

5
backend/src/graphql/resolver/UserResolver.ts
View File

@ -55,6 +55,7 @@ import {
EVENT_SEND_CONFIRMATION_EMAIL, EVENT_SEND_CONFIRMATION_EMAIL,
EVENT_REGISTER, EVENT_REGISTER,
EVENT_ACTIVATE_ACCOUNT, EVENT_ACTIVATE_ACCOUNT,
EVENT_ADMIN_SEND_CONFIRMATION_EMAIL,
} from '@/event/Event' } from '@/event/Event'
import { getUserCreations } from './util/creations' import { getUserCreations } from './util/creations'
import { isValidPassword } from '@/password/EncryptorUtils' import { isValidPassword } from '@/password/EncryptorUtils'
@ -328,7 +329,6 @@ export class UserResolver {
}) })
logger.info(`sendAccountActivationEmail of ${firstName}.${lastName} to ${email}`) logger.info(`sendAccountActivationEmail of ${firstName}.${lastName} to ${email}`)
// TODO: this event is used twice, why?
await EVENT_SEND_CONFIRMATION_EMAIL(dbUser.id) await EVENT_SEND_CONFIRMATION_EMAIL(dbUser.id)
if (!emailSent) { if (!emailSent) {
@ -809,8 +809,7 @@ export class UserResolver {
if (!emailSent) { if (!emailSent) {
logger.info(`Account confirmation link: ${activationLink}`) logger.info(`Account confirmation link: ${activationLink}`)
} else { } else {
// TODO: this event is used twice, why? await EVENT_ADMIN_SEND_CONFIRMATION_EMAIL(user.id)
await EVENT_SEND_CONFIRMATION_EMAIL(user.id)
} }
return true return true