authhero 0.221.0 → 0.223.0

package/dist/authhero.d.ts

@@ -16198,7 +16198,7 @@ export declare function init(config: AuthHeroConfig): {
 					};
 				} & {
 					json: {
-						users: string[];
+						members: string[];
 					};
 				};
 				output: {};
@@ -16219,7 +16219,7 @@ export declare function init(config: AuthHeroConfig): {
 					};
 				} & {
 					json: {
-						users: string[];
+						members: string[];
 					};
 				};
 				output: {};

package/dist/authhero.mjs

@@ -20648,11 +20648,11 @@ const cx = qt.extend({
     description: "Array of organization members"
   })
 }), vx = o.object({
-  users: o.array(o.string()).openapi({
+  members: o.array(o.string()).openapi({
     description: "Array of user IDs to add to the organization"
   })
 }), bx = o.object({
-  users: o.array(o.string()).openapi({
+  members: o.array(o.string()).openapi({
     description: "Array of user IDs to remove from the organization"
   })
 }), $x = new be().openapi(
@@ -20951,7 +20951,7 @@ const cx = qt.extend({
     }
   }),
   async (t) => {
-    const { "tenant-id": e } = t.req.valid("header"), { id: n } = t.req.valid("param"), { users: r } = t.req.valid("json");
+    const { "tenant-id": e } = t.req.valid("header"), { id: n } = t.req.valid("param"), { members: r } = t.req.valid("json");
     if (!await t.env.data.organizations.get(
       e,
       n
@@ -21004,7 +21004,7 @@ const cx = qt.extend({
     }
   }),
   async (t) => {
-    const { "tenant-id": e } = t.req.valid("header"), { id: n } = t.req.valid("param"), { users: r } = t.req.valid("json");
+    const { "tenant-id": e } = t.req.valid("header"), { id: n } = t.req.valid("param"), { members: r } = t.req.valid("json");
     for (const i of r) {
       const a = (await t.env.data.userOrganizations.list(e, {
         q: `user_id:${i}`,
@@ -24981,7 +24981,7 @@ const SE = new be().openapi(
     }
   }),
   async (t) => {
-    var l, u, d, p, h;
+    var u, d, p, h, g;
     const e = t.req.valid("form"), n = EE(t.req.header("Authorization")), r = { ...e, ...n };
     if (!r.client_id)
       throw new E(400, { message: "client_id is required" });
@@ -25023,52 +25023,54 @@ const SE = new be().openapi(
     }
     const s = new Headers();
     if (i.session_id) {
-      const g = wa(
+      const b = wa(
         i.client.tenant.id,
         i.session_id,
         t.var.host || ""
       );
-      s.set("Set-Cookie", g);
+      s.set("Set-Cookie", b);
     }
+    let a = [];
     if (i.authParams.audience)
       try {
-        let g;
+        let b;
         if (e.grant_type === En.ClientCredential)
-          g = await va(t, {
+          b = await va(t, {
             grantType: En.ClientCredential,
             tenantId: i.client.tenant.id,
             clientId: i.client.client_id,
             audience: i.authParams.audience,
-            requestedScopes: ((l = i.authParams.scope) == null ? void 0 : l.split(" ")) || [],
-            organizationId: (u = i.organization) == null ? void 0 : u.id
+            requestedScopes: ((u = i.authParams.scope) == null ? void 0 : u.split(" ")) || [],
+            organizationId: (d = i.organization) == null ? void 0 : d.id
           });
         else {
-          if (!((d = i.user) != null && d.user_id))
+          if (!((p = i.user) != null && p.user_id))
             throw new Rs(400, {
               error: "invalid_request",
               error_description: "User ID is required for user-based grants"
             });
-          g = await va(t, {
+          b = await va(t, {
             grantType: e.grant_type,
             tenantId: i.client.tenant.id,
             userId: i.user.user_id,
             clientId: i.client.client_id,
             audience: i.authParams.audience,
-            requestedScopes: ((p = i.authParams.scope) == null ? void 0 : p.split(" ")) || [],
-            organizationId: (h = i.organization) == null ? void 0 : h.id
+            requestedScopes: ((h = i.authParams.scope) == null ? void 0 : h.split(" ")) || [],
+            organizationId: (g = i.organization) == null ? void 0 : g.id
           });
         }
-        i.authParams.scope = g.scopes.join(" ");
-      } catch (g) {
-        if (g instanceof E)
-          throw g;
-        console.error("Error calculating scopes and permissions:", g);
+        i.authParams.scope = b.scopes.join(" "), a = b.permissions;
+      } catch (b) {
+        if (b instanceof E)
+          throw b;
+        console.error("Error calculating scopes and permissions:", b);
       }
-    const a = await yc(t, {
+    const l = await yc(t, {
       ...i,
-      grantType: e.grant_type
+      grantType: e.grant_type,
+      permissions: a.length > 0 ? a : void 0
     });
-    return t.json(a, {
+    return t.json(l, {
       headers: s
     });
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "authhero",
-  "version": "0.221.0",
+  "version": "0.223.0",
   "files": [
     "dist"
   ],
@@ -35,7 +35,7 @@
     "vite": "^5.4.11",
     "vite-plugin-dts": "^4.3.0",
     "vitest": "^2.1.5",
-    "@authhero/kysely-adapter": "^10.46.0"
+    "@authhero/kysely-adapter": "^10.47.0"
   },
   "dependencies": {
     "@peculiar/x509": "^1.12.3",