@modernlock/common 1.0.55 → 1.0.56

package/build/index.d.ts

@@ -38,3 +38,4 @@ export * from "./things/events";
 export * from "./mqtt/topics";
 export * from "./things/commands";
 export * from "./@types/notification";
+export * from "./@types/express";

package/build/index.js

@@ -54,3 +54,4 @@ __exportStar(require("./things/events"), exports);
 __exportStar(require("./mqtt/topics"), exports);
 __exportStar(require("./things/commands"), exports);
 __exportStar(require("./@types/notification"), exports);
+__exportStar(require("./@types/express"), exports);

package/build/middlewares/checkPermissions.d.ts

@@ -1,3 +1,4 @@
-import { NextFunction, Request, Response } from 'express';
-export declare function strongCheck(read: boolean, write: boolean): (req: Request, res: Response, next: NextFunction) => void;
-export declare function weakCheck(read: boolean, write: boolean): (req: Request, res: Response, next: NextFunction) => void;
+import { Request, Response, NextFunction } from "express";
+type Role = "client" | "owner" | "superAdmin" | "developer" | "supportAgent";
+declare const verifyPermission: (role: Role) => (req: Request, res: Response, next: NextFunction) => void;
+export default verifyPermission;

package/build/middlewares/checkPermissions.js

@@ -1,60 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.weakCheck = exports.strongCheck = void 0;
 const auth_error_1 = require("../errors/auth-error");
-const authorization_error_1 = require("../errors/authorization-error");
-const internal_server_error_1 = require("../errors/internal-server-error");
-const jwtEncryption_1 = require("../utils/jwtEncryption");
-function strongCheck(read, write) {
+const verifyPermission = (role) => {
     return (req, res, next) => {
-        var _a, _b;
-        if (!(write && read))
-            throw new internal_server_error_1.InternalServerError();
-        const { token } = req.session;
-        if (!token)
+        if (role !== req.user.accountType)
             throw new auth_error_1.AuthenticationError();
-        const user = (0, jwtEncryption_1.jwtDecrypt)(token);
-        if (!user)
-            throw new auth_error_1.AuthenticationError();
-        if (!user.isAdmin)
-            throw new authorization_error_1.AuthorizationError();
-        if (write && !((_a = user.permissions) === null || _a === void 0 ? void 0 : _a.write))
-            throw new authorization_error_1.AuthorizationError();
-        if (read && !((_b = user.permissions) === null || _b === void 0 ? void 0 : _b.read))
-            throw new authorization_error_1.AuthorizationError();
-        req.user = user;
-        next();
-    };
-}
-exports.strongCheck = strongCheck;
-;
-function weakCheck(read, write) {
-    return (req, res, next) => {
-        var _a, _b;
-        if (!(write && read))
-            throw new internal_server_error_1.InternalServerError();
-        const { token } = req.session;
-        if (!token)
-            throw new auth_error_1.AuthenticationError();
-        const user = (0, jwtEncryption_1.jwtDecrypt)(token);
-        if (!user)
-            throw new auth_error_1.AuthenticationError();
-        req.user = user;
-        if (!user.isAdmin) {
-            req.user.allowed = false;
-            return next();
-        }
-        if (write && !((_a = user.permissions) === null || _a === void 0 ? void 0 : _a.write)) {
-            req.user.allowed = false;
-            return next();
-        }
-        if (read && !((_b = user.permissions) === null || _b === void 0 ? void 0 : _b.read)) {
-            req.user.allowed = false;
-            return next();
-        }
-        req.user.allowed = true;
         next();
     };
-}
-exports.weakCheck = weakCheck;
-;
+};
+exports.default = verifyPermission;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modernlock/common",
-  "version": "1.0.55",
+  "version": "1.0.56",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",
   "files": [