@tryghost/nodemailer 0.3.1 → 0.3.2

package/lib/nodemailer.js

@@ -46,15 +46,15 @@ module.exports = function (transport, options = {}) {
 
         const pattern = /(.*)email(.*)\.(.*).amazonaws.com/i;
         const result = pattern.exec(options.ServiceUrl);
+        const region = options.region || (result && result[3]) || 'us-east-1';
 
-        const sesOptions = options || {};
-        sesOptions.accessKeyId = sesOptions.accessKeyId || sesOptions.AWSAccessKeyID;
-        sesOptions.secretAccessKey = sesOptions.secretAccessKey || sesOptions.AWSSecretKey;
-        sesOptions.sessionToken = sesOptions.sessionToken || sesOptions.AWSSecurityToken;
-        sesOptions.apiVersion = '2010-12-01';
-        sesOptions.region = sesOptions.region || (result && result[3]) || 'us-east-1';
+        process.env.AWS_ACCESS_KEY_ID = options.accessKeyId || options.AWSAccessKeyID;
+        process.env.AWS_SECRET_ACCESS_KEY = options.secretAccessKey || options.AWSSecretKey;
 
-        const ses = new aws.SES(sesOptions);
+        const ses = new aws.SES({
+            apiVersion: '2010-12-01',
+            region
+        });
 
         transportOptions = {
             SES: {ses, aws}
@@ -75,5 +75,11 @@ module.exports = function (transport, options = {}) {
         });
     }
 
-    return nodemailer.createTransport(transportOptions);
+    const transporter = nodemailer.createTransport(transportOptions);
+
+    if (transport === 'smtp') {
+        Object.assign(transporter.transporter.options, options);
+    }
+
+    return transporter;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tryghost/nodemailer",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "repository": "https://github.com/TryGhost/framework/tree/main/packages/nodemailer",
   "author": "Ghost Foundation",
   "license": "MIT",
@@ -31,5 +31,5 @@
     "nodemailer-direct-transport": "^3.3.2",
     "nodemailer-stub-transport": "^1.1.0"
   },
-  "gitHead": "4dad1a7558cc2c485e6e044a332d6f9242bebf0b"
+  "gitHead": "df79e7ac89a9b6b988ac5607f8680107d4f054cc"
 }