@skalfa/skalfa-api-core 1.0.16 → 1.0.18

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 (9) hide show
  1. package/dist/auth/auth.js +1 -1
  2. package/dist/auth/auth.js.map +1 -1
  3. package/dist/auth/create-access-token.js +1 -1
  4. package/dist/auth/helpers/get-user-permissions.js +1 -1
  5. package/dist/auth/helpers/get-user-permissions.js.map +1 -1
  6. package/package.json +1 -1
  7. package/src/auth/auth.ts +1 -1
  8. package/src/auth/create-access-token.ts +1 -1
  9. package/src/auth/helpers/get-user-permissions.ts +1 -1
package/dist/auth/auth.js CHANGED
@@ -7,7 +7,7 @@ import { listUserSessions } from './list-user-sessions';
7
7
  import { revalidateUserPermissions } from './revalidate-user-permissions';
8
8
  import { revalidateUserPermissionsByRole } from './revalidate-user-permissions-by-role';
9
9
  export const TOKEN_PLAIN_LENGTH = 20;
10
- export const AUTH_PERMISSION = process.env.AUTH_CACHE === "true";
10
+ export const AUTH_PERMISSION = process.env.AUTH_PERMISSION === "true";
11
11
  export const AUTH_CACHE = process.env.AUTH_CACHE === "true";
12
12
  export const AUTH_CACHE_TTL = Number(process.env.AUTH_CACHE_TTL || 600);
