@skalfa/skalfa-api-core 1.0.24 → 1.0.26

package/dist/auth/verify-access-token.js

@@ -31,7 +31,23 @@ export async function verifyAccessToken(token, req) {
     if (!valid)
         return null;
     await db("user_access_tokens").where("id", tokenRecord.id).update({ last_used_at: new Date(), last_used_ip: ip });
-    const user = await db("users").where("id", tokenRecord.user_id).first();
+    const rows = await db("users")
+        .leftJoin("user_has_user_roles", "users.id", "user_has_user_roles.user_id")
+        .leftJoin("user_roles", "user_has_user_roles.user_role_id", "user_roles.id")
+        .where("users.id", tokenRecord.user_id)
+        .select("users.id", "users.username", "users.name", "user_roles.id as role_id", "user_roles.name as role_name");
+    if (!rows || rows.length === 0)
+        return null;
+    const firstRow = rows[0];
+    const user = {
+        id: firstRow.id,
+        username: firstRow.username,
+        name: firstRow.name,
+        roles: rows?.filter((row) => row && row.role_id != null)?.map((row) => ({
+            id: row.role_id,
+            name: row.role_name
+        })) || [],
+    };
     if (AUTH_CACHE) {
         const redis = registry.get('redis');
         if (redis) {

package/dist/auth/verify-access-token.js.map

@@ -1 +1 @@
-{"version":3,"file":"verify-access-token.js","sourceRoot":"","sources":["../../src/auth/verify-access-token.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,EAAE,EAAE,MAAM,oBAAoB,CAAA;AACvC,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAA;AAC1C,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,QAAQ,CAAA;AACnD,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AAEzD,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,KAAa,EAAE,GAAa;IAClE,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC;QAAE,OAAO,IAAI,CAAA;IAErC,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,GAAK,KAAK,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,CAAA;IAC9C,MAAM,KAAK,GAAgB,GAAG,CAAC,CAAC,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;IAC1D,MAAM,EAAE,GAAmB,GAAG,CAAC,CAAC,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;IAEvD,MAAM,QAAQ,GAAG,cAAc,OAAO,EAAE,CAAA;IAExC,IAAI,UAAU,EAAE,CAAC;QACf,MAAM,KAAK,GAAG,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;QACnC,IAAI,KAAK,EAAE,CAAC;YACV,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;YACxC,IAAI,MAAM,EAAE,CAAC;gBACX,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;gBAClC,IAAI,OAAO,CAAC,KAAK,KAAK,KAAK;oBAAE,OAAO,IAAI,CAAA;gBACxC,OAAO,OAAO,CAAA;YAChB,CAAC;QACH,CAAC;IACH,CAAC;IAED,MAAM,WAAW,GAAG,MAAM,EAAE,CAAC,oBAAoB,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,KAAK,EAAE,CAAA;IAE/E,IAAI,CAAC,WAAW;QAAE,OAAO,IAAI,CAAA;IAC7B,IAAI,WAAW,CAAC,KAAK,KAAK,KAAK;QAAE,OAAO,IAAI,CAAA;IAE5C,MAAM,KAAK,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,WAAW,CAAC,KAAK,CAAC,CAAA;IAC5D,IAAI,CAAC,KAAK;QAAE,OAAO,IAAI,CAAA;IAEvB,MAAM,EAAE,CAAC,oBAAoB,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,WAAW,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,EAAE,YAAY,EAAE,IAAI,IAAI,EAAE,EAAE,YAAY,EAAE,EAAE,EAAE,CAAC,CAAA;IAEjH,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,CAAA;IAEvE,IAAI,UAAU,EAAE,CAAC;QACf,MAAM,KAAK,GAAG,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;QACnC,IAAI,KAAK,EAAE,CAAC;YACV,MAAM,KAAK,CAAC,KAAK,CACf,QAAQ,EACR,cAAc,EACd,IAAI,CAAC,SAAS,CAAC;gBACb,IAAI,EAAY,IAAI;gBACpB,KAAK,EAAW,WAAW,CAAC,KAAK;gBACjC,WAAW,EAAK,WAAW,CAAC,UAAU;aACvC,CAAC,CACH,CAAA;QACH,CAAC;IACH,CAAC;IAED,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,WAAW,EAAE,WAAW,EAAE,WAAW,CAAC,UAAU,EAAE,CAAA;AAC1E,CAAC"}
+{"version":3,"file":"verify-access-token.js","sourceRoot":"","sources":["../../src/auth/verify-access-token.ts"],"names":[],"mappings":"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"}

package/dist/context/context.d.ts

@@ -1,7 +1,8 @@
-export type AppContext = {
+export interface AppContext {
     user_id?: number;
-};
+}
 export declare const context: {
-    run<T>(ctx: AppContext, fn: () => T): T;
+    init(ctx: AppContext): void;
     get<K extends keyof AppContext>(key: K): AppContext[K];
+    set<K extends keyof AppContext>(key: K, value: AppContext[K]): void;
 };

package/dist/context/context.js

@@ -1,17 +1,17 @@
 import { AsyncLocalStorage } from 'node:async_hooks';
 const storage = new AsyncLocalStorage();
 export const context = {
-    // =====================================>
-    // ## Context: run a function within context
-    // =====================================>
-    run(ctx, fn) {
-        return storage.run(ctx, fn);
+    init(ctx) {
+        storage.enterWith(ctx);
     },
-    // =====================================>
-    // ## Context: retrieve context property value
-    // =====================================>
     get(key) {
         return storage.getStore()?.[key];
     },
+    set(key, value) {
+        const store = storage.getStore();
+        if (store) {
+            store[key] = value;
+        }
+    }
 };
 //# sourceMappingURL=context.js.map

package/dist/context/context.js.map

@@ -1 +1 @@
-{"version":3,"file":"context.js","sourceRoot":"","sources":["../../src/context/context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAA;AAMpD,MAAM,OAAO,GAAG,IAAI,iBAAiB,EAAc,CAAA;AAEnD,MAAM,CAAC,MAAM,OAAO,GAAG;IACrB,yCAAyC;IACzC,4CAA4C;IAC5C,yCAAyC;IACzC,GAAG,CAAI,GAAe,EAAE,EAAW;QACjC,OAAO,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,CAAC,CAAA;IAC7B,CAAC;IAED,yCAAyC;IACzC,8CAA8C;IAC9C,yCAAyC;IACzC,GAAG,CAA6B,GAAM;QACpC,OAAO,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,GAAG,CAAC,CAAA;IAClC,CAAC;CACF,CAAA"}
+{"version":3,"file":"context.js","sourceRoot":"","sources":["../../src/context/context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAA;AAMpD,MAAM,OAAO,GAAG,IAAI,iBAAiB,EAAc,CAAA;AAEnD,MAAM,CAAC,MAAM,OAAO,GAAG;IACrB,IAAI,CAAC,GAAe;QAClB,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,CAAA;IACxB,CAAC;IAED,GAAG,CAA6B,GAAM;QACpC,OAAO,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,GAAG,CAAC,CAAA;IAClC,CAAC;IAED,GAAG,CAA6B,GAAM,EAAE,KAAoB;QAC1D,MAAM,KAAK,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAA;QAChC,IAAI,KAAK,EAAE,CAAC;YACV,KAAK,CAAC,GAAG,CAAC,GAAG,KAAK,CAAA;QACpB,CAAC;IACH,CAAC;CACF,CAAA"}

package/dist/middleware/context.d.ts

@@ -21,9 +21,9 @@ export declare const ContextMiddleware: (app: Elysia) => Elysia<"", {
     standaloneSchema: {};
     response: {};
 }, {
-    derive: {};
+    derive: Partial<void & {}>;
     resolve: {};
     schema: {};
     standaloneSchema: {};
-    response: import("elysia").ExtractErrorFromHandle<{}>;
+    response: import("elysia").ExtractErrorFromHandle<void>;
 }>;

package/dist/middleware/context.js

@@ -1,8 +1,8 @@
 import { context } from '@utils';
 export const ContextMiddleware = (app) => app.derive(async ({ store }) => {
     const userId = store?.user?.id;
-    return context.run({
+    context.init({
         user_id: userId,
-    }, () => ({}));
+    });
 });
 //# sourceMappingURL=context.js.map

package/dist/middleware/context.js.map

@@ -1 +1 @@
-{"version":3,"file":"context.js","sourceRoot":"","sources":["../../src/middleware/context.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAA;AAEhC,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,GAAW,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE;IAC/E,MAAM,MAAM,GAAI,KAAa,EAAE,IAAI,EAAE,EAAE,CAAA;IAEvC,OAAO,OAAO,CAAC,GAAG,CAAC;QACf,OAAO,EAAE,MAAM;KAChB,EAAC,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,CACb,CAAA;AACH,CAAC,CAAC,CAAA"}
+{"version":3,"file":"context.js","sourceRoot":"","sources":["../../src/middleware/context.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAA;AAEhC,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,GAAW,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE;IAC/E,MAAM,MAAM,GAAI,KAAa,EAAE,IAAI,EAAE,EAAE,CAAA;IAEvC,OAAO,CAAC,IAAI,CAAC;QACX,OAAO,EAAK,MAAM;KACnB,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}

package/dist/middleware/middleware.d.ts

@@ -275,10 +275,10 @@ export declare const middleware: {
         standaloneSchema: {};
         response: {};
     }, {
-        derive: {};
+        derive: Partial<void & {}>;
         resolve: {};
         schema: {};
         standaloneSchema: {};
-        response: import("elysia").ExtractErrorFromHandle<{}>;
+        response: import("elysia").ExtractErrorFromHandle<void>;
     }>;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@skalfa/skalfa-api-core",
-  "version": "1.0.24",
+  "version": "1.0.26",
   "description": "Core and Foundational utilities for the Skalfa API Framework.",
   "keywords": [
     "skalfa",

package/src/auth/verify-access-token.ts

@@ -35,7 +35,30 @@ export async function verifyAccessToken(token: string, req?: Request) {
 
   await db("user_access_tokens").where("id", tokenRecord.id).update({ last_used_at: new Date(), last_used_ip: ip })
 
-  const user = await db("users").where("id", tokenRecord.user_id).first()
+  const rows = await db("users")
+    .leftJoin("user_has_user_roles", "users.id", "user_has_user_roles.user_id")
+    .leftJoin("user_roles", "user_has_user_roles.user_role_id", "user_roles.id")
+    .where("users.id", tokenRecord.user_id)
+    .select(
+      "users.id",
+      "users.username",
+      "users.name",
+      "user_roles.id as role_id",
+      "user_roles.name as role_name"
+    )
+
+  if (!rows || rows.length === 0) return null
+
+  const firstRow = rows[0]
+  const user = {
+    id        :  firstRow.id,
+    username  :  firstRow.username,
+    name      :  firstRow.name,
+    roles     :  rows?.filter((row: any) => row && row.role_id != null)?.map((row: any) => ({
+      id    :  row.role_id,
+      name  :  row.role_name
+    })) || [],
+  }
 
   if (AUTH_CACHE) {
     const redis = registry.get('redis')

package/src/context/context.ts

@@ -1,23 +1,24 @@
 import { AsyncLocalStorage } from 'node:async_hooks'
 
-export type AppContext = { 
-  user_id  ?:  number,
+export interface AppContext {
+  user_id?: number
 }
 
 const storage = new AsyncLocalStorage<AppContext>()
 
 export const context = {
-  // =====================================>
-  // ## Context: run a function within context
-  // =====================================>
-  run<T>(ctx: AppContext, fn: () => T) {
-    return storage.run(ctx, fn)
+  init(ctx: AppContext) {
+    storage.enterWith(ctx)
   },
 
-  // =====================================>
-  // ## Context: retrieve context property value
-  // =====================================>
   get<K extends keyof AppContext>(key: K): AppContext[K] {
     return storage.getStore()?.[key]
   },
+
+  set<K extends keyof AppContext>(key: K, value: AppContext[K]) {
+    const store = storage.getStore()
+    if (store) {
+      store[key] = value
+    }
+  }
 }

package/src/middleware/context.ts

@@ -4,8 +4,7 @@ import { context } from '@utils'
 export const ContextMiddleware = (app: Elysia) => app.derive(async ({ store }) => {
   const userId = (store as any)?.user?.id
 
-  return context.run({
-      user_id: userId,
-    },() => ({})
-  )
+  context.init({
+    user_id  :  userId,
+  })
 })