fix(core): issue organization_id grant for client credentials

logto-io · Jul 3, 2024 · ba7079f · ba7079f
1 parent 06ef199
commit ba7079f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/packages/core/src/oidc/extra-token-claims.ts b/packages/core/src/oidc/extra-token-claims.ts
@@ -34,7 +34,9 @@ export const getExtraTokenClaimsForOrganizationApiResource = async (
     return;
   }
 
-  const isAccessToken = token instanceof ctx.oidc.provider.AccessToken;
+  const isAccessToken =
+    token instanceof ctx.oidc.provider.AccessToken ||
+    token instanceof ctx.oidc.provider.ClientCredentials;
 
   // Only handle access tokens
   if (!isAccessToken) {

diff --git a/packages/core/src/oidc/grants/client-credentials.ts b/packages/core/src/oidc/grants/client-credentials.ts
@@ -126,6 +126,9 @@ export const buildHandler: (
     token.scope =
       scopes.filter(Set.prototype.has.bind(new Set(resourceServer.scope.split(' ')))).join(' ') ||
       undefined;
+    if (organizationId) {
+      token.extra = { ...token.extra, organization_id: organizationId };
+    }
   }
 
   // Issue organization token only if resource server is not present.

diff --git a/packages/integration-tests/src/tests/api/oidc/client-credentials-grant.test.ts b/packages/integration-tests/src/tests/api/oidc/client-credentials-grant.test.ts
@@ -244,6 +244,7 @@ describe('client credentials grant', () => {
       expect(returnedScope).toBe(`${scope1.name} ${scope2.name}`);
 
       const verified = await jwtVerify(accessToken, jwkSet, { audience: resource.indicator });
+      expect(verified.payload.organization_id).toBe(organization.id);
       expect(verified.payload.scope).toBe(`${scope1.name} ${scope2.name}`);
     });
 
@@ -271,6 +272,7 @@ describe('client credentials grant', () => {
       expect(returnedScope1).toBe(scope1.name);
 
       const verified1 = await jwtVerify(accessToken1, jwkSet, { audience: resource.indicator });
+      expect(verified1.payload.organization_id).toBe(organization.id);
       expect(verified1.payload.scope).toBe(scope1.name);
 
       const { access_token: accessToken2, scope: returnedScope2 } = await post({
@@ -281,6 +283,7 @@ describe('client credentials grant', () => {
       expect(returnedScope2).toBe(undefined);
 
       const verified2 = await jwtVerify(accessToken2, jwkSet, { audience: resource.indicator });
+      expect(verified1.payload.organization_id).toBe(organization.id);
       expect(verified2.payload.scope).toBe(undefined);
     });
   });