fix(api): Added support for Ethereal authentication

nodemailer · Jun 19, 2024 · 56b2205 · 56b2205
1 parent 21a28a1
commit 56b2205
Show file tree

Hide file tree

Showing 5 changed files with 1,156 additions and 844 deletions.
diff --git a/.ncurc.js b/.ncurc.js
@@ -2,6 +2,9 @@ module.exports = {
     upgrade: true,
     reject: [
         // API changes break existing tests
-        'proxy'
+        'proxy',
+
+        // API changes
+        'eslint'
     ]
 };
diff --git a/lib/nodemailer.js b/lib/nodemailer.js
@@ -13,6 +13,7 @@ const packageData = require('../package.json');
 
 const ETHEREAL_API = (process.env.ETHEREAL_API || 'https://api.nodemailer.com').replace(/\/+$/, '');
 const ETHEREAL_WEB = (process.env.ETHEREAL_WEB || 'https://ethereal.email').replace(/\/+$/, '');
+const ETHEREAL_API_KEY = (process.env.ETHEREAL_API_KEY || '').replace(/\s*/g, '') || null;
 const ETHEREAL_CACHE = ['true', 'yes', 'y', '1'].includes((process.env.ETHEREAL_CACHE || 'yes').toString().trim().toLowerCase());
 
 let testAccount = false;
@@ -79,15 +80,21 @@ module.exports.createTestAccount = function (apiUrl, callback) {
     let chunks = [];
     let chunklen = 0;
 
+    let requestHeaders = {};
+    let requestBody = {
+        requestor: packageData.name,
+        version: packageData.version
+    };
+
+    if (ETHEREAL_API_KEY) {
+        requestHeaders.Authorization = 'Bearer ' + ETHEREAL_API_KEY;
+    }
+
     let req = nmfetch(apiUrl + '/user', {
         contentType: 'application/json',
         method: 'POST',
-        body: Buffer.from(
-            JSON.stringify({
-                requestor: packageData.name,
-                version: packageData.version
-            })
-        )
+        headers: requestHeaders,
+        body: Buffer.from(JSON.stringify(requestBody))
     });
 
     req.on('readable', () => {