fix: resolve undefined credential_definition.type in credentialRequest (

#1989) Signed-off-by: Paramet Kongjaroen <parametprame2@gmail.com>
openwallet-foundation · Aug 14, 2024 · 69b75bd · 69b75bd
1 parent 3ef3f10
commit 69b75bd
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 14 deletions.
diff --git a/packages/openid4vc/src/openid4vc-issuer/OpenId4VcIssuerService.ts b/packages/openid4vc/src/openid4vc-issuer/OpenId4VcIssuerService.ts
@@ -468,23 +468,32 @@ export class OpenId4VcIssuerService {
           credentialRequest.format === OpenId4VciCredentialFormatProfile.JwtVcJson &&
           offeredCredential.format === credentialRequest.format
         ) {
-          return equalsIgnoreOrder(offeredCredential.credential_definition.type ?? [], credentialRequest.types)
+          const types =
+            'credential_definition' in credentialRequest
+              ? credentialRequest.credential_definition.type
+              : credentialRequest.types
+
+          return equalsIgnoreOrder(offeredCredential.credential_definition.type ?? [], types)
         } else if (
           credentialRequest.format === OpenId4VciCredentialFormatProfile.JwtVcJsonLd &&
           offeredCredential.format === credentialRequest.format
         ) {
-          return equalsIgnoreOrder(
-            offeredCredential.credential_definition.type ?? [],
-            credentialRequest.credential_definition.types
-          )
+          const types =
+            'type' in credentialRequest.credential_definition
+              ? credentialRequest.credential_definition.type
+              : credentialRequest.credential_definition.types
+
+          return equalsIgnoreOrder(offeredCredential.credential_definition.type ?? [], types)
         } else if (
           credentialRequest.format === OpenId4VciCredentialFormatProfile.LdpVc &&
           offeredCredential.format === credentialRequest.format
         ) {
-          return equalsIgnoreOrder(
-            offeredCredential.credential_definition.type ?? [],
-            credentialRequest.credential_definition.types
-          )
+          const types =
+            'type' in credentialRequest.credential_definition
+              ? credentialRequest.credential_definition.type
+              : credentialRequest.credential_definition.types
+
+          return equalsIgnoreOrder(offeredCredential.credential_definition.type ?? [], types)
         } else if (
           credentialRequest.format === OpenId4VciCredentialFormatProfile.SdJwtVc &&
           offeredCredential.format === credentialRequest.format

diff --git a/packages/openid4vc/src/shared/models/index.ts b/packages/openid4vc/src/shared/models/index.ts
@@ -13,10 +13,13 @@ import type {
   CredentialOfferPayloadV1_0_13,
   CredentialRequestJwtVcJson,
   CredentialRequestJwtVcJsonLdAndLdpVc,
+  CredentialRequestJwtVcJsonLdAndLdpVcV1_0_13,
+  CredentialRequestJwtVcJsonV1_0_13,
   CredentialRequestSdJwtVc,
   CredentialsSupportedLegacy,
   MetadataDisplay,
   TxCode,
+  UniformCredentialRequest,
 } from '@sphereon/oid4vci-common'
 
 export type OpenId4VciCredentialSupportedWithId = OpenId4VciCredentialSupported & { id: string }
@@ -31,13 +34,14 @@ export type OpenId4VciIssuerMetadata = OpenId4VciIssuerMetadataV1Draft11 | OpenI
 
 export type OpenId4VciIssuerMetadataDisplay = MetadataDisplay
 
-export type OpenId4VciCredentialRequest =
-  | CredentialRequestJwtVcJson
+export type OpenId4VciCredentialRequest = UniformCredentialRequest
+
+export type OpenId4VciCredentialRequestJwtVcJson = CredentialRequestJwtVcJson | CredentialRequestJwtVcJsonV1_0_13
+
+export type OpenId4VciCredentialRequestJwtVcJsonLdAndLdpVc =
   | CredentialRequestJwtVcJsonLdAndLdpVc
-  | CredentialRequestSdJwtVc
+  | CredentialRequestJwtVcJsonLdAndLdpVcV1_0_13
 
-export type OpenId4VciCredentialRequestJwtVcJson = CredentialRequestJwtVcJson
-export type OpenId4VciCredentialRequestJwtVcJsonLdAndLdpVc = CredentialRequestJwtVcJsonLdAndLdpVc
 export type OpenId4VciCredentialRequestSdJwtVc = CredentialRequestSdJwtVc
 export type OpenId4VciCredentialOffer = AssertedUniformCredentialOffer
 export type OpenId4VciCredentialOfferPayload = CredentialOfferPayloadV1_0_11 | CredentialOfferPayloadV1_0_13