Merge pull request #13 from PRATHAM1ST/master

Added Middleware and Handler

app.ts

@@ -1,7 +1,9 @@
+require('dotenv').config()
 import express, { Express, Request, Response } from "express";
 import membersRoute from "./routes/members";
 import cors from "cors";
 import morgan from "morgan";
+import ResponseHandler from "./components/response";
 
 const corsOptions = {
 	origin: "*",
@@ -15,11 +17,7 @@ app.use(cors());
 app.use(morgan("dev"));
 
 app.get("/", (req: Request, res: Response) => {
-	return res.status(200).send({
-		status: true,
-		data: "Hello World",
-		message: "Success",
-	});
+	return ResponseHandler.success(req, res, "Hello World", "Success");
 });
 
 app.use("/members", membersRoute);

components/response.ts

@@ -0,0 +1,20 @@
+import { Request, Response } from "express";
+
+class ResponseHandler {
+	static success(req: Request, res: Response, data: any, message: string) {
+		return res.status(200).json({
+			status: true,
+			data,
+			message,
+		});
+	}
+
+	static error(req: Request, res: Response, message: string) {
+		return res.status(500).json({
+			status: false,
+			message,
+		});
+	}
+}
+
+export default ResponseHandler;

controllers/members.ts

@@ -3,6 +3,7 @@ import axios, { AxiosResponse } from "axios";
 import { parseHTML } from "linkedom";
 import membersList from "../data/members-list-old.json";
 import membersListLatest from "../data/members-list.json";
+import ResponseHandler from "../components/response";
 
 interface Member {
 	login: string;
@@ -91,31 +92,27 @@ export async function PATCH(req: Request, res: Response) {
 			membersListArray.map(async (member) => updateSingleMember(member))
 		);
 
-		return res.status(200).json({
-			status: true,
-			data: membersListArray,
-			message: "Members list updated",
-		});
-	} catch (err) {
-		return res.status(500).json({
-			status: false,
-			message: err,
-		});
+		return ResponseHandler.success(
+			req,
+			res,
+			membersListArray,
+			"Members list updated"
+		);
+	} catch (err: any) {
+		return ResponseHandler.error(req, res, err);
 	}
 }
 
 export async function GET(req: Request, res: Response) {
 	try {
-		return res.status(200).json({
-			status: true,
-			data: membersListLatest,
-			message: "Members list successfully retrieved",
-		});
-	} catch (err) {
-		return res.status(500).json({
-			status: false,
-			message: err,
-		});
+		return ResponseHandler.success(
+			req,
+			res,
+			membersListLatest,
+			"Members list"
+		);
+	} catch (err: any) {
+		return ResponseHandler.error(req, res, err);
 	}
 }
 

middleware/auth.ts

@@ -0,0 +1,25 @@
+import { NextFunction, Request, Response } from "express";
+
+function auth(req: Request, res: Response, next: NextFunction) {
+	try {
+		const token = req.header("Authorization");
+		if (!token) throw Error("No token, authorization denied");
+
+		const [user, password] = token?.split(" ");
+		if (!user || !password) throw Error("No token, authorization denied");
+		if (
+			user !== process.env.USERNAME?.toLowerCase() ||
+			password !== process.env.PASSWORD?.toLowerCase()
+		)
+			throw Error("Invalid token, authorization denied");
+
+		next();
+	} catch (err) {
+		return res.status(500).json({
+			status: false,
+			message: err,
+		});
+	}
+}
+
+export default auth;

package.json

@@ -29,6 +29,7 @@
   "dependencies": {
     "axios": "^1.5.0",
     "cors": "^2.8.5",
+    "dotenv": "^16.3.1",
     "express": "^4.18.2",
     "linkedom": "^0.15.3",
     "morgan": "^1.10.0",

routes/members.ts

@@ -1,9 +1,10 @@
 import express from "express";
 import controllers from "../controllers/members";
+import auth from "../middleware/auth";
 
 const router = express.Router();
 
 router.get("/", controllers.GET);
-router.patch("/", controllers.PATCH);
+router.patch("/", auth, controllers.PATCH);
 
 export default router;