diff --git a/backend/.env.dist b/backend/.env.dist index a820780ab..b0a08753c 100644 --- a/backend/.env.dist +++ b/backend/.env.dist @@ -43,9 +43,9 @@ EMAIL_SMTP_PORT=587 EMAIL_LINK_VERIFICATION=http://localhost/checkEmail/{optin}{code} EMAIL_LINK_SETPASSWORD=http://localhost/reset-password/{optin} EMAIL_LINK_FORGOTPASSWORD=http://localhost/forgot-password +EMAIL_LINK_OVERVIEW=http://localhost/overview EMAIL_CODE_VALID_TIME=1440 EMAIL_CODE_REQUEST_TIME=10 -EMAIL_CLIENT_URI=http://localhost # Webhook WEBHOOK_ELOPAGE_SECRET=secret \ No newline at end of file diff --git a/backend/.env.template b/backend/.env.template index d66217ebf..5da108f53 100644 --- a/backend/.env.template +++ b/backend/.env.template @@ -41,9 +41,9 @@ EMAIL_SMTP_URL=$EMAIL_SMTP_URL EMAIL_SMTP_PORT=587 EMAIL_LINK_VERIFICATION=$EMAIL_LINK_VERIFICATION EMAIL_LINK_SETPASSWORD=$EMAIL_LINK_SETPASSWORD +EMAIL_LINK_OVERVIEW=$EMAIL_LINK_OVERVIEW 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 \ No newline at end of file diff --git a/backend/src/config/index.ts b/backend/src/config/index.ts index c69f9c92a..91f450369 100644 --- a/backend/src/config/index.ts +++ b/backend/src/config/index.ts @@ -72,6 +72,7 @@ const email = { process.env.EMAIL_LINK_SETPASSWORD || 'http://localhost/reset-password/{optin}', EMAIL_LINK_FORGOTPASSWORD: process.env.EMAIL_LINK_FORGOTPASSWORD || 'http://localhost/forgot-password', + EMAIL_LINK_OVERVIEW: process.env.EMAIL_LINK_OVERVIEW || 'http://localhost/overview', // time in minutes a optin code is valid EMAIL_CODE_VALID_TIME: process.env.EMAIL_CODE_VALID_TIME ? parseInt(process.env.EMAIL_CODE_VALID_TIME) || 1440 @@ -80,7 +81,6 @@ 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 = { diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts index 2d54e8167..69e1899d9 100644 --- a/backend/src/graphql/resolver/TransactionResolver.ts +++ b/backend/src/graphql/resolver/TransactionResolver.ts @@ -126,7 +126,6 @@ export const executeTransaction = async ( } // send notification email - const overviewURL = new URL('/overview', CONFIG.EMAIL_CLIENT_URI) // TODO: translate await sendTransactionReceivedEmail({ senderFirstName: sender.firstName, @@ -137,7 +136,7 @@ export const executeTransaction = async ( senderEmail: sender.email, amount, memo, - overviewURL: overviewURL.toString(), + overviewURL: CONFIG.EMAIL_LINK_OVERVIEW, }) return true diff --git a/backend/src/mailer/sendTransactionReceivedEmail.test.ts b/backend/src/mailer/sendTransactionReceivedEmail.test.ts index d933e53d3..75631cc7a 100644 --- a/backend/src/mailer/sendTransactionReceivedEmail.test.ts +++ b/backend/src/mailer/sendTransactionReceivedEmail.test.ts @@ -34,7 +34,7 @@ describe('sendTransactionReceivedEmail', () => { expect.stringContaining('Bibi Bloxberg') && expect.stringContaining('(bibi@bloxberg.de)') && expect.stringContaining('Vielen herzlichen Dank für den neuen Hexenbesen!') && - expect.stringContaining(''), + expect.stringContaining('http://localhost/overview'), }) }) }) diff --git a/backend/src/mailer/text/transactionReceived.ts b/backend/src/mailer/text/transactionReceived.ts index a976bd842..c56a923b4 100644 --- a/backend/src/mailer/text/transactionReceived.ts +++ b/backend/src/mailer/text/transactionReceived.ts @@ -29,6 +29,6 @@ Mit freundlichen Grüßen, dein Gradido-Team -Link zur Übersicht: Deine Übersicht`, +Link zu deiner Übersicht: ${data.overviewURL}`, }, } diff --git a/deployment/bare_metal/.env.dist b/deployment/bare_metal/.env.dist index 1b287fe47..4c6e956af 100644 --- a/deployment/bare_metal/.env.dist +++ b/deployment/bare_metal/.env.dist @@ -44,9 +44,9 @@ EMAIL_SMTP_URL=smtp.lustig.de EMAIL_LINK_VERIFICATION=https://stage1.gradido.net/checkEmail/{optin}{code} EMAIL_LINK_SETPASSWORD=https://stage1.gradido.net/reset-password/{optin} EMAIL_LINK_FORGOTPASSWORD=https://stage1.gradido.net/forgot-password +EMAIL_LINK_OVERVIEW=https://stage1.gradido.net/overview EMAIL_CODE_VALID_TIME=1440 EMAIL_CODE_REQUEST_TIME=10 -EMAIL_CLIENT_URI=https://stage1.gradido.net WEBHOOK_ELOPAGE_SECRET=secret