@zenofolio/hyper-decor 1.0.55 → 1.0.57

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -60,4 +60,4 @@ export declare const METADATA_STATE_KEYS: {
60
60
  CREATED: string;
61
61
  PREPARED: string;
62
62
  };
63
- export declare const FULL_ACCESS_SCOPE = "full-access-scope";
63
+ export declare const FULL_ACCESS = "*";
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.FULL_ACCESS_SCOPE = exports.METADATA_STATE_KEYS = exports.METADATA_PARAMS_KEYS = exports.METADATA_METHOD_KEYS = exports.METADATA_STORE_KEYS = exports.METADATA_KEYS = exports.METADATA_HYPER_TYPE = exports.DESIGN_TYPE = exports.DESIGN_RETURNTYPE = exports.DESIGN_PARAMTYPES = exports.KEY_STATE_BY_PASS = exports.KEY_STATE_PREPARED = exports.KEY_STATE_CREATED = exports.KEY_STATE_UPDATED = exports.KEY_PARAMS_PASS = exports.KEY_PARAMS_ROLE = exports.KEY_PARAMS_SCOPE = exports.KEY_PARAMS_MIDDLEWARES = exports.KEY_PARAMS_PARAM = exports.KEY_PARAMS_ROUTE = exports.KEY_PARAMS_MODULE = exports.KEY_PARAMS_CONTROLLER = exports.KEY_PARAMS_APP = exports.KEY_TYPE_GUARD = exports.KEY_TYPE_SERVICE = exports.KEY_TYPE_ROUTE = exports.KEY_TYPE_MODULE = exports.KEY_TYPE_CONTROLLER = exports.KEY_TYPE_APP = void 0;
3
+ exports.FULL_ACCESS = exports.METADATA_STATE_KEYS = exports.METADATA_PARAMS_KEYS = exports.METADATA_METHOD_KEYS = exports.METADATA_STORE_KEYS = exports.METADATA_KEYS = exports.METADATA_HYPER_TYPE = exports.DESIGN_TYPE = exports.DESIGN_RETURNTYPE = exports.DESIGN_PARAMTYPES = exports.KEY_STATE_BY_PASS = exports.KEY_STATE_PREPARED = exports.KEY_STATE_CREATED = exports.KEY_STATE_UPDATED = exports.KEY_PARAMS_PASS = exports.KEY_PARAMS_ROLE = exports.KEY_PARAMS_SCOPE = exports.KEY_PARAMS_MIDDLEWARES = exports.KEY_PARAMS_PARAM = exports.KEY_PARAMS_ROUTE = exports.KEY_PARAMS_MODULE = exports.KEY_PARAMS_CONTROLLER = exports.KEY_PARAMS_APP = exports.KEY_TYPE_GUARD = exports.KEY_TYPE_SERVICE = exports.KEY_TYPE_ROUTE = exports.KEY_TYPE_MODULE = exports.KEY_TYPE_CONTROLLER = exports.KEY_TYPE_APP = void 0;
4
4
  //////////////////////////////
5
5
  /// Types constants
6
6
  //////////////////////////////
@@ -71,4 +71,4 @@ exports.METADATA_STATE_KEYS = {
71
71
  CREATED: "hyper:created",
72
72
  PREPARED: "hyper:prepared",
73
73
  };
74
- exports.FULL_ACCESS_SCOPE = "full-access-scope";
74
+ exports.FULL_ACCESS = "*";
@@ -3,20 +3,23 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.default = roleTransform;
4
4
  const exeptions_1 = require("../../exeptions");
5
5
  const helpers_1 = require("../../common/helpers");
6
+ const constants_1 = require("../constants");
6
7
  function roleTransform(list, callback) {
7
8
  const { roles, names, isEmtpy } = resolveRoles(list);
8
9
  const middleware = (req, res, next) => {
9
- // if scopes is empty, then we don't need to check for scopes
10
+ var _a;
10
11
  if (isEmtpy)
11
12
  return next();
12
- // get the user scopes
13
- const requestRoles = (0, helpers_1.getRoles)(req);
14
- // find the first scope that is not in the userScopes
15
- const role = roles.find((scope) => requestRoles === null || requestRoles === void 0 ? void 0 : requestRoles.includes(scope.role));
13
+ const requestRoles = new Set((_a = (0, helpers_1.getRoles)(req)) !== null && _a !== void 0 ? _a : []);
14
+ if (requestRoles.size === 0 && isEmtpy)
15
+ return next();
16
+ if (requestRoles.has(constants_1.FULL_ACCESS))
17
+ return next();
18
+ const role = roles.some((scope) => requestRoles.has(scope.role));
16
19
  if (role) {
17
20
  return next();
18
21
  }
19
- return next(new exeptions_1.NotRoleException(`Only ${Array.from(names).join(", ")} can access this resource`, requestRoles, Array.from(names)));
22
+ return next(new exeptions_1.NotRoleException(`Only ${Array.from(names).join(", ")} can access this resource`, Array.from(requestRoles), Array.from(names)));
20
23
  };
21
24
  if (names.size > 0 && callback) {
22
25
  callback(middleware, roles, names);
@@ -3,22 +3,23 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.default = scopeTransfrom;
4
4
  const exeptions_1 = require("../../exeptions");
5
5
  const helpers_1 = require("../../common/helpers");
6
+ const constants_1 = require("../constants");
6
7
  function scopeTransfrom(listScopes, ...callback) {
7
8
  const { scopes, scopeNames, isEmtpy } = resolveScopes(listScopes);
8
9
  const middleware = (req, res, next) => {
9
- var _a;
10
- // if scopes is empty, then we don't need to check for scopes
10
+ var _a, _b;
11
11
  if (isEmtpy)
12
12
  return next();
13
13
  // get the user scopes
14
- const userScopes = (0, helpers_1.getScopes)(req);
15
- // hek if has global scope
16
- if (userScopes === null || userScopes === void 0 ? void 0 : userScopes.includes("*"))
14
+ const userScopes = new Set((_a = (0, helpers_1.getScopes)(req)) !== null && _a !== void 0 ? _a : []);
15
+ if (userScopes.size === 0 && isEmtpy)
16
+ return next();
17
+ if (userScopes.has(constants_1.FULL_ACCESS))
17
18
  return next();
18
19
  // find the first scope that is not in the userScopes
19
- const error = scopes.find((scope) => !(userScopes === null || userScopes === void 0 ? void 0 : userScopes.includes(scope.scope)));
20
+ const error = scopes.find((scope) => !userScopes.has(scope.scope));
20
21
  if (error) {
21
- 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)));
22
+ 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)));
22
23
  }
23
24
  return next();
24
25
  };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zenofolio/hyper-decor",
3
- "version": "1.0.55",
3
+ "version": "1.0.57",
4
4
  "description": "Project core with utilities and features",
5
5
  "main": "dist/index.js",
6
6
  "author": "zenozaga",