diff --git a/backend/.env.dist b/backend/.env.dist index df08c7a66..2bbc5c9d1 100644 --- a/backend/.env.dist +++ b/backend/.env.dist @@ -46,7 +46,6 @@ EMAIL_LINK_SETPASSWORD=http://localhost/reset-password/{optin} EMAIL_LINK_FORGOTPASSWORD=http://localhost/forgot-password EMAIL_LINK_OVERVIEW=http://localhost/overview EMAIL_LINK_SUPPORT=https://gradido.net/de/contact/ -EMAIL_EMAIL_SUPPORT=support@gradido.net EMAIL_CODE_VALID_TIME=1440 EMAIL_CODE_REQUEST_TIME=10 diff --git a/backend/.env.template b/backend/.env.template index 091ddf08c..07dd0edc2 100644 --- a/backend/.env.template +++ b/backend/.env.template @@ -45,7 +45,6 @@ EMAIL_LINK_SETPASSWORD=$EMAIL_LINK_SETPASSWORD EMAIL_LINK_FORGOTPASSWORD=$EMAIL_LINK_FORGOTPASSWORD EMAIL_LINK_OVERVIEW=$EMAIL_LINK_OVERVIEW EMAIL_LINK_SUPPORT=$EMAIL_LINK_SUPPORT -EMAIL_EMAIL_SUPPORT=$EMAIL_EMAIL_SUPPORT EMAIL_CODE_VALID_TIME=$EMAIL_CODE_VALID_TIME EMAIL_CODE_REQUEST_TIME=$EMAIL_CODE_REQUEST_TIME diff --git a/backend/src/config/index.ts b/backend/src/config/index.ts index 7e28d3d08..28fd0fb80 100644 --- a/backend/src/config/index.ts +++ b/backend/src/config/index.ts @@ -78,7 +78,6 @@ const email = { process.env.EMAIL_LINK_FORGOTPASSWORD || 'http://localhost/forgot-password', EMAIL_LINK_OVERVIEW: process.env.EMAIL_LINK_OVERVIEW || 'http://localhost/overview', EMAIL_LINK_SUPPORT: process.env.EMAIL_LINK_SUPPORT || 'https://gradido.net/de/contact/', - EMAIL_EMAIL_SUPPORT: process.env.EMAIL_EMAIL_SUPPORT || 'support@gradido.net', // 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 diff --git a/backend/src/mailer/sendAccountMultiRegistrationEmail.test.ts b/backend/src/mailer/sendAccountMultiRegistrationEmail.test.ts index 67749c966..ba71b8b37 100644 --- a/backend/src/mailer/sendAccountMultiRegistrationEmail.test.ts +++ b/backend/src/mailer/sendAccountMultiRegistrationEmail.test.ts @@ -20,7 +20,6 @@ describe('sendAccountMultiRegistrationEmail', () => { it('calls sendEMail', () => { expect(sendEMail).toBeCalledWith({ to: `Peter Lustig `, - cc: 'support@gradido.net', subject: 'Gradido: Erneuter Registrierungsversuch mit deiner E-Mail', text: expect.stringContaining('Hallo Peter Lustig') && diff --git a/backend/src/mailer/sendAccountMultiRegistrationEmail.ts b/backend/src/mailer/sendAccountMultiRegistrationEmail.ts index f1420a229..8999e9e2b 100644 --- a/backend/src/mailer/sendAccountMultiRegistrationEmail.ts +++ b/backend/src/mailer/sendAccountMultiRegistrationEmail.ts @@ -9,7 +9,6 @@ export const sendAccountMultiRegistrationEmail = (data: { }): Promise => { return sendEMail({ to: `${data.firstName} ${data.lastName} <${data.email}>`, - cc: CONFIG.EMAIL_EMAIL_SUPPORT, subject: accountMultiRegistration.de.subject, text: accountMultiRegistration.de.text({ ...data, diff --git a/deployment/bare_metal/.env.dist b/deployment/bare_metal/.env.dist index b90ec9ea7..ac31a8524 100644 --- a/deployment/bare_metal/.env.dist +++ b/deployment/bare_metal/.env.dist @@ -48,7 +48,6 @@ 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_LINK_SUPPORT=https://gradido.net/de/contact/ -EMAIL_EMAIL_SUPPORT=support@gradido.net EMAIL_CODE_VALID_TIME=1440 EMAIL_CODE_REQUEST_TIME=10