Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Introduce new query language (Approach 3) #266

Merged
merged 57 commits into from
Oct 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
665eda8
First draft of new query language
danielfett Jul 25, 2024
7562b69
Merge branch 'main' into danielfett/vp-query-language
danielfett Jul 25, 2024
157e696
Fix compile errors
danielfett Jul 25, 2024
e4bd784
Apply suggestions from code review
danielfett Jul 30, 2024
bf0ee77
Add back accidentally deleted whitespace
danielfett Jul 30, 2024
7d71960
Fix anchor name
danielfett Jul 30, 2024
50b1721
Revert "Fix anchor name"
danielfett Jul 30, 2024
2005364
Fix anchor name
danielfett Jul 30, 2024
ba440ba
Apply suggestions from Mike's code review
danielfett Aug 1, 2024
24aa273
Update openid-4-verifiable-presentations-1_0.md
danielfett Aug 20, 2024
8db4ddb
Merge branch 'main' into danielfett/vp-query-language
danielfett Aug 20, 2024
acdfd88
Remove purpose from credential query language proposal
danielfett Aug 20, 2024
110714c
Add missing vp_query definition back into the PR
danielfett Aug 20, 2024
da38019
Remove another purpose mention
danielfett Aug 20, 2024
da854b3
New format in examples
danielfett Sep 11, 2024
ef77fbf
Merge branch 'main' into danielfett/vp-query-language-2
danielfett Sep 11, 2024
d21e8e9
Update spec text
danielfett Sep 11, 2024
1263648
Add value matching
danielfett Sep 11, 2024
df46111
Apply suggestions from code review
danielfett Sep 12, 2024
fc66dd1
Add comments
danielfett Sep 12, 2024
c2d3f9e
New proposal for QL
Sep 18, 2024
1b0c504
Improve comments
Sep 18, 2024
c37d2e3
Improve examples
Sep 18, 2024
45490ef
Merge branch 'main' into danielfett/vp-query-language-3
Sep 18, 2024
90de936
Update text describing the mechanisms
Sep 19, 2024
12f34a0
Apply suggestions from Paul's review
danielfett Sep 23, 2024
8851589
Address Paul's comments
danielfett Sep 23, 2024
c7dacb9
Clarify returning credentials
danielfett Sep 23, 2024
fc45605
Merge branch 'main' into danielfett/vp-query-language-3
danielfett Oct 1, 2024
da8a504
Apply suggestions from code review
danielfett Oct 8, 2024
638dcab
Merge branch 'main' into danielfett/vp-query-language-3
danielfett Oct 8, 2024
f411525
Drop expect_ and valid_ prefixes, remove algorithm matching
danielfett Oct 9, 2024
8854472
Adapt description of ID Token
danielfett Oct 9, 2024
728c41f
Update examples/query_lang/claims_alternatives.json
danielfett Oct 10, 2024
6d594e7
Introduce ?! modifier, remove `value`
danielfett Oct 10, 2024
9cd1bbb
Proposed alterations to how optionality is handled in query language …
tplooker Oct 17, 2024
ca65bfc
Update openid-4-verifiable-presentations-1_0.md
danielfett Oct 18, 2024
b28113b
Merge branch 'main' into danielfett/vp-query-language-3
danielfett Oct 18, 2024
f71a2e2
Remove merge conflict
danielfett Oct 18, 2024
d7cacf4
Remove question mark notation; add purpose; add/fix example descriptions
danielfett Oct 21, 2024
935b247
Apply suggestions from code review
danielfett Oct 21, 2024
4b070d5
Merge branch 'main' into danielfett/vp-query-language-3
Sakurann Oct 21, 2024
ed7c8e2
Fix examples, adapt language from feedback
danielfett Oct 22, 2024
56855ac
Apply suggestions from code review
danielfett Oct 22, 2024
1511de4
Apply suggestions from code review
danielfett Oct 22, 2024
9c032a9
Reword how credentials are to be returned, fix definition of request …
danielfett Oct 22, 2024
2abe63c
Some editorial changes
danielfett Oct 22, 2024
c632c25
Fix examples
danielfett Oct 22, 2024
69df934
Make presentation submission dependent on the query lang
danielfett Oct 22, 2024
1012ba4
Add examples
danielfett Oct 22, 2024
ef8d487
editorial
danielfett Oct 22, 2024
ec4d524
Update openid-4-verifiable-presentations-1_0.md
danielfett Oct 22, 2024
92f74b7
Clarify language around selecting credentials
danielfett Oct 22, 2024
eb353e3
Apply suggestions from code review
danielfett Oct 22, 2024
fc06b5b
Rename to DCQL, add purpose to examples
danielfett Oct 22, 2024
5e39e18
Apply suggestions from Brian's review
danielfett Oct 23, 2024
ff62fcf
Address Brian's comments
danielfett Oct 23, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions examples/query_lang/claims_alternatives.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"credentials": [
{
"id": "pid",
"format": "vc+sd-jwt",
"meta": {
"vct_values": [ "https://credentials.example.com/identity_credential" ]
},
"claims": [
{"id": "a", "path": ["last_name"]},
{"id": "b", "path": ["postal_code"]},
{"id": "c", "path": ["locality"]},
{"id": "d", "path": ["region"]},
{"id": "e", "path": ["date_of_birth"]}
],
"claim_sets": [
["a", "c", "d", "e"],
["a", "b", "e"]
]
danielfett marked this conversation as resolved.
Show resolved Hide resolved
}
]
}
107 changes: 107 additions & 0 deletions examples/query_lang/complex_mdoc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,107 @@
{
"credentials": [
{
"id": "mdl-id",
"format": "mso_mdoc",
"meta": {
"doctype_value": "org.iso.18013.5.1.mDL"
},
"claims": [
{
"id": "given_name",
"namespace": "org.iso.18013.5.1",
"claim_name": "given_name"
},
{
"id": "family_name",
"namespace": "org.iso.18013.5.1",
"claim_name": "family_name"
},
{
"id": "portrait",
"namespace": "org.iso.18013.5.1",
"claim_name": "portrait"
}
]
},
{
"id": "mdl-address",
"format": "mso_mdoc",
"meta": {
"doctype_value": "org.iso.18013.5.1.mDL"
},
"claims": [
{
"id": "resident_address",
"namespace": "org.iso.18013.5.1",
"claim_name": "resident_address"
},
{
"id": "resident_country",
"namespace": "org.iso.18013.5.1",
"claim_name": "resident_country"
}
]
},
{
"id": "photo_card-id",
"format": "mso_mdoc",
"meta": {
"doctype_value": "org.iso.23220.photoid.1"
},
"claims": [
{
"id": "given_name",
"namespace": "org.iso.23220.1",
"claim_name": "given_name"
},
{
"id": "family_name",
"namespace": "org.iso.23220.1",
"claim_name": "family_name"
},
{
"id": "portrait",
"namespace": "org.iso.23220.1",
"claim_name": "portrait"
}
]
},
{
"id": "photo_card-address",
"format": "mso_mdoc",
"meta": {
"doctype_value": "org.iso.23220.photoid.1"
},
"claims": [
{
"id": "resident_address",
"namespace": "org.iso.23220.1",
"claim_name": "resident_address"
},
{
"id": "resident_country",
"namespace": "org.iso.23220.1",
"claim_name": "resident_country"
}
]
}
],
"credential_sets": [
{
"purpose": "Identification",
"options": [
[ "mdl-id" ],
[ "photo_card-id" ]
]
},
{
"purpose": "Proof of address",
"required": false,
"options": [
[ "mdl-address" ],
[ "photo_card-address" ]
]
}
]
}
78 changes: 78 additions & 0 deletions examples/query_lang/credentials_alternatives.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
{
"credentials": [
{
"id": "pid",
"format": "vc+sd-jwt",
Sakurann marked this conversation as resolved.
Show resolved Hide resolved
"meta": {
"vct_values": ["https://credentials.example.com/identity_credential"]
},
"claims": [
{"path": ["given_name"]},
{"path": ["family_name"]},
{"path": ["address", "street_address"]}
]
},
{
"id": "other_pid",
"format": "vc+sd-jwt",
"meta": {
"vct_values": ["https://othercredentials.example/pid"]
},
"claims": [
{"path": ["given_name"]},
{"path": ["family_name"]},
{"path": ["address", "street_address"]}
]
},
{
"id": "pid_reduced_cred_1",
"format": "vc+sd-jwt",
"meta": {
"vct_values": ["https://credentials.example.com/reduced_identity_credential"]
},
"claims": [
{"path": ["family_name"]},
{"path": ["given_name"]}
]
},
{
"id": "pid_reduced_cred_2",
"format": "vc+sd-jwt",
"meta": {
"vct_values": ["https://cred.example/residence_credential"]
},
"claims": [
{"path": ["postal_code"]},
{"path": ["locality"]},
{"path": ["region"]}
]
},
{
"id": "nice_to_have",
"format": "vc+sd-jwt",
"meta": {
"vct_values": ["https://company.example/company_rewards"]
},
"claims": [
{"path": ["rewards_number"]}
]
}
],
"credential_sets": [
{
"purpose": "Identification",
"options": [
[ "pid" ],
[ "other_pid" ],
[ "pid_reduced_cred_1", "pid_reduced_cred_2" ]
]
},
{
"purpose": "Show your rewards card",
"required": false,
"options": [
[ "nice_to_have" ]
]
}
]
}
33 changes: 33 additions & 0 deletions examples/query_lang/multi_credentials.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{
"credentials": [
{
"id": "pid",
"format": "vc+sd-jwt",
"meta": {
"vct_values": ["https://credentials.example.com/identity_credential"]
},
"claims": [
{"path": ["given_name"]},
{"path": ["family_name"]},
{"path": ["address", "street_address"]}
]
},
{
"id": "mdl",
"format": "mso_mdoc",
"meta": {
"doctype_value": "org.iso.7367.1.mVRC"
},
"claims": [
{
"namespace": "org.iso.7367.1",
"claim_name": "vehicle_holder"
},
{
"namespace": "org.iso.18013.5.1",
"claim_name": "first_name"
}
]
}
]
}
16 changes: 16 additions & 0 deletions examples/query_lang/simple.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"credentials": [
{
"id": "my_credential",
"format": "vc+sd-jwt",
"meta": {
"vct_values": [ "https://credentials.example.com/identity_credential" ]
},
"claims": [
{"path": ["last_name"]},
{"path": ["first_name"]},
{"path": ["address", "street_address"]}
]
}
]
}
21 changes: 21 additions & 0 deletions examples/query_lang/simple_mdoc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"credentials": [
{
"id": "my_credential",
"format": "mso_mdoc",
"meta": {
"doctype_value": "org.iso.7367.1.mVRC"
},
"claims": [
{
"namespace": "org.iso.7367.1",
"claim_name": "vehicle_holder"
},
{
"namespace": "org.iso.18013.5.1",
"claim_name": "first_name"
}
]
}
]
}
23 changes: 23 additions & 0 deletions examples/query_lang/value_matching_simple.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"credentials": [
{
"id": "my_credential",
"format": "vc+sd-jwt",
"meta": {
"vct_values": [ "https://credentials.example.com/identity_credential" ]
},
"claims": [
{
"path": ["last_name"],
"values": ["Doe"]
},
{"path": ["first_name"]},
{"path": ["address", "street_address"]},
{
"path": ["postal_code"],
"values": ["90210", "90211"]
}
]
}
]
}
Loading