updated middleware for code quality

HackIllinois · Aug 17, 2023 · 0d2fd2c · 0d2fd2c
1 parent 70c4be0
commit 0d2fd2c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/src/middleware/select-auth.ts b/src/middleware/select-auth.ts
@@ -9,14 +9,9 @@ const githubOptions: AuthenticateOptions = {session: false};
 
 
 export function SelectAuthProvider(provider: string): RequestHandler {
-
-	console.log("|%s|", provider);
-	if (provider == "google") {
-		return authenticateFunction("google", googleOptions);
-	}
-
-	if (provider == "github") {
-		return authenticateFunction("github", githubOptions);
+	switch (provider) {
+	case "google": return authenticateFunction("google", googleOptions);
+	case "github": return authenticateFunction("github", githubOptions);
 	}
 
 	throw new Error("Provider not found!");

diff --git a/src/middleware/verify-jwt.ts b/src/middleware/verify-jwt.ts
@@ -2,6 +2,7 @@ import { Request, Response, NextFunction} from "express";
 
 import Constants from "../constants.js";
 import { decodeJwtToken } from "../services/auth/auth-lib.js";
+import jsonwebtoken from "jsonwebtoken";
 
 export function verifyJwt(req: Request, res: Response, next: NextFunction): void {
 	const token: string | undefined = req.headers.authorization;
@@ -15,7 +16,14 @@ export function verifyJwt(req: Request, res: Response, next: NextFunction): void
 		res.locals.payload = decodeJwtToken(token);
 		next();
 	} catch (error) {
-		res.status(Constants.FORBIDDEN).send({error: error as string});
-		next("route");
+		if (error instanceof jsonwebtoken.TokenExpiredError) {
+			console.log("token expired!");
+			res.status(Constants.FORBIDDEN).send("TOKEN EXPIRED");
+			next("router");
+		} else {
+			console.log(error);
+			res.status(Constants.FORBIDDEN).send({error: error as string});
+			next("router");
+		}
 	}
 }