From a40ab11287326eaf2722ebe5421b1950167dc97a Mon Sep 17 00:00:00 2001 From: einhorn_b Date: Mon, 30 Oct 2023 14:25:20 +0100 Subject: [PATCH 1/5] put sender email in config --- backend/.env.dist | 1 + backend/.env.template | 1 + backend/src/config/index.ts | 4 +++- backend/src/emails/sendEmailVariants.ts | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) 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, From 2662af34d1a2ac5e653741db1ec0ff8468fbcae5 Mon Sep 17 00:00:00 2001 From: Einhornimmond Date: Mon, 30 Oct 2023 15:49:06 +0100 Subject: [PATCH 2/5] undo unneccessary changes, use mailto links --- backend/src/config/index.ts | 2 -- backend/src/emails/sendEmailVariants.ts | 2 +- backend/src/emails/templates/includes/footer.pug | 5 ++++- frontend/src/components/ContentFooter.vue | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/backend/src/config/index.ts b/backend/src/config/index.ts index 9aa71b3c5..c49f6c8c2 100644 --- a/backend/src/config/index.ts +++ b/backend/src/config/index.ts @@ -79,8 +79,6 @@ 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 33509c9c6..ff7709380 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: CONFIG.EMAIL_SENDER_GRADIDOS_RECEIVED, + senderEmail: data.senderEmail, transactionAmount: decimalSeparatorByLanguage(data.transactionAmount, data.language), overviewURL: CONFIG.EMAIL_LINK_OVERVIEW, supportEmail: CONFIG.COMMUNITY_SUPPORT_MAIL, diff --git a/backend/src/emails/templates/includes/footer.pug b/backend/src/emails/templates/includes/footer.pug index 3ae63e32e..dac7bffe0 100644 --- a/backend/src/emails/templates/includes/footer.pug +++ b/backend/src/emails/templates/includes/footer.pug @@ -40,7 +40,10 @@ footer .line .footer div(class="footer_p1")= t("emails.footer.contactOurSupport") - div(class="footer_p2")= t("emails.footer.supportEmail") + a( + class="footer_p2" + href='mailto:' + t("emails.footer.supportEmail"))= t("emails.footer.supportEmail" + ) img.image( alt="Gradido Logo" src="https://gdd.gradido.net/img/brand/green.png" diff --git a/frontend/src/components/ContentFooter.vue b/frontend/src/components/ContentFooter.vue index c563cc23d..28fc8997f 100755 --- a/frontend/src/components/ContentFooter.vue +++ b/frontend/src/components/ContentFooter.vue @@ -44,7 +44,7 @@ > {{ $t('footer.whitepaper') }} - + {{ $t('navigation.support') }} From 35da7b5062d140161f144071dde23753add0c87f Mon Sep 17 00:00:00 2001 From: einhorn_b Date: Mon, 30 Oct 2023 17:43:44 +0100 Subject: [PATCH 3/5] fix links and tests --- backend/src/emails/templates/includes/footer.pug | 10 +++++----- frontend/src/components/ContentFooter.spec.js | 8 +------- frontend/src/components/ContentFooter.vue | 3 ++- 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/backend/src/emails/templates/includes/footer.pug b/backend/src/emails/templates/includes/footer.pug index dac7bffe0..5827b203b 100644 --- a/backend/src/emails/templates/includes/footer.pug +++ b/backend/src/emails/templates/includes/footer.pug @@ -42,17 +42,17 @@ footer div(class="footer_p1")= t("emails.footer.contactOurSupport") a( class="footer_p2" - href='mailto:' + t("emails.footer.supportEmail"))= t("emails.footer.supportEmail" - ) + href='mailto:' + t("emails.footer.supportEmail") + )= t("emails.footer.supportEmail") img.image( alt="Gradido Logo" src="https://gdd.gradido.net/img/brand/green.png" ) div a( - class="terms_of_use" - href="https://gradido.net/de/impressum/" - target="_blank" + class="terms_of_use" + href="https://gradido.net/de/impressum/" + target="_blank" )= t("emails.footer.imprint") br a( diff --git a/frontend/src/components/ContentFooter.spec.js b/frontend/src/components/ContentFooter.spec.js index 29d13bc28..1066abf58 100644 --- a/frontend/src/components/ContentFooter.spec.js +++ b/frontend/src/components/ContentFooter.spec.js @@ -105,7 +105,7 @@ describe('ContentFooter', () => { it('links to the support', () => { expect(wrapper.findAll('a.nav-link').at(3).attributes('href')).toEqual( - 'https://gradido.net/en/contact/', + 'mailto:support@supportmail.com', ) }) @@ -137,12 +137,6 @@ describe('ContentFooter', () => { 'https://docs.google.com/document/d/1jZp-DiiMPI9ZPNXmjsvOQ1BtnfDFfx8BX7CDmA8KKjY/edit?usp=sharing', ) }) - - it('links to the German support-page when locale is de', () => { - expect(wrapper.findAll('a.nav-link').at(3).attributes('href')).toEqual( - 'https://gradido.net/de/contact/', - ) - }) }) }) }) diff --git a/frontend/src/components/ContentFooter.vue b/frontend/src/components/ContentFooter.vue index 28fc8997f..720c14e0a 100755 --- a/frontend/src/components/ContentFooter.vue +++ b/frontend/src/components/ContentFooter.vue @@ -44,7 +44,7 @@ > {{ $t('footer.whitepaper') }} - + {{ $t('navigation.support') }} @@ -62,6 +62,7 @@ export default { version: CONFIG.APP_VERSION, hash: CONFIG.BUILD_COMMIT, shortHash: CONFIG.BUILD_COMMIT_SHORT, + supportEmail: CONFIG.COMMUNITY_SUPPORT_MAIL, } }, } From 117e0f70a86b452b979410d7501e00930b3f1d16 Mon Sep 17 00:00:00 2001 From: einhorn_b Date: Mon, 30 Oct 2023 17:48:44 +0100 Subject: [PATCH 4/5] rollback some earlier changes --- backend/.env.dist | 1 - backend/.env.template | 1 - backend/src/config/index.ts | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/backend/.env.dist b/backend/.env.dist index f9e0504d8..9844d8c4a 100644 --- a/backend/.env.dist +++ b/backend/.env.dist @@ -44,7 +44,6 @@ 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 2107b8599..e79122368 100644 --- a/backend/.env.template +++ b/backend/.env.template @@ -46,7 +46,6 @@ 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 c49f6c8c2..25e901491 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: 'v21.2023-10-29', + EXPECTED: 'v20.2023-09-19', CURRENT: '', }, } From 4ee91697a5fb4e35f62a538d8d025b7c22396c58 Mon Sep 17 00:00:00 2001 From: einhorn_b Date: Tue, 31 Oct 2023 14:20:28 +0100 Subject: [PATCH 5/5] update snapshot for email variants render test --- .../sendEmailVariants.test.ts.snap | 27 +++++++------------ 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/backend/src/emails/__snapshots__/sendEmailVariants.test.ts.snap b/backend/src/emails/__snapshots__/sendEmailVariants.test.ts.snap index f05291eab..da50bbcaf 100644 --- a/backend/src/emails/__snapshots__/sendEmailVariants.test.ts.snap +++ b/backend/src/emails/__snapshots__/sendEmailVariants.test.ts.snap @@ -160,8 +160,7 @@ If the validity of the link has already expired, you can have a new link sent to
\\"facebook\\"\\"Telegram\\"\\"Twitter\\"\\"youtube\\"
-
If you have any further questions, please contact our support.
-
support@gradido.net
\\"Gradido +
If you have any further questions, please contact our support.
support@gradido.net\\"Gradido
Privacy Policy
Gradido-Akademie
Institut für Wirtschaftsbionik
Pfarrweg 2
74653 Künzelsau
Deutschland


