From a629e553e3aaa0968d78564aa31d1d542f873d1b Mon Sep 17 00:00:00 2001
From: Carina Antunes <carina.oliveira.antunes@cern.ch>
Date: Wed, 31 Mar 2021 17:23:11 +0000
Subject: [PATCH] [HOTFIX] Fix mail gateway address
---
.env | 1 +
.env.development.local | 1 +
.env.production | 1 +
.env.qa | 1 +
src/help/components/ChannelHelp.js | 9 +++++++--
src/help/components/SendNotificationHelp.js | 9 +++++++--
6 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/.env b/.env
index 83ec78bc..b7c7ffe0 100644
--- a/.env
+++ b/.env
@@ -1,3 +1,4 @@
REACT_APP_AUTHORIZATION_URL=https://auth.cern.ch/auth/realms/cern/protocol/openid-connect/auth
REACT_APP_ARCHIVE_URL=https://cern.ch/notifications-dev-archives
REACT_APP_VAPID_PUBLICKEY=BBynDjA9f_i8oOGAR0yeFzxQ2LIdmuR5BSZ7hVlv4Bti-vaeA7c-1nZj8jYgZHXBYAhp-iRFtGZQ1Zq6YBmJv4Y
+REACT_APP_EMAIL_GATEWAY_USER=notifications.dev
diff --git a/.env.development.local b/.env.development.local
index 89016378..61d18860 100644
--- a/.env.development.local
+++ b/.env.development.local
@@ -3,3 +3,4 @@ REACT_APP_OAUTH_REDIRECT_URL=https://localhost:3000/redirect
REACT_APP_OAUTH_LOGOUT_URL=https://localhost:3000/logout
REACT_APP_NODE_TLS_REJECT_UNAUTHORIZED=0
REACT_APP_NAME="CERN Notifications (Local Development)"
+
diff --git a/.env.production b/.env.production
index 312b8233..3b2edeaa 100644
--- a/.env.production
+++ b/.env.production
@@ -6,3 +6,4 @@ REACT_APP_APPLE_WEBSITEPUSHID=web.ch.cern.notifications
REACT_APP_APPLE_WEBSERVICEURL=https://api-notifications.app.cern.ch/apple/safari
REACT_APP_NAME="CERN Notifications"
REACT_APP_ARCHIVE_URL=https://cern.ch/notifications-archives
+REACT_APP_EMAIL_GATEWAY_USER=notifications
diff --git a/.env.qa b/.env.qa
index c136948a..d10128e0 100644
--- a/.env.qa
+++ b/.env.qa
@@ -6,3 +6,4 @@ REACT_APP_APPLE_WEBSITEPUSHID=web.ch.cern.notifications-qa
REACT_APP_APPLE_WEBSERVICEURL=https://api-notifications-qa.app.cern.ch/apple/safari
REACT_APP_NAME="CERN Notifications (QA)"
REACT_APP_ARCHIVE_URL=https://cern.ch/notifications-qa-archives
+REACT_APP_EMAIL_GATEWAY_USER=notifications.qa
diff --git a/src/help/components/ChannelHelp.js b/src/help/components/ChannelHelp.js
index 4284c0de..88a59902 100644
--- a/src/help/components/ChannelHelp.js
+++ b/src/help/components/ChannelHelp.js
@@ -91,12 +91,17 @@ const ChannelHelp = props => {
notification:
<br />
<Label>
- notifications+{'<'}channel-slug{'>+<'}level{'>'}@cern.ch
+ {process.env.REACT_APP_EMAIL_GATEWAY_USER}+{'<'}channel-slug{'>+<'}level{'>'}
+ @dovecotmta.cern.ch
</Label>
</p>
<p>
Example, to send an normal notification to channel <i>cern-barbecue</i> send the
- email to <i>notifications+cern-barbecue+normal@cern.ch</i>
+ email to{' '}
+ <i>
+ {process.env.REACT_APP_EMAIL_GATEWAY_USER}
+ +cern-barbecue+normal@dovecotmta.cern.ch
+ </i>
</p>
</List.Content>
</List.Item>
diff --git a/src/help/components/SendNotificationHelp.js b/src/help/components/SendNotificationHelp.js
index 946a1e7c..90af4850 100644
--- a/src/help/components/SendNotificationHelp.js
+++ b/src/help/components/SendNotificationHelp.js
@@ -60,12 +60,17 @@ const SendNotificationHelp = props => {
notification:
<br />
<Label>
- notifications+{'<'}channel-slug{'>+<'}level{'>'}@cern.ch
+ {process.env.REACT_APP_EMAIL_GATEWAY_USER}+{'<'}channel-slug{'>+<'}level{'>'}
+ @dovecotmta.cern.ch
</Label>
</p>
<p>
Example, to send an normal notification to channel <i>cern-barbecue</i> send the
- email to <i>notifications+cern-barbecue+normal@cern.ch</i>
+ email to{' '}
+ <i>
+ {process.env.REACT_APP_EMAIL_GATEWAY_USER}
+ +cern-barbecue+normal@dovecotmta.cern.ch
+ </i>
</p>
</List.Content>
</List.Item>
--
GitLab