@sphereon/ssi-sdk.siopv2-oid4vp-op-auth 0.34.1-fix.182 → 0.34.1-fix.226
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.cjs +26 -30
- package/dist/index.cjs.map +1 -1
- package/dist/index.js +7 -11
- package/dist/index.js.map +1 -1
- package/package.json +22 -22
- package/src/agent/DidAuthSiopOpAuthenticator.ts +1 -1
- package/src/services/Siopv2MachineService.ts +15 -12
- package/src/session/functions.ts +1 -8
- package/src/utils/CredentialUtils.ts +1 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@sphereon/ssi-sdk.siopv2-oid4vp-op-auth",
|
|
3
|
-
"version": "0.34.1-fix.
|
|
3
|
+
"version": "0.34.1-fix.226+0b5294f9",
|
|
4
4
|
"source": "src/index.ts",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "./dist/index.cjs",
|
|
@@ -26,26 +26,26 @@
|
|
|
26
26
|
"build": "tsup --config ../../tsup.config.ts --tsconfig ../../tsconfig.tsup.json"
|
|
27
27
|
},
|
|
28
28
|
"dependencies": {
|
|
29
|
-
"@sphereon/did-auth-siop": "0.19.1-feature.DIIPv4.
|
|
30
|
-
"@sphereon/did-auth-siop-adapter": "0.19.1-feature.DIIPv4.
|
|
31
|
-
"@sphereon/oid4vc-common": "0.19.1-feature.DIIPv4.
|
|
29
|
+
"@sphereon/did-auth-siop": "0.19.1-feature.DIIPv4.170",
|
|
30
|
+
"@sphereon/did-auth-siop-adapter": "0.19.1-feature.DIIPv4.170",
|
|
31
|
+
"@sphereon/oid4vc-common": "0.19.1-feature.DIIPv4.170",
|
|
32
32
|
"@sphereon/pex": "5.0.0-unstable.28",
|
|
33
33
|
"@sphereon/pex-models": "^2.3.2",
|
|
34
|
-
"@sphereon/ssi-sdk-ext.did-utils": "0.34.1-fix.
|
|
35
|
-
"@sphereon/ssi-sdk-ext.identifier-resolution": "0.34.1-fix.
|
|
36
|
-
"@sphereon/ssi-sdk-ext.jwt-service": "0.34.1-fix.
|
|
37
|
-
"@sphereon/ssi-sdk.contact-manager": "0.34.1-fix.
|
|
38
|
-
"@sphereon/ssi-sdk.core": "0.34.1-fix.
|
|
39
|
-
"@sphereon/ssi-sdk.credential-store": "0.34.1-fix.
|
|
40
|
-
"@sphereon/ssi-sdk.credential-validation": "0.34.1-fix.
|
|
41
|
-
"@sphereon/ssi-sdk.data-store": "0.34.1-fix.
|
|
42
|
-
"@sphereon/ssi-sdk.issuance-branding": "0.34.1-fix.
|
|
43
|
-
"@sphereon/ssi-sdk.pd-manager": "0.34.1-fix.
|
|
44
|
-
"@sphereon/ssi-sdk.presentation-exchange": "0.34.1-fix.
|
|
45
|
-
"@sphereon/ssi-sdk.sd-jwt": "0.34.1-fix.
|
|
46
|
-
"@sphereon/ssi-sdk.siopv2-oid4vp-common": "0.34.1-fix.
|
|
47
|
-
"@sphereon/ssi-sdk.xstate-machine-persistence": "0.34.1-fix.
|
|
48
|
-
"@sphereon/ssi-types": "0.34.1-fix.
|
|
34
|
+
"@sphereon/ssi-sdk-ext.did-utils": "0.34.1-fix.226+0b5294f9",
|
|
35
|
+
"@sphereon/ssi-sdk-ext.identifier-resolution": "0.34.1-fix.226+0b5294f9",
|
|
36
|
+
"@sphereon/ssi-sdk-ext.jwt-service": "0.34.1-fix.226+0b5294f9",
|
|
37
|
+
"@sphereon/ssi-sdk.contact-manager": "0.34.1-fix.226+0b5294f9",
|
|
38
|
+
"@sphereon/ssi-sdk.core": "0.34.1-fix.226+0b5294f9",
|
|
39
|
+
"@sphereon/ssi-sdk.credential-store": "0.34.1-fix.226+0b5294f9",
|
|
40
|
+
"@sphereon/ssi-sdk.credential-validation": "0.34.1-fix.226+0b5294f9",
|
|
41
|
+
"@sphereon/ssi-sdk.data-store": "0.34.1-fix.226+0b5294f9",
|
|
42
|
+
"@sphereon/ssi-sdk.issuance-branding": "0.34.1-fix.226+0b5294f9",
|
|
43
|
+
"@sphereon/ssi-sdk.pd-manager": "0.34.1-fix.226+0b5294f9",
|
|
44
|
+
"@sphereon/ssi-sdk.presentation-exchange": "0.34.1-fix.226+0b5294f9",
|
|
45
|
+
"@sphereon/ssi-sdk.sd-jwt": "0.34.1-fix.226+0b5294f9",
|
|
46
|
+
"@sphereon/ssi-sdk.siopv2-oid4vp-common": "0.34.1-fix.226+0b5294f9",
|
|
47
|
+
"@sphereon/ssi-sdk.xstate-machine-persistence": "0.34.1-fix.226+0b5294f9",
|
|
48
|
+
"@sphereon/ssi-types": "0.34.1-fix.226+0b5294f9",
|
|
49
49
|
"@sphereon/wellknown-dids-client": "^0.1.3",
|
|
50
50
|
"@veramo/core": "4.2.0",
|
|
51
51
|
"@veramo/credential-w3c": "4.2.0",
|
|
@@ -59,8 +59,8 @@
|
|
|
59
59
|
},
|
|
60
60
|
"devDependencies": {
|
|
61
61
|
"@sphereon/did-uni-client": "^0.6.3",
|
|
62
|
-
"@sphereon/ssi-sdk-ext.did-resolver-jwk": "0.34.1-fix.
|
|
63
|
-
"@sphereon/ssi-sdk.agent-config": "0.34.1-fix.
|
|
62
|
+
"@sphereon/ssi-sdk-ext.did-resolver-jwk": "0.34.1-fix.226+0b5294f9",
|
|
63
|
+
"@sphereon/ssi-sdk.agent-config": "0.34.1-fix.226+0b5294f9",
|
|
64
64
|
"@types/i18n-js": "^3.8.9",
|
|
65
65
|
"@types/lodash.memoize": "^4.1.9",
|
|
66
66
|
"@types/sha.js": "^2.4.4",
|
|
@@ -102,5 +102,5 @@
|
|
|
102
102
|
"OpenID Connect",
|
|
103
103
|
"Authenticator"
|
|
104
104
|
],
|
|
105
|
-
"gitHead": "
|
|
105
|
+
"gitHead": "0b5294f9513532c0bf553b1faf38363c5754b5af"
|
|
106
106
|
}
|
|
@@ -214,7 +214,7 @@ export class DidAuthSiopOpAuthenticator implements IAgentPlugin {
|
|
|
214
214
|
(args.url.includes('request_uri')
|
|
215
215
|
? decodeURIComponent(args.url.split('?request_uri=')[1].trim())
|
|
216
216
|
: (verifiedAuthorizationRequest.issuer ?? verifiedAuthorizationRequest.registrationMetadataPayload?.client_id))
|
|
217
|
-
const uri: URL | undefined = url
|
|
217
|
+
const uri: URL | undefined = url?.includes('://') ? new URL(url) : undefined
|
|
218
218
|
const correlationId: string = uri?.hostname ?? (await this.determineCorrelationId(uri, verifiedAuthorizationRequest, clientName, context))
|
|
219
219
|
const clientId: string | undefined = verifiedAuthorizationRequest.authorizationRequest.getMergedProperty<string>('client_id')
|
|
220
220
|
|
|
@@ -1,17 +1,22 @@
|
|
|
1
|
-
import { AuthorizationRequest, Json
|
|
1
|
+
import { AuthorizationRequest, Json } from '@sphereon/did-auth-siop'
|
|
2
|
+
import { getOrCreatePrimaryIdentifier, SupportedDidMethodEnum } from '@sphereon/ssi-sdk-ext.did-utils'
|
|
2
3
|
import { isOID4VCIssuerIdentifier, ManagedIdentifierOptsOrResult } from '@sphereon/ssi-sdk-ext.identifier-resolution'
|
|
4
|
+
import { encodeJoseBlob } from '@sphereon/ssi-sdk.core'
|
|
3
5
|
import { UniqueDigitalCredential, verifiableCredentialForRoleFilter } from '@sphereon/ssi-sdk.credential-store'
|
|
4
6
|
import { ConnectionType } from '@sphereon/ssi-sdk.data-store'
|
|
5
|
-
import {
|
|
6
|
-
|
|
7
|
-
|
|
7
|
+
import {
|
|
8
|
+
CredentialMapper,
|
|
9
|
+
CredentialRole,
|
|
10
|
+
HasherSync,
|
|
11
|
+
Loggers,
|
|
12
|
+
OriginalVerifiableCredential,
|
|
13
|
+
SdJwtDecodedVerifiableCredential,
|
|
14
|
+
} from '@sphereon/ssi-types'
|
|
15
|
+
import { IAgentContext, IDIDManager } from '@veramo/core'
|
|
16
|
+
import { DcqlPresentation, DcqlQuery } from 'dcql'
|
|
8
17
|
import { OpSession } from '../session'
|
|
9
18
|
import { LOGGER_NAMESPACE, RequiredContext, SelectableCredential, SelectableCredentialsMap, Siopv2HolderEvent } from '../types'
|
|
10
|
-
import { encodeJoseBlob } from '@sphereon/ssi-sdk.core'
|
|
11
|
-
import { DcqlPresentation, DcqlQuery } from 'dcql'
|
|
12
19
|
import { convertToDcqlCredentials } from '../utils/dcql'
|
|
13
|
-
import { IAgentContext, IDIDManager } from '@veramo/core'
|
|
14
|
-
import { getOrCreatePrimaryIdentifier, SupportedDidMethodEnum } from '@sphereon/ssi-sdk-ext.did-utils'
|
|
15
20
|
|
|
16
21
|
export const logger = Loggers.DEFAULT.get(LOGGER_NAMESPACE)
|
|
17
22
|
|
|
@@ -59,10 +64,8 @@ export const siopSendAuthorizationResponse = async (
|
|
|
59
64
|
logger.debug(`AUD: ${aud}`)
|
|
60
65
|
logger.debug(JSON.stringify(request.authorizationRequest))
|
|
61
66
|
|
|
62
|
-
const domain =
|
|
63
|
-
|
|
64
|
-
request.issuer ??
|
|
65
|
-
(request.versions.includes(SupportedVersion.JWT_VC_PRESENTATION_PROFILE_v1) ? 'https://self-issued.me/v2/openid-vc' : 'https://self-issued.me/v2')
|
|
67
|
+
const domain = ((await request.authorizationRequest.getMergedProperty('client_id')) as string) ?? request.issuer ?? 'https://self-issued.me/v2'
|
|
68
|
+
|
|
66
69
|
logger.debug(`NONCE: ${session.nonce}, domain: ${domain}`)
|
|
67
70
|
|
|
68
71
|
const firstUniqueDC = credentials[0]
|
package/src/session/functions.ts
CHANGED
|
@@ -60,14 +60,7 @@ export async function createOPBuilder({
|
|
|
60
60
|
const eventEmitter = opOptions.eventEmitter ?? new EventEmitter()
|
|
61
61
|
const builder = OP.builder()
|
|
62
62
|
.withResponseMode(opOptions.responseMode ?? ResponseMode.DIRECT_POST)
|
|
63
|
-
.withSupportedVersions(
|
|
64
|
-
opOptions.supportedVersions ?? [
|
|
65
|
-
SupportedVersion.SIOPv2_ID1,
|
|
66
|
-
SupportedVersion.JWT_VC_PRESENTATION_PROFILE_v1,
|
|
67
|
-
SupportedVersion.SIOPv2_D11,
|
|
68
|
-
SupportedVersion.SIOPv2_D12_OID4VP_D18,
|
|
69
|
-
],
|
|
70
|
-
)
|
|
63
|
+
.withSupportedVersions(opOptions.supportedVersions ?? [SupportedVersion.OID4VP_v1, SupportedVersion.SIOPv2_OID4VP_D28])
|
|
71
64
|
.withExpiresIn(opOptions.expiresIn ?? 300)
|
|
72
65
|
.withEventEmitter(eventEmitter)
|
|
73
66
|
.withRegistration({
|
|
@@ -25,7 +25,7 @@ const getCredentialFromProofOrWrapped = (cred: any, hasher?: HasherSync): Origin
|
|
|
25
25
|
return cred.proof.jwt
|
|
26
26
|
}
|
|
27
27
|
|
|
28
|
-
return CredentialMapper.toWrappedVerifiableCredential(cred as OriginalVerifiableCredential, { hasher }).original
|
|
28
|
+
return CredentialMapper.toWrappedVerifiableCredential(cred as OriginalVerifiableCredential, { hasher }).original as OriginalVerifiableCredential // FIXME SSISDK-59
|
|
29
29
|
}
|
|
30
30
|
|
|
31
31
|
export const isUniqueDigitalCredential = (credential: InputCredential): credential is UniqueDigitalCredential => {
|