From 490c8834cd1d76eb315152b7c65f10dd2de9ce30 Mon Sep 17 00:00:00 2001
From: Anton SHEPILOV <ashepilov@linagora.com>
Date: Fri, 1 Mar 2024 15:15:22 +0100
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8Be=20able=20to=20use=20SMTP=20transpor?=
 =?UTF-8?q?t=20without=20TLS?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tdrive/backend/node/package-lock.json                  | 10 ++++++++++
 tdrive/backend/node/package.json                       |  1 +
 .../src/core/platform/services/email-pusher/index.ts   |  3 +++
 .../src/core/platform/services/email-pusher/types.ts   |  1 +
 tdrive/backend/node/yarn.lock                          |  7 +++++++
 5 files changed, 22 insertions(+)

diff --git a/tdrive/backend/node/package-lock.json b/tdrive/backend/node/package-lock.json
index 17b89e08d..798d2f0c6 100644
--- a/tdrive/backend/node/package-lock.json
+++ b/tdrive/backend/node/package-lock.json
@@ -114,6 +114,7 @@
         "@types/node-cron": "^3.0.0",
         "@types/node-fetch": "^2.5.12",
         "@types/node-uuid": "^0.0.28",
+        "@types/nodemailer": "^6.4.14",
         "@types/pdf-image": "^2.0.1",
         "@types/pg-pool": "^2.0.6",
         "@types/pump": "^1.1.1",
@@ -3078,6 +3079,15 @@
         "@types/node": "*"
       }
     },
+    "node_modules/@types/nodemailer": {
+      "version": "6.4.14",
+      "resolved": "https://registry.npmjs.org/@types/nodemailer/-/nodemailer-6.4.14.tgz",
+      "integrity": "sha512-fUWthHO9k9DSdPCSPRqcu6TWhYyxTBg382vlNIttSe9M7XfsT06y0f24KHXtbnijPGGRIcVvdKHTNikOI6qiHA==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
     "node_modules/@types/normalize-package-data": {
       "version": "2.4.1",
       "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz",
diff --git a/tdrive/backend/node/package.json b/tdrive/backend/node/package.json
index 48da1e6e6..dc96fa938 100644
--- a/tdrive/backend/node/package.json
+++ b/tdrive/backend/node/package.json
@@ -73,6 +73,7 @@
     "@types/node-cron": "^3.0.0",
     "@types/node-fetch": "^2.5.12",
     "@types/node-uuid": "^0.0.28",
+    "@types/nodemailer": "^6.4.14",
     "@types/pdf-image": "^2.0.1",
     "@types/pg-pool": "^2.0.6",
     "@types/pump": "^1.1.1",
diff --git a/tdrive/backend/node/src/core/platform/services/email-pusher/index.ts b/tdrive/backend/node/src/core/platform/services/email-pusher/index.ts
index 65c3031fc..b87df43fc 100644
--- a/tdrive/backend/node/src/core/platform/services/email-pusher/index.ts
+++ b/tdrive/backend/node/src/core/platform/services/email-pusher/index.ts
@@ -47,7 +47,10 @@ export default class EmailPusherClass
         host: this.configuration.get<string>("smtp_host", ""),
         port: this.configuration.get<number>("smtp_port", 25),
         secure: false,
+        ignoreTLS: !this.configuration.get<boolean>("smtp_tls", false),
+        requireTLS: this.configuration.get<boolean>("smtp_tls", true),
       };
+      this.logger.info(`Start SMTP client with configuration: ${JSON.stringify(smtpConfig)}`);
       this.transporter = nodemailer.createTransport(smtpConfig);
       this.sender = this.configuration.get<string>("sender", "");
     } else {
diff --git a/tdrive/backend/node/src/core/platform/services/email-pusher/types.ts b/tdrive/backend/node/src/core/platform/services/email-pusher/types.ts
index 3682ad9d3..25c45f4fe 100644
--- a/tdrive/backend/node/src/core/platform/services/email-pusher/types.ts
+++ b/tdrive/backend/node/src/core/platform/services/email-pusher/types.ts
@@ -53,6 +53,7 @@ export type SMTPClientConfigType = {
   port: number;
   secure?: boolean;
   requireTLS?: boolean;
+  ignoreTLS?: boolean;
   auth?: {
     user: string;
     pass: string;
diff --git a/tdrive/backend/node/yarn.lock b/tdrive/backend/node/yarn.lock
index 7efdacb6a..cbd128695 100644
--- a/tdrive/backend/node/yarn.lock
+++ b/tdrive/backend/node/yarn.lock
@@ -1309,6 +1309,13 @@
   resolved "https://registry.npmjs.org/@types/node/-/node-15.14.9.tgz"
   integrity sha512-qjd88DrCxupx/kJD5yQgZdcYKZKSIGBVDIBE1/LTGcNm3d2Np/jxojkdePDdfnBHJc5W7vSMpbJ1aB7p/Py69A==
 
+"@types/nodemailer@^6.4.14":
+  version "6.4.14"
+  resolved "https://registry.npmjs.org/@types/nodemailer/-/nodemailer-6.4.14.tgz"
+  integrity sha512-fUWthHO9k9DSdPCSPRqcu6TWhYyxTBg382vlNIttSe9M7XfsT06y0f24KHXtbnijPGGRIcVvdKHTNikOI6qiHA==
+  dependencies:
+    "@types/node" "*"
+
 "@types/normalize-package-data@^2.4.0":
   version "2.4.1"
   resolved "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz"