@vita-mojo/auth 1.0.45 → 1.0.46

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.
Files changed (3) hide show
  1. package/package.json +1 -1
  2. package/src/generic-permissions-checker.js +14 -5
  3. package/src/generic-permissions-checker.js.map +1 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@vita-mojo/auth",
3
- "version": "1.0.45",
3
+ "version": "1.0.46",
4
4
  "dependencies": {
5
5
  "passport-jwt": "^4.0.1",
6
6
  "jsonwebtoken": "^9.0.2"
package/src/generic-permissions-checker.js CHANGED
@@ -15,7 +15,7 @@ class GenericPermissionsChecker {
15
15
  return (resource) => resource ? `${namespace}__${resource}` : namespace;
16
16
  }
17
17
  static check(user, resource) {
18
- var _a, _b;
18
+ var _a, _b, _c, _d, _e;
19
19
  if (!user || !GenericPermissionsChecker.permissionsMap)
20
20
  return false;
21
21
  if (!resource)
@@ -25,12 +25,21 @@ class GenericPermissionsChecker {
25
25
  return false;
26
26
  if (((_a = user.role) === null || _a === void 0 ? void 0 : _a.slug) === 'service-account')
27
27
  return true;
28
- if (!permissionsMap[resource].permission ||
29
- permissionsMap[resource].permission === '*')
28
+ const noPermissionsDefined = !permissionsMap[resource].permission &&
29
+ !((_b = permissionsMap[resource].permissions) === null || _b === void 0 ? void 0 : _b.length);
30
+ const allowAllEnabled = permissionsMap[resource].permission === '*' ||
31
+ ((_c = permissionsMap[resource].permissions) === null || _c === void 0 ? void 0 : _c.includes('*'));
32
+ if (noPermissionsDefined || allowAllEnabled)
30
33
  return true;
31
- if (!((_b = user.role) === null || _b === void 0 ? void 0 : _b.permissions))
34
+ if (!((_d = user.role) === null || _d === void 0 ? void 0 : _d.permissions))
32
35
  return false;
33
- return user.role.permissions.includes(permissionsMap[resource].permission);
36
+ const resourcePermissions = permissionsMap[resource].permission
37
+ ? [
38
+ ...(permissionsMap[resource].permissions || []),
39
+ permissionsMap[resource].permission,
40
+ ]
41
+ : (_e = permissionsMap[resource].permissions) !== null && _e !== void 0 ? _e : [];
42
+ return resourcePermissions.some((permission) => user.role.permissions.includes(permission));
34
43
  }
35
44
  }
36
45
  exports.GenericPermissionsChecker = GenericPermissionsChecker;
package/src/generic-permissions-checker.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"generic-permissions-checker.js","sourceRoot":"","sources":["../../../../packages/auth/src/generic-permissions-checker.ts"],"names":[],"mappings":";;;AAEA,MAAa,yBAAyB;IAGpC,MAAM,CAAC,mBAAmB,CAAC,cAA+C;QACxE,yBAAyB,CAAC,cAAc;YACtC,cAAc,CAAC,MAAM,CAAiB,CAAC,WAAW,EAAE,OAAO,EAAE,EAAE;gBAC7D,WAAW,CACT,OAAO,CAAC,QAAQ;oBACd,CAAC,CAAC,GAAG,OAAO,CAAC,SAAS,KAAK,OAAO,CAAC,QAAQ,EAAE;oBAC7C,CAAC,CAAC,OAAO,CAAC,SAAS,CACtB,GAAG,OAAO,CAAC;gBAEZ,OAAO,WAAW,CAAC;YACrB,CAAC,EAAE,EAAE,CAAC,CAAC;IACX,CAAC;IAED,MAAM,CAAC,6BAA6B,CAAC,SAAiB;QACpD,OAAO,CAAC,QAAiB,EAAE,EAAE,CAC3B,QAAQ,CAAC,CAAC,CAAC,GAAG,SAAS,KAAK,QAAQ,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;IACvD,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,IAAU,EAAE,QAAgB;;QACvC,IAAI,CAAC,IAAI,IAAI,CAAC,yBAAyB,CAAC,cAAc;YAAE,OAAO,KAAK,CAAC;QAErE,IAAI,CAAC,QAAQ;YAAE,OAAO,IAAI,CAAC;QAE3B,MAAM,cAAc,GAAG,yBAAyB,CAAC,cAAc,CAAC;QAEhE,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC;YAAE,OAAO,KAAK,CAAC;QAE5C,IAAI,CAAA,MAAA,IAAI,CAAC,IAAI,0CAAE,IAAI,MAAK,iBAAiB;YAAE,OAAO,IAAI,CAAC;QAEvD,IACE,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,UAAU;YACpC,cAAc,CAAC,QAAQ,CAAC,CAAC,UAAU,KAAK,GAAG;YAE3C,OAAO,IAAI,CAAC;QAEd,IAAI,CAAC,CAAA,MAAA,IAAI,CAAC,IAAI,0CAAE,WAAW,CAAA;YAAE,OAAO,KAAK,CAAC;QAE1C,OAAO,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,UAAU,CAAC,CAAC;IAC7E,CAAC;CACF;AA1CD,8DA0CC"}
1
+ {"version":3,"file":"generic-permissions-checker.js","sourceRoot":"","sources":["../../../../packages/auth/src/generic-permissions-checker.ts"],"names":[],"mappings":";;;AAEA,MAAa,yBAAyB;IAGpC,MAAM,CAAC,mBAAmB,CAAC,cAA+C;QACxE,yBAAyB,CAAC,cAAc;YACtC,cAAc,CAAC,MAAM,CAAiB,CAAC,WAAW,EAAE,OAAO,EAAE,EAAE;gBAC7D,WAAW,CACT,OAAO,CAAC,QAAQ;oBACd,CAAC,CAAC,GAAG,OAAO,CAAC,SAAS,KAAK,OAAO,CAAC,QAAQ,EAAE;oBAC7C,CAAC,CAAC,OAAO,CAAC,SAAS,CACtB,GAAG,OAAO,CAAC;gBAEZ,OAAO,WAAW,CAAC;YACrB,CAAC,EAAE,EAAE,CAAC,CAAC;IACX,CAAC;IAED,MAAM,CAAC,6BAA6B,CAAC,SAAiB;QACpD,OAAO,CAAC,QAAiB,EAAE,EAAE,CAC3B,QAAQ,CAAC,CAAC,CAAC,GAAG,SAAS,KAAK,QAAQ,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;IACvD,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,IAAU,EAAE,QAAgB;;QACvC,IAAI,CAAC,IAAI,IAAI,CAAC,yBAAyB,CAAC,cAAc;YAAE,OAAO,KAAK,CAAC;QAErE,IAAI,CAAC,QAAQ;YAAE,OAAO,IAAI,CAAC;QAE3B,MAAM,cAAc,GAAG,yBAAyB,CAAC,cAAc,CAAC;QAEhE,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC;YAAE,OAAO,KAAK,CAAC;QAE5C,IAAI,CAAA,MAAA,IAAI,CAAC,IAAI,0CAAE,IAAI,MAAK,iBAAiB;YAAE,OAAO,IAAI,CAAC;QAEvD,MAAM,oBAAoB,GACxB,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,UAAU;YACpC,CAAC,CAAA,MAAA,cAAc,CAAC,QAAQ,CAAC,CAAC,WAAW,0CAAE,MAAM,CAAA,CAAC;QAChD,MAAM,eAAe,GACnB,cAAc,CAAC,QAAQ,CAAC,CAAC,UAAU,KAAK,GAAG;aAC3C,MAAA,cAAc,CAAC,QAAQ,CAAC,CAAC,WAAW,0CAAE,QAAQ,CAAC,GAAG,CAAC,CAAA,CAAC;QAEtD,IAAI,oBAAoB,IAAI,eAAe;YAAE,OAAO,IAAI,CAAC;QAEzD,IAAI,CAAC,CAAA,MAAA,IAAI,CAAC,IAAI,0CAAE,WAAW,CAAA;YAAE,OAAO,KAAK,CAAC;QAE1C,MAAM,mBAAmB,GAAG,cAAc,CAAC,QAAQ,CAAC,CAAC,UAAU;YAC7D,CAAC,CAAC;gBACE,GAAG,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,WAAW,IAAI,EAAE,CAAC;gBAC/C,cAAc,CAAC,QAAQ,CAAC,CAAC,UAAoB;aAC9C;YACH,CAAC,CAAC,MAAA,cAAc,CAAC,QAAQ,CAAC,CAAC,WAAW,mCAAI,EAAE,CAAC;QAE/C,OAAO,mBAAmB,CAAC,IAAI,CAAC,CAAC,UAAU,EAAE,EAAE,CAC7C,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,UAAU,CAAC,CAC3C,CAAC;IACJ,CAAC;CACF;AAtDD,8DAsDC"}