refactor: more refactors

.env.example

@@ -1,7 +1,6 @@
 PORT =
-ACCESS_TOKEN_SECRET =
 
 DB_URI =
 
-CURRENT_ENV = local
-# CURRENT_ENV = development
+JWT_SECRET =
+JWT_EXPIRES_IN =

src/configs/config.ts

@@ -7,6 +7,10 @@ export interface Config {
   db: {
     uri: string;
   };
+  jwt: {
+    secret: string;
+    expiresIn: string;
+  };
 }
 
 export const config: Config = {
@@ -14,4 +18,8 @@ export const config: Config = {
   db: {
     uri: Env.get("DB_URI").toString(),
   },
+  jwt: {
+    secret: Env.get("JWT_SECRET").toString(),
+    expiresIn: Env.get("JWT_EXPIRES_IN").toString(),
+  },
 };

src/helpers/jwt.helper.ts

@@ -1,23 +1,34 @@
 import jwt from "jsonwebtoken";
+import { config } from "../configs/config";
 
 export class jwtHelper {
-    static generateToken(payload: any) {
-        return jwt.sign(payload, process.env.ACCESS_TOKEN_SECRET || "secret", { expiresIn: '30d' })
-    }
+  static generateToken(payload: any) {
+    return jwt.sign(payload, config.jwt.secret, {
+      expiresIn: config.jwt.expiresIn,
+    });
+  }
 
-    static verifyToken(role: any) {
-        return (req: any, res: any, next: any) => {
-            let authHeader = req.headers['authorization']
-            const token = authHeader && authHeader.split(" ")[1]
-            if (token) {
-                jwt.verify(token, process.env.ACCESS_TOKEN_SECRET || "secret", (err: any, tokenData: any) => {
-                    if (err) return res.status(403).json({ success: false, code: 403, message: "Invalid Token!" })
-                    if (!role.includes(tokenData.role)) return res.status(401).json({ success: false, code: 401, message: "Unauthorized" })
-                    req.tokenData = tokenData;
-                    next();
-                })
-    
-            } else return res.status(401).json({ success: false, code: 401, message: "Unauthorized" })
-        }
-    }
-}
+  static verifyToken(role: any) {
+    return (req: any, res: any, next: any) => {
+      let authHeader = req.headers["authorization"];
+      const token = authHeader && authHeader.split(" ")[1];
+      if (token) {
+        jwt.verify(token, config.jwt.secret, (err: any, tokenData: any) => {
+          if (err)
+            return res
+              .status(403)
+              .json({ success: false, code: 403, message: "Invalid Token!" });
+          if (!role.includes(tokenData.role))
+            return res
+              .status(401)
+              .json({ success: false, code: 401, message: "Unauthorized" });
+          req.tokenData = tokenData;
+          next();
+        });
+      } else
+        return res
+          .status(401)
+          .json({ success: false, code: 401, message: "Unauthorized" });
+    };
+  }
+}

src/modules/console/index.route.ts

@@ -1,11 +0,0 @@
-import express from "express";
-const adminRouter = express.Router();
-
-import { jwtHelper } from "../../helpers/jwt.helper";
-const allowedRoles = ["superAdmin", "admin"];
-
-import { adminUserRoutes } from "./users/routes/admin-users.route";
-
-adminRouter.use("/users", jwtHelper.verifyToken(allowedRoles), adminUserRoutes);
-
-export { adminRouter };

src/modules/console/users/controllers/users.controller.ts

@@ -1,18 +1,34 @@
+import { jwtHelper } from "../../../../helpers/jwt.helper";
+import { validator } from "../../../../helpers/validation.helper";
+import { BaseController } from "../../../../lib/controllers/controller.base";
+import { Prefix } from "../../../common/decorators/prefix.decorator";
 import { usersService } from "../services/users.service";
+import { adminUserValidation } from "../validation/admin.userValidation";
 
-export class adminUsersController {
+const allowedRoles = ["superAdmin", "admin"];
 
-    static async create(req, res) {
-        try {
-            let result = await usersService.create(req.body);
-            return res.status(result.code).json(result);
-        } catch (err) {
-            console.log(`err.message`, err.message);
-            return res.status(500).json({
-                success: false,
-                code: 500,
-                error: err.message
-            })
-        }
+@Prefix("/admin/users")
+export class adminUsersController extends BaseController {
+  static setRoutes(router) {
+    router.post(
+      "/create",
+      jwtHelper.verifyToken(allowedRoles),
+      validator(adminUserValidation.createValidation),
+      adminUsersController.create
+    );
+  }
+
+  static async create(req, res) {
+    try {
+      let result = await usersService.create(req.body);
+      return res.status(result.code).json(result);
+    } catch (err) {
+      console.log(`err.message`, err.message);
+      return res.status(500).json({
+        success: false,
+        code: 500,
+        error: err.message,
+      });
     }
-}
+  }
+}

src/modules/console/users/routes/admin-users.route.ts

@@ -1,11 +0,0 @@
-import express from "express";
-import { adminUsersController } from "../controllers/users.controller";
-import { adminUserValidation } from "../validation/admin.userValidation";
-import { validator } from "../../../../helpers/validation.helper";
-
-const app = express.Router();
-
-app.post("/create", validator(adminUserValidation.createValidation), adminUsersController.create);
-
-export { app as adminUserRoutes };
-

src/modules/user/index.route.ts

@@ -1,11 +0,0 @@
-import express from 'express';
-const app = express();
-
-import { jwtHelper } from '../../helpers/jwt.helper';
-const allowedRoles = ["user"];
-
-import { authRoutes } from './users/routes/auth.route';
-
-app.use(authRoutes);
-
-export { app as userRoutes };

src/modules/user/users/controllers/auth.controller.ts

@@ -5,6 +5,7 @@ import { validator } from "../../../../helpers/validation.helper";
 import { userValidation } from "../validation/user.Validation";
 import { Router } from "express";
 import { Prefix } from "../../../common/decorators/prefix.decorator";
+import { Env } from "../../../../configs/env";
 
 @Prefix("/user")
 export class AuthController extends BaseController {

src/modules/user/users/routes/auth.route.ts

@@ -1,12 +0,0 @@
-import express from "express";
-import { AuthController } from "../controllers/auth.controller";
-import { userValidation } from "../validation/user.Validation";
-import { validator } from "../../../../helpers/validation.helper";
-
-const app = express.Router();
-
-// app.post("/register", validator(userValidation.createValidation), AuthController.register);
-// app.post("/login", validator(userValidation.loginValidation), AuthController.login);
-
-export { app as authRoutes };
-

src/routes.ts

@@ -1,8 +1,5 @@
 import { Router, Express } from "express";
 
-import { userRoutes } from "./modules/user/index.route";
-import { adminRouter } from "./modules/console/index.route";
-
 import * as glob from "glob";
 import path from "path";
 import { BaseController } from "./lib/controllers/controller.base";
@@ -19,8 +16,6 @@ export const setAppRoutes = async (app: Express) => {
 /* custom routes */
 
 const setCustomRoutes = (router: Router) => {
-  router.use("/admin", adminRouter);
-
   router.get("/health", (_req: any, res: any) => {
     res
       .status(200)