@sphereon/ssi-sdk.oid4vci-holder 0.34.1-feature.SSISDK.50.98 → 0.34.1-feature.SSISDK.50.type.refactor.142

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sphereon/ssi-sdk.oid4vci-holder",
-  "version": "0.34.1-feature.SSISDK.50.98+48bdc676",
+  "version": "0.34.1-feature.SSISDK.50.type.refactor.142+de2d8d54",
   "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.1-feature.SSISDK.45.92",
+    "@sphereon/did-auth-siop": "0.19.1-feature.DIIPv4.106",
     "@sphereon/kmp-mdoc-core": "0.2.0-SNAPSHOT.26",
-    "@sphereon/oid4vci-client": "0.19.1-feature.SSISDK.45.92",
-    "@sphereon/oid4vci-common": "0.19.1-feature.SSISDK.45.92",
-    "@sphereon/ssi-sdk-ext.did-utils": "0.34.1-feature.SSISDK.50.98+48bdc676",
-    "@sphereon/ssi-sdk-ext.identifier-resolution": "0.34.1-feature.SSISDK.50.98+48bdc676",
-    "@sphereon/ssi-sdk-ext.jwt-service": "0.34.1-feature.SSISDK.50.98+48bdc676",
-    "@sphereon/ssi-sdk-ext.key-utils": "0.34.1-feature.SSISDK.50.98+48bdc676",
-    "@sphereon/ssi-sdk.contact-manager": "0.34.1-feature.SSISDK.50.98+48bdc676",
-    "@sphereon/ssi-sdk.core": "0.34.1-feature.SSISDK.50.98+48bdc676",
-    "@sphereon/ssi-sdk.credential-store": "0.34.1-feature.SSISDK.50.98+48bdc676",
-    "@sphereon/ssi-sdk.credential-validation": "0.34.1-feature.SSISDK.50.98+48bdc676",
-    "@sphereon/ssi-sdk.data-store": "0.34.1-feature.SSISDK.50.98+48bdc676",
-    "@sphereon/ssi-sdk.issuance-branding": "0.34.1-feature.SSISDK.50.98+48bdc676",
-    "@sphereon/ssi-sdk.mdl-mdoc": "0.34.1-feature.SSISDK.50.98+48bdc676",
-    "@sphereon/ssi-sdk.oidf-client": "0.34.1-feature.SSISDK.50.98+48bdc676",
-    "@sphereon/ssi-sdk.sd-jwt": "0.34.1-feature.SSISDK.50.98+48bdc676",
-    "@sphereon/ssi-sdk.siopv2-oid4vp-common": "0.34.1-feature.SSISDK.50.98+48bdc676",
-    "@sphereon/ssi-sdk.siopv2-oid4vp-op-auth": "0.34.1-feature.SSISDK.50.98+48bdc676",
-    "@sphereon/ssi-sdk.xstate-machine-persistence": "0.34.1-feature.SSISDK.50.98+48bdc676",
-    "@sphereon/ssi-types": "0.34.1-feature.SSISDK.50.98+48bdc676",
+    "@sphereon/oid4vci-client": "0.19.1-feature.DIIPv4.106",
+    "@sphereon/oid4vci-common": "0.19.1-feature.DIIPv4.106",
+    "@sphereon/ssi-sdk-ext.did-utils": "0.34.1-feature.SSISDK.50.type.refactor.142+de2d8d54",
+    "@sphereon/ssi-sdk-ext.identifier-resolution": "0.34.1-feature.SSISDK.50.type.refactor.142+de2d8d54",
+    "@sphereon/ssi-sdk-ext.jwt-service": "0.34.1-feature.SSISDK.50.type.refactor.142+de2d8d54",
+    "@sphereon/ssi-sdk-ext.key-utils": "0.34.1-feature.SSISDK.50.type.refactor.142+de2d8d54",
+    "@sphereon/ssi-sdk.contact-manager": "0.34.1-feature.SSISDK.50.type.refactor.142+de2d8d54",
+    "@sphereon/ssi-sdk.core": "0.34.1-feature.SSISDK.50.type.refactor.142+de2d8d54",
+    "@sphereon/ssi-sdk.credential-store": "0.34.1-feature.SSISDK.50.type.refactor.142+de2d8d54",
+    "@sphereon/ssi-sdk.credential-validation": "0.34.1-feature.SSISDK.50.type.refactor.142+de2d8d54",
+    "@sphereon/ssi-sdk.data-store": "0.34.1-feature.SSISDK.50.type.refactor.142+de2d8d54",
+    "@sphereon/ssi-sdk.issuance-branding": "0.34.1-feature.SSISDK.50.type.refactor.142+de2d8d54",
+    "@sphereon/ssi-sdk.mdl-mdoc": "0.34.1-feature.SSISDK.50.type.refactor.142+de2d8d54",
+    "@sphereon/ssi-sdk.oidf-client": "0.34.1-feature.SSISDK.50.type.refactor.142+de2d8d54",
+    "@sphereon/ssi-sdk.sd-jwt": "0.34.1-feature.SSISDK.50.type.refactor.142+de2d8d54",
+    "@sphereon/ssi-sdk.siopv2-oid4vp-common": "0.34.1-feature.SSISDK.50.type.refactor.142+de2d8d54",
+    "@sphereon/ssi-sdk.siopv2-oid4vp-op-auth": "0.34.1-feature.SSISDK.50.type.refactor.142+de2d8d54",
+    "@sphereon/ssi-sdk.xstate-machine-persistence": "0.34.1-feature.SSISDK.50.type.refactor.142+de2d8d54",
+    "@sphereon/ssi-types": "0.34.1-feature.SSISDK.50.type.refactor.142+de2d8d54",
     "@veramo/core": "4.2.0",
     "@veramo/data-store": "4.2.0",
     "@veramo/utils": "4.2.0",
