From ce3e5c84bd18e6f78a11399918f2db8d4df70055 Mon Sep 17 00:00:00 2001
From: Dobromir Popov <dobromir.popov@gateway.one>
Date: Sun, 7 Apr 2024 00:29:38 +0300
Subject: [PATCH] mailclient settings from config

---
 .env                          | 10 ++++++++--
 _deploy/deoloy.azure.demo.yml |  2 +-
 src/helpers/email.js          | 16 +++++++++-------
 3 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/.env b/.env
index 24dc32d..44e9f90 100644
--- a/.env
+++ b/.env
@@ -42,8 +42,14 @@ GITHUB_SECRET=
 TWITTER_ID=
 TWITTER_SECRET=
 
-EMAIL_SERVER=smtp://8ec69527ff2104:c7bc05f171c96c@smtp.mailtrap.io:2525
-EMAIL_FROM=noreply@example.com
+
+# EMAIL_SERVER=smtp://8ec69527ff2104:c7bc05f171c96c@smtp.mailtrap.io:2525
+EMAIL_FROM=noreply@mwitnessing.com
+
+MAILTRAP_HOST_BULK=bulk.smtp.mailtrap.io
+MAILTRAP_HOST=sandbox.smtp.mailtrap.io
+MAILTRAP_USER=8ec69527ff2104
+MAILTRAP_PASS=c7bc05f171c96c
 
 GMAIL_EMAIL_USERNAME=
 GMAIL_EMAIL_APP_PASS=
diff --git a/_deploy/deoloy.azure.demo.yml b/_deploy/deoloy.azure.demo.yml
index 8dac626..44a440c 100644
--- a/_deploy/deoloy.azure.demo.yml
+++ b/_deploy/deoloy.azure.demo.yml
@@ -1,6 +1,6 @@
 version: "3"
 services:
-  nextjs-app: # https://sofia.mwhitnessing.com/
+  nextjs-app: # https://sofia.mwitnessing.com/
     hostname: jwpw-app-staging # jwpw-nextjs-app-1
     image: docker.d-popov.com/jwpw:latest
     volumes:
diff --git a/src/helpers/email.js b/src/helpers/email.js
index a69db91..1d99093 100644
--- a/src/helpers/email.js
+++ b/src/helpers/email.js
@@ -12,11 +12,13 @@ const Handlebars = require('handlebars');
 // const OAuth2 = google.auth.OAuth2;
 
 const { Shift, Publisher, PrismaClient } = require("@prisma/client");
+const { env } = require("../../next.config");
+
+// const TOKEN = process.env.TOKEN || "a7d7147a530235029d74a4c2f228e6ad";
+// const SENDER_EMAIL = "sofia@mwitnessing.com";
+// const sender = { name: "Специално Свидетелстване София", email: SENDER_EMAIL };
+// const client = new MailtrapClient({ token: TOKEN });
 
-const TOKEN = process.env.TOKEN || "a7d7147a530235029d74a4c2f228e6ad";
-const SENDER_EMAIL = "sofia@mwitnessing.com";
-const sender = { name: "Специално Свидетелстване София", email: SENDER_EMAIL };
-const client = new MailtrapClient({ token: TOKEN });
 let mailtrapTestClient = null;
 // const mailtrapTestClient = new MailtrapClient({
 //   username: '8ec69527ff2104',//not working now
@@ -25,11 +27,11 @@ let mailtrapTestClient = null;
 
 //test
 var transporter = nodemailer.createTransport({
-  host: "sandbox.smtp.mailtrap.io",
+  host: process.env.MAILTRAP_HOST || "sandbox.smtp.mailtrap.io",
   port: 2525,
   auth: {
-    user: "8ec69527ff2104",
-    pass: "c7bc05f171c96c"
+    user: process.env.MAILTRAP_USER,
+    pass: process.env.MAILTRAP_PASS
   }
 });
 // production