@sphereon/did-auth-siop-adapter 0.16.1-unstable.94 → 0.17.0
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/DidJwtAdapter.d.ts +1 -2
- package/dist/DidJwtAdapter.d.ts.map +1 -1
- package/dist/DidJwtAdapter.js.map +1 -1
- package/dist/did/DIDResolution.d.ts.map +1 -1
- package/dist/did/DIDResolution.js +6 -1
- package/dist/did/DIDResolution.js.map +1 -1
- package/dist/did/DidJWT.d.ts +1 -1
- package/dist/did/DidJWT.d.ts.map +1 -1
- package/dist/did/DidJWT.js +11 -12
- package/dist/did/DidJWT.js.map +1 -1
- package/lib/DidJwtAdapter.ts +1 -2
- package/lib/did/DIDResolution.ts +8 -3
- package/lib/did/DidJWT.ts +5 -5
- package/package.json +4 -5
package/dist/DidJwtAdapter.d.ts
CHANGED
|
@@ -1,5 +1,4 @@
|
|
|
1
|
-
import { JwtIssuerWithContext } from '@sphereon/did-auth-siop';
|
|
2
|
-
import { JwtVerifier } from '@sphereon/did-auth-siop';
|
|
1
|
+
import { JwtIssuerWithContext, JwtVerifier } from '@sphereon/did-auth-siop';
|
|
3
2
|
import { JwtHeader, JwtPayload } from '@sphereon/oid4vc-common';
|
|
4
3
|
import { Resolvable } from 'did-resolver';
|
|
5
4
|
import { ExternalSignature, ExternalVerification, InternalSignature, InternalVerification, SuppliedSignature } from './types';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DidJwtAdapter.d.ts","sourceRoot":"","sources":["../lib/DidJwtAdapter.ts"],"names":[],"mappings":"AAAA,OAAO,EAA+C,oBAAoB,
|
|
1
|
+
{"version":3,"file":"DidJwtAdapter.d.ts","sourceRoot":"","sources":["../lib/DidJwtAdapter.ts"],"names":[],"mappings":"AAAA,OAAO,EAA+C,oBAAoB,EAAE,WAAW,EAAwB,MAAM,yBAAyB,CAAA;AAC9I,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAA;AAC/D,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAGzC,OAAO,EAAqB,iBAAiB,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAA;AAEhJ,eAAO,MAAM,mBAAmB,gBACjB,WAAW,OACnB;IAAE,MAAM,EAAE,SAAS,CAAC;IAAC,OAAO,EAAE,UAAU,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,WACnD;IACP,YAAY,EAAE,oBAAoB,GAAG,oBAAoB,CAAA;IACzD,QAAQ,EAAE,UAAU,CAAA;CACrB,KACA,QAAQ,OAAO,CAkCjB,CAAA;AAED,eAAO,MAAM,mBAAmB,cACnB,iBAAiB,GAAG,iBAAiB,GAAG,iBAAiB,aACzD,oBAAoB,OAC1B;IAAE,MAAM,EAAE,SAAS,CAAC;IAAC,OAAO,EAAE,UAAU,CAAA;CAAE,KAC9C,QAAQ,MAAM,CAWhB,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DidJwtAdapter.js","sourceRoot":"","sources":["../lib/DidJwtAdapter.ts"],"names":[],"mappings":";;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"DidJwtAdapter.js","sourceRoot":"","sources":["../lib/DidJwtAdapter.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DIDResolution.d.ts","sourceRoot":"","sources":["../../lib/did/DIDResolution.ts"],"names":[],"mappings":"AAEA,OAAO,EAAwD,UAAU,
|
|
1
|
+
{"version":3,"file":"DIDResolution.d.ts","sourceRoot":"","sources":["../../lib/did/DIDResolution.ts"],"names":[],"mappings":"AAEA,OAAO,EAAwD,UAAU,EAA8B,MAAM,cAAc,CAAA;AAE3H,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,UAAU,CAAA;AAInD,wBAAgB,WAAW,CAAC,IAAI,EAAE,WAAW,GAAG,UAAU,CAoCzD;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,gBAAgB,CAC9B,cAAc,EAAE,UAAU,EAC1B,2BAA2B,EAAE,MAAM,EAAE,GAAG,MAAM,EAC9C,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,GACnC,UAAU,CAmCZ;AAED,wBAAgB,kBAAkB,CAAC,2BAA2B,EAAE,MAAM,GAAG,MAAM,EAAE,EAAE,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,GAAG,MAAM,EAAE,CAQ/H;AAED,wBAAsB,kBAAkB,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,CAa9F"}
|
|
@@ -77,11 +77,16 @@ function getResolverUnion(customResolver, subjectSyntaxTypesSupported, resolverM
|
|
|
77
77
|
let methodResolver;
|
|
78
78
|
if (!resolverMap.has(dm) || resolverMap.get(dm) === null) {
|
|
79
79
|
methodResolver = (0, did_uni_client_1.getUniResolver)((0, index_1.getMethodFromDid)(dm));
|
|
80
|
+
if (methodResolver) {
|
|
81
|
+
uniResolvers.push(methodResolver);
|
|
82
|
+
}
|
|
80
83
|
}
|
|
81
84
|
else {
|
|
82
85
|
methodResolver = resolverMap.get(dm);
|
|
86
|
+
if (methodResolver) {
|
|
87
|
+
uniResolvers.push({ [dm]: methodResolver.resolve });
|
|
88
|
+
}
|
|
83
89
|
}
|
|
84
|
-
uniResolvers.push(methodResolver);
|
|
85
90
|
});
|
|
86
91
|
return subjectTypes.indexOf(did_auth_siop_1.SubjectSyntaxTypesSupportedValues.DID.valueOf()) !== -1
|
|
87
92
|
? new did_resolver_1.Resolver(...Object.assign({ fallbackResolver }, uniResolvers))
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DIDResolution.js","sourceRoot":"","sources":["../../lib/did/DIDResolution.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2DAAkG;AAClG,6DAAsE;AACtE,+
|
|
1
|
+
{"version":3,"file":"DIDResolution.js","sourceRoot":"","sources":["../../lib/did/DIDResolution.ts"],"names":[],"mappings":"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"}
|
package/dist/did/DidJWT.d.ts
CHANGED
|
@@ -47,7 +47,7 @@ export declare function signIDTokenPayload(payload: IDTokenPayload, signature: I
|
|
|
47
47
|
export declare function signRequestObjectPayload(payload: RequestObjectPayload, signature: InternalSignature | ExternalSignature | SuppliedSignature): Promise<string>;
|
|
48
48
|
export declare function signDidJwtInternal(payload: IDTokenPayload | RequestObjectPayload, issuer: string, hexPrivateKey: string, alg: SigningAlgo, kid: string, customJwtSigner?: Signer): Promise<string>;
|
|
49
49
|
export declare function getAudience(jwt: string): string;
|
|
50
|
-
export declare function getSubDidFromPayload(payload: JWTPayload, header?: JWTHeader): string
|
|
50
|
+
export declare function getSubDidFromPayload(payload: JWTPayload, header?: JWTHeader): string;
|
|
51
51
|
export declare function isIssSelfIssued(payload: JWTPayload): boolean;
|
|
52
52
|
export declare function getMethodFromDid(did: string): string;
|
|
53
53
|
/**
|
package/dist/did/DidJWT.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DidJWT.d.ts","sourceRoot":"","sources":["../../lib/did/DidJWT.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"DidJWT.d.ts","sourceRoot":"","sources":["../../lib/did/DidJWT.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,cAAc,EAEd,oBAAoB,EAKpB,WAAW,EACZ,MAAM,yBAAyB,CAAA;AAChC,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAA;AACrD,OAAO,EAOL,SAAS,EACT,UAAU,EACV,UAAU,EACV,gBAAgB,EAChB,MAAM,EAEP,MAAM,SAAS,CAAA;AAChB,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAGzC,OAAO,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAA;AAElF;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAsB,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,WAAW,CAAC,CAErH;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAsB,YAAY,CAChC,OAAO,EAAE,OAAO,CAAC,UAAU,CAAC,EAC5B,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,YAAY,EAAE,EAAE,UAAU,EACvD,MAAM,EAAE,OAAO,CAAC,SAAS,CAAC,GACzB,OAAO,CAAC,MAAM,CAAC,CAEjB;AAED,wBAAsB,kBAAkB,CAAC,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,iBAAiB,GAAG,iBAAiB,GAAG,iBAAiB,mBAkBrI;AAED,wBAAsB,wBAAwB,CAAC,OAAO,EAAE,oBAAoB,EAAE,SAAS,EAAE,iBAAiB,GAAG,iBAAiB,GAAG,iBAAiB,mBA+BjJ;AAED,wBAAsB,kBAAkB,CACtC,OAAO,EAAE,cAAc,GAAG,oBAAoB,EAC9C,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,MAAM,EACrB,GAAG,EAAE,WAAW,EAChB,GAAG,EAAE,MAAM,EACX,eAAe,CAAC,EAAE,MAAM,GACvB,OAAO,CAAC,MAAM,CAAC,CAajB;AAkED,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,UAWtC;AASD,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,UAAU,EAAE,MAAM,CAAC,EAAE,SAAS,GAAG,MAAM,CAgBpF;AAED,wBAAgB,eAAe,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAM5D;AAED,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAYpD;AAED;;;GAGG;AACH,wBAAgB,2BAA2B,CAAC,WAAW,EAAE,MAAM,UAO9D"}
|
package/dist/did/DidJWT.js
CHANGED
|
@@ -11,7 +11,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.toSIOPRegistrationDidMethod = exports.getMethodFromDid = exports.isIssSelfIssued = exports.getSubDidFromPayload = exports.getAudience = exports.signDidJwtInternal = exports.signRequestObjectPayload = exports.signIDTokenPayload = exports.createDidJWT = exports.verifyDidJWT = void 0;
|
|
13
13
|
const did_auth_siop_1 = require("@sphereon/did-auth-siop");
|
|
14
|
-
const did_auth_siop_2 = require("@sphereon/did-auth-siop");
|
|
15
14
|
const oid4vc_common_1 = require("@sphereon/oid4vc-common");
|
|
16
15
|
const did_jwt_1 = require("did-jwt");
|
|
17
16
|
const helpers_1 = require("../helpers");
|
|
@@ -134,7 +133,7 @@ function signDidJwtInternal(payload, issuer, hexPrivateKey, alg, kid, customJwtS
|
|
|
134
133
|
const options = {
|
|
135
134
|
issuer,
|
|
136
135
|
signer,
|
|
137
|
-
expiresIn:
|
|
136
|
+
expiresIn: did_auth_siop_1.DEFAULT_EXPIRATION_TIME,
|
|
138
137
|
};
|
|
139
138
|
return yield createDidJWT(Object.assign({}, payload), options, header);
|
|
140
139
|
});
|
|
@@ -145,9 +144,9 @@ function signDidJwtExternal(payload, signatureUri, authZToken, alg, kid) {
|
|
|
145
144
|
const body = {
|
|
146
145
|
issuer: payload.iss && payload.iss.includes('did:') ? payload.iss : payload.sub,
|
|
147
146
|
payload,
|
|
148
|
-
expiresIn:
|
|
147
|
+
expiresIn: did_auth_siop_1.DEFAULT_EXPIRATION_TIME,
|
|
149
148
|
alg,
|
|
150
|
-
selfIssued: payload.iss && payload.iss.includes(
|
|
149
|
+
selfIssued: payload.iss && payload.iss.includes(did_auth_siop_1.ResponseIss.SELF_ISSUED_V2) ? payload.iss : undefined,
|
|
151
150
|
kid,
|
|
152
151
|
};
|
|
153
152
|
const response = yield (0, did_auth_siop_1.post)(signatureUri, JSON.stringify(body), { bearerToken: authZToken });
|
|
@@ -166,7 +165,7 @@ function signDidJwtSupplied(payload, issuer, signer, alg, kid) {
|
|
|
166
165
|
const options = {
|
|
167
166
|
issuer,
|
|
168
167
|
signer,
|
|
169
|
-
expiresIn:
|
|
168
|
+
expiresIn: did_auth_siop_1.DEFAULT_EXPIRATION_TIME,
|
|
170
169
|
};
|
|
171
170
|
return yield createDidJWT(Object.assign({}, payload), options, header);
|
|
172
171
|
});
|
|
@@ -195,13 +194,13 @@ const determineSigner = (alg, hexPrivateKey, customSigner) => {
|
|
|
195
194
|
function getAudience(jwt) {
|
|
196
195
|
const { payload } = (0, did_jwt_1.decodeJWT)(jwt);
|
|
197
196
|
if (!payload) {
|
|
198
|
-
throw new Error(
|
|
197
|
+
throw new Error(did_auth_siop_1.SIOPErrors.NO_AUDIENCE);
|
|
199
198
|
}
|
|
200
199
|
else if (!payload.aud) {
|
|
201
200
|
return undefined;
|
|
202
201
|
}
|
|
203
202
|
else if (Array.isArray(payload.aud)) {
|
|
204
|
-
throw new Error(
|
|
203
|
+
throw new Error(did_auth_siop_1.SIOPErrors.INVALID_AUDIENCE);
|
|
205
204
|
}
|
|
206
205
|
return payload.aud;
|
|
207
206
|
}
|
|
@@ -230,21 +229,21 @@ function getSubDidFromPayload(payload, header) {
|
|
|
230
229
|
}
|
|
231
230
|
exports.getSubDidFromPayload = getSubDidFromPayload;
|
|
232
231
|
function isIssSelfIssued(payload) {
|
|
233
|
-
return ((payload.iss &&
|
|
234
|
-
(payload.iss && payload.iss.includes(
|
|
235
|
-
payload.iss === payload.sub)
|
|
232
|
+
return ((payload.iss && payload.iss.includes(did_auth_siop_1.ResponseIss.SELF_ISSUED_V1)) ||
|
|
233
|
+
(payload.iss && payload.iss.includes(did_auth_siop_1.ResponseIss.SELF_ISSUED_V2)) ||
|
|
234
|
+
payload.iss === payload.sub);
|
|
236
235
|
}
|
|
237
236
|
exports.isIssSelfIssued = isIssSelfIssued;
|
|
238
237
|
function getMethodFromDid(did) {
|
|
239
238
|
if (!did) {
|
|
240
|
-
throw new Error(
|
|
239
|
+
throw new Error(did_auth_siop_1.SIOPErrors.BAD_PARAMS);
|
|
241
240
|
}
|
|
242
241
|
const split = did.split(':');
|
|
243
242
|
if (split.length == 1 && did.length > 0) {
|
|
244
243
|
return did;
|
|
245
244
|
}
|
|
246
245
|
else if (!did.startsWith('did:') || split.length < 2) {
|
|
247
|
-
throw new Error(
|
|
246
|
+
throw new Error(did_auth_siop_1.SIOPErrors.BAD_PARAMS);
|
|
248
247
|
}
|
|
249
248
|
return split[1];
|
|
250
249
|
}
|
package/dist/did/DidJWT.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DidJWT.js","sourceRoot":"","sources":["../../lib/did/DidJWT.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"DidJWT.js","sourceRoot":"","sources":["../../lib/did/DidJWT.ts"],"names":[],"mappings":"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"}
|
package/lib/DidJwtAdapter.ts
CHANGED
|
@@ -1,5 +1,4 @@
|
|
|
1
|
-
import { AuthorizationRequestPayload, IDTokenPayload, JwtIssuerWithContext, RequestObjectPayload } from '@sphereon/did-auth-siop'
|
|
2
|
-
import { JwtVerifier } from '@sphereon/did-auth-siop'
|
|
1
|
+
import { AuthorizationRequestPayload, IDTokenPayload, JwtIssuerWithContext, JwtVerifier, RequestObjectPayload } from '@sphereon/did-auth-siop'
|
|
3
2
|
import { JwtHeader, JwtPayload } from '@sphereon/oid4vc-common'
|
|
4
3
|
import { Resolvable } from 'did-resolver'
|
|
5
4
|
|
package/lib/did/DIDResolution.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { SubjectIdentifierType, SubjectSyntaxTypesSupportedValues } from '@sphereon/did-auth-siop'
|
|
2
2
|
import { getUniResolver, UniResolver } from '@sphereon/did-uni-client'
|
|
3
|
-
import { DIDResolutionOptions, DIDResolutionResult, ParsedDID, Resolvable, Resolver } from 'did-resolver'
|
|
3
|
+
import { DIDResolutionOptions, DIDResolutionResult, ParsedDID, Resolvable, Resolver, ResolverRegistry } from 'did-resolver'
|
|
4
4
|
|
|
5
5
|
import { DIDDocument, ResolveOpts } from '../types'
|
|
6
6
|
|
|
@@ -78,13 +78,18 @@ export function getResolverUnion(
|
|
|
78
78
|
}
|
|
79
79
|
const specificDidMethods = subjectTypes.filter((sst) => !!sst && sst.startsWith('did:'))
|
|
80
80
|
specificDidMethods.forEach((dm) => {
|
|
81
|
-
let methodResolver
|
|
81
|
+
let methodResolver: ResolverRegistry | Resolvable | undefined
|
|
82
82
|
if (!resolverMap.has(dm) || resolverMap.get(dm) === null) {
|
|
83
83
|
methodResolver = getUniResolver(getMethodFromDid(dm))
|
|
84
|
+
if (methodResolver) {
|
|
85
|
+
uniResolvers.push(methodResolver)
|
|
86
|
+
}
|
|
84
87
|
} else {
|
|
85
88
|
methodResolver = resolverMap.get(dm)
|
|
89
|
+
if (methodResolver) {
|
|
90
|
+
uniResolvers.push({ [dm]: methodResolver.resolve })
|
|
91
|
+
}
|
|
86
92
|
}
|
|
87
|
-
uniResolvers.push(methodResolver)
|
|
88
93
|
})
|
|
89
94
|
return subjectTypes.indexOf(SubjectSyntaxTypesSupportedValues.DID.valueOf()) !== -1
|
|
90
95
|
? new Resolver(...{ fallbackResolver, ...uniResolvers })
|
package/lib/did/DidJWT.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { post } from '@sphereon/did-auth-siop'
|
|
2
1
|
import {
|
|
3
2
|
DEFAULT_EXPIRATION_TIME,
|
|
4
3
|
IDTokenPayload,
|
|
4
|
+
post,
|
|
5
5
|
RequestObjectPayload,
|
|
6
6
|
ResponseIss,
|
|
7
7
|
SignatureResponse,
|
|
@@ -238,7 +238,7 @@ function assertIssSelfIssuedOrDid(payload: JWTPayload) {
|
|
|
238
238
|
}
|
|
239
239
|
}
|
|
240
240
|
|
|
241
|
-
export function getSubDidFromPayload(payload: JWTPayload, header?: JWTHeader): string
|
|
241
|
+
export function getSubDidFromPayload(payload: JWTPayload, header?: JWTHeader): string {
|
|
242
242
|
assertIssSelfIssuedOrDid(payload)
|
|
243
243
|
|
|
244
244
|
if (isIssSelfIssued(payload)) {
|
|
@@ -253,14 +253,14 @@ export function getSubDidFromPayload(payload: JWTPayload, header?: JWTHeader): s
|
|
|
253
253
|
return did
|
|
254
254
|
}
|
|
255
255
|
}
|
|
256
|
-
return payload.sub
|
|
256
|
+
return payload.sub!
|
|
257
257
|
}
|
|
258
258
|
|
|
259
259
|
export function isIssSelfIssued(payload: JWTPayload): boolean {
|
|
260
260
|
return (
|
|
261
|
-
(payload.iss &&
|
|
261
|
+
(payload.iss && payload.iss.includes(ResponseIss.SELF_ISSUED_V1)) ||
|
|
262
262
|
(payload.iss && payload.iss.includes(ResponseIss.SELF_ISSUED_V2)) ||
|
|
263
|
-
payload.iss === payload.sub
|
|
263
|
+
payload.iss === payload.sub
|
|
264
264
|
)
|
|
265
265
|
}
|
|
266
266
|
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@sphereon/did-auth-siop-adapter",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.17.0",
|
|
4
4
|
"description": "Self Issued OpenID V2 (SIOPv2) and OpenID 4 Verifiable Presentations (OID4VP) did adapter",
|
|
5
5
|
"source": "lib/index.ts",
|
|
6
6
|
"main": "dist/index.js",
|
|
@@ -11,16 +11,15 @@
|
|
|
11
11
|
"clean": "rimraf dist coverage"
|
|
12
12
|
},
|
|
13
13
|
"dependencies": {
|
|
14
|
-
"@sphereon/did-auth-siop": "0.
|
|
14
|
+
"@sphereon/did-auth-siop": "0.17.0",
|
|
15
15
|
"@sphereon/did-uni-client": "^0.6.2",
|
|
16
|
-
"@sphereon/oid4vc-common": "0.
|
|
16
|
+
"@sphereon/oid4vc-common": "0.17.0",
|
|
17
17
|
"@sphereon/wellknown-dids-client": "^0.1.3",
|
|
18
18
|
"did-jwt": "6.11.6",
|
|
19
19
|
"did-resolver": "^4.1.0"
|
|
20
20
|
},
|
|
21
21
|
"devDependencies": {
|
|
22
22
|
"@types/jest": "^29.5.12",
|
|
23
|
-
"@types/jwt-decode": "^3.1.0",
|
|
24
23
|
"typescript": "5.4.5"
|
|
25
24
|
},
|
|
26
25
|
"engines": {
|
|
@@ -51,5 +50,5 @@
|
|
|
51
50
|
"publishConfig": {
|
|
52
51
|
"access": "public"
|
|
53
52
|
},
|
|
54
|
-
"gitHead": "
|
|
53
|
+
"gitHead": "730c459314d3831431a924920a0de39500f72c9d"
|
|
55
54
|
}
|