Merge pull request #230 from Aggie-Web-Developers/develop

Develop

Author: cdconn00

app.js

@@ -16,8 +16,16 @@ const portalRoutes = require('./routes/portal/index');
 const emailRoutes = require('./routes/portal/emails');
 const sponsorRoutes = require('./routes/portal/sponsors');
 const projectRoutes = require('./routes/portal/projects');
+const recordingRoutes = require('./routes/portal/recordings');
+const profileRoutes = require('./routes/portal/profile');
 const middleware = require('./middleware');
 
+// overload console.error to send error emails when an error occurs
+console.error = async (err) => {
+	console.log(err.stack); // print error to console
+	await email.sendErrorEmail(err.stack.toString()); // send error email
+};
+
 initPassport(passport);
 
 app.use(bodyParser.urlencoded({ extended: true }));
@@ -66,7 +74,7 @@ sql
 	})
 	.catch(function (err) {
 		console.log('Connecting to database: [FAILED]');
-		console.log(err);
+		console.error(err);
 	});
 
 app.use(function (err, req, res, next) {
@@ -96,6 +104,8 @@ app.use('/portal/events', eventRoutes);
 app.use('/portal/emails', emailRoutes);
 app.use('/portal/sponsors', sponsorRoutes);
 app.use('/portal/projects', projectRoutes);
+app.use('/portal/recordings', recordingRoutes);
+app.use('/portal/profile', profileRoutes);
 
 app.get('/*', function (req, res) {
 	res.render('404');

email/email.js

@@ -10,6 +10,46 @@ aws.config.region = process.env.region;
 
 const ses = new aws.SES();
 
+// sends an email to the org email when an error occurs
+mailerObj.sendErrorEmail = async function (err) {
+	const siteType = process.env.NODE_ENV == 'prod' ? 'Production' : 'Dev';
+
+	let content = '<p><b>Error:</b> ' + err + '</p>';
+	content = content.replace(/"/g, "'").replace(/(?:\r\n|\r|\n)/g, '<br>'); // make content string safe for template data
+	content = content.replace(/\\/g, '/');
+
+	const params = {
+		Destination: {
+			BccAddresses: [],
+			ToAddresses: ['[email protected]'],
+		},
+		Source: 'Aggie Web Developers <[email protected]>',
+		Template: 'AWD-Error-Email',
+		TemplateData:
+			'{ "Subject": "ERROR: AWD SITE - ' +
+			siteType +
+			'", "content": "' +
+			content +
+			'"}',
+		ReplyToAddresses: ['[email protected]'],
+	};
+
+	const sendPromise = new aws.SES({ apiVersion: '2010-12-01' })
+		.sendTemplatedEmail(params)
+		.promise();
+
+	return new Promise((resolve, reject) => {
+		sendPromise
+			.then(async function (data) {
+				resolve('Success');
+			})
+			.catch(function (err) {
+				console.log(err);
+				resolve('Error');
+			});
+	});
+};
+
 mailerObj.sendContactUsEmailGen = async function (formData) {
 	let content = '<p><b>Name:</b> ' + formData.txtNameGen + '</p>';
 	content += '<p><b>Email:</b> ' + formData.txtEmailGen + '</p>';
@@ -42,6 +82,7 @@ mailerObj.sendContactUsEmailGen = async function (formData) {
 				resolve('Success');
 			})
 			.catch(function (err) {
+				console.error(err);
 				resolve('Error');
 			});
 	});
@@ -80,6 +121,7 @@ mailerObj.sendContactUsEmailCorp = async function (formData) {
 				resolve('Success');
 			})
 			.catch(function (err) {
+				console.error(err);
 				resolve('Error');
 			});
 	});
@@ -240,6 +282,7 @@ async function attemptSend(email, sendList) {
 				resolve(true);
 			})
 			.catch((err) => {
+				console.error(err);
 				resolve(false);
 			});
 	});
@@ -270,7 +313,7 @@ async function sendBulkMail(email, recips) {
 				else resolve('Success');
 			})
 			.catch(function (err) {
-				console.log(err);
+				console.error(err);
 				reject(new Error(err));
 			});
 	});
@@ -293,6 +336,7 @@ mailerObj.listenForScheduledEmails = function () {
 				});
 			})
 			.catch((err) => {
+				console.error(err);
 				console.log('Error sending scheduled emails.');
 			});
 	});
@@ -310,6 +354,7 @@ function getEmailById(id) {
 				resolve(result.recordset[0]);
 			})
 			.catch((err) => {
+				console.error(err);
 				resolve('Error');
 			});
 	});
@@ -325,7 +370,7 @@ function getGeneralRecipeints() {
 				resolve(result.recordset);
 			})
 			.catch((err) => {
-				console.log(err);
+				console.error(err);
 				resolve('Error');
 			});
 	});
@@ -341,6 +386,7 @@ function getCorporateRecipeints() {
 				resolve(result.recordset);
 			})
 			.catch((err) => {
+				console.error(err);
 				resolve('Error');
 			});
 	});
@@ -355,6 +401,7 @@ function markEmailSent(id) {
 				resolve(true);
 			})
 			.catch((err) => {
+				console.error(err);
 				resolve(false);
 			});
 	});

middleware/index.js

@@ -16,4 +16,14 @@ mwObject.checkNotAuthenticated = function (req, res, next) {
 	}
 };
 
+mwObject.checkIsOfficer = function (req, res, next) {
+	if (!req.isAuthenticated()) {
+		res.redirect('/portal/login');
+	} else if (req.user.officer_id == null || req.user.officer_id <= 0) {
+		res.redirect('/portal/member');
+	} else {
+		return next();
+	}
+};
+
 module.exports = mwObject;