✨ Add better routing

Author: AnandChowdhary

src/helpers/middleware.ts

@@ -1,6 +1,18 @@
 import { Request, Response, NextFunction } from "express";
+import { HTTPError } from "../interfaces/general";
 
-export const errorHandler = (error: string) => {
+export const errorHandler = (
+  error: any,
+  req: Request,
+  res: Response,
+  next: NextFunction
+) => {
+  const response: HTTPError = safeError(error.toString());
+  res.status(response.status);
+  res.json({ error: response.code, message: response.message });
+};
+
+export const safeError = (error: string) => {
   const errorString = error.toString();
   if (errorString.startsWith("JsonWebTokenError"))
     return { status: 401, code: "invalid-token" };

src/index.ts

@@ -1,36 +1,13 @@
-import express, { Request, Response, NextFunction } from "express";
+import express from "express";
 import { PORT } from "./config";
-import { register, verifyEmail } from "./rest/auth";
-import asyncHandler from "express-async-handler";
-import { HTTPError } from "./interfaces/general";
 import { errorHandler, trackingHandler } from "./helpers/middleware";
+import { router } from "./routes";
 
 const app = express();
 
 app.use(trackingHandler);
+router(app);
 
-app.get("/", (req, res) => res.json({ hello: "world" }));
-
-app.put("/user", async (req, res) => {
-  const user = req.body;
-  const email = user.email;
-  delete user.email;
-  const users = await register(user, email);
-  res.json({ success: true, users });
-});
-
-app.get(
-  "/verify-email/:token",
-  asyncHandler(async (req, res) => {
-    await verifyEmail(req.params.token, res.locals);
-    res.json({ success: true });
-  })
-);
-
-app.use((error: any, req: Request, res: Response, next: NextFunction) => {
-  const response: HTTPError = errorHandler(error.toString());
-  res.status(response.status);
-  res.json({ error: response.code, message: response.message });
-});
+app.use(errorHandler);
 
 app.listen(PORT, () => console.log("App running"));

src/routes/emails.ts

@@ -0,0 +1,7 @@
+import { Request, Response } from "express";
+import { verifyEmail } from "../rest/auth";
+
+export const routeEmailVerify = async (req: Request, res: Response) => {
+  await verifyEmail(req.body.token || req.params.token, res.locals);
+  res.json({ success: true });
+};

src/routes/index.ts

@@ -0,0 +1,22 @@
+import { Application } from "express";
+import asyncHandler from "express-async-handler";
+import { routeUserMe, routeUserPut } from "./users";
+import { routeEmailVerify } from "./emails";
+
+export const router = (app: Application) => {
+  app.get("/", (req, res) => res.json({ hello: "world" }));
+
+  routesUser(app);
+  routesEmail(app);
+
+  return app;
+};
+
+const routesUser = (app: Application) => {
+  app.get("/users/me", asyncHandler(routeUserMe));
+  app.put("/users", asyncHandler(routeUserPut));
+};
+
+const routesEmail = (app: Application) => {
+  app.post("/emails/verify", asyncHandler(routeEmailVerify));
+};

src/routes/users.ts

@@ -0,0 +1,18 @@
+import { Request, Response } from "express";
+import { register } from "../rest/auth";
+
+export const routeUserMe = async (req: Request, res: Response) => {
+  const user = req.body;
+  const email = user.email;
+  delete user.email;
+  const users = await register(user, email);
+  res.json({ success: true, users });
+};
+
+export const routeUserPut = async (req: Request, res: Response) => {
+  const user = req.body;
+  const email = user.email;
+  delete user.email;
+  const users = await register(user, email);
+  res.json({ success: true, users });
+};