diff --git a/backend/.env.dist b/backend/.env.dist index 9844d8c4a..f9e0504d8 100644 --- a/backend/.env.dist +++ b/backend/.env.dist @@ -44,6 +44,7 @@ EMAIL_TEST_MODUS=false EMAIL_TEST_RECEIVER=stage1@gradido.net EMAIL_USERNAME=gradido_email EMAIL_SENDER=info@gradido.net +EMAIL_SENDER_GRADIDOS_RECEIVED=noreply@gradido.net EMAIL_PASSWORD=xxx EMAIL_SMTP_URL=gmail.com EMAIL_SMTP_PORT=587 diff --git a/backend/.env.template b/backend/.env.template index e79122368..2107b8599 100644 --- a/backend/.env.template +++ b/backend/.env.template @@ -46,6 +46,7 @@ EMAIL_TEST_MODUS=$EMAIL_TEST_MODUS EMAIL_TEST_RECEIVER=$EMAIL_TEST_RECEIVER EMAIL_USERNAME=$EMAIL_USERNAME EMAIL_SENDER=$EMAIL_SENDER +EMAIL_SENDER_GRADIDOS_RECEIVED=$EMAIL_SENDER_GRADIDOS_RECEIVED EMAIL_PASSWORD=$EMAIL_PASSWORD EMAIL_SMTP_URL=$EMAIL_SMTP_URL EMAIL_SMTP_PORT=587 diff --git a/backend/src/config/index.ts b/backend/src/config/index.ts index 25e901491..9aa71b3c5 100644 --- a/backend/src/config/index.ts +++ b/backend/src/config/index.ts @@ -19,7 +19,7 @@ const constants = { LOG_LEVEL: process.env.LOG_LEVEL ?? 'info', CONFIG_VERSION: { DEFAULT: 'DEFAULT', - EXPECTED: 'v20.2023-09-19', + EXPECTED: 'v21.2023-10-29', CURRENT: '', }, } @@ -79,6 +79,8 @@ const email = { EMAIL_TEST_RECEIVER: process.env.EMAIL_TEST_RECEIVER ?? 'stage1@gradido.net', EMAIL_USERNAME: process.env.EMAIL_USERNAME ?? '', EMAIL_SENDER: process.env.EMAIL_SENDER ?? 'info@gradido.net', + EMAIL_SENDER_GRADIDOS_RECEIVED: + process.env.EMAIL_SENDER_GRADIDOS_RECEIVED ?? 'noreply@gradido.net', EMAIL_PASSWORD: process.env.EMAIL_PASSWORD ?? '', EMAIL_SMTP_URL: process.env.EMAIL_SMTP_URL ?? 'mailserver', EMAIL_SMTP_PORT: Number(process.env.EMAIL_SMTP_PORT) || 1025, diff --git a/backend/src/emails/sendEmailVariants.ts b/backend/src/emails/sendEmailVariants.ts index ff7709380..33509c9c6 100644 --- a/backend/src/emails/sendEmailVariants.ts +++ b/backend/src/emails/sendEmailVariants.ts @@ -230,7 +230,7 @@ export const sendTransactionReceivedEmail = (data: { locale: data.language, senderFirstName: data.senderFirstName, senderLastName: data.senderLastName, - senderEmail: data.senderEmail, + senderEmail: CONFIG.EMAIL_SENDER_GRADIDOS_RECEIVED, transactionAmount: decimalSeparatorByLanguage(data.transactionAmount, data.language), overviewURL: CONFIG.EMAIL_LINK_OVERVIEW, supportEmail: CONFIG.COMMUNITY_SUPPORT_MAIL,