From 767387bb7c16934374a434c5f5eef84d060f8fa8 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Wed, 23 Mar 2022 09:05:39 +0100
Subject: [PATCH] change {code} to {optin} to avoid confusion when redeem code
 is provided

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

diff --git a/backend/.env.dist b/backend/.env.dist
index 3c93f1576..37d0f0e67 100644
--- a/backend/.env.dist
+++ b/backend/.env.dist
@@ -38,8 +38,8 @@ EMAIL_SENDER=info@gradido.net
 EMAIL_PASSWORD=xxx
 EMAIL_SMTP_URL=gmail.com
 EMAIL_SMTP_PORT=587
-EMAIL_LINK_VERIFICATION=http://localhost/checkEmail/{code}
-EMAIL_LINK_SETPASSWORD=http://localhost/reset/{code}
+EMAIL_LINK_VERIFICATION=http://localhost/checkEmail/{optin}
+EMAIL_LINK_SETPASSWORD=http://localhost/reset/{optin}
 EMAIL_CODE_VALID_TIME=10
 
 # Webhook
diff --git a/backend/src/config/index.ts b/backend/src/config/index.ts
index 754bfbf08..9ef7d29e2 100644
--- a/backend/src/config/index.ts
+++ b/backend/src/config/index.ts
@@ -62,9 +62,9 @@ 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/{code}',
+    process.env.EMAIL_LINK_VERIFICATION || 'http://localhost/checkEmail/{optin}',
   EMAIL_LINK_SETPASSWORD:
-    process.env.EMAIL_LINK_SETPASSWORD || 'http://localhost/reset-password/{code}',
+    process.env.EMAIL_LINK_SETPASSWORD || 'http://localhost/reset-password/{optin}',
   EMAIL_CODE_VALID_TIME: process.env.EMAIL_CODE_VALID_TIME
     ? parseInt(process.env.EMAIL_CODE_VALID_TIME) || 10
     : 10,
diff --git a/backend/src/graphql/resolver/UserResolver.test.ts b/backend/src/graphql/resolver/UserResolver.test.ts
index f873fd694..a85601648 100644
--- a/backend/src/graphql/resolver/UserResolver.test.ts
+++ b/backend/src/graphql/resolver/UserResolver.test.ts
@@ -124,7 +124,7 @@ describe('UserResolver', () => {
 
     describe('account activation email', () => {
       it('sends an account activation email', () => {
-        const activationLink = CONFIG.EMAIL_LINK_VERIFICATION.replace(/{code}/g, emailOptIn)
+        const activationLink = CONFIG.EMAIL_LINK_VERIFICATION.replace(/{optin}/g, emailOptIn)
         expect(sendAccountActivationEmail).toBeCalledWith({
           link: activationLink,
           firstName: 'Peter',
diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts
index 6ff3acb17..7cf7a0daa 100644
--- a/backend/src/graphql/resolver/UserResolver.ts
+++ b/backend/src/graphql/resolver/UserResolver.ts
@@ -368,7 +368,7 @@ export class UserResolver {
       const emailOptIn = await createEmailOptIn(dbUser.id, queryRunner)
 
       let activationLink = CONFIG.EMAIL_LINK_VERIFICATION.replace(
-        /{code}/g,
+        /{optin}/g,
         emailOptIn.verificationCode.toString(),
       )
 
@@ -417,7 +417,7 @@ export class UserResolver {
       const emailOptIn = await createEmailOptIn(user.id, queryRunner)
 
       const activationLink = CONFIG.EMAIL_LINK_VERIFICATION.replace(
-        /{code}/g,
+        /{optin}/g,
         emailOptIn.verificationCode.toString(),
       )
 
@@ -456,7 +456,7 @@ export class UserResolver {
     const optInCode = await getOptInCode(user.id)
 
     const link = CONFIG.EMAIL_LINK_SETPASSWORD.replace(
-      /{code}/g,
+      /{optin}/g,
       optInCode.verificationCode.toString(),
     )