13
13
  export const auth = {
package/dist/auth/auth.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"auth.js","sourceRoot":"","sources":["../../src/auth/auth.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAA;AACzD,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAA;AACzD,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAA;AACzD,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAA;AAC9D,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAA;AAC9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AACvD,OAAO,EAAE,yBAAyB,EAAE,MAAM,+BAA+B,CAAA;AACzE,OAAO,EAAE,+BAA+B,EAAE,MAAM,uCAAuC,CAAA;AAEvF,MAAM,CAAC,MAAM,kBAAkB,GAAK,EAAE,CAAA;AACtC,MAAM,CAAC,MAAM,eAAe,GAAQ,OAAO,CAAC,GAAG,CAAC,UAAU,KAAO,MAAM,CAAA;AACvE,MAAM,CAAC,MAAM,UAAU,GAAa,OAAO,CAAC,GAAG,CAAC,UAAU,KAAO,MAAM,CAAA;AACvE,MAAM,CAAC,MAAM,cAAc,GAAS,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,IAAI,GAAG,CAAC,CAAA;AAE7E,MAAM,CAAC,MAAM,IAAI,GAAG;IAClB,yCAAyC;IACzC,4CAA4C;IAC5C,yCAAyC;IACzC,iBAAiB;IAEjB,yCAAyC;IACzC,4CAA4C;IAC5C,yCAAyC;IACzC,iBAAiB;IAEjB,yCAAyC;IACzC,+BAA+B;IAC/B,yCAAyC;IACzC,iBAAiB;IAEjB,yCAAyC;IACzC,kCAAkC;IAClC,yCAAyC;IACzC,mBAAmB;IAEnB,yCAAyC;IACzC,kCAAkC;IAClC,yCAAyC;IACzC,mBAAmB;IAEnB,yCAAyC;IACzC,8BAA8B;IAC9B,yCAAyC;IACzC,gBAAgB;IAEhB,yCAAyC;IACzC,sCAAsC;IACtC,yCAAyC;IACzC,yBAAyB;IACzB,+BAA+B;CAChC,CAAA"}
1
+ {"version":3,"file":"auth.js","sourceRoot":"","sources":["../../src/auth/auth.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAA;AACzD,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAA;AACzD,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAA;AACzD,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAA;AAC9D,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAA;AAC9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AACvD,OAAO,EAAE,yBAAyB,EAAE,MAAM,+BAA+B,CAAA;AACzE,OAAO,EAAE,+BAA+B,EAAE,MAAM,uCAAuC,CAAA;AAEvF,MAAM,CAAC,MAAM,kBAAkB,GAAK,EAAE,CAAA;AACtC,MAAM,CAAC,MAAM,eAAe,GAAQ,OAAO,CAAC,GAAG,CAAC,eAAe,KAAO,MAAM,CAAA;AAC5E,MAAM,CAAC,MAAM,UAAU,GAAa,OAAO,CAAC,GAAG,CAAC,UAAU,KAAO,MAAM,CAAA;AACvE,MAAM,CAAC,MAAM,cAAc,GAAS,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,IAAI,GAAG,CAAC,CAAA;AAE7E,MAAM,CAAC,MAAM,IAAI,GAAG;IAClB,yCAAyC;IACzC,4CAA4C;IAC5C,yCAAyC;IACzC,iBAAiB;IAEjB,yCAAyC;IACzC,4CAA4C;IAC5C,yCAAyC;IACzC,iBAAiB;IAEjB,yCAAyC;IACzC,+BAA+B;IAC/B,yCAAyC;IACzC,iBAAiB;IAEjB,yCAAyC;IACzC,kCAAkC;IAClC,yCAAyC;IACzC,mBAAmB;IAEnB,yCAAyC;IACzC,kCAAkC;IAClC,yCAAyC;IACzC,mBAAmB;IAEnB,yCAAyC;IACzC,8BAA8B;IAC9B,yCAAyC;IACzC,gBAAgB;IAEhB,yCAAyC;IACzC,sCAAsC;IACtC,yCAAyC;IACzC,yBAAyB;IACzB,+BAA+B;CAChC,CAAA"}
package/dist/auth/create-access-token.js CHANGED
@@ -8,7 +8,7 @@ export async function createAccessToken(userId, req, permission = true) {
8
8
  const hash = await bcrypt.hash(plain, 10);
9
9
  const agent = generateAgentId(req);
10
10
  let permissions = [];
11
- if (AUTH_PERMISSION && permission) {
11
+ if (AUTH_PERMISSION || permission) {
12
12
  permissions = await getUserPermissions(userId);
13
13
  }
14
14
  const isMySql = db.client?.config?.client?.includes?.('mysql');
package/dist/auth/helpers/get-user-permissions.js CHANGED
@@ -1,6 +1,6 @@
1
1
  import { db } from '@skalfa/skalfa-orm';
2
2
  export async function getUserPermissions(userId) {
3
- const roleIds = await db("user_roles").where("user_id", userId).pluck("role_id");
3
+ const roleIds = await db("user_roles").where("user_id", userId).pluck("user_role_id");
4
4
  const query = db("user_permissions").where("user_id", userId);
5
5
  if (roleIds.length > 0) {
6
6
  query.orWhereIn("user_role_id", roleIds);
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,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,cAAc,EAAE,OAAO,CAAC,CAAA;IAC1C,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"}
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,cAAc,CAAC,CAAA;IAErF,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,cAAc,EAAE,OAAO,CAAC,CAAA;IAC1C,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.16",
3
+ "version": "1.0.18",
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",
package/src/auth/auth.ts CHANGED
@@ -8,7 +8,7 @@ import { revalidateUserPermissions } from './revalidate-user-permissions'
8
8
  import { revalidateUserPermissionsByRole } from './revalidate-user-permissions-by-role'
9
9
 
10
10
  export const TOKEN_PLAIN_LENGTH = 20
11
- export const AUTH_PERMISSION = process.env.AUTH_CACHE === "true"
11
+ export const AUTH_PERMISSION = process.env.AUTH_PERMISSION === "true"
12
12
  export const AUTH_CACHE = process.env.AUTH_CACHE === "true"
13
13
  export const AUTH_CACHE_TTL = Number(process.env.AUTH_CACHE_TTL || 600)
14
14
 
package/src/auth/create-access-token.ts CHANGED
@@ -10,7 +10,7 @@ export async function createAccessToken(userId: number, req: Request, permission
10
10
  const agent = generateAgentId(req)
11
11
 
12
12
  let permissions: string[] = []
13
- if (AUTH_PERMISSION && permission) {
13
+ if (AUTH_PERMISSION || permission) {
14
14
  permissions = await getUserPermissions(userId)
15
15
  }
16
16
 
package/src/auth/helpers/get-user-permissions.ts CHANGED
@@ -1,7 +1,7 @@
1
1
  import { db } from '@skalfa/skalfa-orm'
2
2
 
3
3
  export async function getUserPermissions(userId: number): Promise<string[]> {
4
- const roleIds = await db("user_roles").where("user_id", userId).pluck("role_id")
4
+ const roleIds = await db("user_roles").where("user_id", userId).pluck("user_role_id")
5
5
 
6
6
  const query = db("user_permissions").where("user_id", userId)
7
7