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

time span for email code valid time

Browse Source
This commit is contained in:
Moriz Wahl 2022-03-23 14:28:24 +01:00
parent 2faad50919
commit 662285161c
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -157,7 +157,7 @@ const createEmailOptIn = async (
}) })
if (emailOptIn) { if (emailOptIn) {
if (isOptInCodeValid(emailOptIn)) { if (isOptInCodeValid(emailOptIn)) {
throw new Error(`email already sent less than $(CONFIG.EMAIL_CODE_VALID_TIME} minutes ago`) throw new Error(`email already sent less than ${printEmailCodeValidTime()} ago`)
} }
emailOptIn.updatedAt = new Date() emailOptIn.updatedAt = new Date()
emailOptIn.resendCount++ emailOptIn.resendCount++
@ -184,7 +184,7 @@ const getOptInCode = async (loginUserId: number): Promise<LoginEmailOptIn> => {
// Check for `CONFIG.EMAIL_CODE_VALID_TIME` minute delay // Check for `CONFIG.EMAIL_CODE_VALID_TIME` minute delay
if (optInCode) { if (optInCode) {
if (isOptInCodeValid(optInCode)) { if (isOptInCodeValid(optInCode)) {
throw new Error(`email already sent less than $(CONFIG.EMAIL_CODE_VALID_TIME} minutes ago`) throw new Error(`email already sent less than $(printEmailCodeValidTime()} minutes ago`)
} }
optInCode.updatedAt = new Date() optInCode.updatedAt = new Date()
optInCode.resendCount++ optInCode.resendCount++
@ -486,7 +486,7 @@ export class UserResolver {
// Code is only valid for `CONFIG.EMAIL_CODE_VALID_TIME` minutes // Code is only valid for `CONFIG.EMAIL_CODE_VALID_TIME` minutes
if (!isOptInCodeValid(optInCode)) { if (!isOptInCodeValid(optInCode)) {
throw new Error(`email already more than $(CONFIG.EMAIL_CODE_VALID_TIME} minutes ago`) throw new Error(`email was sent more than ${printEmailCodeValidTime()} ago`)
} }
// load user // load user
@ -565,7 +565,7 @@ export class UserResolver {
const optInCode = await LoginEmailOptIn.findOneOrFail({ verificationCode: optIn }) const optInCode = await LoginEmailOptIn.findOneOrFail({ verificationCode: optIn })
// Code is only valid for `CONFIG.EMAIL_CODE_VALID_TIME` minutes // Code is only valid for `CONFIG.EMAIL_CODE_VALID_TIME` minutes
if (!isOptInCodeValid(optInCode)) { if (!isOptInCodeValid(optInCode)) {
throw new Error(`email was sent more than $(CONFIG.EMAIL_CODE_VALID_TIME} minutes ago`) throw new Error(`email was sent more than $(printEmailCodeValidTime()} ago`)
} }
return true return true
} }
@ -671,7 +671,25 @@ export class UserResolver {
return hasElopageBuys(userEntity.email) return hasElopageBuys(userEntity.email)
} }
} }
function isOptInCodeValid(optInCode: LoginEmailOptIn) { function isOptInCodeValid(optInCode: LoginEmailOptIn) {
const timeElapsed = Date.now() - new Date(optInCode.updatedAt).getTime() const timeElapsed = Date.now() - new Date(optInCode.updatedAt).getTime()
return timeElapsed <= CONFIG.EMAIL_CODE_VALID_TIME * 60 * 1000 return timeElapsed <= CONFIG.EMAIL_CODE_VALID_TIME * 60 * 1000
} }
const emailCodeValidTime = (): { hours?: number; minutes: number } => {
if (CONFIG.EMAIL_CODE_VALID_TIME > 60) {
return {
hours: Math.floor(CONFIG.EMAIL_CODE_VALID_TIME / 60),
minutes: CONFIG.EMAIL_CODE_VALID_TIME % 60,
}
}
return { minutes: CONFIG.EMAIL_CODE_VALID_TIME }
}
const printEmailCodeValidTime = (): string => {
const time = emailCodeValidTime()
const result = time.minutes > 0 ? `${time.minutes} minutes` : ''
if (time.hours) return `${time.hours} hours` + result !== '' ? ` and ${result}` : ''
return result
}