@@ -59,8 +59,8 @@
     "xstate": "^4.38.3"
   },
   "devDependencies": {
-    "@sphereon/oid4vc-common": "0.19.1-feature.SSISDK.45.92",
-    "@sphereon/ssi-sdk-ext.did-resolver-jwk": "0.34.1-feature.SSISDK.50.98+48bdc676",
+    "@sphereon/oid4vc-common": "0.19.1-feature.DIIPv4.106",
+    "@sphereon/ssi-sdk-ext.did-resolver-jwk": "0.34.1-feature.SSISDK.50.type.refactor.142+de2d8d54",
     "@sphereon/ssi-sdk.siopv2-oid4vp-common": "workspace:*",
     "@types/i18n-js": "^3.8.9",
     "@types/lodash.memoize": "^4.1.9",
@@ -90,5 +90,5 @@
     "OID4VCI",
     "State Machine"
   ],
-  "gitHead": "48bdc676bed10bd17c66ed7dfdbd401c54925cbb"
+  "gitHead": "de2d8d5432490eb88e3f081d2838f8e9164c59ac"
 }

package/src/agent/OID4VCIHolder.ts

@@ -4,13 +4,14 @@ import {
   AuthorizationRequestOpts,
   AuthorizationServerClientOpts,
   AuthorizationServerOpts,
+  CredentialConfigurationSupported,
   CredentialConfigurationSupportedJwtVcJsonLdAndLdpVcV1_0_15,
   CredentialDefinitionJwtVcJsonLdAndLdpVcV1_0_15,
   CredentialOfferRequestWithBaseUrl,
   DefaultURISchemes,
   EndpointMetadataResult,
   getTypesFromAuthorizationDetails,
-  getTypesFromCredentialOffer,
+  getTypesFromCredentialSupported,
   getTypesFromObject,
   Jwt,
   NotificationRequest,
@@ -229,7 +230,7 @@ export class OID4VCIHolder implements IAgentPlugin {
     oid4vciHolderStoreIssuerBranding: this.oid4vciHolderStoreIssuerBranding.bind(this),
   }
 
-  private readonly vcFormatPreferences: Array<string> = ['dc+sd-jwt', 'vc+sd-jwt', 'mso_mdoc', 'jwt_vc_json', 'jwt_vc', 'ldp_vc']
+  private readonly vcFormatPreferences: Array<string> = ['dc+sd-jwt', 'vc+sd-jwt', 'mso_mdoc', 'jwt_vc_json', 'jwt_vc', 'ldp_vc'] // TODO see SSISDK-52 concerning vc+sd-jwt
   private readonly jsonldCryptographicSuitePreferences: Array<string> = [
     'Ed25519Signature2018',
     'EcdsaSecp256k1Signature2019',
@@ -443,7 +444,13 @@ export class OID4VCIHolder implements IAgentPlugin {
     }
 
     if (offer) {
-      types = getTypesFromCredentialOffer(offer.original_credential_offer)
+      const credentialsSupported: CredentialConfigurationSupported[] = offer.original_credential_offer.credential_configuration_ids.flatMap(
+        (configId) => {
+          const config = oid4vciClient.endpointMetadata.credentialIssuerMetadata?.credential_configurations_supported[configId]
+          return config ? [config as CredentialConfigurationSupported] : []
+        },
+      )
+      types = credentialsSupported.map((credentialSupported) => getTypesFromCredentialSupported(credentialSupported))
     } else {
       types = asArray(authorizationRequestOpts.authorizationDetails)
         .map((authReqOpts) => getTypesFromAuthorizationDetails(authReqOpts) ?? [])

package/src/services/OID4VCIHolderService.ts

@@ -3,7 +3,6 @@ import {
   AuthorizationChallengeCodeResponse,
   CredentialConfigurationSupported,
   CredentialConfigurationSupportedSdJwtVcV1_0_15,
-  CredentialOfferFormatV1_0_11,
   CredentialResponse,
   CredentialResponseV1_0_15,
   CredentialSupportedSdJwtVc,
@@ -11,7 +10,6 @@ import {
   getTypesFromCredentialSupported,
   getTypesFromObject,
   MetadataDisplay,
-  OpenId4VCIVersion,
 } from '@sphereon/oid4vci-common'
 import { KeyUse } from '@sphereon/ssi-sdk-ext.did-resolver-jwk'
 import { getOrCreatePrimaryIdentifier, SupportedDidMethodEnum } from '@sphereon/ssi-sdk-ext.did-utils'
@@ -386,7 +384,10 @@ export const getCredentialConfigsSupportedBySingleTypeOrId = async (
   }
 
   if (configurationId) {
-    const allSupported = client.getCredentialsSupported(false)
+    if (!format) {
+      return Promise.reject(Error('format parameter missing from input'))
+    }
+    const allSupported = client.getCredentialsSupported(format)
     return Object.fromEntries(
       Object.entries(allSupported).filter(
         ([id, supported]) => id === configurationId || supported.id === configurationId || createIdFromTypes(supported) === configurationId,
@@ -394,29 +395,15 @@ export const getCredentialConfigsSupportedBySingleTypeOrId = async (
     )
   }
 
-  if (!types && !client.credentialOffer) {
-    return Promise.reject(Error('openID4VCIClient has no credentialOffer and no types where provided'))
-    /*} else if (!format && !client.credentialOffer) {
-    return Promise.reject(Error('openID4VCIClient has no credentialOffer and no formats where provided'))*/
+  if (!client.credentialOffer) {
+    return Promise.reject(Error('openID4VCIClient has no credentialOffer'))
   }
-  // We should always have a credential offer at this point given the above
-  if (!Array.isArray(format) && client.credentialOffer) {
-    if (
-      client.version() > OpenId4VCIVersion.VER_1_0_09 &&
-      typeof client.credentialOffer.credential_offer === 'object' &&
-      'credentials' in client.credentialOffer.credential_offer
-    ) {
-      format = client.credentialOffer.credential_offer.credentials
-        .filter((cred: CredentialOfferFormatV1_0_11 | string) => typeof cred !== 'string')
-        .map((cred: CredentialOfferFormatV1_0_11 | string) => (cred as CredentialOfferFormatV1_0_11).format)
-      if (format?.length === 0) {
-        format = undefined // Otherwise we would match nothing
-      }
-    }
+  if (!types) {
+    return Promise.reject(Error('openID4VCIClient has no types'))
   }
 
   const offerSupported = getSupportedCredentials({
-    types: types ? [types] : client.getCredentialOfferTypes(),
+    types: [types],
     format,
     version: client.version(),
     issuerMetadata: client.endpointMetadata.credentialIssuerMetadata,
@@ -596,7 +583,7 @@ export const getIssuanceCryptoSuite = async (opts: GetIssuanceCryptoSuiteArgs):
     case 'jwt':
     case 'jwt_vc_json':
     case 'jwt_vc':
-    case 'vc+sd-jwt':
+    //case 'vc+sd-jwt': // TODO see SSISDK-52 concerning vc+sd-jwt
     case 'dc+sd-jwt':
     case 'mso_mdoc': {
       const supportedPreferences: Array<JoseSignatureAlgorithm | JoseSignatureAlgorithmString> = jwtCryptographicSuitePreferences.filter(

package/src/types/FirstPartyMachine.ts

@@ -1,12 +1,12 @@
-import { BaseActionObject, Interpreter, ResolveTypegenMeta, ServiceMap, State, StateMachine, StatesConfig, TypegenDisabled } from 'xstate'
-import { OpenID4VCIClientState } from '@sphereon/oid4vci-client'
-import { DidAuthConfig, Party } from '@sphereon/ssi-sdk.data-store'
 import { RPRegistrationMetadataPayload } from '@sphereon/did-auth-siop'
-import { UniqueDigitalCredential } from '@sphereon/ssi-sdk.credential-store'
+import { OpenID4VCIClientState } from '@sphereon/oid4vci-client'
 import { AuthorizationChallengeCodeResponse } from '@sphereon/oid4vci-common'
+import { UniqueDigitalCredential } from '@sphereon/ssi-sdk.credential-store'
+import { DidAuthConfig, Party } from '@sphereon/ssi-sdk.data-store'
 import { IIdentifier } from '@veramo/core'
-import { ErrorDetails, RequiredContext } from './IOID4VCIHolder'
 import { DcqlQuery } from 'dcql'
+import { BaseActionObject, Interpreter, ResolveTypegenMeta, ServiceMap, State, StateMachine, StatesConfig, TypegenDisabled } from 'xstate'
+import { ErrorDetails, RequiredContext } from './IOID4VCIHolder'
 
 export enum FirstPartyMachineStateTypes {
   sendAuthorizationChallengeRequest = 'sendAuthorizationChallengeRequest',