add returns on responses

jaspermayone · jaspermayone · commit 2e112bb2bce2 · 2025-04-14T09:50:32.000-04:00
diff --git a/src/admin-routes/router.ts b/src/admin-routes/router.ts
@@ -25,17 +25,15 @@ router.use(async (req, res, next) => {
   let user = await getUserInfo(req);
 
   if (!user) {
-    res.status(401).json({
+    return res.status(401).json({
       error: "Unauthorized",
     });
-    return;
   }
 
   if (user.permissionLevel < permissionLevel.enumValues[2]) {
-    res.status(403).json({
+    return res.status(403).json({
       error: "You do not have permission to access this endpoint",
     });
-    return;
   } else {
     next();
   }
@@ -138,7 +136,7 @@ router.get("/metrics", logRequest, async (req, res) => {
 
   let environment = process.env.NODE_ENV;
 
-  res.status(200).json({
+  return res.status(200).json({
     status: "up",
     environment: environment,
     uptime: uptimeString,
diff --git a/src/admin-routes/routes/domain.ts b/src/admin-routes/routes/domain.ts
@@ -20,7 +20,7 @@ const router = express.Router();
  */
 router.get("/", async (req: Request, res: Response) => {
   let alldomains = await db.select().from(domains);
-  res.status(200).json(alldomains);
+  return res.status(200).json(alldomains);
 });
 
 /**
@@ -45,9 +45,9 @@ router.get("/:id", async (req: Request, res: Response) => {
       return res.status(400).json("Domain not found");
     }
 
-    res.status(200).json(dbDomain);
+    return res.status(200).json(dbDomain);
   } catch (error) {
-    res
+    return res
       .status(500)
       .json({ error: "An error occurred while fetching the domain." });
   }
diff --git a/src/admin-routes/routes/user.ts b/src/admin-routes/routes/user.ts
@@ -35,7 +35,7 @@ const router = express.Router();
 router.get("/", async (req, res) => {
   // metrics.increment("endpoint.admin.users.get");
   const dbUsers = await db.query.users.findMany();
-  res.status(200).json(dbUsers);
+  return res.status(200).json(dbUsers);
 });
 
 /**
@@ -83,7 +83,7 @@ router.get("/user/:id", async (req, res) => {
       });
     }
 
-    res.status(200).json(dbUser);
+    return res.status(200).json(dbUser);
   } catch (error) {
     logger.error(error as string);
 
@@ -132,11 +132,11 @@ router.patch("/user/:id", async (req, res) => {
       .set(updateData)
       .where(eq(users.id, parseInt(id)));
 
-    res.status(200).json({
+    return res.status(200).json({
       message: "User updated successfully.",
     });
   } catch (error) {
-    res.status(500).json({
+    return res.status(500).json({
       message: "An error occurred.",
     });
   }
@@ -167,10 +167,9 @@ router.post("/user/new", async (req, res) => {
   const { name, email, password } = body;
 
   if (!name || !email || !password) {
-    res
+    return res
       .status(400)
       .json("Invalid arguments. Please provide name, email, and password");
-    return;
   }
 
   // Check if the user already exists
@@ -179,8 +178,7 @@ router.post("/user/new", async (req, res) => {
   });
 
   if (user) {
-    res.status(400).json("User with that email already exists");
-    return;
+    return res.status(400).json("User with that email already exists");
   }
 
   const salt = bcrypt.genSaltSync(saltRounds);
@@ -197,7 +195,7 @@ router.post("/user/new", async (req, res) => {
     })
     .returning();
 
-  res.status(200).json({
+  return res.status(200).json({
     message: "User created successfully, please login.",
     uuid: newUser.uuid,
   });
@@ -228,11 +226,11 @@ router.delete("/user/:id", async (req, res) => {
       })
       .where(eq(users.id, parseInt(id)));
 
-    res.status(200).json({
+    return res.status(200).json({
       message: "User deleted successfully.",
     });
   } catch (error) {
-    res.status(500).json({
+    return res.status(500).json({
       message: "An error occurred.",
     });
   }
@@ -319,11 +317,11 @@ router.patch("/role/:id/:role", async (req, res) => {
       })
       .where(eq(users.id, parseInt(id)));
 
-    res.status(200).json({
+    return res.status(200).json({
       message: `User role updated to ${permission} successfully.`,
     });
   } catch (error) {
-    res.status(500).json({
+    return res.status(500).json({
       message: "An error occurred.",
     });
   }
@@ -382,11 +380,11 @@ router.patch("/useExtended/:id/:useExtended", async (req, res) => {
       })
       .where(eq(users.id, parseInt(id)));
 
-    res.status(200).json({
+    return res.status(200).json({
       message: `User useExtended data updated to ${useExtended} successfully.`,
     });
   } catch (error) {
-    res.status(500).json({
+    return res.status(500).json({
       message: "An error occurred.",
     });
   }
diff --git a/src/routes/domain/adblock.ts b/src/routes/domain/adblock.ts
@@ -1,8 +1,7 @@
+import { eq } from "drizzle-orm";
 import express from "express";
 import { db } from "src/utils/db";
 const router = express.Router();
-import { domains } from "src/db/schema";
-import { eq } from "drizzle-orm";
 
 async function getAllDomains() {
   const dbDomains = await db.query.domains.findMany({
@@ -34,7 +33,7 @@ router.get("/adgaurd", async (req, res) => {
   const filters = domains.map((domain) => `||${domain}^`).join("\n");
   // Set content type for filter list
   res.setHeader("Content-Type", "text/plain");
-  res.send(`${header}\n${filters}`);
+  return res.status(200).send(`${header}\n${filters}`);
 });
 
 /**
@@ -58,7 +57,7 @@ router.get("/ublock", async (req, res) => {
   const filters = domains.map((domain) => `||${domain}^`).join("\n");
   // Set content type for filter list
   res.setHeader("Content-Type", "text/plain");
-  res.send(`${header}\n${filters}`);
+  return res.status(200).send(`${header}\n${filters}`);
 });
 
 /**
@@ -79,7 +78,7 @@ router.get("/pihole", async (req, res) => {
     "#",
   ].join("\n");
   res.setHeader("Content-Type", "text/plain");
-  res.send(`${header}\n${domains.join("\n")}`);
+  return res.status(200).send(`${header}\n${domains.join("\n")}`);
 });
 
 export default router;
diff --git a/src/routes/email.ts b/src/routes/email.ts
@@ -59,7 +59,7 @@ router.get("/check", authenticateToken, async (req, res) => {
   }
 
   const result = await ipQualityScoreService.email.check(email);
-  res.status(200).json(result);
+  return res.status(200).json(result);
 });
 
 export default router;
diff --git a/src/routes/misc.ts b/src/routes/misc.ts
@@ -38,7 +38,7 @@ router.get("/metrics", async (req, res) => {
   let dateStartedFormatted = moment(dateStarted).format("MM-DD-YY H:m:s A Z");
   let environment = process.env.NODE_ENV;
 
-  res.status(200).json({
+  return res.status(200).json({
     status: "up",
     environment: environment,
     uptime: uptimeString,
diff --git a/src/routes/user.ts b/src/routes/user.ts
@@ -50,12 +50,11 @@ router.post("/signup", async (req, res) => {
   const { firstName, lastName, email, password } = body;
 
   if (!firstName || !lastName || !email || !password) {
-    res
+    return res
       .status(400)
       .json(
         "Invalid arguments. Please provide firstName, lastName, email, and password"
       );
-    return;
   }
 
   let isDisposable = await disposableEmailDetector(email as string);
@@ -68,8 +67,7 @@ router.post("/signup", async (req, res) => {
   // use regex to validate email
   const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
   if (!emailRegex.test(email)) {
-    res.status(400).json("Invalid email address");
-    return;
+    return res.status(400).json("Invalid email address");
   }
 
   // Check if the user already exists
@@ -78,8 +76,7 @@ router.post("/signup", async (req, res) => {
   });
 
   if (user) {
-    res.status(400).json("User with that email already exists");
-    return;
+    return res.status(400).json("User with that email already exists");
   }
 
   const salt = bcrypt.genSaltSync(saltRounds);
@@ -155,12 +152,12 @@ router.post("/signup", async (req, res) => {
     }
 
     // Send success response with the user's uuid
-    res.status(200).json({
+    return res.status(200).json({
       message: "User created successfully, please login.",
       uuid: newUser.uuid,
     });
   } catch (error: any) {
-    res.status(500).json({
+    return res.status(500).json({
       message: "Error creating user",
       error: error.message,
     });
@@ -196,8 +193,7 @@ router.post("/login", async (req, res) => {
   const { email, password } = body;
 
   if (!email || !password) {
-    res.status(400).json("Missing email or password");
-    return;
+    return res.status(400).json("Missing email or password");
   }
 
   // Get IP address from the request
@@ -317,7 +313,7 @@ router.post("/login", async (req, res) => {
     };
   }
 
-  res.status(200).json(jsonresponsebody);
+  return res.status(200).json(jsonresponsebody);
 });
 
 /**
@@ -413,7 +409,7 @@ router.get("/me", authenticateToken, async (req, res) => {
     count: methodGroup.count,
   }));
 
-  res.status(200).json({
+  return res.status(200).json({
     name: userInfo.firstName + " " + userInfo.lastName,
     email: userInfo.email,
     uuid: userInfo.uuid,
@@ -493,7 +489,7 @@ router.patch("/me", authenticateToken, async (req, res) => {
       .where(eq(users.id, userInfo.id));
   }
 
-  res.status(200).json("User updated successfully");
+  return res.status(200).json("User updated successfully");
 });
 
 export default router;

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ router.get("/check", authenticateToken, async (req, res) => {`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`const result = await ipQualityScoreService.email.check(email);`
`62`		`- res.status(200).json(result);`
	`62`	`+ return res.status(200).json(result);`
`63`	`63`	`});`
`64`	`64`
`65`	`65`	`export default router;`