@otters.ai/common-backend 1.0.191 → 1.0.193

package/build/middleware/checkRoles.d.ts

@@ -4,5 +4,5 @@
  * @param {*} next  Express next Function
  */
 type RolePermissions = Record<string, string[]>;
-export declare const checkRole: (rolesPermissions: RolePermissions, requiredPermission: string, role: string, req: any, res: any, next: any) => any;
+export declare const checkRole: (rolesPermissions: RolePermissions, requiredPermission: string, req: any, res: any, next: any) => any;
 export {};

package/build/middleware/checkRoles.js

@@ -6,8 +6,10 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkRole = void 0;
-const checkRole = (rolesPermissions, requiredPermission, role, req, res, next) => {
+const checkRole = (rolesPermissions, requiredPermission, req, res, next) => {
+    var _a;
     try {
+        const role = (_a = req.user) === null || _a === void 0 ? void 0 : _a.role;
         const permissions = rolesPermissions[role] || [];
         if (!permissions.includes(requiredPermission)) {
             return res.status(200).json({

package/build/middleware/checkToken.d.ts

@@ -3,4 +3,4 @@
  * @param {*} res  Express res Object
  * @param {*} next  Express next Function
  */
-export declare const checkToken: (sessionLogService: any, req: any, res: any, next: any) => Promise<any>;
+export declare const checkToken: (req: any, res: any, next: any) => Promise<any>;

package/build/middleware/checkToken.js

@@ -16,34 +16,25 @@ const services_1 = require("../services");
  * @param {*} res  Express res Object
  * @param {*} next  Express next Function
  */
-const checkToken = (sessionLogService, req, res, next) => __awaiter(void 0, void 0, void 0, function* () {
+const checkToken = (req, res, next) => __awaiter(void 0, void 0, void 0, function* () {
     try {
         const authHeader = req.get('Authorization');
         const token = authHeader && authHeader.toString().split(' ')[1];
         if (!token) {
             return res.status(200).json({ success: false, message: "Token not found." });
         }
-        if (!req.headers['sessionid']) {
-            return res.status(200).json({ success: false, message: "Session Id not found." });
+        const verifyToken = services_1.JwtService.verifyJSONToken({
+            token: token
+        });
+        if (!verifyToken.flag) {
+            return res.status(200).json({ success: false, message: verifyToken.message });
         }
-        let result = yield sessionLogService
-            .findEntry({ sessionId: req.headers['sessionid'].toString() });
-        if (result.flag) {
-            const verifyToken = services_1.JwtService.verifyJSONToken({
-                token: token
-            });
-            if (!verifyToken.flag) {
-                return res.status(200).json({ success: false, message: verifyToken.message });
-            }
-            if (typeof verifyToken.message === "object") {
-                req['userEmail'] = verifyToken.message.email;
-                req['userId'] = verifyToken.message.id;
-            }
-            next();
-        }
-        else {
-            return res.status(200).json({ success: false, message: result.message });
+        if (typeof verifyToken.message === "object") {
+            req['userEmail'] = verifyToken.message.email;
+            req['userId'] = verifyToken.message.id;
+            req['role'] = verifyToken.message.role;
         }
+        next();
     }
     catch (e) {
         return next(e);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@otters.ai/common-backend",
-  "version": "1.0.191",
+  "version": "1.0.193",
   "description": "",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",