@sphereon/ssi-sdk.siopv2-oid4vp-op-auth 0.34.1-fix.171 → 0.34.1-fix.223

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sphereon/ssi-sdk.siopv2-oid4vp-op-auth",
-  "version": "0.34.1-fix.171+3754c1bc",
+  "version": "0.34.1-fix.223+9c86d039",
   "source": "src/index.ts",
   "type": "module",
   "main": "./dist/index.cjs",
@@ -26,26 +26,26 @@
     "build": "tsup --config ../../tsup.config.ts --tsconfig ../../tsconfig.tsup.json"
   },
   "dependencies": {
-    "@sphereon/did-auth-siop": "0.19.1-feature.DIIPv4.126",
-    "@sphereon/did-auth-siop-adapter": "0.19.1-feature.DIIPv4.126",
-    "@sphereon/oid4vc-common": "0.19.1-feature.DIIPv4.126",
+    "@sphereon/did-auth-siop": "0.19.1-feature.DIIPv4.170",
+    "@sphereon/did-auth-siop-adapter": "0.19.1-feature.DIIPv4.170",
+    "@sphereon/oid4vc-common": "0.19.1-feature.DIIPv4.170",
     "@sphereon/pex": "5.0.0-unstable.28",
     "@sphereon/pex-models": "^2.3.2",
-    "@sphereon/ssi-sdk-ext.did-utils": "0.34.1-fix.171+3754c1bc",
-    "@sphereon/ssi-sdk-ext.identifier-resolution": "0.34.1-fix.171+3754c1bc",
-    "@sphereon/ssi-sdk-ext.jwt-service": "0.34.1-fix.171+3754c1bc",
-    "@sphereon/ssi-sdk.contact-manager": "0.34.1-fix.171+3754c1bc",
-    "@sphereon/ssi-sdk.core": "0.34.1-fix.171+3754c1bc",
-    "@sphereon/ssi-sdk.credential-store": "0.34.1-fix.171+3754c1bc",
-    "@sphereon/ssi-sdk.credential-validation": "0.34.1-fix.171+3754c1bc",
-    "@sphereon/ssi-sdk.data-store": "0.34.1-fix.171+3754c1bc",
-    "@sphereon/ssi-sdk.issuance-branding": "0.34.1-fix.171+3754c1bc",
-    "@sphereon/ssi-sdk.pd-manager": "0.34.1-fix.171+3754c1bc",
-    "@sphereon/ssi-sdk.presentation-exchange": "0.34.1-fix.171+3754c1bc",
-    "@sphereon/ssi-sdk.sd-jwt": "0.34.1-fix.171+3754c1bc",
-    "@sphereon/ssi-sdk.siopv2-oid4vp-common": "0.34.1-fix.171+3754c1bc",
-    "@sphereon/ssi-sdk.xstate-machine-persistence": "0.34.1-fix.171+3754c1bc",
-    "@sphereon/ssi-types": "0.34.1-fix.171+3754c1bc",
+    "@sphereon/ssi-sdk-ext.did-utils": "0.34.1-fix.223+9c86d039",
+    "@sphereon/ssi-sdk-ext.identifier-resolution": "0.34.1-fix.223+9c86d039",
+    "@sphereon/ssi-sdk-ext.jwt-service": "0.34.1-fix.223+9c86d039",
+    "@sphereon/ssi-sdk.contact-manager": "0.34.1-fix.223+9c86d039",
+    "@sphereon/ssi-sdk.core": "0.34.1-fix.223+9c86d039",
+    "@sphereon/ssi-sdk.credential-store": "0.34.1-fix.223+9c86d039",
+    "@sphereon/ssi-sdk.credential-validation": "0.34.1-fix.223+9c86d039",
+    "@sphereon/ssi-sdk.data-store": "0.34.1-fix.223+9c86d039",
+    "@sphereon/ssi-sdk.issuance-branding": "0.34.1-fix.223+9c86d039",
+    "@sphereon/ssi-sdk.pd-manager": "0.34.1-fix.223+9c86d039",
+    "@sphereon/ssi-sdk.presentation-exchange": "0.34.1-fix.223+9c86d039",
+    "@sphereon/ssi-sdk.sd-jwt": "0.34.1-fix.223+9c86d039",
+    "@sphereon/ssi-sdk.siopv2-oid4vp-common": "0.34.1-fix.223+9c86d039",
+    "@sphereon/ssi-sdk.xstate-machine-persistence": "0.34.1-fix.223+9c86d039",
+    "@sphereon/ssi-types": "0.34.1-fix.223+9c86d039",
     "@sphereon/wellknown-dids-client": "^0.1.3",
     "@veramo/core": "4.2.0",
     "@veramo/credential-w3c": "4.2.0",
@@ -59,8 +59,8 @@
   },
   "devDependencies": {
     "@sphereon/did-uni-client": "^0.6.3",
-    "@sphereon/ssi-sdk-ext.did-resolver-jwk": "0.34.1-fix.171+3754c1bc",
-    "@sphereon/ssi-sdk.agent-config": "0.34.1-fix.171+3754c1bc",
+    "@sphereon/ssi-sdk-ext.did-resolver-jwk": "0.34.1-fix.223+9c86d039",
+    "@sphereon/ssi-sdk.agent-config": "0.34.1-fix.223+9c86d039",
     "@types/i18n-js": "^3.8.9",
     "@types/lodash.memoize": "^4.1.9",
     "@types/sha.js": "^2.4.4",
@@ -102,5 +102,5 @@
     "OpenID Connect",
     "Authenticator"
   ],
