@zenofolio/hyper-decor 1.0.56 → 1.0.57

package/dist/__internals/transform/role.transform.js

@@ -7,19 +7,19 @@ const constants_1 = require("../constants");
 function roleTransform(list, callback) {
     const { roles, names, isEmtpy } = resolveRoles(list);
     const middleware = (req, res, next) => {
-        // if scopes is empty, then we don't need to check for scopes
+        var _a;
         if (isEmtpy)
             return next();
-        // get the user scopes
-        const requestRoles = (0, helpers_1.getRoles)(req);
-        if (requestRoles === null || requestRoles === void 0 ? void 0 : requestRoles.includes(constants_1.FULL_ACCESS))
+        const requestRoles = new Set((_a = (0, helpers_1.getRoles)(req)) !== null && _a !== void 0 ? _a : []);
+        if (requestRoles.size === 0 && isEmtpy)
             return next();
-        // find the first scope that is not in the userScopes
-        const role = roles.find((scope) => requestRoles === null || requestRoles === void 0 ? void 0 : requestRoles.includes(scope.role));
+        if (requestRoles.has(constants_1.FULL_ACCESS))
+            return next();
+        const role = roles.some((scope) => requestRoles.has(scope.role));
         if (role) {
             return next();
         }
-        return next(new exeptions_1.NotRoleException(`Only ${Array.from(names).join(", ")} can access this resource`, requestRoles, Array.from(names)));
+        return next(new exeptions_1.NotRoleException(`Only ${Array.from(names).join(", ")} can access this resource`, Array.from(requestRoles), Array.from(names)));
     };
     if (names.size > 0 && callback) {
         callback(middleware, roles, names);

package/dist/__internals/transform/scope.transfrom.js

@@ -7,19 +7,19 @@ const constants_1 = require("../constants");
 function scopeTransfrom(listScopes, ...callback) {
     const { scopes, scopeNames, isEmtpy } = resolveScopes(listScopes);
     const middleware = (req, res, next) => {
-        var _a;
-        // if scopes is empty, then we don't need to check for scopes
+        var _a, _b;
         if (isEmtpy)
             return next();
         // get the user scopes
-        const userScopes = (0, helpers_1.getScopes)(req);
-        // hek if has global scope
-        if (userScopes === null || userScopes === void 0 ? void 0 : userScopes.includes(constants_1.FULL_ACCESS))
+        const userScopes = new Set((_a = (0, helpers_1.getScopes)(req)) !== null && _a !== void 0 ? _a : []);
+        if (userScopes.size === 0 && isEmtpy)
+            return next();
+        if (userScopes.has(constants_1.FULL_ACCESS))
             return next();
         // find the first scope that is not in the userScopes
-        const error = scopes.find((scope) => !(userScopes === null || userScopes === void 0 ? void 0 : userScopes.includes(scope.scope)));
+        const error = scopes.find((scope) => !userScopes.has(scope.scope));
         if (error) {
-            return next(new exeptions_1.NotScopeException((_a = error.message) !== null && _a !== void 0 ? _a : `You don't have the required scopes to access this resource`, userScopes, Array.from(scopeNames)));
+            return next(new exeptions_1.NotScopeException((_b = error.message) !== null && _b !== void 0 ? _b : `You don't have the required scopes to access this resource`, Array.from(userScopes), Array.from(scopeNames)));
         }
         return next();
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zenofolio/hyper-decor",
-  "version": "1.0.56",
+  "version": "1.0.57",
   "description": "Project core with utilities and features",
   "main": "dist/index.js",
   "author": "zenozaga",