@skalfa/skalfa-api-core 1.0.13 → 1.0.15

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 (4) hide show
  1. package/dist/auth/helpers/get-user-permissions.js +5 -3
  2. package/dist/auth/helpers/get-user-permissions.js.map +1 -1
  3. package/package.json +2 -2
  4. package/src/auth/helpers/get-user-permissions.ts +6 -2
package/dist/auth/helpers/get-user-permissions.js CHANGED
@@ -1,9 +1,11 @@
1
1
  import { db } from '@skalfa/skalfa-orm';
2
2
  export async function getUserPermissions(userId) {
3
3
  const roleIds = await db("user_roles").where("user_id", userId).pluck("role_id");
4
- if (roleIds.length === 0)
5
- return [];
6
- const rows = await db("permissions").whereIn("role_id", roleIds).pluck("permissions");
4
+ const query = db("user_permissions").where("user_id", userId);
5
+ if (roleIds.length > 0) {
6
+ query.orWhereIn("role_id", roleIds);
7
+ }
8
+ const rows = await query.pluck("permissions");
7
9
  return Array.from(new Set(rows.flatMap((p) => p ?? [])));
8
10
  }
9
11
  //# sourceMappingURL=get-user-permissions.js.map
package/dist/auth/helpers/get-user-permissions.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"get-user-permissions.js","sourceRoot":"","sources":["../../../src/auth/helpers/get-user-permissions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,oBAAoB,CAAA;AAEvC,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAC,MAAc;IACrD,MAAM,OAAO,GAAG,MAAM,EAAE,CAAC,YAAY,CAAC,CAAC,KAAK,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,CAAA;IAEhF,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAA;IAEnC,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,KAAK,CAAC,aAAa,CAAC,CAAA;IAErF,OAAO,KAAK,CAAC,IAAI,CACf,IAAI,GAAG,CACL,IAAI,CAAC,OAAO,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAClC,CACF,CAAA;AACH,CAAC"}
1
+ {"version":3,"file":"get-user-permissions.js","sourceRoot":"","sources":["../../../src/auth/helpers/get-user-permissions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,oBAAoB,CAAA;AAEvC,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAC,MAAc;IACrD,MAAM,OAAO,GAAG,MAAM,EAAE,CAAC,YAAY,CAAC,CAAC,KAAK,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,CAAA;IAEhF,MAAM,KAAK,GAAG,EAAE,CAAC,kBAAkB,CAAC,CAAC,KAAK,CAAC,SAAS,EAAE,MAAM,CAAC,CAAA;IAE7D,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACvB,KAAK,CAAC,SAAS,CAAC,SAAS,EAAE,OAAO,CAAC,CAAA;IACrC,CAAC;IAED,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,KAAK,CAAC,aAAa,CAAC,CAAA;IAE7C,OAAO,KAAK,CAAC,IAAI,CACf,IAAI,GAAG,CACL,IAAI,CAAC,OAAO,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAClC,CACF,CAAA;AACH,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@skalfa/skalfa-api-core",
3
- "version": "1.0.13",
3
+ "version": "1.0.15",
4
4
  "description": "Core framework engine and foundational utilities for the Skalfa API backend.",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",
@@ -15,7 +15,7 @@
15
15
  "author": "",
16
16
  "license": "MIT",
17
17
  "dependencies": {
18
- "@skalfa/skalfa-orm": "^1.0.7",
18
+ "@skalfa/skalfa-orm": "*",
19
19
  "knex": "^3.1.0",
20
20
  "bcrypt": "^6.0.0",
21
21
  "commander": "^12.1.0",
package/src/auth/helpers/get-user-permissions.ts CHANGED
@@ -3,9 +3,13 @@ import { db } from '@skalfa/skalfa-orm'
3
3
  export async function getUserPermissions(userId: number): Promise<string[]> {
4
4
  const roleIds = await db("user_roles").where("user_id", userId).pluck("role_id")
5
5
 
6
- if (roleIds.length === 0) return []
6
+ const query = db("user_permissions").where("user_id", userId)
7
7
 
8
- const rows = await db("permissions").whereIn("role_id", roleIds).pluck("permissions")
8
+ if (roleIds.length > 0) {
9
+ query.orWhereIn("role_id", roleIds)
10
+ }
11
+
12
+ const rows = await query.pluck("permissions")
9
13
 
10
14
  return Array.from(
11
15
  new Set(