Skip to content

Commit 719f6fc

Browse files
nklompnklomp
authored
Merge pull request #63 from Sphereon-Opensource/develop
New release
2 parents 9278959 + a750cc7 commit 719f6fc

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+3051
-3031
lines changed

‎lerna.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,5 @@
1414
"gitRemote": "origin",
1515
"message": "chore(release): %s"
1616
}
17-
},
18-
"useWorkspaces": true
17+
}
1918
}

‎package.json

+8-8
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,17 @@
2828
"printWidth": 150
2929
},
3030
"devDependencies": {
31-
"@types/debug": "^4.1.7",
32-
"@types/jest": "^29.5.1",
33-
"@types/node": "^18.16.0",
31+
"@types/debug": "^4.1.8",
32+
"@types/jest": "^29.5.3",
33+
"@types/node": "^18.17.3",
3434
"codecov": "^3.8.3",
35-
"jest": "^29.5.0",
36-
"lerna": "^6.6.1",
35+
"jest": "^29.6.2",
36+
"lerna": "^7.1.4",
3737
"lerna-changelog": "^2.2.0",
3838
"npm-run-all": "^4.1.5",
39-
"prettier": "^2.8.8",
40-
"rimraf": "^4.4.1",
41-
"ts-jest": "^29.1.0",
39+
"prettier": "^3.0.1",
40+
"rimraf": "^5.0.1",
41+
"ts-jest": "^29.1.1",
4242
"typescript": "4.9.5"
4343
},
4444
"keywords": [

‎packages/callback-example/CHANGELOG.md

+6-8
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,14 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
55

66
# [0.6.0](https://github.com/Sphereon-Opensource/OID4VCI/compare/v0.4.0...v0.6.0) (2023-06-24)
77

8-
98
### Bug Fixes
109

11-
* Many v11 fixes on server and client side ([08be1ed](https://github.com/Sphereon-Opensource/OID4VCI/commit/08be1ed009fb80e910cffa2e4cf376758798b27e))
12-
10+
- Many v11 fixes on server and client side ([08be1ed](https://github.com/Sphereon-Opensource/OID4VCI/commit/08be1ed009fb80e910cffa2e4cf376758798b27e))
1311

1412
### Features
1513

16-
* Add status support to sessions ([a1fa6a4](https://github.com/Sphereon-Opensource/OID4VCI/commit/a1fa6a4c569c36951e1a7cedb632aa0b22104448))
17-
* Add support for alg, kid, did, did document to Jwt Verification callback so we can ensure to set proper values in the resulting VC. ([62dd947](https://github.com/Sphereon-Opensource/OID4VCI/commit/62dd947d0e09360719e6f704db33d766dff2363a))
18-
* Add VCI Issuer ([5cab075](https://github.com/Sphereon-Opensource/OID4VCI/commit/5cab07534e7a8b340f7a05343f56fbf091d64738))
19-
* Issuer credential offer and more fixes/features ([0bbe17c](https://github.com/Sphereon-Opensource/OID4VCI/commit/0bbe17c13de4df95e2fd79b3470a746cc7a5374a))
20-
* Support data supplier callback ([1c49cc8](https://github.com/Sphereon-Opensource/OID4VCI/commit/1c49cc80cfd83115956c7e9a040e12e814724e72))
14+
- Add status support to sessions ([a1fa6a4](https://github.com/Sphereon-Opensource/OID4VCI/commit/a1fa6a4c569c36951e1a7cedb632aa0b22104448))
15+
- Add support for alg, kid, did, did document to Jwt Verification callback so we can ensure to set proper values in the resulting VC. ([62dd947](https://github.com/Sphereon-Opensource/OID4VCI/commit/62dd947d0e09360719e6f704db33d766dff2363a))
16+
- Add VCI Issuer ([5cab075](https://github.com/Sphereon-Opensource/OID4VCI/commit/5cab07534e7a8b340f7a05343f56fbf091d64738))
17+
- Issuer credential offer and more fixes/features ([0bbe17c](https://github.com/Sphereon-Opensource/OID4VCI/commit/0bbe17c13de4df95e2fd79b3470a746cc7a5374a))
18+
- Support data supplier callback ([1c49cc8](https://github.com/Sphereon-Opensource/OID4VCI/commit/1c49cc80cfd83115956c7e9a040e12e814724e72))

‎packages/callback-example/lib/__tests__/issuerCallback.spec.ts

+6-6
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { CredentialRequestClient, CredentialRequestClientBuilder, ProofOfPossess
44
import {
55
Alg,
66
CNonceState,
7-
CredentialOfferJwtVcJsonLdAndLdpVcV1_0_11,
7+
CredentialOfferLdpVcV1_0_11,
88
CredentialSupported,
99
IssuerCredentialSubjectDisplay,
1010
IssueStatus,
@@ -130,7 +130,7 @@ describe('issuerCallback', () => {
130130
user_pin_required: true,
131131
},
132132
},
133-
} as CredentialOfferJwtVcJsonLdAndLdpVcV1_0_11,
133+
} as CredentialOfferLdpVcV1_0_11,
134134
},
135135
})
136136

@@ -159,7 +159,7 @@ describe('issuerCallback', () => {
159159
credentialSubject: {},
160160
},
161161
format: 'ldp_vc',
162-
}) as Promise<CredentialDataSupplierResult>
162+
}) as Promise<CredentialDataSupplierResult>,
163163
)
164164
.withCredentialSignerCallback((opts) =>
165165
Promise.resolve({
@@ -171,7 +171,7 @@ describe('issuerCallback', () => {
171171
proofPurpose: IProofPurpose.assertionMethod,
172172
verificationMethod: 'sdfsdfasdfasdfasdfasdfassdfasdf',
173173
},
174-
})
174+
}),
175175
)
176176
.build()
177177
}, 30000)
@@ -204,7 +204,7 @@ describe('issuerCallback', () => {
204204
type: ['VerifiableCredential'],
205205
})
206206
await expect(verifyCredential(vc, didKey.keyPairs, didKey.didDocument.verificationMethod[0].id)).resolves.toEqual(
207-
expect.objectContaining({ verified: true })
207+
expect.objectContaining({ verified: true }),
208208
)
209209
})
210210
it('Should pass requesting a verifiable credential using the client', async () => {
@@ -284,7 +284,7 @@ describe('issuerCallback', () => {
284284
})
285285

286286
await expect(
287-
verifyCredential(credentialResponse.credential as W3CVerifiableCredential, didKey.keyPairs, didKey.didDocument.verificationMethod[0].id)
287+
verifyCredential(credentialResponse.credential as W3CVerifiableCredential, didKey.keyPairs, didKey.didDocument.verificationMethod[0].id),
288288
).resolves.toEqual(expect.objectContaining({ verified: true }))
289289
})
290290
})

‎packages/callback-example/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"@sphereon/oid4vci-client": "workspace:*",
1818
"@sphereon/oid4vci-common": "workspace:*",
1919
"@sphereon/oid4vci-issuer": "workspace:*",
20-
"@sphereon/ssi-types": "^0.11.0",
20+
"@sphereon/ssi-types": "^0.15.1",
2121
"jose": "^4.10.0"
2222
},
2323
"devDependencies": {

‎packages/client/CHANGELOG.md

+18-24
Original file line numberDiff line numberDiff line change
@@ -5,35 +5,29 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
55

66
# [0.6.0](https://github.com/Sphereon-Opensource/OID4VCI/compare/v0.4.0...v0.6.0) (2023-06-24)
77

8-
98
### Bug Fixes
109

11-
* added a couple of todos for handling v11, plus changed the getIssuer method to throw exception if nothing is found, and some other pr notes ([091786e](https://github.com/Sphereon-Opensource/OID4VCI/commit/091786e31246da16f6c9385fc13e7fd3e01664dc))
12-
* added CredentialOffer to exports of client ([5cc5ab1](https://github.com/Sphereon-Opensource/OID4VCI/commit/5cc5ab10a4b5eb9c1741dc639f08d3613f9f45ea))
13-
* added disable eslint comments in three places ([0e3ffdb](https://github.com/Sphereon-Opensource/OID4VCI/commit/0e3ffdb3a434e142d3bd8d0e04ca0b2b0f8f73e3))
14-
* deleted wrong import and fixed the usage ([fc17946](https://github.com/Sphereon-Opensource/OID4VCI/commit/fc179469fa0d1b3669c454632aef03fa0f8d4119))
15-
* Many v11 fixes on server and client side ([08be1ed](https://github.com/Sphereon-Opensource/OID4VCI/commit/08be1ed009fb80e910cffa2e4cf376758798b27e))
16-
* PAR objects where in the wrong locations and one had a wrong name ([24f98e7](https://github.com/Sphereon-Opensource/OID4VCI/commit/24f98e75137cf70595753cbcf77159584d7ebe08))
17-
* prettier, plus some type casting in test/mock files for v9 ([162af38](https://github.com/Sphereon-Opensource/OID4VCI/commit/162af3828b3dc826dc3cd5adffe3dab61925ad33))
18-
* rename jwt_vc_json_ld to jwt_vc_json-ld ([a366bef](https://github.com/Sphereon-Opensource/OID4VCI/commit/a366bef5a7bda052de6ffa201186e02b70447a79))
19-
10+
- added a couple of todos for handling v11, plus changed the getIssuer method to throw exception if nothing is found, and some other pr notes ([091786e](https://github.com/Sphereon-Opensource/OID4VCI/commit/091786e31246da16f6c9385fc13e7fd3e01664dc))
11+
- added CredentialOffer to exports of client ([5cc5ab1](https://github.com/Sphereon-Opensource/OID4VCI/commit/5cc5ab10a4b5eb9c1741dc639f08d3613f9f45ea))
12+
- added disable eslint comments in three places ([0e3ffdb](https://github.com/Sphereon-Opensource/OID4VCI/commit/0e3ffdb3a434e142d3bd8d0e04ca0b2b0f8f73e3))
13+
- deleted wrong import and fixed the usage ([fc17946](https://github.com/Sphereon-Opensource/OID4VCI/commit/fc179469fa0d1b3669c454632aef03fa0f8d4119))
14+
- Many v11 fixes on server and client side ([08be1ed](https://github.com/Sphereon-Opensource/OID4VCI/commit/08be1ed009fb80e910cffa2e4cf376758798b27e))
15+
- PAR objects where in the wrong locations and one had a wrong name ([24f98e7](https://github.com/Sphereon-Opensource/OID4VCI/commit/24f98e75137cf70595753cbcf77159584d7ebe08))
16+
- prettier, plus some type casting in test/mock files for v9 ([162af38](https://github.com/Sphereon-Opensource/OID4VCI/commit/162af3828b3dc826dc3cd5adffe3dab61925ad33))
17+
- rename jwt_vc_json_ld to jwt_vc_json-ld ([a366bef](https://github.com/Sphereon-Opensource/OID4VCI/commit/a366bef5a7bda052de6ffa201186e02b70447a79))
2018

2119
### Features
2220

23-
* Add support for alg, kid, did, did document to Jwt Verification callback so we can ensure to set proper values in the resulting VC. ([62dd947](https://github.com/Sphereon-Opensource/OID4VCI/commit/62dd947d0e09360719e6f704db33d766dff2363a))
24-
* Add supported flow type detection ([100f9e6](https://github.com/Sphereon-Opensource/OID4VCI/commit/100f9e6ccd7c53353f2876be81df4d6e3f7efde4))
25-
* Add VCI Issuer ([5cab075](https://github.com/Sphereon-Opensource/OID4VCI/commit/5cab07534e7a8b340f7a05343f56fbf091d64738))
26-
* added better support (and distinction) for types v1.0.09 and v1.0.11 ([f311258](https://github.com/Sphereon-Opensource/OID4VCI/commit/f31125865a3d63ce7719f790fc5ac74fea7f9ade))
27-
* Added new mock data from actual issuers, fixed a small bug with v1_0_08 types, updated v1_0_08 types to support data from jff issuers ([a6b1eea](https://github.com/Sphereon-Opensource/OID4VCI/commit/a6b1eeaabc0f34cc13a79cf967a8c35a6d8dc7f5))
28-
* Added new tests for CredentialRequestClient plus fixed a problem with CredentialOfferUtil. a CredentialRequest can have no issuer field ([50f2292](https://github.com/Sphereon-Opensource/OID4VCI/commit/50f22928426761cc3bf5d973d1f15fea407a9175))
29-
* added support for v8 in our types (partially) to make old logics work ([4b5abf1](https://github.com/Sphereon-Opensource/OID4VCI/commit/4b5abf16507bcde0d696ea3948f816d9a2de13c4))
30-
* added VcIssuer and builders related to that ([c2592a8](https://github.com/Sphereon-Opensource/OID4VCI/commit/c2592a8846061c5791050a76e522f50e21f617de))
31-
* Issuer credential offer and more fixes/features ([0bbe17c](https://github.com/Sphereon-Opensource/OID4VCI/commit/0bbe17c13de4df95e2fd79b3470a746cc7a5374a))
32-
* Translate v8 credentials_supported to v11 ([b06fa22](https://github.com/Sphereon-Opensource/OID4VCI/commit/b06fa221bed33e69aa76ae0234779f80314f2887))
33-
34-
35-
36-
21+
- Add support for alg, kid, did, did document to Jwt Verification callback so we can ensure to set proper values in the resulting VC. ([62dd947](https://github.com/Sphereon-Opensource/OID4VCI/commit/62dd947d0e09360719e6f704db33d766dff2363a))
22+
- Add supported flow type detection ([100f9e6](https://github.com/Sphereon-Opensource/OID4VCI/commit/100f9e6ccd7c53353f2876be81df4d6e3f7efde4))
23+
- Add VCI Issuer ([5cab075](https://github.com/Sphereon-Opensource/OID4VCI/commit/5cab07534e7a8b340f7a05343f56fbf091d64738))
24+
- added better support (and distinction) for types v1.0.09 and v1.0.11 ([f311258](https://github.com/Sphereon-Opensource/OID4VCI/commit/f31125865a3d63ce7719f790fc5ac74fea7f9ade))
25+
- Added new mock data from actual issuers, fixed a small bug with v1_0_08 types, updated v1_0_08 types to support data from jff issuers ([a6b1eea](https://github.com/Sphereon-Opensource/OID4VCI/commit/a6b1eeaabc0f34cc13a79cf967a8c35a6d8dc7f5))
26+
- Added new tests for CredentialRequestClient plus fixed a problem with CredentialOfferUtil. a CredentialRequest can have no issuer field ([50f2292](https://github.com/Sphereon-Opensource/OID4VCI/commit/50f22928426761cc3bf5d973d1f15fea407a9175))
27+
- added support for v8 in our types (partially) to make old logics work ([4b5abf1](https://github.com/Sphereon-Opensource/OID4VCI/commit/4b5abf16507bcde0d696ea3948f816d9a2de13c4))
28+
- added VcIssuer and builders related to that ([c2592a8](https://github.com/Sphereon-Opensource/OID4VCI/commit/c2592a8846061c5791050a76e522f50e21f617de))
29+
- Issuer credential offer and more fixes/features ([0bbe17c](https://github.com/Sphereon-Opensource/OID4VCI/commit/0bbe17c13de4df95e2fd79b3470a746cc7a5374a))
30+
- Translate v8 credentials_supported to v11 ([b06fa22](https://github.com/Sphereon-Opensource/OID4VCI/commit/b06fa221bed33e69aa76ae0234779f80314f2887))
3731

3832
# Release Notes
3933

‎packages/client/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -449,7 +449,7 @@ const encodedURI = convertJsonToURI(
449449
{
450450
arrayTypeProperties: ['credential_type'],
451451
urlTypeProperties: ['issuer', 'credential_type'],
452-
}
452+
},
453453
);
454454
console.log(encodedURI);
455455
// issuer=https%3A%2F%2Fserver%2Eexample%2Ecom&credential_type=https%3A%2F%2Fdid%2Eexample%2Eorg%2FhealthCard&credential_type=https%3A%2F%2Fdid%2Eexample%2Eorg%2FdriverLicense&op_state=eyJhbGciOiJSU0Et...FYUaBy
@@ -468,7 +468,7 @@ const decodedJson = convertURIToJsonObject(
468468
{
469469
arrayTypeProperties: ['credential_type'],
470470
requiredProperties: ['issuer', 'credential_type'],
471-
}
471+
},
472472
);
473473
console.log(decodedJson);
474474
// {

‎packages/client/lib/CredentialOfferClient.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ export class CredentialOfferClient {
6666
requestWithBaseUrl: CredentialOfferRequestWithBaseUrl,
6767
opts?: {
6868
version?: OpenId4VCIVersion;
69-
}
69+
},
7070
): string {
7171
debug(`Credential Offer Request with base URL: ${JSON.stringify(requestWithBaseUrl)}`);
7272
const version = opts?.version ?? requestWithBaseUrl.version;

0 commit comments

Comments
 (0)