@sphereon/ssi-sdk.siopv2-oid4vp-op-auth 0.34.1-feature.SSISDK.57.uni.client.206 → 0.34.1-feature.SSISDK.58.host.nonce.endpoint.194

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sphereon/ssi-sdk.siopv2-oid4vp-op-auth",
-  "version": "0.34.1-feature.SSISDK.57.uni.client.206+c30b7b42",
+  "version": "0.34.1-feature.SSISDK.58.host.nonce.endpoint.194+287878cc",
   "source": "src/index.ts",
   "type": "module",
   "main": "./dist/index.cjs",
@@ -31,21 +31,21 @@
     "@sphereon/oid4vc-common": "0.19.1-feature.DIIPv4.161",
     "@sphereon/pex": "5.0.0-unstable.28",
     "@sphereon/pex-models": "^2.3.2",
-    "@sphereon/ssi-sdk-ext.did-utils": "0.34.1-feature.SSISDK.57.uni.client.206+c30b7b42",
-    "@sphereon/ssi-sdk-ext.identifier-resolution": "0.34.1-feature.SSISDK.57.uni.client.206+c30b7b42",
-    "@sphereon/ssi-sdk-ext.jwt-service": "0.34.1-feature.SSISDK.57.uni.client.206+c30b7b42",
-    "@sphereon/ssi-sdk.contact-manager": "0.34.1-feature.SSISDK.57.uni.client.206+c30b7b42",
-    "@sphereon/ssi-sdk.core": "0.34.1-feature.SSISDK.57.uni.client.206+c30b7b42",
-    "@sphereon/ssi-sdk.credential-store": "0.34.1-feature.SSISDK.57.uni.client.206+c30b7b42",
-    "@sphereon/ssi-sdk.credential-validation": "0.34.1-feature.SSISDK.57.uni.client.206+c30b7b42",
-    "@sphereon/ssi-sdk.data-store": "0.34.1-feature.SSISDK.57.uni.client.206+c30b7b42",
-    "@sphereon/ssi-sdk.issuance-branding": "0.34.1-feature.SSISDK.57.uni.client.206+c30b7b42",
-    "@sphereon/ssi-sdk.pd-manager": "0.34.1-feature.SSISDK.57.uni.client.206+c30b7b42",
-    "@sphereon/ssi-sdk.presentation-exchange": "0.34.1-feature.SSISDK.57.uni.client.206+c30b7b42",
-    "@sphereon/ssi-sdk.sd-jwt": "0.34.1-feature.SSISDK.57.uni.client.206+c30b7b42",
-    "@sphereon/ssi-sdk.siopv2-oid4vp-common": "0.34.1-feature.SSISDK.57.uni.client.206+c30b7b42",
-    "@sphereon/ssi-sdk.xstate-machine-persistence": "0.34.1-feature.SSISDK.57.uni.client.206+c30b7b42",
-    "@sphereon/ssi-types": "0.34.1-feature.SSISDK.57.uni.client.206+c30b7b42",
+    "@sphereon/ssi-sdk-ext.did-utils": "0.34.1-feature.SSISDK.58.host.nonce.endpoint.194+287878cc",
+    "@sphereon/ssi-sdk-ext.identifier-resolution": "0.34.1-feature.SSISDK.58.host.nonce.endpoint.194+287878cc",
+    "@sphereon/ssi-sdk-ext.jwt-service": "0.34.1-feature.SSISDK.58.host.nonce.endpoint.194+287878cc",
+    "@sphereon/ssi-sdk.contact-manager": "0.34.1-feature.SSISDK.58.host.nonce.endpoint.194+287878cc",
+    "@sphereon/ssi-sdk.core": "0.34.1-feature.SSISDK.58.host.nonce.endpoint.194+287878cc",
+    "@sphereon/ssi-sdk.credential-store": "0.34.1-feature.SSISDK.58.host.nonce.endpoint.194+287878cc",
+    "@sphereon/ssi-sdk.credential-validation": "0.34.1-feature.SSISDK.58.host.nonce.endpoint.194+287878cc",
+    "@sphereon/ssi-sdk.data-store": "0.34.1-feature.SSISDK.58.host.nonce.endpoint.194+287878cc",
+    "@sphereon/ssi-sdk.issuance-branding": "0.34.1-feature.SSISDK.58.host.nonce.endpoint.194+287878cc",
+    "@sphereon/ssi-sdk.pd-manager": "0.34.1-feature.SSISDK.58.host.nonce.endpoint.194+287878cc",
+    "@sphereon/ssi-sdk.presentation-exchange": "0.34.1-feature.SSISDK.58.host.nonce.endpoint.194+287878cc",
+    "@sphereon/ssi-sdk.sd-jwt": "0.34.1-feature.SSISDK.58.host.nonce.endpoint.194+287878cc",
+    "@sphereon/ssi-sdk.siopv2-oid4vp-common": "0.34.1-feature.SSISDK.58.host.nonce.endpoint.194+287878cc",
+    "@sphereon/ssi-sdk.xstate-machine-persistence": "0.34.1-feature.SSISDK.58.host.nonce.endpoint.194+287878cc",
+    "@sphereon/ssi-types": "0.34.1-feature.SSISDK.58.host.nonce.endpoint.194+287878cc",
     "@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-feature.SSISDK.57.uni.client.206+c30b7b42",
-    "@sphereon/ssi-sdk.agent-config": "0.34.1-feature.SSISDK.57.uni.client.206+c30b7b42",
+    "@sphereon/ssi-sdk-ext.did-resolver-jwk": "0.34.1-feature.SSISDK.58.host.nonce.endpoint.194+287878cc",
+    "@sphereon/ssi-sdk.agent-config": "0.34.1-feature.SSISDK.58.host.nonce.endpoint.194+287878cc",
     "@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": "c30b7b42dfbd1ea969234fe7a4a5813c5fddef3b"
+  "gitHead": "287878cc3c59e1fe8f3303600e4139ef30258b17"
 }

package/src/services/Siopv2MachineService.ts

@@ -1,22 +1,17 @@
-import { AuthorizationRequest, Json } from '@sphereon/did-auth-siop'
-import { getOrCreatePrimaryIdentifier, SupportedDidMethodEnum } from '@sphereon/ssi-sdk-ext.did-utils'
+import { AuthorizationRequest, Json, SupportedVersion } from '@sphereon/did-auth-siop'
 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 {
-  CredentialMapper,
-  CredentialRole,
-  HasherSync,
-  Loggers,
-  OriginalVerifiableCredential,
-  SdJwtDecodedVerifiableCredential,
-} from '@sphereon/ssi-types'
-import { IAgentContext, IDIDManager } from '@veramo/core'
-import { DcqlPresentation, DcqlQuery } from 'dcql'
+import { CredentialRole } from '@sphereon/ssi-types'
+
+import { CredentialMapper, HasherSync, Loggers, OriginalVerifiableCredential, SdJwtDecodedVerifiableCredential } from '@sphereon/ssi-types'
 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)
 
@@ -64,8 +59,10 @@ 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 ?? 'https://self-issued.me/v2'
-
+  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')
   logger.debug(`NONCE: ${session.nonce}, domain: ${domain}`)
 
   const firstUniqueDC = credentials[0]

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 as OriginalVerifiableCredential // FIXME SSISDK-59
+  return CredentialMapper.toWrappedVerifiableCredential(cred as OriginalVerifiableCredential, { hasher }).original
 }
 
 export const isUniqueDigitalCredential = (credential: InputCredential): credential is UniqueDigitalCredential => {