@sphereon/ssi-sdk.oid4vci-holder 0.34.1-feature.DIIPv4.75 → 0.34.1-feature.FIDES.1.274

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sphereon/ssi-sdk.oid4vci-holder",
-  "version": "0.34.1-feature.DIIPv4.75+68d7e440",
+  "version": "0.34.1-feature.FIDES.1.274+3d1f4edd",
   "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.DIIPv4.86",
+    "@sphereon/did-auth-siop": "0.19.1-feature.DIIPv4.219",
     "@sphereon/kmp-mdoc-core": "0.2.0-SNAPSHOT.26",
-    "@sphereon/oid4vci-client": "0.19.1-feature.DIIPv4.86",
-    "@sphereon/oid4vci-common": "0.19.1-feature.DIIPv4.86",
-    "@sphereon/ssi-sdk-ext.did-utils": "0.34.1-feature.DIIPv4.75+68d7e440",
-    "@sphereon/ssi-sdk-ext.identifier-resolution": "0.34.1-feature.DIIPv4.75+68d7e440",
-    "@sphereon/ssi-sdk-ext.jwt-service": "0.34.1-feature.DIIPv4.75+68d7e440",
-    "@sphereon/ssi-sdk-ext.key-utils": "0.34.1-feature.DIIPv4.75+68d7e440",
-    "@sphereon/ssi-sdk.contact-manager": "0.34.1-feature.DIIPv4.75+68d7e440",
-    "@sphereon/ssi-sdk.core": "0.34.1-feature.DIIPv4.75+68d7e440",
-    "@sphereon/ssi-sdk.credential-store": "0.34.1-feature.DIIPv4.75+68d7e440",
-    "@sphereon/ssi-sdk.credential-validation": "0.34.1-feature.DIIPv4.75+68d7e440",
-    "@sphereon/ssi-sdk.data-store": "0.34.1-feature.DIIPv4.75+68d7e440",
-    "@sphereon/ssi-sdk.issuance-branding": "0.34.1-feature.DIIPv4.75+68d7e440",
-    "@sphereon/ssi-sdk.mdl-mdoc": "0.34.1-feature.DIIPv4.75+68d7e440",
-    "@sphereon/ssi-sdk.oidf-client": "0.34.1-feature.DIIPv4.75+68d7e440",
-    "@sphereon/ssi-sdk.sd-jwt": "0.34.1-feature.DIIPv4.75+68d7e440",
-    "@sphereon/ssi-sdk.siopv2-oid4vp-common": "0.34.1-feature.DIIPv4.75+68d7e440",
-    "@sphereon/ssi-sdk.siopv2-oid4vp-op-auth": "0.34.1-feature.DIIPv4.75+68d7e440",
-    "@sphereon/ssi-sdk.xstate-machine-persistence": "0.34.1-feature.DIIPv4.75+68d7e440",
-    "@sphereon/ssi-types": "0.34.1-feature.DIIPv4.75+68d7e440",
+    "@sphereon/oid4vci-client": "0.19.1-feature.DIIPv4.219",
+    "@sphereon/oid4vci-common": "0.19.1-feature.DIIPv4.219",
+    "@sphereon/ssi-sdk-ext.did-utils": "0.34.1-feature.FIDES.1.274+3d1f4edd",
+    "@sphereon/ssi-sdk-ext.identifier-resolution": "0.34.1-feature.FIDES.1.274+3d1f4edd",
+    "@sphereon/ssi-sdk-ext.jwt-service": "0.34.1-feature.FIDES.1.274+3d1f4edd",
+    "@sphereon/ssi-sdk-ext.key-utils": "0.34.1-feature.FIDES.1.274+3d1f4edd",
+    "@sphereon/ssi-sdk.contact-manager": "0.34.1-feature.FIDES.1.274+3d1f4edd",
+    "@sphereon/ssi-sdk.core": "0.34.1-feature.FIDES.1.274+3d1f4edd",
+    "@sphereon/ssi-sdk.credential-store": "0.34.1-feature.FIDES.1.274+3d1f4edd",
+    "@sphereon/ssi-sdk.credential-validation": "0.34.1-feature.FIDES.1.274+3d1f4edd",
+    "@sphereon/ssi-sdk.data-store-types": "0.34.1-feature.FIDES.1.274+3d1f4edd",
+    "@sphereon/ssi-sdk.issuance-branding": "0.34.1-feature.FIDES.1.274+3d1f4edd",
+    "@sphereon/ssi-sdk.mdl-mdoc": "0.34.1-feature.FIDES.1.274+3d1f4edd",
+    "@sphereon/ssi-sdk.oidf-client": "0.34.1-feature.FIDES.1.274+3d1f4edd",
+    "@sphereon/ssi-sdk.sd-jwt": "0.34.1-feature.FIDES.1.274+3d1f4edd",
+    "@sphereon/ssi-sdk.siopv2-oid4vp-common": "0.34.1-feature.FIDES.1.274+3d1f4edd",
+    "@sphereon/ssi-sdk.siopv2-oid4vp-op-auth": "0.34.1-feature.FIDES.1.274+3d1f4edd",
+    "@sphereon/ssi-sdk.xstate-machine-persistence": "0.34.1-feature.FIDES.1.274+3d1f4edd",
+    "@sphereon/ssi-types": "0.34.1-feature.FIDES.1.274+3d1f4edd",
     "@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.DIIPv4.86",
