Add EMAIL_CLIENT_URI in config

- Increment config version.
- Correct usage of EMAIL_CLIENT_URI.

backend/.env.dist

@@ -1,4 +1,4 @@
-CONFIG_VERSION=v4.2022-04-05
+CONFIG_VERSION=v5.2022-04-12
 
 # Server
 PORT=4000
@@ -45,6 +45,7 @@ EMAIL_LINK_SETPASSWORD=http://localhost/reset-password/{optin}
 EMAIL_LINK_FORGOTPASSWORD=http://localhost/forgot-password
 EMAIL_CODE_VALID_TIME=1440
 EMAIL_CODE_REQUEST_TIME=10
+EMAIL_CLIENT_URI=http://localhost
 
 # Webhook
 WEBHOOK_ELOPAGE_SECRET=secret

backend/.env.template

@@ -43,6 +43,7 @@ EMAIL_LINK_VERIFICATION=$EMAIL_LINK_VERIFICATION
 EMAIL_LINK_SETPASSWORD=$EMAIL_LINK_SETPASSWORD
 EMAIL_CODE_VALID_TIME=$EMAIL_CODE_VALID_TIME
 EMAIL_CODE_REQUEST_TIME=$EMAIL_CODE_REQUEST_TIME
+EMAIL_CLIENT_URI=$EMAIL_CLIENT_URI
 
 # Webhook
 WEBHOOK_ELOPAGE_SECRET=$WEBHOOK_ELOPAGE_SECRET

backend/src/config/index.ts

@@ -14,7 +14,7 @@ const constants = {
   DECAY_START_TIME: new Date('2021-05-13 17:46:31'), // GMT+0
   CONFIG_VERSION: {
     DEFAULT: 'DEFAULT',
-    EXPECTED: 'v4.2022-04-05',
+    EXPECTED: 'v5.2022-04-12',
     CURRENT: '',
   },
 }
@@ -80,6 +80,7 @@ const email = {
   EMAIL_CODE_REQUEST_TIME: process.env.EMAIL_CODE_REQUEST_TIME
     ? parseInt(process.env.EMAIL_CODE_REQUEST_TIME) || 10
     : 10,
+  EMAIL_CLIENT_URI: process.env.EMAIL_CLIENT_URI || 'http://localhost',
 }
 
 const webhook = {

backend/src/graphql/resolver/TransactionResolver.ts

@@ -3,6 +3,8 @@
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 /* eslint-disable @typescript-eslint/no-non-null-assertion */
 
+import CONFIG from '@/config'
+
 import { Resolver, Query, Args, Authorized, Ctx, Mutation } from 'type-graphql'
 import { getCustomRepository, getConnection } from '@dbTools/typeorm'
 
@@ -125,7 +127,7 @@ export const executeTransaction = async (
   }
 
   // send notification email
-  const overviewURL = new URL('/overview' /* , XXX CONFIG.CLIENT_URI */) // http://localhost/overview
+  const overviewURL = new URL('/overview', CONFIG.EMAIL_CLIENT_URI)
   // TODO: translate
   await sendTransactionReceivedEmail({
     senderFirstName: sender.firstName,

deployment/bare_metal/.env.dist

@@ -18,7 +18,7 @@ WEBHOOK_GITHUB_SECRET=secret
 WEBHOOK_GITHUB_BRANCH=master
 
 # backend
-BACKEND_CONFIG_VERSION=v4.2022-04-05
+BACKEND_CONFIG_VERSION=v5.2022-04-12
 
 JWT_EXPIRES_IN=30m
 GDT_API_URL=https://gdt.gradido.net
@@ -46,6 +46,7 @@ EMAIL_LINK_SETPASSWORD=https://stage1.gradido.net/reset-password/{optin}
 EMAIL_LINK_FORGOTPASSWORD=https://stage1.gradido.net/forgot-password
 EMAIL_CODE_VALID_TIME=1440
 EMAIL_CODE_REQUEST_TIME=10
+EMAIL_CLIENT_URI=https://stage1.gradido.net
 
 WEBHOOK_ELOPAGE_SECRET=secret