Add in Error Handling for All Cases

nus-mtp · Apr 4, 2017 · 4e536c0 · 4e536c0
1 parent 0b59fa5
commit 4e536c0
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 38 deletions.
diff --git a/app.js b/app.js
@@ -57,7 +57,7 @@ app.use(function (req, res, next) {
 	//res.send(err.message || '** no unicorns here **');
 	//res.redirect('/error');
 
-	var errorMessage = "Auth unsuccessful 4";
+	var errorMessage = "Unsuccessful Authentication (E1)";
 
 	res.render('error.ejs', {
 		errorMessage: errorMessage

diff --git a/source/controller/dashboard.js b/source/controller/dashboard.js
@@ -38,24 +38,13 @@ if (!usehttps) {
  			}
  		});
 	} else {
-		res.send('Auth unsuccessful');
-		//res.render('\error', {title: '404: File Not Found'});
-		//res.redirect('/error');
+		//res.send('Auth unsuccessful');
 
-		//errorMessage = "Failure to Authenticate";
-		/*var drinks = [
-			{ name: 'Bloody Mary', drunkness: 3 },
-			{ name: 'Martini', drunkness: 5 },
-			{ name: 'Scotch', drunkness: 10 }
-		];
-		var tagline = "Any code of your own that you haven't looked at for six or more months might as well have been written by someone else.";*/
-
-		/*res.render('error.ejs', {
-			errorMessage: errorMessage
-			//drinks: drinks,
-			//tagline: tagline
-		});*/
+		var errorMessage = "Unsuccessful Authentication (E1B)";
 
+		res.render('error.ejs', {
+			errorMessage: errorMessage
+		});
 	}
 
 }
@@ -70,13 +59,13 @@ var forceSyncIVLE = function (req, res, next) {
 			res.json({success: true, result: 'Synchronization Complete'});
 		}); 
 	} else {
-		res.send("Permission denied");
+		//res.send("Permission denied");
 
-		/*errorMessage = "Permission denied.";
+		var errorMessage = "Permission Denied (E2)";
 
 		res.render('error.ejs', {
 			errorMessage: errorMessage
-		});*/
+		});
 	}
 }
 
@@ -99,13 +88,13 @@ var getTutorials = function (req, res, next) {
 		});
 
 	} else {
-		res.send("Permission denied");
+		//res.send("Permission denied");
 
-		/*errorMessage = "Permission denied.";
+		var errorMessage = "Permission Denied (E2B)";
 
 		res.render('error.ejs', {
 			errorMessage: errorMessage
-		});*/
+		});
 	}
 }
 
@@ -116,13 +105,13 @@ var syncUser = function (req, res, next) {
 			res.json({success: true, message: 'Success', data: data});
 		});
 	} else {
-		res.send("Permission denied");
+		//res.send("Permission denied");
 
-		/*errorMessage = "Permission denied.";
+		var errorMessage = "Permission Denied (E2C)";
 
 		res.render('error.ejs', {
 			errorMessage: errorMessage
-		});*/
+		});
 	}
 }
 
@@ -135,7 +124,13 @@ var getUserInfo = function (req, res, next) {
 			res.json({success: true, message: 'Success', data: userTuts});
 		});
 	} else {
-		res.send("Permission denied");
+		//res.send("Permission denied");
+
+		var errorMessage = "Permission Denied (E2D)";
+
+		res.render('error.ejs', {
+			errorMessage: errorMessage
+		});
 	}
 }
 
@@ -167,7 +162,6 @@ var processUserInfo = function (result) {
 	return returnObject;
 }
 
-
 module.exports.get = get;
 module.exports.forceSyncIVLE = forceSyncIVLE;
 module.exports.getTutorials = getTutorials;

diff --git a/source/controller/lobby.js b/source/controller/lobby.js
@@ -33,13 +33,13 @@ var get = function (req, res, next)
 
 	} else {
 		//console.log('fail');
-		res.send('Auth unsuccessful 2.');
+		//res.send('Auth unsuccessful 2.');
 
-		/*var errorMessage = "Auth unsuccessful";
+		var errorMessage = "Unsuccessful Authentication (E1C)";
 
 		res.render('error.ejs', {
 			errorMessage: errorMessage
-		});*/
+		});
 	}
 };
 
@@ -82,7 +82,7 @@ var enterLobby = function (req, res, next) {
 							//res.json({ success: false, message: 'The tutor of this tutorial class has not registered with the system.'});
 							//res.redirect('/error');
 
-							var errorMessage = "Auth unsuccessful 3";
+							var errorMessage = "Unregistered Tutor (E4)";
 
 							res.render('error.ejs', {
 								errorMessage: errorMessage
@@ -91,12 +91,24 @@ var enterLobby = function (req, res, next) {
 					}); 
 
 			} else {
-				res.json({ success: false, message: 'You are not a member of this tutorial.'});
+				//res.json({ success: false, message: 'You are not a member of this tutorial.'});
+
+				var errorMessage = "Not a Member of this Tutorial (E5)";
+
+				res.render('error.ejs', {
+					errorMessage: errorMessage
+				});
 			}
 		});
 
 	} else {
-		res.json({success: false, message: 'Please access lobby from dashboard!'});
+		//res.json({success: false, message: 'Please access lobby from dashboard!'});
+
+		var errorMessage = "Please Access Lobby from Dashboard (E6)";
+
+		res.render('error.ejs', {
+			errorMessage: errorMessage
+		});
 	}
 }
 
@@ -145,14 +157,18 @@ var getUsersInTutorial = function (req, res, next) {
 			return next();	
 			//res.json({success: true, users: users, tutorialId: tid});
 		}).catch(function (err) {
-			res.json({success: false, message: 'Could not find users in tutorial'});
+			//res.json({success: false, message: 'Could not find users in tutorial'});
+
+			var errorMessage = "Could Not Find Users in Tutorial (E7)";
+
+			res.render('error.ejs', {
+				errorMessage: errorMessage
+			});
 		});
 	});
 
 }
 
-
-
 module.exports.get = get;
 module.exports.enterLobby = enterLobby;
 module.exports.getUsersInTutorial = getUsersInTutorial;
diff --git a/source/router.js b/source/router.js
@@ -24,7 +24,7 @@ router.get ('/dashboard', auth.ensureAuth, dashboard.get);
 router.get ('/error',
 	function (req, res, next)
 	{
-		var errorMessage = "You Cannot Just Access the Error Page Manually!";
+		var errorMessage = "You Cannot Just Access the Error Page Manually! (E3)";
 
 		res.render('error.ejs', {
 			errorMessage: errorMessage