@adonis-agora/authkit-server 0.41.0 → 0.43.0

package/build/src/define_config.d.ts

@@ -561,6 +561,21 @@ export interface AuthServerConfigInput {
     ttl?: TtlConfig;
     /** Nome da CLAIM (não do scope) onde os papéis globais são emitidos. Default: 'roles'. */
     globalRolesClaim?: string;
+    /**
+     * Resolves the global-roles claim at token-mint time. Return the roles to embed
+     * in the `<globalRolesClaim>` claim for a first-party client. Lets the host source
+     * roles from an external authority (e.g. @adonis-agora/authz) or a custom store
+     * instead of the account's stored `globalRoles`. Default when omitted:
+     * `account.globalRoles ?? []` (unchanged behavior).
+     */
+    resolveTokenRoles?: (account: AuthAccount, context: {
+        clientId?: string;
+        activeOrg?: {
+            orgId: string;
+            orgSlug: string;
+            orgRole: string;
+        } | null;
+    }) => string[] | Promise<string[]>;
     cookieKeys?: string[];
     observability?: ObservabilityConfig;
     /** Contrato primário de identidade. Deriva findAccount/verifyCredentials do provider. */
@@ -769,6 +784,18 @@ export interface ResolvedServerConfig {
         session: number;
     };
     globalRolesClaim: string;
+    /**
+     * Resolves the global-roles claim at token-mint time (first-party only). When
+     * omitted, the mint falls back to `account.globalRoles ?? []` (unchanged behavior).
+     */
+    resolveTokenRoles?: (account: AuthAccount, context: {
+        clientId?: string;
+        activeOrg?: {
+            orgId: string;
+            orgSlug: string;
+            orgRole: string;
+        } | null;
+    }) => string[] | Promise<string[]>;
     cookieKeys: string[];
     observability: ObservabilityConfig;
     findAccount: (sub: string) => Promise<AuthAccount | null>;

package/build/src/define_config.js

@@ -303,6 +303,7 @@ export function defineConfig(config) {
                 session: toSeconds(config.ttl?.session, 604800),
             },
             globalRolesClaim: config.globalRolesClaim ?? "roles",
+            resolveTokenRoles: config.resolveTokenRoles,
             cookieKeys: config.cookieKeys ?? [],
             observability: config.observability ?? {},
             findAccount: (sub) => config.accountStore.findById(sub),

package/build/src/provider/oidc_service.js

@@ -98,7 +98,9 @@ export class OidcService {
                         };
                         // roles/org_* são dados de autorização interna: só para first-party.
                         if (firstParty) {
-                            base[config.globalRolesClaim] = user.globalRoles ?? [];
+                            base[config.globalRolesClaim] = config.resolveTokenRoles
+                                ? await config.resolveTokenRoles(user, { clientId, activeOrg })
+                                : (user.globalRoles ?? []);
                             // Emite claims de org somente quando há uma org ativa na sessão.
                             if (activeOrg) {
                                 base['org_id'] = activeOrg.orgId;
@@ -115,6 +117,7 @@ export class OidcService {
         registerTokenExchange(provider, {
             findAccount: config.findAccount,
             globalRolesClaim: config.globalRolesClaim,
+            resolveTokenRoles: config.resolveTokenRoles,
             // Resource indicators (RFC 8707) suportados: o `audience` default + cada
             // resource declarado. Usado para validar `audience`/`resource` no pedido de
             // token-exchange — alvos fora desta lista são rejeitados (invalid_target).

package/build/src/provider/token_exchange.d.ts

@@ -1,4 +1,5 @@
 import type { AuditSink } from '../audit/audit_sink.js';
+import type { AuthAccount } from '../accounts/account_store.js';
 export interface TokenExchangeAccount {
     id: string;
     email?: string;
@@ -8,6 +9,20 @@ export interface TokenExchangeAccount {
 export interface TokenExchangeDeps {
     findAccount: (sub: string) => Promise<TokenExchangeAccount | null>;
     globalRolesClaim: string;
+    /**
+     * Resolves the global-roles claim at token-mint time. When omitted, falls back to
+     * `target.globalRoles ?? []` (unchanged behavior). Mirrors the mint-time hook used
+     * by the authorization-code flow so impersonated tokens source roles from the same
+     * authority (e.g. @adonis-agora/authz) or custom store.
+     */
+    resolveTokenRoles?: (account: AuthAccount, context: {
+        clientId?: string;
+        activeOrg?: {
+            orgId: string;
+            orgSlug: string;
+            orgRole: string;
+        } | null;
+    }) => string[] | Promise<string[]>;
     adminRole?: string;
     /**
      * Resource indicators (RFC 8707) suportados pelo provider. Quando o pedido traz

package/build/src/provider/token_exchange.js

@@ -82,12 +82,20 @@ export function registerTokenExchange(provider, deps) {
         }
         const at = new provider.AccessToken({ accountId: target.id, client, scope });
         const accessToken = await at.save();
+        // Token exchange is not tied to a browser session, so there is no active org
+        // context here — roles are resolved for the impersonated target with clientId only.
+        const roles = deps.resolveTokenRoles
+            ? await deps.resolveTokenRoles(target, {
+                clientId: client?.clientId,
+                activeOrg: null,
+            })
+            : (target.globalRoles ?? []);
         const idToken = new provider.IdToken({
             sub: target.id,
             email: target.email,
             email_verified: true,
             name: target.name,
-            [deps.globalRolesClaim]: target.globalRoles ?? [],
+            [deps.globalRolesClaim]: roles,
         }, { ctx });
         idToken.scope = scope;
         idToken.set('act', { sub: actor.id });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adonis-agora/authkit-server",
-  "version": "0.41.0",
+  "version": "0.43.0",
   "description": "AdonisJS OIDC/OAuth2 provider (Identity Provider) toolkit: ejectable auth server with sessions, rate-limiting, MFA/TOTP, audit log, federated logout and OpenTelemetry metrics.",
   "license": "MIT",
   "author": "dudousxd",
@@ -66,6 +66,7 @@
     "@adonisjs/redis": "^9.2.0",
     "@adonisjs/session": "^8.1.0",
     "@adonisjs/shield": "^9.0.0",
+    "@vinejs/vine": "^4.3.0",
     "edge.js": "^6.5.1"
   },
   "peerDependenciesMeta": {
@@ -96,7 +97,6 @@
   },
   "dependencies": {
     "@simplewebauthn/server": "^13.3.1",
-    "@vinejs/vine": "4.4.0",
     "jose": "^5.9.0",
     "koa": "^3.2.1",
     "koa-mount": "^4.2.0",
@@ -130,6 +130,7 @@
     "ioredis-mock": "^8.9.0",
     "luxon": "3.7.2",
     "tailwindcss": "^3.4.19",
+    "@vinejs/vine": "4.4.0",
     "typescript": "6.0.3",
     "@vitejs/plugin-react": "6.0.2",
     "@types/react": "19.2.15",