@sphereon/ssi-sdk.oid4vci-holder 0.34.0 → 0.34.1-feature.SSISDK.13.32

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sphereon/ssi-sdk.oid4vci-holder",
-  "version": "0.34.0",
+  "version": "0.34.1-feature.SSISDK.13.32+dca9f4d2",
   "source": "src/index.ts",
   "type": "module",
   "main": "./dist/index.cjs",
@@ -26,27 +26,27 @@
     "build": "tsup --config ../../tsup.config.ts --tsconfig ../../tsconfig.tsup.json"
   },
   "dependencies": {
-    "@sphereon/did-auth-siop": "0.19.0",
+    "@sphereon/did-auth-siop": "0.19.1-feature.SSISDK.13.19",
     "@sphereon/kmp-mdoc-core": "0.2.0-SNAPSHOT.26",
-    "@sphereon/oid4vci-client": "0.19.0",
-    "@sphereon/oid4vci-common": "0.19.0",
-    "@sphereon/ssi-sdk-ext.did-utils": "0.29.0",
-    "@sphereon/ssi-sdk-ext.identifier-resolution": "0.29.0",
-    "@sphereon/ssi-sdk-ext.jwt-service": "0.29.0",
-    "@sphereon/ssi-sdk-ext.key-utils": "0.29.0",
-    "@sphereon/ssi-sdk.contact-manager": "0.34.0",
-    "@sphereon/ssi-sdk.core": "0.34.0",
-    "@sphereon/ssi-sdk.credential-store": "0.34.0",
-    "@sphereon/ssi-sdk.credential-validation": "0.34.0",
-    "@sphereon/ssi-sdk.data-store": "0.34.0",
-    "@sphereon/ssi-sdk.issuance-branding": "0.34.0",
-    "@sphereon/ssi-sdk.mdl-mdoc": "0.34.0",
-    "@sphereon/ssi-sdk.oidf-client": "0.34.0",
-    "@sphereon/ssi-sdk.sd-jwt": "0.34.0",
-    "@sphereon/ssi-sdk.siopv2-oid4vp-common": "0.34.0",
-    "@sphereon/ssi-sdk.siopv2-oid4vp-op-auth": "0.34.0",
-    "@sphereon/ssi-sdk.xstate-machine-persistence": "0.34.0",
-    "@sphereon/ssi-types": "0.34.0",
+    "@sphereon/oid4vci-client": "0.19.1-feature.SSISDK.13.19",
+    "@sphereon/oid4vci-common": "0.19.1-feature.SSISDK.13.19",
+    "@sphereon/ssi-sdk-ext.did-utils": "0.29.1-next.3",
+    "@sphereon/ssi-sdk-ext.identifier-resolution": "0.29.1-next.3",
+    "@sphereon/ssi-sdk-ext.jwt-service": "0.29.1-next.3",
+    "@sphereon/ssi-sdk-ext.key-utils": "0.29.1-next.3",
+    "@sphereon/ssi-sdk.contact-manager": "0.34.1-feature.SSISDK.13.32+dca9f4d2",
+    "@sphereon/ssi-sdk.core": "0.34.1-feature.SSISDK.13.32+dca9f4d2",
+    "@sphereon/ssi-sdk.credential-store": "0.34.1-feature.SSISDK.13.32+dca9f4d2",
+    "@sphereon/ssi-sdk.credential-validation": "0.34.1-feature.SSISDK.13.32+dca9f4d2",
+    "@sphereon/ssi-sdk.data-store": "0.34.1-feature.SSISDK.13.32+dca9f4d2",
+    "@sphereon/ssi-sdk.issuance-branding": "0.34.1-feature.SSISDK.13.32+dca9f4d2",
+    "@sphereon/ssi-sdk.mdl-mdoc": "0.34.1-feature.SSISDK.13.32+dca9f4d2",
+    "@sphereon/ssi-sdk.oidf-client": "0.34.1-feature.SSISDK.13.32+dca9f4d2",
+    "@sphereon/ssi-sdk.sd-jwt": "0.34.1-feature.SSISDK.13.32+dca9f4d2",
+    "@sphereon/ssi-sdk.siopv2-oid4vp-common": "0.34.1-feature.SSISDK.13.32+dca9f4d2",
+    "@sphereon/ssi-sdk.siopv2-oid4vp-op-auth": "0.34.1-feature.SSISDK.13.32+dca9f4d2",
+    "@sphereon/ssi-sdk.xstate-machine-persistence": "0.34.1-feature.SSISDK.13.32+dca9f4d2",
+    "@sphereon/ssi-types": "0.34.1-feature.SSISDK.13.32+dca9f4d2",
     "@veramo/core": "4.2.0",
     "@veramo/data-store": "4.2.0",
     "@veramo/utils": "4.2.0",
@@ -58,8 +58,8 @@
     "xstate": "^4.38.3"
   },
   "devDependencies": {
-    "@sphereon/oid4vc-common": "0.19.0",
-    "@sphereon/ssi-sdk-ext.did-resolver-jwk": "0.29.0",
+    "@sphereon/oid4vc-common": "0.19.1-feature.SSISDK.13.19",
+    "@sphereon/ssi-sdk-ext.did-resolver-jwk": "0.29.1-next.3",
     "@sphereon/ssi-sdk.siopv2-oid4vp-common": "workspace:*",
     "@types/i18n-js": "^3.8.9",
     "@types/lodash.memoize": "^4.1.9",
@@ -89,5 +89,5 @@
     "OID4VCI",
     "State Machine"
   ],