-  "gitHead": "3754c1bc0327ad2bfec81912fdeae0b7b66d21e3"
+  "gitHead": "9c86d03951f1267495e456d1fbfd9eb380f27e78"
 }

package/src/agent/DidAuthSiopOpAuthenticator.ts

@@ -214,7 +214,7 @@ export class DidAuthSiopOpAuthenticator implements IAgentPlugin {
       (args.url.includes('request_uri')
         ? decodeURIComponent(args.url.split('?request_uri=')[1].trim())
         : (verifiedAuthorizationRequest.issuer ?? verifiedAuthorizationRequest.registrationMetadataPayload?.client_id))
-    const uri: URL | undefined = url.includes('://') ? new URL(url) : undefined
+    const uri: URL | undefined = url?.includes('://') ? new URL(url) : undefined
     const correlationId: string = uri?.hostname ?? (await this.determineCorrelationId(uri, verifiedAuthorizationRequest, clientName, context))
     const clientId: string | undefined = verifiedAuthorizationRequest.authorizationRequest.getMergedProperty<string>('client_id')
 

package/src/services/Siopv2MachineService.ts

@@ -1,17 +1,22 @@
-import { AuthorizationRequest, Json, SupportedVersion } from '@sphereon/did-auth-siop'
+import { AuthorizationRequest, Json } from '@sphereon/did-auth-siop'
+import { getOrCreatePrimaryIdentifier, SupportedDidMethodEnum } from '@sphereon/ssi-sdk-ext.did-utils'
 import { isOID4VCIssuerIdentifier, ManagedIdentifierOptsOrResult } from '@sphereon/ssi-sdk-ext.identifier-resolution'
+import { encodeJoseBlob } from '@sphereon/ssi-sdk.core'
 import { UniqueDigitalCredential, verifiableCredentialForRoleFilter } from '@sphereon/ssi-sdk.credential-store'
 import { ConnectionType } from '@sphereon/ssi-sdk.data-store'
-import { CredentialRole } from '@sphereon/ssi-types'
-
-import { CredentialMapper, HasherSync, Loggers, OriginalVerifiableCredential, SdJwtDecodedVerifiableCredential } from '@sphereon/ssi-types'
+import {
+  CredentialMapper,
+  CredentialRole,
+  HasherSync,
+  Loggers,
+  OriginalVerifiableCredential,
+  SdJwtDecodedVerifiableCredential,
+} from '@sphereon/ssi-types'
+import { IAgentContext, IDIDManager } from '@veramo/core'
+import { DcqlPresentation, DcqlQuery } from 'dcql'
 import { OpSession } from '../session'
 import { LOGGER_NAMESPACE, RequiredContext, SelectableCredential, SelectableCredentialsMap, Siopv2HolderEvent } from '../types'
-import { encodeJoseBlob } from '@sphereon/ssi-sdk.core'
-import { DcqlPresentation, DcqlQuery } from 'dcql'
 import { convertToDcqlCredentials } from '../utils/dcql'
-import { IAgentContext, IDIDManager } from '@veramo/core'
-import { getOrCreatePrimaryIdentifier, SupportedDidMethodEnum } from '@sphereon/ssi-sdk-ext.did-utils'
 
 export const logger = Loggers.DEFAULT.get(LOGGER_NAMESPACE)
 
@@ -59,10 +64,8 @@ export const siopSendAuthorizationResponse = async (
   logger.debug(`AUD: ${aud}`)
   logger.debug(JSON.stringify(request.authorizationRequest))
 
-  const domain =
-    ((await request.authorizationRequest.getMergedProperty('client_id')) as string) ??
-    request.issuer ??
-    (request.versions.includes(SupportedVersion.JWT_VC_PRESENTATION_PROFILE_v1) ? 'https://self-issued.me/v2/openid-vc' : 'https://self-issued.me/v2')
+  const domain = ((await request.authorizationRequest.getMergedProperty('client_id')) as string) ?? request.issuer ?? 'https://self-issued.me/v2'
+
   logger.debug(`NONCE: ${session.nonce}, domain: ${domain}`)
 
   const firstUniqueDC = credentials[0]

package/src/session/functions.ts

@@ -60,14 +60,7 @@ export async function createOPBuilder({
   const eventEmitter = opOptions.eventEmitter ?? new EventEmitter()
   const builder = OP.builder()
     .withResponseMode(opOptions.responseMode ?? ResponseMode.DIRECT_POST)
-    .withSupportedVersions(
-      opOptions.supportedVersions ?? [
-        SupportedVersion.SIOPv2_ID1,
-        SupportedVersion.JWT_VC_PRESENTATION_PROFILE_v1,
-        SupportedVersion.SIOPv2_D11,
-        SupportedVersion.SIOPv2_D12_OID4VP_D18,
-      ],
-    )
+    .withSupportedVersions(opOptions.supportedVersions ?? [SupportedVersion.OID4VP_v1, SupportedVersion.SIOPv2_OID4VP_D28])
     .withExpiresIn(opOptions.expiresIn ?? 300)
     .withEventEmitter(eventEmitter)
     .withRegistration({

package/src/utils/CredentialUtils.ts

@@ -25,7 +25,7 @@ const getCredentialFromProofOrWrapped = (cred: any, hasher?: HasherSync): Origin
     return cred.proof.jwt
   }
 
-  return CredentialMapper.toWrappedVerifiableCredential(cred as OriginalVerifiableCredential, { hasher }).original
+  return CredentialMapper.toWrappedVerifiableCredential(cred as OriginalVerifiableCredential, { hasher }).original as OriginalVerifiableCredential // FIXME SSISDK-59
 }
 
 export const isUniqueDigitalCredential = (credential: InputCredential): credential is UniqueDigitalCredential => {