@@ -330,8 +329,7 @@ exports[`sendEmailVariants sendAccountMultiRegistrationEmail calls "sendEmailTra
\\"facebook\\"\\"Telegram\\"\\"Twitter\\"\\"youtube\\"
-
If you have any further questions, please contact our support.
-
support@gradido.net
\\"Gradido +
If you have any further questions, please contact our support.
support@gradido.net\\"Gradido
Privacy Policy
Gradido-Akademie
Institut für Wirtschaftsbionik
Pfarrweg 2
74653 Künzelsau
Deutschland


@@ -497,8 +495,7 @@ exports[`sendEmailVariants sendAddedContributionMessageEmail result has the corr
\\"facebook\\"\\"Telegram\\"\\"Twitter\\"\\"youtube\\"
-
If you have any further questions, please contact our support.
-
support@gradido.net
\\"Gradido +
If you have any further questions, please contact our support.
support@gradido.net\\"Gradido
Privacy Policy
Gradido-Akademie
Institut für Wirtschaftsbionik
Pfarrweg 2
74653 Künzelsau
Deutschland


@@ -665,8 +662,7 @@ exports[`sendEmailVariants sendContributionConfirmedEmail result has the correct
\\"facebook\\"\\"Telegram\\"\\"Twitter\\"\\"youtube\\"
-
If you have any further questions, please contact our support.
-
support@gradido.net
\\"Gradido +
If you have any further questions, please contact our support.
support@gradido.net\\"Gradido
Privacy Policy
Gradido-Akademie
Institut für Wirtschaftsbionik
Pfarrweg 2
74653 Künzelsau
Deutschland


@@ -833,8 +829,7 @@ exports[`sendEmailVariants sendContributionDeletedEmail result has the correct h
\\"facebook\\"\\"Telegram\\"\\"Twitter\\"\\"youtube\\"
-
If you have any further questions, please contact our support.
-
support@gradido.net
\\"Gradido +
If you have any further questions, please contact our support.
support@gradido.net\\"Gradido
Privacy Policy
Gradido-Akademie
Institut für Wirtschaftsbionik
Pfarrweg 2
74653 Künzelsau
Deutschland


@@ -1001,8 +996,7 @@ exports[`sendEmailVariants sendContributionDeniedEmail result has the correct ht
\\"facebook\\"\\"Telegram\\"\\"Twitter\\"\\"youtube\\"
-
If you have any further questions, please contact our support.
-
support@gradido.net
\\"Gradido +
If you have any further questions, please contact our support.
support@gradido.net\\"Gradido
Privacy Policy
Gradido-Akademie
Institut für Wirtschaftsbionik
Pfarrweg 2
74653 Künzelsau
Deutschland


@@ -1173,8 +1167,7 @@ If the validity of the link has already expired, you can have a new link sent to
\\"facebook\\"\\"Telegram\\"\\"Twitter\\"\\"youtube\\"
-
If you have any further questions, please contact our support.
-
support@gradido.net
\\"Gradido +
If you have any further questions, please contact our support.
support@gradido.net\\"Gradido
Privacy Policy
Gradido-Akademie
Institut für Wirtschaftsbionik
Pfarrweg 2
74653 Künzelsau
Deutschland


@@ -1341,8 +1334,7 @@ exports[`sendEmailVariants sendTransactionLinkRedeemedEmail result has the corre
\\"facebook\\"\\"Telegram\\"\\"Twitter\\"\\"youtube\\"
-
If you have any further questions, please contact our support.
-
support@gradido.net
\\"Gradido +
If you have any further questions, please contact our support.
support@gradido.net\\"Gradido
Privacy Policy
Gradido-Akademie
Institut für Wirtschaftsbionik
Pfarrweg 2
74653 Künzelsau
Deutschland


@@ -1508,8 +1500,7 @@ exports[`sendEmailVariants sendTransactionReceivedEmail result has the correct h
\\"facebook\\"\\"Telegram\\"\\"Twitter\\"\\"youtube\\"
-
If you have any further questions, please contact our support.
-
support@gradido.net
\\"Gradido +
If you have any further questions, please contact our support.
support@gradido.net\\"Gradido
Privacy Policy
Gradido-Akademie
Institut für Wirtschaftsbionik
Pfarrweg 2
74653 Künzelsau
Deutschland