fix: set client_id on authorization url

Sphereon-Opensource · Jun 2, 2024 · 04e7cb8 · 04e7cb8
1 parent d51bf25
commit 04e7cb8
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/packages/client/lib/AuthorizationCodeClient.ts b/packages/client/lib/AuthorizationCodeClient.ts
@@ -49,7 +49,7 @@ export const createAuthorizationRequestUrl = async ({
   authorizationRequest: AuthorizationRequestOpts;
   credentialOffer?: CredentialOfferRequestWithBaseUrl;
   credentialConfigurationSupported?: Record<string, CredentialConfigurationSupportedV1_0_13>;
-  clientId?: string,
+  clientId?: string;
   version?: OpenId4VCIVersion;
 }): Promise<string> => {
   function removeDisplayAndValueTypes(obj: any): void {
@@ -63,7 +63,10 @@ export const createAuthorizationRequestUrl = async ({
   }
 
   const { redirectUri } = authorizationRequest;
-  const client_id = clientId ?? authorizationRequest.clientId
+  const client_id = clientId ?? authorizationRequest.clientId;
+  if (!client_id) {
+    throw Error(`Cannot use PAR without a client_id value set`);
+  }
   let { scope, authorizationDetails } = authorizationRequest;
   const parMode = endpointMetadata?.credentialIssuerMetadata?.require_pushed_authorization_requests
     ? PARMode.REQUIRE
@@ -143,7 +146,7 @@ export const createAuthorizationRequestUrl = async ({
     }),
     authorization_details: JSON.stringify(handleAuthorizationDetails(endpointMetadata, authorizationDetails)),
     ...(redirectUri && { redirect_uri: redirectUri }),
-    ...(client_id && { client_id }),
+    client_id,
     ...(credentialOffer?.issuerState && { issuer_state: credentialOffer.issuerState }),
     scope,
   };
@@ -168,7 +171,7 @@ export const createAuthorizationRequestUrl = async ({
       }
     } else {
       debug(`PAR response: ${(parResponse.successBody, null, 2)}`);
-      queryObj = { request_uri: parResponse.successBody.request_uri };
+      queryObj = { client_id, request_uri: parResponse.successBody.request_uri };
     }
   }
 

diff --git a/packages/common/lib/functions/IssuerMetadataUtils.ts b/packages/common/lib/functions/IssuerMetadataUtils.ts
@@ -77,11 +77,12 @@ export function getTypesFromCredentialSupported(
     credentialSupported.format === 'jwt_vc_json-ld' ||
     credentialSupported.format === 'ldp_vc'
   ) {
-    types = (credentialSupported.types
-      ? (credentialSupported.types as string[])
-      : 'credential_definition' in credentialSupported
-        ? credentialSupported.credential_definition?.type
-        : []) ?? [];
+    types =
+      (credentialSupported.types
+        ? (credentialSupported.types as string[])
+        : 'credential_definition' in credentialSupported
+          ? credentialSupported.credential_definition?.type
+          : []) ?? [];
   } else if (credentialSupported.format === 'vc+sd-jwt') {
     // eslint-disable-next-line @typescript-eslint/ban-ts-comment
     // @ts-ignore