From b1520182a2435783690321d6f070d598f470768d Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Wed, 12 Jan 2022 12:13:42 +0100 Subject: [PATCH] sendResetPasswordEmail with object as arg --- backend/src/graphql/resolver/UserResolver.ts | 8 ++++---- .../src/mailer/sendResetPasswordEmail.test.ts | 7 ++++++- backend/src/mailer/sendResetPasswordEmail.ts | 18 +++++++++--------- 3 files changed, 19 insertions(+), 14 deletions(-) diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index bf2274c7e..b37c69f87 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -522,12 +522,12 @@ export class UserResolver { optInCode.verificationCode.toString(), ) - const emailSent = await sendResetPasswordEmail( + const emailSent = await sendResetPasswordEmail({ link, - loginUser.firstName, - loginUser.lastName, + firstName: loginUser.firstName, + lastName: loginUser.lastName, email, - ) + }) // In case EMails are disabled log the activation link for the user if (!emailSent) { diff --git a/backend/src/mailer/sendResetPasswordEmail.test.ts b/backend/src/mailer/sendResetPasswordEmail.test.ts index 18eaaf179..a384d979a 100644 --- a/backend/src/mailer/sendResetPasswordEmail.test.ts +++ b/backend/src/mailer/sendResetPasswordEmail.test.ts @@ -10,7 +10,12 @@ jest.mock('./sendEMail', () => { describe('sendResetPasswordEmail', () => { beforeEach(async () => { - await sendResetPasswordEmail('resetLink', 'Peter', 'Lustig', 'peter@lustig.de') + await sendResetPasswordEmail({ + link: 'resetLink', + firstName: 'Peter', + lastName: 'Lustig', + email: 'peter@lustig.de', + }) }) it('calls sendEMail', () => { diff --git a/backend/src/mailer/sendResetPasswordEmail.ts b/backend/src/mailer/sendResetPasswordEmail.ts index 7cf9e7f23..ffdc84f41 100644 --- a/backend/src/mailer/sendResetPasswordEmail.ts +++ b/backend/src/mailer/sendResetPasswordEmail.ts @@ -1,18 +1,18 @@ import { sendEMail } from './sendEMail' -export const sendResetPasswordEmail = ( - resetLink: string, - firstName: string, - lastName: string, - email: string, -): Promise => { +export const sendResetPasswordEmail = (data: { + link: string + firstName: string + lastName: string + email: string +}): Promise => { return sendEMail({ - to: `${firstName} ${lastName} <${email}>`, + to: `${data.firstName} ${data.lastName} <${data.email}>`, subject: 'Gradido: Reset Password', - text: `Hallo ${firstName} ${lastName}, + text: `Hallo ${data.firstName} ${data.lastName}, Du oder jemand anderes hat für dieses Konto ein Zurücksetzen des Passworts angefordert. -Wenn du es warst, klicke bitte auf den Link: ${resetLink} +Wenn du es warst, klicke bitte auf den Link: ${data.link} oder kopiere den obigen Link in Dein Browserfenster. Mit freundlichen Grüßen,