Merge pull request #2720 from overleaf/sk-remove-nodemailer-sendgrid

Remove nodemailer sendgrid

GitOrigin-RevId: af84dd78291957371d679de43bc4570960a7b635

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

@@ -4,7 +4,6 @@ const metrics = require('metrics-sharelatex')
 const Settings = require('settings-sharelatex')
 const nodemailer = require('nodemailer')
 const sesTransport = require('nodemailer-ses-transport')
-const sgTransport = require('nodemailer-sendgrid-transport')
 const mandrillTransport = require('nodemailer-mandrill-transport')
 const OError = require('@overleaf/o-error')
 const RateLimiter = require('../../infrastructure/RateLimiter')
@@ -29,14 +28,10 @@ function getClient() {
       logger.log('using aws ses for email')
       client = nodemailer.createTransport(sesTransport(emailParameters))
     } else if (emailParameters.sendgridApiKey) {
-      logger.log('using sendgrid for email')
-      client = nodemailer.createTransport(
-        sgTransport({
-          auth: {
-            api_key: emailParameters.sendgridApiKey
-          }
-        })
-      )
+      throw new OError({
+        message:
+          'sendgridApiKey configuration option is deprecated, use SMTP instead'
+      })
     } else if (emailParameters.MandrillApiKey) {
       logger.log('using mandril for email')
       client = nodemailer.createTransport(

services/web/package-lock.json

@@ -15388,14 +15388,6 @@
         }
       }
     },
-    "nodemailer-sendgrid-transport": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/nodemailer-sendgrid-transport/-/nodemailer-sendgrid-transport-0.2.0.tgz",
-      "integrity": "sha512-mtLnvTe8Zx1wwyZp7hMzuk+bqMvdH5FOyaEtkkVqj6IfLRqI9tBkFH8OE23cX8KJMfXbB09fOr6dTo0th70Bpg==",
-      "requires": {
-        "sendgrid": "^1.8.0"
-      }
-    },
     "nodemailer-ses-transport": {
       "version": "1.5.1",
       "resolved": "https://registry.npmjs.org/nodemailer-ses-transport/-/nodemailer-ses-transport-1.5.1.tgz",
@@ -20309,24 +20301,6 @@
         }
       }
     },
-    "sendgrid": {
-      "version": "1.9.2",
-      "resolved": "https://registry.npmjs.org/sendgrid/-/sendgrid-1.9.2.tgz",
-      "integrity": "sha512-WYZmAyFejBeg3oTxWQRji7xAtLywxfpKXnBiOmWOjOxwkvyvvTtmNZIMxErmWpsJkTMGVdkb7AEzK9OmsQ5wUA==",
-      "requires": {
-        "lodash": "^3.0.1 || ^2.0.0",
-        "mime": "^1.2.9",
-        "request": "^2.60.0",
-        "smtpapi": "^1.2.0"
-      },
-      "dependencies": {
-        "lodash": {
-          "version": "3.10.1",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
-          "integrity": "sha512-9mDDwqVIma6OZX79ZlDACZl8sBm0TEnkf99zV3iMA4GzkIT/9hiqP5mY0HoT1iNLCrKc/R1HByV+yJfRWVJryQ=="
-        }
-      }
-    },
     "serialize-javascript": {
       "version": "1.7.0",
       "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.7.0.tgz",
@@ -20682,11 +20656,6 @@
         "nodemailer-shared": "1.0.3"
       }
     },
-    "smtpapi": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/smtpapi/-/smtpapi-1.3.1.tgz",
-      "integrity": "sha512-Ab+fXyJLvm1arzgUUIfgZVgjSgvnaA4uG4hpnms45i01rmoYFcXpDsKgIHF8l4H12FCzBoYbW+qfEpba3S0myQ=="
-    },
     "snapdragon": {
       "version": "0.8.2",
       "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",

services/web/package.json

@@ -87,7 +87,6 @@
     "node-html-encoder": "0.0.2",
     "nodemailer": "2.1.0",
     "nodemailer-mandrill-transport": "^1.2.0",
-    "nodemailer-sendgrid-transport": "^0.2.0",
     "nodemailer-ses-transport": "^1.3.0",
     "nvd3": "^1.8.6",
     "oauth2-server": "^3.0.1",

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

@@ -39,7 +39,6 @@ describe('EmailSender', function() {
       requires: {
         nodemailer: this.ses,
         'nodemailer-mandrill-transport': {},
-        'nodemailer-sendgrid-transport': {},
         'settings-sharelatex': this.Settings,
         '../../infrastructure/RateLimiter': this.RateLimiter,
         'logger-sharelatex': {