From eea49804b4ca5a42fd8f4efaf43da74110562bd9 Mon Sep 17 00:00:00 2001
From: FORESTIER Fabien <fabien.forestier@soprasteria.com>
Date: Tue, 26 Mar 2019 09:53:28 +0100
Subject: [PATCH] Add the no-reply address as var env
---
.gitlab-ci.yml | 2 ++
docker-compose.yml | 1 +
src/configuration/config.service.ts | 1 +
src/configuration/config.ts | 1 +
src/configuration/template.env | 3 ++-
src/email/email.service.ts | 5 +++--
6 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4145f5b..8ac72ce 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -43,6 +43,7 @@ deploy_development:
- export RABBITMQ_LISTENING_PORT=5672
- export RABBITMQ_GUI_PORT=15672
- export MAIL_SUBJECT_PREFIX=alpha
+ - export NO_REPLY_MAIL_ADDRESS=no-reply@erasme.org
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
- docker-compose pull
- docker-compose --project-name service-email-${TAG} up -d --force-recreate
@@ -60,6 +61,7 @@ deploy_staging:
- export RABBITMQ_LISTENING_PORT=5673
- export RABBITMQ_GUI_PORT=15673
- export MAIL_SUBJECT_PREFIX=alpha
+ - export NO_REPLY_MAIL_ADDRESS=no-reply@erasme.org
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
- TAG=dev docker-compose pull
- docker tag $CI_REGISTRY/refonte-data/service-email:dev $CI_REGISTRY/refonte-data/service-email:${TAG}
diff --git a/docker-compose.yml b/docker-compose.yml
index 8d66098..978d069 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -14,6 +14,7 @@ services:
- GROUP_HEADER=x-consumer-groups
- EMAIL_WRITER_GROUP_NAME=email-writer
- MAIL_SUBJECT_PREFIX=${MAIL_SUBJECT_PREFIX}
+ - NO_REPLY_MAIL_ADDRESS=${NO_REPLY_MAIL_ADDRESS}
restart: unless-stopped
rabbitmq:
diff --git a/src/configuration/config.service.ts b/src/configuration/config.service.ts
index 2b12b4a..80c8f4b 100644
--- a/src/configuration/config.service.ts
+++ b/src/configuration/config.service.ts
@@ -24,6 +24,7 @@ export class ConfigService {
this._config.groupNames.emailWriter = process.env.EMAIL_WRITER_GROUP_NAME;
this._config.groupHeader = process.env.GROUP_HEADER;
this._config.mailSubjectPrefix = process.env.MAIL_SUBJECT_PREFIX;
+ this._config.noReplyMailAddress = process.env.NO_REPLY_MAIL_ADDRESS;
}
get config() {
diff --git a/src/configuration/config.ts b/src/configuration/config.ts
index dc11d00..b842d19 100644
--- a/src/configuration/config.ts
+++ b/src/configuration/config.ts
@@ -13,4 +13,5 @@ export const config = {
},
groupHeader: '',
mailSubjectPrefix: '',
+ noReplyMailAddress: '',
};
\ No newline at end of file
diff --git a/src/configuration/template.env b/src/configuration/template.env
index 6621c6d..06f4d17 100644
--- a/src/configuration/template.env
+++ b/src/configuration/template.env
@@ -1,4 +1,5 @@
RABBITMQ_USER=
RABBITMQ_PASSWORD=
USER_SUPPORT_MAILBOX=
-MAIL_SUBJECT_PREFIX=
\ No newline at end of file
+MAIL_SUBJECT_PREFIX=
+NO_REPLY_MAIL_ADDRESS=
\ No newline at end of file
diff --git a/src/email/email.service.ts b/src/email/email.service.ts
index ae8cb1c..ff428f1 100644
--- a/src/email/email.service.ts
+++ b/src/email/email.service.ts
@@ -43,6 +43,7 @@ export class EmailService {
const userEmail = new EmailWithoutFrom();
userEmail.to = [contactForm.email];
+ adminEmail.replyTo = this.config.userSupportMailbox;
userEmail.subject = contactForm.subject;
userEmail.html = userEmailBody;
@@ -89,10 +90,10 @@ export class EmailService {
const mailerQueue = this.config.mailerQueue;
let email = new Email();
- email.from = this.config.userSupportMailbox;
+ email.from = this.config.noReplyMailAddress;
email = Object.assign(email, emailInfo);
- if (this.config.emailSubjectPrefix) {
+ if (this.config.mailSubjectPrefix) {
email.subject = `[${this.config.mailSubjectPrefix}] ${email.subject}`;
}
--
GitLab