Merge branch 'testing' into 'prep_prod'

Testing

See merge request !94

config/config.js

@@ -28,6 +28,7 @@ module.exports = {
       host: 'mailhost',  // hostname
       secureConnection: false,        // TLS requires secureConnection to be false
       port: 587,                      // port for secure SMTP
+      TLS: true,                      // sets requireTLS
       authUser: 'mailuser',
       authPass: 'mailpass',
       tlsCiphers: 'SSLv3',
@@ -66,6 +67,7 @@ module.exports = {
       host: 'mailhost',  // hostname
       secureConnection: false,        // TLS requires secureConnection to be false
       port: 587,                      // port for secure SMTP
+      TLS: true,                      // sets requireTLS
       authUser: 'mailuser',
       authPass: 'mailpass',
       tlsCiphers: 'SSLv3',
@@ -75,4 +77,4 @@ module.exports = {
       token_readWriteProjects: 'token-goes-here'
     }
   }
-}
\ No newline at end of file
+}

config/mailer.js

-const nodemailer = require('nodemailer')
+const nodemailer = require('nodemailer');
+const nodemailerNTLMAuth = require('nodemailer-ntlm-auth');
+
 
 var env = process.env.NODE_ENV || 'testing';
 const config = require('./config')[env]
@@ -7,9 +9,18 @@ var smtpTransport = nodemailer.createTransport({
     host: config.mailer.host,
     secure: config.mailer.secureConnection,
     port: config.mailer.port,
+    requireTLS: config.mailer.TLS,
     auth: {
+      type: 'custom',
+      method: 'NTLM',
       user: config.mailer.authUser,
-      pass: config.mailer.authPass
+      pass: config.mailer.authPass,
+     options: {
+        domain: 'ad'
+      }
+    },
+    customAuth:{
+        NTLM: nodemailerNTLMAuth
     }
 });
   
@@ -25,4 +36,4 @@ var mailer = {
     options: mailOptions
 }
 
-module.exports = mailer
\ No newline at end of file
+module.exports = mailer

package.json

@@ -42,6 +42,7 @@
     "mysql": "^2.17.1",
     "mysql2": "^2.2.5",
     "nodemailer": "^6.3.1",
+    "nodemailer-ntlm-auth": "^1.0.1",
     "passport": "0.3.2",
     "passport-saml": "^2.1.0",
     "pug": "^3.0.2"