-    "@sphereon/ssi-sdk-ext.did-resolver-jwk": "0.34.1-feature.DIIPv4.75+68d7e440",
+    "@sphereon/oid4vc-common": "0.19.1-feature.DIIPv4.219",
+    "@sphereon/ssi-sdk-ext.did-resolver-jwk": "0.34.1-feature.FIDES.1.274+3d1f4edd",
     "@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": "68d7e440417e7094486b9c05f36a417669bda8f2"
+  "gitHead": "3d1f4edd13301b5e8ae524e80249b5e25f99eeac"
 }

package/src/agent/OID4VCIHolder.ts

@@ -9,8 +9,6 @@ import {
   CredentialOfferRequestWithBaseUrl,
   DefaultURISchemes,
   EndpointMetadataResult,
-  getTypesFromAuthorizationDetails,
-  getTypesFromCredentialOffer,
   getTypesFromObject,
   Jwt,
   NotificationRequest,
@@ -31,12 +29,11 @@ import {
 import { IJwtService, JwsHeader } from '@sphereon/ssi-sdk-ext.jwt-service'
 import { signatureAlgorithmFromKey } from '@sphereon/ssi-sdk-ext.key-utils'
 import { defaultHasher } from '@sphereon/ssi-sdk.core'
+import { ensureRawDocument } from '@sphereon/ssi-sdk.data-store-types'
 import {
   ConnectionType,
   CorrelationIdentifierType,
   CredentialCorrelationType,
-  CredentialRole,
-  ensureRawDocument,
   FindPartyArgs,
   IBasicCredentialLocaleBranding,
   IBasicIssuerLocaleBranding,
@@ -45,10 +42,11 @@ import {
   IIssuerLocaleBranding,
   NonPersistedIdentity,
   Party,
-} from '@sphereon/ssi-sdk.data-store'
+} from '@sphereon/ssi-sdk.data-store-types'
 import {
   CredentialMapper,
   type CredentialProofFormat,
+  CredentialRole,
   HasherSync,
   IVerifiableCredential,
   JoseSignatureAlgorithm,
@@ -70,6 +68,7 @@ import {
   W3CVerifiableCredential,
 } from '@veramo/core'
 import { asArray, computeEntryHash } from '@veramo/utils'
+import fetch from 'cross-fetch'
 import { decodeJWT } from 'did-jwt'
 import { v4 as uuidv4 } from 'uuid'
 import { OID4VCIMachine } from '../machines/oid4vciMachine'
@@ -85,7 +84,6 @@ import {
   startFirstPartApplicationMachine,
   verifyCredentialToAccept,
 } from '../services/OID4VCIHolderService'
-import 'cross-fetch/polyfill'
 import {
   AddContactIdentityArgs,
   AssertValidCredentialsArgs,
@@ -229,7 +227,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',
@@ -400,7 +398,6 @@ export class OID4VCIHolder implements IAgentPlugin {
       formats = Array.from(new Set(authFormats))
     }
     let oid4vciClient: OpenID4VCIClient
-    let types: string[][] | undefined = undefined
     let offer: CredentialOfferRequestWithBaseUrl | undefined
     if (requestData.existingClientState) {
       oid4vciClient = await OpenID4VCIClient.fromState({ state: requestData.existingClientState })
@@ -442,20 +439,23 @@ export class OID4VCIHolder implements IAgentPlugin {
       }
     }
 
+    let configurationIds: Array<string> = []
     if (offer) {
-      types = getTypesFromCredentialOffer(offer.original_credential_offer)
+      configurationIds = offer.original_credential_offer.credential_configuration_ids
     } else {
-      types = asArray(authorizationRequestOpts.authorizationDetails)
-        .map((authReqOpts) => getTypesFromAuthorizationDetails(authReqOpts) ?? [])
-        .filter((inner) => inner.length > 0)
+      configurationIds = asArray(authorizationRequestOpts.authorizationDetails)
+        .filter((authDetails): authDetails is Exclude<AuthorizationDetails, string> => typeof authDetails !== 'string')
+        .map((authReqOpts) => authReqOpts.credential_configuration_id)
+        .filter((id): id is string => !!id)
     }
 
-    const serverMetadata = await oid4vciClient.retrieveServerMetadata()
     const credentialsSupported = await getCredentialConfigsSupportedMerged({
       client: oid4vciClient,
       vcFormatPreferences: formats,
-      types,
+      configurationIds,
     })
+
+    const serverMetadata = await oid4vciClient.retrieveServerMetadata()
     const credentialBranding = await getCredentialBranding({ credentialsSupported, context })
     const authorizationCodeURL = oid4vciClient.authorizationURL
     if (authorizationCodeURL) {

package/src/machines/firstPartyMachine.ts

@@ -1,6 +1,6 @@
 import { assign, createMachine, DoneInvokeEvent, interpret } from 'xstate'
 import { AuthorizationChallengeCodeResponse, AuthorizationChallengeError, AuthorizationChallengeErrorResponse } from '@sphereon/oid4vci-common'
-import { DidAuthConfig } from '@sphereon/ssi-sdk.data-store'
+import { DidAuthConfig } from '@sphereon/ssi-sdk.data-store-types'
 import { CreateConfigResult } from '@sphereon/ssi-sdk.siopv2-oid4vp-op-auth'
 import { createConfig, getSiopRequest, sendAuthorizationChallengeRequest, sendAuthorizationResponse } from '../services/FirstPartyMachineServices'
 import { translate } from '../localization/Localization'

package/src/machines/oid4vciMachine.ts

@@ -1,5 +1,5 @@
 import { AuthorizationChallengeCodeResponse, AuthzFlowType, toAuthorizationResponsePayload } from '@sphereon/oid4vci-common'
-import { IBasicIssuerLocaleBranding, Identity, IIssuerLocaleBranding, Party } from '@sphereon/ssi-sdk.data-store'
+import { IBasicIssuerLocaleBranding, Identity, IIssuerLocaleBranding, Party } from '@sphereon/ssi-sdk.data-store-types'
 import { assign, createMachine, DoneInvokeEvent, interpret } from 'xstate'
 import { translate } from '../localization/Localization'
 import {

package/src/mappers/OIDC4VCIBrandingMapper.ts

@@ -1,5 +1,5 @@
 import { CredentialsSupportedDisplay, NameAndLocale } from '@sphereon/oid4vci-common'
-import { IBasicCredentialClaim, IBasicCredentialLocaleBranding, IBasicIssuerLocaleBranding } from '@sphereon/ssi-sdk.data-store'
+import { IBasicCredentialClaim, IBasicCredentialLocaleBranding, IBasicIssuerLocaleBranding } from '@sphereon/ssi-sdk.data-store-types'
 import { SdJwtClaimDisplayMetadata, SdJwtClaimMetadata, SdJwtClaimPath, SdJwtTypeDisplayMetadata } from '@sphereon/ssi-types'
 import {
   IssuerLocaleBrandingFromArgs,

package/src/services/OID4VCIHolderService.ts

@@ -23,7 +23,7 @@ import {
 } from '@sphereon/ssi-sdk-ext.identifier-resolution'
 import { keyTypeFromCryptographicSuite } from '@sphereon/ssi-sdk-ext.key-utils'
 import { defaultHasher } from '@sphereon/ssi-sdk.core'
-import { IBasicCredentialLocaleBranding, IBasicIssuerLocaleBranding } from '@sphereon/ssi-sdk.data-store'
+import { IBasicCredentialLocaleBranding, IBasicIssuerLocaleBranding } from '@sphereon/ssi-sdk.data-store-types'
 import {
   CredentialMapper,
   Hasher,
@@ -580,7 +580,7 @@ export const getIssuanceCryptoSuite = async (opts: GetIssuanceCryptoSuiteArgs):
     case 'jwt':
     case 'jwt_vc_json':
     case 'jwt_vc':
-    //case 'vc+sd-jwt':  FIXME re-enable for vcdm2
+    //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

@@ -2,7 +2,7 @@ import { RPRegistrationMetadataPayload } from '@sphereon/did-auth-siop'
 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 { DidAuthConfig, Party } from '@sphereon/ssi-sdk.data-store-types'
 import { IIdentifier } from '@veramo/core'
 import { DcqlQuery } from 'dcql'
 import { BaseActionObject, Interpreter, ResolveTypegenMeta, ServiceMap, State, StateMachine, StatesConfig, TypegenDisabled } from 'xstate'

package/src/types/IOID4VCIHolder.ts

@@ -34,7 +34,7 @@ import {
   Identity,
   IIssuerLocaleBranding,
   Party,
-} from '@sphereon/ssi-sdk.data-store'
+} from '@sphereon/ssi-sdk.data-store-types'
 import { IIssuanceBranding } from '@sphereon/ssi-sdk.issuance-branding'
 import { ImDLMdoc } from '@sphereon/ssi-sdk.mdl-mdoc'
 import { ISDJwtPlugin } from '@sphereon/ssi-sdk.sd-jwt'