-  "gitHead": "b1c9c5e91a9ce4bc677ff2cce5f2d520a16b366d"
+  "gitHead": "dca9f4d24c3afb293bd06bef406bdc94863a4ace"
 }

package/src/agent/OID4VCIHolder.ts

@@ -4,8 +4,8 @@ import {
   AuthorizationRequestOpts,
   AuthorizationServerClientOpts,
   AuthorizationServerOpts,
-  CredentialConfigurationSupportedJwtVcJsonLdAndLdpVcV1_0_13,
-  CredentialDefinitionJwtVcJsonLdAndLdpVcV1_0_13,
+  CredentialConfigurationSupportedJwtVcJsonLdAndLdpVcV1_0_15,
+  CredentialDefinitionJwtVcJsonLdAndLdpVcV1_0_15,
   CredentialOfferRequestWithBaseUrl,
   DefaultURISchemes,
   EndpointMetadataResult,
@@ -849,11 +849,30 @@ export class OID4VCIHolder implements IAgentPlugin {
 
     let counter = 0
     for (const credentialId of selectedCredentials) {
-      const localeBranding: Array<IBasicCredentialLocaleBranding> | undefined = credentialBranding?.[credentialId]
+      // The selectedCredential from context is the configurationId, whilst we store the branding by type. We need to map
+      const configId = credentialId
+      const types =
+        credentialsToAccept
+          .find((ac) => ac.correlationId === configId || ac.credentialToAccept.id === configId || ac.types.includes(configId))
+          ?.types?.filter((type) => type != 'VerifiableCredential') ?? []
+
+      const localeBranding: Array<IBasicCredentialLocaleBranding> = credentialBranding?.[configId] ?? []
+      if (localeBranding.length === 0) {
+        for (const type of types) {
+          const branding = credentialBranding?.[type] ?? []
+          if (branding.length > 0) {
+            localeBranding.push(...branding)
+          }
+        }
+      }
+
       if (localeBranding && localeBranding.length > 0) {
         const credential = credentialsToAccept.find(
           (credAccept) =>
-            credAccept.credentialToAccept.id === credentialId || JSON.stringify(credAccept.types) === credentialId || credentialsToAccept[counter],
+            credAccept.credentialToAccept.id === credentialId ||
+            JSON.stringify(credAccept.types) === credentialId ||
+            JSON.stringify(credAccept.types.filter((cred) => cred !== 'VerifiableCredential')) === JSON.stringify(types) ||
+            credentialsToAccept[counter],
         )!
         counter++
         await context.agent.ibAddCredentialBranding({
@@ -1150,9 +1169,9 @@ export class OID4VCIHolder implements IAgentPlugin {
     return undefined
   }
 
-  private getCredentialDefinition(issuanceOpt: IssuanceOpts): CredentialDefinitionJwtVcJsonLdAndLdpVcV1_0_13 | undefined {
+  private getCredentialDefinition(issuanceOpt: IssuanceOpts): CredentialDefinitionJwtVcJsonLdAndLdpVcV1_0_15 | undefined {
     if (issuanceOpt.format == 'ldp_vc' || issuanceOpt.format == 'jwt_vc_json-ld') {
-      return (issuanceOpt as CredentialConfigurationSupportedJwtVcJsonLdAndLdpVcV1_0_13).credential_definition
+      return (issuanceOpt as CredentialConfigurationSupportedJwtVcJsonLdAndLdpVcV1_0_15).credential_definition
     }
     return undefined
   }

package/src/services/OID4VCIHolderService.ts

@@ -2,7 +2,7 @@ import { LOG } from '@sphereon/oid4vci-client'
 import {
   CredentialConfigurationSupported,
   CredentialSupportedSdJwtVc,
-  CredentialConfigurationSupportedSdJwtVcV1_0_13,
+  CredentialConfigurationSupportedSdJwtVcV1_0_15,
   CredentialOfferFormatV1_0_11,
   CredentialResponse,
   getSupportedCredentials,
@@ -73,7 +73,7 @@ export const getCredentialBranding = async (args: GetCredentialBrandingArgs): Pr
     Object.entries(credentialsSupported).map(async ([configId, credentialsConfigSupported]): Promise<void> => {
       let sdJwtTypeMetadata: SdJwtTypeMetadata | undefined
       if (credentialsConfigSupported.format === 'vc+sd-jwt') {
-        const vct = (<CredentialSupportedSdJwtVc | CredentialConfigurationSupportedSdJwtVcV1_0_13>credentialsConfigSupported).vct
+        const vct = (<CredentialSupportedSdJwtVc | CredentialConfigurationSupportedSdJwtVcV1_0_15>credentialsConfigSupported).vct
         if (vct.startsWith('http')) {
           try {
             sdJwtTypeMetadata = await context.agent.fetchSdJwtTypeMetadataFromVctUrl({ vct })