From 807922a8d5f391b713b7652a629c74cc6ad58aab Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Wed, 23 Mar 2022 09:17:15 +0100
Subject: [PATCH] redeem code in email link config

---
 backend/.env.dist                                 | 2 +-
 backend/src/config/index.ts                       | 2 +-
 backend/src/graphql/resolver/UserResolver.test.ts | 5 ++++-
 backend/src/graphql/resolver/UserResolver.ts      | 8 ++------
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/backend/.env.dist b/backend/.env.dist
index 37d0f0e67..7994daacf 100644
--- a/backend/.env.dist
+++ b/backend/.env.dist
@@ -38,7 +38,7 @@ EMAIL_SENDER=info@gradido.net
 EMAIL_PASSWORD=xxx
 EMAIL_SMTP_URL=gmail.com
 EMAIL_SMTP_PORT=587
-EMAIL_LINK_VERIFICATION=http://localhost/checkEmail/{optin}
+EMAIL_LINK_VERIFICATION=http://localhost/checkEmail/{optin}{code}
 EMAIL_LINK_SETPASSWORD=http://localhost/reset/{optin}
 EMAIL_CODE_VALID_TIME=10
 
diff --git a/backend/src/config/index.ts b/backend/src/config/index.ts
index 9ef7d29e2..e502272d3 100644
--- a/backend/src/config/index.ts
+++ b/backend/src/config/index.ts
@@ -62,7 +62,7 @@ const email = {
   EMAIL_SMTP_URL: process.env.EMAIL_SMTP_URL || 'gmail.com',
   EMAIL_SMTP_PORT: process.env.EMAIL_SMTP_PORT || '587',
   EMAIL_LINK_VERIFICATION:
-    process.env.EMAIL_LINK_VERIFICATION || 'http://localhost/checkEmail/{optin}',
+    process.env.EMAIL_LINK_VERIFICATION || 'http://localhost/checkEmail/{optin}{code}',
   EMAIL_LINK_SETPASSWORD:
     process.env.EMAIL_LINK_SETPASSWORD || 'http://localhost/reset-password/{optin}',
   EMAIL_CODE_VALID_TIME: process.env.EMAIL_CODE_VALID_TIME
diff --git a/backend/src/graphql/resolver/UserResolver.test.ts b/backend/src/graphql/resolver/UserResolver.test.ts
index a85601648..53f39668e 100644
--- a/backend/src/graphql/resolver/UserResolver.test.ts
+++ b/backend/src/graphql/resolver/UserResolver.test.ts
@@ -124,7 +124,10 @@ describe('UserResolver', () => {
 
     describe('account activation email', () => {
       it('sends an account activation email', () => {
-        const activationLink = CONFIG.EMAIL_LINK_VERIFICATION.replace(/{optin}/g, emailOptIn)
+        const activationLink = CONFIG.EMAIL_LINK_VERIFICATION.replace(
+          /{optin}/g,
+          emailOptIn,
+        ).replace(/{code}/g, '')
         expect(sendAccountActivationEmail).toBeCalledWith({
           link: activationLink,
           firstName: 'Peter',
diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts
index 7cf7a0daa..b24aa1b58 100644
--- a/backend/src/graphql/resolver/UserResolver.ts
+++ b/backend/src/graphql/resolver/UserResolver.ts
@@ -367,14 +367,10 @@ export class UserResolver {
       // TODO: this has duplicate code with sendResetPasswordEmail
       const emailOptIn = await createEmailOptIn(dbUser.id, queryRunner)
 
-      let activationLink = CONFIG.EMAIL_LINK_VERIFICATION.replace(
+      const activationLink = CONFIG.EMAIL_LINK_VERIFICATION.replace(
         /{optin}/g,
         emailOptIn.verificationCode.toString(),
-      )
-
-      if (redeemCode) {
-        activationLink += '/' + redeemCode
-      }
+      ).replace(/{code}/g, redeemCode ? '/' + redeemCode : '')
 
       // eslint-disable-next-line @typescript-eslint/no-unused-vars
       const emailSent = await sendAccountActivationEmail({