Merge pull request #15127 from overleaf/ae-mandrill

Remove Mandrill nodemailer transport

GitOrigin-RevId: e83897fd8d54accec0954b9a36bb502a30cff22f

services/web/app/src/Features/Email/EmailSender.js

@@ -4,7 +4,6 @@ const metrics = require('@overleaf/metrics')
 const Settings = require('@overleaf/settings')
 const nodemailer = require('nodemailer')
 const sesTransport = require('nodemailer-ses-transport')
-const mandrillTransport = require('nodemailer-mandrill-transport')
 const OError = require('@overleaf/o-error')
 const { RateLimiter } = require('../../infrastructure/RateLimiter')
 const _ = require('lodash')
@@ -37,13 +36,8 @@ function getClient() {
         'sendgridApiKey configuration option is deprecated, use SMTP instead'
       )
     } else if (emailParameters.MandrillApiKey) {
-      logger.debug('using mandril for email')
-      client = nodemailer.createTransport(
-        mandrillTransport({
-          auth: {
-            apiKey: emailParameters.MandrillApiKey,
-          },
-        })
+      throw new OError(
+        'MandrillApiKey configuration option is deprecated, use SMTP instead'
       )
     } else {
       logger.debug('using smtp for email')

services/web/package.json

@@ -133,7 +133,6 @@
     "nock": "^13.1.3",
     "node-fetch": "^2.6.7",
     "nodemailer": "^6.7.0",
-    "nodemailer-mandrill-transport": "^1.2.0",
     "nodemailer-ses-transport": "^1.5.1",
     "otplib": "^12.0.1",
     "p-limit": "^2.3.0",

services/web/test/unit/src/Email/EmailSenderTests.js

@@ -37,7 +37,6 @@ describe('EmailSender', function () {
       requires: {
         nodemailer: this.ses,
         'nodemailer-ses-transport': sinon.stub(),
-        'nodemailer-mandrill-transport': {},
         '@overleaf/settings': this.Settings,
         '../../infrastructure/RateLimiter': this.RateLimiter,
         '@overleaf/metrics': {