Merge pull request #3 from Prakharnagore/promise-bug-fix

Promise bug fix

.eslintignore

@@ -2,4 +2,5 @@ dist
 node_modules
 *.spec.ts
 tests/
-.DS_Store
+.DS_Store
+.github

.eslintrc.cjs

@@ -15,7 +15,7 @@ module.exports = {
     rules: {
         "no-console": "error",
         "dot-notation": "error",
-        "@typescript-eslint/no-misused-promises": "off",
+        // "@typescript-eslint/no-misused-promises": "off",
         "@typescript-eslint/require-await": "off",
     },
 };

src/app.ts

@@ -13,7 +13,7 @@ app.use(express.static("public"));
 app.use(cookieParser());
 app.use(express.json());
 
-app.get("/", async (req, res) => {
+app.get("/", (req, res) => {
     res.status(200).send("Welcome to auth service");
 });
 

src/routes/auth.ts

@@ -1,4 +1,9 @@
-import express, { NextFunction, Request, Response } from "express";
+import express, {
+    NextFunction,
+    Request,
+    RequestHandler,
+    Response,
+} from "express";
 import { AuthController } from "../controllers/AuthController";
 import { UserService } from "../services/UserService";
 import { TokenService } from "../services/TokenService";
@@ -27,36 +32,51 @@ const authController = new AuthController(
     credentialService,
 );
 
-router.post(
-    "/register",
-    registerValidator,
-    (req: Request, res: Response, next: NextFunction) =>
-        authController.register(req, res, next),
-);
+router.post("/register", registerValidator, (async (
+    req: Request,
+    res: Response,
+    next: NextFunction,
+) => {
+    await authController.register(req, res, next);
+}) as RequestHandler);
 
 router.post(
     "/login",
     loginValidator,
     (req: Request, res: Response, next: NextFunction) =>
-        authController.login(req, res, next),
+        authController.login(req, res, next) as unknown as RequestHandler,
 );
 
-router.get("/self", authenticate, (req: Request, res: Response) =>
-    authController.self(req as AuthRequest, res),
+router.get(
+    "/self",
+    authenticate as RequestHandler,
+    (req: Request, res: Response) =>
+        authController.self(
+            req as AuthRequest,
+            res,
+        ) as unknown as RequestHandler,
 );
 
 router.post(
     "/refresh",
-    validateRefreshToken,
+    validateRefreshToken as RequestHandler,
     (req: Request, res: Response, next: NextFunction) =>
-        authController.refresh(req as AuthRequest, res, next),
+        authController.refresh(
+            req as AuthRequest,
+            res,
+            next,
+        ) as unknown as RequestHandler,
 );
 
 router.post(
     "/logout",
-    parseRefreshToken,
+    parseRefreshToken as RequestHandler,
     (req: Request, res: Response, next: NextFunction) =>
-        authController.logout(req as AuthRequest, res, next),
+        authController.logout(
+            req as AuthRequest,
+            res,
+            next,
+        ) as unknown as RequestHandler,
 );
 
 export default router;

src/routes/tenant.ts

@@ -1,4 +1,9 @@
-import express, { NextFunction, Request, Response } from "express";
+import express, {
+    NextFunction,
+    Request,
+    RequestHandler,
+    Response,
+} from "express";
 import { TenantController } from "../controllers/TenantController";
 import { TenantService } from "../services/TenantService";
 import { Tenant } from "../entity/Tenant";
@@ -17,30 +22,40 @@ const tenantController = new TenantController(tenantService, logger);
 
 router.post(
     "/",
-    authenticate,
+    authenticate as RequestHandler,
     canAccess([Roles.ADMIN]),
     (req: Request, res: Response, next: NextFunction) =>
-        tenantController.create(req, res, next),
+        tenantController.create(req, res, next) as unknown as RequestHandler,
 );
 
 router.patch(
     "/:id",
-    authenticate,
+    authenticate as RequestHandler,
     canAccess([Roles.ADMIN]),
     tenantValidator,
     (req: CreateTenantRequest, res: Response, next: NextFunction) =>
-        tenantController.update(req, res, next),
+        tenantController.update(req, res, next) as unknown as RequestHandler,
 );
 
-router.get("/", (req, res, next) => tenantController.getAll(req, res, next));
-router.get("/:id", authenticate, canAccess([Roles.ADMIN]), (req, res, next) =>
-    tenantController.getOne(req, res, next),
+router.get(
+    "/",
+    (req, res, next) =>
+        tenantController.getAll(req, res, next) as unknown as RequestHandler,
+);
+
+router.get(
+    "/:id",
+    authenticate as RequestHandler,
+    canAccess([Roles.ADMIN]),
+    (req, res, next) =>
+        tenantController.getOne(req, res, next) as unknown as RequestHandler,
 );
 router.delete(
     "/:id",
-    authenticate,
+    authenticate as RequestHandler,
     canAccess([Roles.ADMIN]),
-    (req, res, next) => tenantController.destroy(req, res, next),
+    (req, res, next) =>
+        tenantController.destroy(req, res, next) as unknown as RequestHandler,
 );
 
 export default router;

src/routes/user.ts

@@ -1,4 +1,4 @@
-import express, { NextFunction, Response } from "express";
+import express, { NextFunction, RequestHandler, Response } from "express";
 import authenticate from "../middlewares/authenticate";
 import { canAccess } from "../middlewares/canAccess";
 import { Roles } from "../constants";
@@ -18,35 +18,44 @@ const userController = new UserController(userService, logger);
 
 router.post(
     "/",
-    authenticate,
+    authenticate as RequestHandler,
     canAccess([Roles.ADMIN]),
     createUserValidator,
     (req: CreateUserRequest, res: Response, next: NextFunction) =>
-        userController.create(req, res, next),
+        userController.create(req, res, next) as unknown as RequestHandler,
 );
 
 router.patch(
     "/:id",
-    authenticate,
+    authenticate as RequestHandler,
     canAccess([Roles.ADMIN]),
     updateUserValidator,
     (req: UpdateUserRequest, res: Response, next: NextFunction) =>
-        userController.update(req, res, next),
+        userController.update(req, res, next) as unknown as RequestHandler,
 );
 
-router.get("/", authenticate, canAccess([Roles.ADMIN]), (req, res, next) =>
-    userController.getAll(req, res, next),
+router.get(
+    "/",
+    authenticate as RequestHandler,
+    canAccess([Roles.ADMIN]),
+    (req, res, next) =>
+        userController.getAll(req, res, next) as unknown as RequestHandler,
 );
 
-router.get("/:id", authenticate, canAccess([Roles.ADMIN]), (req, res, next) =>
-    userController.getOne(req, res, next),
+router.get(
+    "/:id",
+    authenticate as RequestHandler,
+    canAccess([Roles.ADMIN]),
+    (req, res, next) =>
+        userController.getOne(req, res, next) as unknown as RequestHandler,
 );
 
 router.delete(
     "/:id",
-    authenticate,
+    authenticate as RequestHandler,
     canAccess([Roles.ADMIN]),
-    (req, res, next) => userController.destroy(req, res, next),
+    (req, res, next) =>
+        userController.destroy(req, res, next) as unknown as RequestHandler,
 );
 
 export default router;