From dc48a74373ac5ee13d8efeb48d0c7a4eb448a74e Mon Sep 17 00:00:00 2001
From: Puyodead1 <puyodead@protonmail.com>
Date: Fri, 24 Feb 2023 00:39:17 -0500
Subject: [PATCH] add SendGrid transport

---
 package-lock.json                             | Bin 519006 -> 523352 bytes
 package.json                                  |   3 +-
 src/util/config/types/EmailConfiguration.ts   |   2 ++
 .../types/subconfigurations/email/SendGrid.ts |  21 +++++++++++
 src/util/util/Email.ts                        |  34 +++++++++++++++++-
 5 files changed, 58 insertions(+), 2 deletions(-)
 create mode 100644 src/util/config/types/subconfigurations/email/SendGrid.ts

diff --git a/package-lock.json b/package-lock.json
index 898f1761f2e7d5ef59d4967924e68885e0a24ef1..e6aed6b2bec95e3e83d610f018868db73a51ffe2 100644
GIT binary patch
delta 2435
zcmd5;No*Tc7}j{aG!0Nf)YNW*lRA_@+}Jbr*fUNkbP{h9J6_^7MnW3f&s*#ndpurZ
zC2T^<jUHU_I3Pihaz&|f2v-iM5~pxMTv#NKdPpQ<38@uG2s?Ic1&U}7l`@BU@6Fr3
z|NFo9z4`IG$?qRd?x<um$0tF7&E|nHR|Z@%Eo75(qQG+HA}@%V`6<mZD`eR@2cPE)
zas4Ak?<!=6(v?SaoL(lK6*HCi{Qs>sn6!H^6gnC@2Bc5qv+&Lbl1nJ5Bb%*ZeBuOZ
zrw4GNey&%U>kJsVc_kF6JGJXn4$%GpXJxBG(27+Y*61q3tl8J|i@X+C`Bb<NbNjIr
zWj1hJDZXe7CvlK7$4NIJ^KpK?;kTRZq@7PzF@vyLE>>XcO~i!V>~Ed{`63X?9hTl|
zZ>+;K*Uk^M9}Qd2^4-sv&H(Wo^2(@LH#@blF-3KY*KgpM4z@@{{d|A5UMTRw2J*7B
zJ<km9dJ!CEH;`w$P1Y&Z1bwwcl(1E~fV0AIi_45?%g_#v4cMY93pufov823W*=Dxk
z4s(&L=1GvWff&GXzcYnXTC>)YUNQONuCTuBaCulOwaPAo<G3L6u}p~&kdC72=4XFN
zhr84t#|RM-9Xlak-ACMuzs-KH)}bHz52Tt9U8d_PkI`XWNJROVejP6~Xgcm{1jSIy
zq>TwqZz1A0kQTba+M^-QV#X5paVtfS2_xd^DhQVNh!)40hA(Yout+#<Wjw_iEX||D
zP!fP*0SIXTzfeoYnzx3>;qpCH0e?y%;~n5V&9p@g*<s1W6WGc=?2g>qm^;O>URv*K
zLRyY4`fQdO<5{RW1EG4&TVGrAmzMPmO|uKDyw8%Uk&#;3>hb&P0xML)C1<t)f>|*v
zx*XY3WYJYH6u4Z5h&nvRRMqY-v0c2^2YTsd_}_9FjQEG5;K<j=%zsL!x&P<zuJeyy
z4<(=ocZ^aMeD^n*6n^@eM1QeQQajLo9ggVGtD%OWwiJsB1>j6pSC@+VP~BvzF}V^?
z;SSS6kw|EHn>!fMlB{43@ac$?&50(~lJ*+QM#joI0(3NIUBjw*zsqA33T29o8+rKE
zZMh2We2&PWw;&mZo^4dKHG3b~o4qf&4&amv9XfZC0Qinlp@#0bTnXQ1P*vpdJwexY
zk!jYF0Dv$O<|K}>EM~A!l!c%$%A7K?Bw<cbfNF~<VT1<^IsqU4F42w+2<{}kmjI%9
z)KYIH+~{7yEuHz{>{-p^M|Wf|Jh|N<F~wDwKa`w<+eh-zu62AHlNw-V19`67Y+aF0
zhf+_)O5S@$LBf|d5hY6KD7gQLV&cMp{WE1Itz8*5I2*^JAan+uLDTW@&Gu`v<K~(H
z`m^9DZP56QlY`W|^q#;_+E)~O1DB2MefX;En|o)(H#A$}mTWKFlK(u@{6$K@2NC%w
zd~pf=65iUDU4pjDiU*KaDoz^+`P6LVyh?GoPx0V?<mThs6udhv)2U7gr*AqslV<PQ
IxWcgiH%=)m@Bjb+

delta 93
zcmV-j0HXic_#fWZAFvq(vup+01ea+Y1P-&V3P13dfCT{rw;%xl=<J6>?*X?%?*chx
zhp<%xx3E<NCEd3#I0eqfmqYIX?T70D2Dj@02k|DCu2BOgw+bl--vPHaEC(XcGEOE6

diff --git a/package.json b/package.json
index 810ae894..85039e60 100644
--- a/package.json
+++ b/package.json
@@ -97,7 +97,6 @@
 		"node-fetch": "^2.6.7",
 		"node-os-utils": "^1.3.7",
 		"nodemailer": "^6.9.0",
-		"nodemailer-mailjet-transport": "github:n0script22/nodemailer-mailjet-transport",
 		"picocolors": "^1.0.0",
 		"probe-image-size": "^7.2.3",
 		"proxy-agent": "^5.0.0",
@@ -117,6 +116,8 @@
 	"optionalDependencies": {
 		"erlpack": "^0.1.4",
 		"nodemailer-mailgun-transport": "^2.1.5",
+		"nodemailer-mailjet-transport": "github:n0script22/nodemailer-mailjet-transport",
+		"nodemailer-sendgrid-transport": "github:Maria-Golomb/nodemailer-sendgrid-transport",
 		"sqlite3": "^5.1.4"
 	}
 }
diff --git a/src/util/config/types/EmailConfiguration.ts b/src/util/config/types/EmailConfiguration.ts
index 625507f2..989d59eb 100644
--- a/src/util/config/types/EmailConfiguration.ts
+++ b/src/util/config/types/EmailConfiguration.ts
@@ -21,10 +21,12 @@ import {
 	MailJetConfiguration,
 	SMTPConfiguration,
 } from "./subconfigurations/email";
+import { SendGridConfiguration } from "./subconfigurations/email/SendGrid";
 
 export class EmailConfiguration {
 	provider: string | null = null;
 	smtp: SMTPConfiguration = new SMTPConfiguration();
 	mailgun: MailGunConfiguration = new MailGunConfiguration();
 	mailjet: MailJetConfiguration = new MailJetConfiguration();
+	sendgrid: SendGridConfiguration = new SendGridConfiguration();
 }
diff --git a/src/util/config/types/subconfigurations/email/SendGrid.ts b/src/util/config/types/subconfigurations/email/SendGrid.ts
new file mode 100644
index 00000000..a4755dfb
--- /dev/null
+++ b/src/util/config/types/subconfigurations/email/SendGrid.ts
@@ -0,0 +1,21 @@
+/*
+	Fosscord: A FOSS re-implementation and extension of the Discord.com backend.
+	Copyright (C) 2023 Fosscord and Fosscord Contributors
+	
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Affero General Public License as published
+	by the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+	
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU Affero General Public License for more details.
+	
+	You should have received a copy of the GNU Affero General Public License
+	along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+export class SendGridConfiguration {
+	apiKey: string | null = null;
+}
diff --git a/src/util/util/Email.ts b/src/util/util/Email.ts
index 8575e7b2..3028b063 100644
--- a/src/util/util/Email.ts
+++ b/src/util/util/Email.ts
@@ -141,7 +141,7 @@ const transporters = {
 		} catch {
 			// if the package is not installed, log an error and return void so we don't set the transporter
 			console.error(
-				"[Email] Mailjet transport is not installed. Please run `npm install nodemailer-mailjet-transport --save-optional` to install it.",
+				"[Email] Mailjet transport is not installed. Please run `npm install n0script22/nodemailer-mailjet-transport --save-optional` to install it.",
 			);
 			return;
 		}
@@ -157,6 +157,38 @@ const transporters = {
 		// create the transporter and return it
 		return nodemailer.createTransport(mj(auth));
 	},
+	sendgrid: async function () {
+		// get configuration
+		const { apiKey } = Config.get().email.sendgrid;
+
+		// ensure all required configuration values are set
+		if (!apiKey)
+			return console.error(
+				"[Email] SendGrid has not been configured correctly.",
+			);
+
+		let sg;
+		try {
+			// try to import the transporter package
+			sg = require("nodemailer-sendgrid-transport");
+		} catch {
+			// if the package is not installed, log an error and return void so we don't set the transporter
+			console.error(
+				"[Email] SendGrid transport is not installed. Please run `npm install Maria-Golomb/nodemailer-sendgrid-transport --save-optional` to install it.",
+			);
+			return;
+		}
+
+		// create the transporter configuration object
+		const auth = {
+			auth: {
+				api_key: apiKey,
+			},
+		};
+
+		// create the transporter and return it
+		return nodemailer.createTransport(sg(auth));
+	},
 };
 
 export const Email: {