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

Merge branch 'master' into 2594-filter-query-all-contributions

Browse Source
This commit is contained in:
Hannes Heine 2023-02-01 13:46:46 +01:00 committed by GitHub
commit cc4ff9c4b7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/graphql/resolver/EmailOptinCodes.test.ts
View File

@ -96,7 +96,7 @@ describe('EmailOptinCodes', () => {
mutate({ mutation: forgotPassword, variables: { email: 'peter@lustig.de' } }), mutate({ mutation: forgotPassword, variables: { email: 'peter@lustig.de' } }),
).resolves.toMatchObject({ ).resolves.toMatchObject({
data: null, data: null,
errors: [new GraphQLError('email already sent less than 10 minutes minutes ago')], errors: [new GraphQLError('email already sent less than 10 minutes ago')],
}) })
}) })

6
backend/src/graphql/resolver/UserResolver.test.ts
View File

@ -830,7 +830,7 @@ describe('UserResolver', () => {
new GraphQLError( new GraphQLError(
`email already sent less than ${printTimeDuration( `email already sent less than ${printTimeDuration(
CONFIG.EMAIL_CODE_REQUEST_TIME, CONFIG.EMAIL_CODE_REQUEST_TIME,
)} minutes ago`, )} ago`,
), ),
], ],
}), }),
@ -870,13 +870,13 @@ describe('UserResolver', () => {
CONFIG.EMAIL_CODE_REQUEST_TIME = emailCodeRequestTime CONFIG.EMAIL_CODE_REQUEST_TIME = emailCodeRequestTime
await expect(mutate({ mutation: forgotPassword, variables })).resolves.toEqual( await expect(mutate({ mutation: forgotPassword, variables })).resolves.toEqual(
expect.objectContaining({ expect.objectContaining({
errors: [new GraphQLError('email already sent less than 10 minutes minutes ago')], errors: [new GraphQLError('email already sent less than 10 minutes ago')],
}), }),
) )
}) })
it('logs the error found', () => { it('logs the error found', () => {
expect(logger.error).toBeCalledWith(`email already sent less than 10 minutes minutes ago`) expect(logger.error).toBeCalledWith(`email already sent less than 10 minutes ago`)
}) })
}) })
}) })

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

@ -392,16 +392,11 @@ export class UserResolver {
} }
if (!canEmailResend(user.emailContact.updatedAt || user.emailContact.createdAt)) { if (!canEmailResend(user.emailContact.updatedAt || user.emailContact.createdAt)) {
logger.error( const errorMessage = `email already sent less than ${printTimeDuration(
`email already sent less than ${printTimeDuration(
CONFIG.EMAIL_CODE_REQUEST_TIME, CONFIG.EMAIL_CODE_REQUEST_TIME,
)} minutes ago`, )} ago`
) logger.error(errorMessage)
throw new Error( throw new Error(errorMessage)
`email already sent less than ${printTimeDuration(
CONFIG.EMAIL_CODE_REQUEST_TIME,
)} minutes ago`,
)
} }
user.emailContact.updatedAt = new Date() user.emailContact.updatedAt = new Date()