From f93067308638730920949b1f62f012930ff8e45c Mon Sep 17 00:00:00 2001
From: FORESTIER Fabien <fabien.forestier@soprasteria.com>
Date: Tue, 22 Jan 2019 17:27:37 +0100
Subject: [PATCH] Use only one var env for the admin email/ email of the
platforme
---
docker-compose.yml | 1 -
src/configuration/config.service.ts | 1 -
src/configuration/config.ts | 1 -
src/configuration/template.env | 2 +-
src/email/email.service.ts | 2 +-
5 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/docker-compose.yml b/docker-compose.yml
index 88f494b..18436d1 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -8,7 +8,6 @@ services:
- ${DEV_SERVICE_EMAIL_PORT}:3000
environment:
- NODE_ENV=${NODE_ENV}
- - ADMIN_EMAILS=${DEV_ADMIN_EMAILS}
- PLATEFORM_DATA_EMAIL=${DEV_PLATEFORM_DATA_EMAIL}
- RABBITMQ_USER=${DEV_RABBITMQ_USER}
- RABBITMQ_PASSWORD=${DEV_RABBITMQ_PASSWORD}
diff --git a/src/configuration/config.service.ts b/src/configuration/config.service.ts
index d36c34e..f08c79f 100644
--- a/src/configuration/config.service.ts
+++ b/src/configuration/config.service.ts
@@ -20,7 +20,6 @@ export class ConfigService {
// Initializing conf with values from var env
this._config.rabbitMQ.user = process.env.RABBITMQ_USER;
this._config.rabbitMQ.password = process.env.RABBITMQ_PASSWORD;
- this._config.adminEmails = process.env.ADMIN_EMAILS.split(',');
this._config.plateformDataEmail = process.env.PLATEFORM_DATA_EMAIL;
}
diff --git a/src/configuration/config.ts b/src/configuration/config.ts
index 52dcedc..04375b1 100644
--- a/src/configuration/config.ts
+++ b/src/configuration/config.ts
@@ -6,6 +6,5 @@ export const config = {
port: '5672',
},
mailerQueue: 'portail-data-send-email',
- adminEmails: [],
plateformDataEmail: '',
};
\ No newline at end of file
diff --git a/src/configuration/template.env b/src/configuration/template.env
index 667471d..82d123b 100644
--- a/src/configuration/template.env
+++ b/src/configuration/template.env
@@ -1,3 +1,3 @@
RABBITMQ_USER=
RABBITMQ_PASSWORD=
-ADMIN_EMAILS=
\ No newline at end of file
+PLATEFORM_DATA_EMAIL=
\ No newline at end of file
diff --git a/src/email/email.service.ts b/src/email/email.service.ts
index 94e984a..448a69c 100644
--- a/src/email/email.service.ts
+++ b/src/email/email.service.ts
@@ -19,7 +19,7 @@ export class EmailService {
const email = new Email();
email.from = `${contactForm.firstname} ${contactForm.lastname} ${contactForm.from}`;
- email.to = this.config.adminEmails;
+ email.to = this.config.plateformDataEmail;
email.subject = contactForm.subject;
email.text = contactForm.text;
--
GitLab