Merge branch 'development' of github.com:PurdueHackers/PH-Website

Author: ashwinGokhale

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2018 Ashwin Gokhale
+Copyright (c) 2018 Purdue Hackers
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

backend/config/index.ts

@@ -20,7 +20,8 @@ const config = {
 	EMAIL_SERVICE: env.EMAIL_SERVICE || 'gmail',
 	MAILGUN_DOMAIN: env.MAILGUN_DOMAIN || 'mydomain',
 	MAILGUN_SECRET: env.MAILGUN_SECRET || 'mysecret',
-	GC_BUCKET: env.GC_BUCKET || 'mybucket'
+	GC_BUCKET: env.GC_BUCKET || 'mybucket',
+	SENDGRID_KEY: env.SENDGRID_KEY || 'sendgridkey'
 };
 
 export default config;

backend/utils/email.ts

@@ -1,5 +1,5 @@
 import * as nodemailer from 'nodemailer';
-import * as mailgunTransport from 'nodemailer-mailgun-transport';
+import { Request } from 'express';
 import { join } from 'path';
 import { readFileSync } from 'fs';
 import * as jwt from 'jsonwebtoken';
@@ -8,30 +8,15 @@ import CONFIG from '../config';
 import { IEventModel } from '../models/event';
 import { IMemberModel } from '../models/member';
 import { formatDate } from './';
-import { Request } from 'express';
 
-// const transport = nodemailer.createTransport({
-// 	service: CONFIG.EMAIL_SERVICE,
-// 	host: 'smtp.gmail.com',
-// 	port: 587,
-// 	auth: {
-// 		user: CONFIG.EMAIL,
-// 		pass: CONFIG.EMAIL_PASSWORD
-// 	},
-// 	tls: {
-// 		rejectUnauthorized: false
-// 	},
-// 	debug: true
-// });
-
-const transport = nodemailer.createTransport(
-	mailgunTransport({
-		auth: {
-			api_key: CONFIG.MAILGUN_SECRET,
-			domain: CONFIG.MAILGUN_DOMAIN
-		}
-	})
-);
+const transport = nodemailer.createTransport({
+	host: 'smtp.sendgrid.net',
+	port: 465,
+	auth: {
+		user: 'apikey',
+		pass: CONFIG.SENDGRID_KEY
+	}
+});
 
 const resetTemplate = compile(
 	readFileSync(join(__dirname, '../emails', 'reset.hbs'), 'utf8')
@@ -68,7 +53,9 @@ export const sendResetEmail = async (member: IMemberModel, req: Request) => {
 	});
 	member.resetPasswordToken = token;
 	await member.save();
-	const resetUrl =`${req.protocol}://${req.get('host')}/reset?token=${token}`;
+	const resetUrl = `${req.protocol}://${req.get(
+		'host'
+	)}/reset?token=${token}`;
 	return await _sendResetEmail(member, resetUrl);
 };
 
@@ -107,7 +94,9 @@ export const sendAccountCreatedEmail = async (
 	});
 	member.resetPasswordToken = token;
 	await member.save();
-	const resetUrl =`${req.protocol}://${req.get('host')}/reset?token=${token}`;
+	const resetUrl = `${req.protocol}://${req.get(
+		'host'
+	)}/reset?token=${token}`;
 	return await _sendAccountCreatedEmail(
 		member,
 		event.name,

package.json

@@ -13,6 +13,7 @@
 	},
 	"dependencies": {
 		"@google-cloud/storage": "^1.7.0",
+		"@sendgrid/mail": "^6.3.1",
 		"axios": "^0.18.0",
 		"bcrypt": "^2.0.1",
 		"cookie-parser": "~1.4.3",
@@ -24,13 +25,11 @@
 		"handlebars": "^4.0.11",
 		"helmet": "^3.13.0",
 		"jsonwebtoken": "^8.2.1",
-		"mailgun-js": "^0.20.0",
 		"mongodb": "^3.1.3",
 		"mongoose": "^5.2.8",
 		"morgan": "~1.9.0",
 		"multer": "^1.3.1",
 		"nodemailer": "^4.6.7",
-		"nodemailer-mailgun-transport": "^1.4.0",
 		"nodemon": "^1.17.3",
 		"passport": "^0.4.0",
 		"passport-jwt": "^4.0.0",
@@ -63,6 +62,7 @@
 		"@types/nodemailer-mailgun-transport": "^1.3.3",
 		"@types/passport": "^0.4.6",
 		"@types/passport-jwt": "^3.0.1",
+		"@types/sendgrid": "^4.3.0",
 		"@types/validator": "^9.4.1",
 		"concurrently": "^3.5.1",
 		"eslint": "^5.3.0",