Skip to content

Fix compatibility with the test site digitalcredentials.dev #25

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.

Sign up for GitHub

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

Merged
QZHelen merged 2 commits into from
Mar 19, 2026
Merged

Fix compatibility with the test site digitalcredentials.dev #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3f863db
Lift all fields of Credential Offer into its parent
netheril96 Mar 12, 2026
7f2c75d
Workaround nanoserde bug
netheril96 Mar 19, 2026
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
56 changes: 24 additions & 32 deletions matcher-rs/src/issuance.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,14 +115,12 @@ mod test {
{
"protocol": "openid4vci-1.1",
"data": {
"credential_offer": {
"credential_issuer": "https://issuer.my",
"credential_configuration_ids": [
"US_SOCIAL_SECURITY_NUMBER"
],
"grants": {
"authorization_code": {}
}
"credential_issuer": "https://issuer.my",
"credential_configuration_ids": [
"US_SOCIAL_SECURITY_NUMBER"
],
"grants": {
"authorization_code": {}
},
"credential_issuer_metadata": {
"nonce_endpoint": "https://nonce.my"
Expand Down Expand Up @@ -174,14 +172,12 @@ mod test {
{
"protocol": "openid4vci-1.1",
"data": {
"credential_offer": {
"credential_issuer": "https://issuer.my",
"credential_configuration_ids": [
"US_SOCIAL_SECURITY_NUMBER"
],
"grants": {
"authorization_code": {}
}
"credential_issuer": "https://issuer.my",
"credential_configuration_ids": [
"US_SOCIAL_SECURITY_NUMBER"
],
"grants": {
"authorization_code": {}
},
"credential_issuer_metadata": {
"nonce_endpoint": "https://nonce.my"
Expand Down Expand Up @@ -214,14 +210,12 @@ mod test {
{
"protocol": "openid4vci-1.1",
"data": {
"credential_offer": {
"credential_issuer": "https://issuer.my",
"credential_configuration_ids": [
"US_SOCIAL_SECURITY_NUMBER"
],
"grants": {
"authorization_code": {}
}
"credential_issuer": "https://issuer.my",
"credential_configuration_ids": [
"US_SOCIAL_SECURITY_NUMBER"
],
"grants": {
"authorization_code": {}
},
"credential_issuer_metadata": {
"nonce_endpoint": "https://nonce.my"
Expand Down Expand Up @@ -288,14 +282,12 @@ mod test {
{
"protocol": "openid4vci-1.1",
"data": {
"credential_offer": {
"credential_issuer": "https://issuer.my",
"credential_configuration_ids": [
"FICTITIOUS_STATE_MDL"
],
"grants": {
"authorization_code": {}
}
"credential_issuer": "https://issuer.my",
"credential_configuration_ids": [
"FICTITIOUS_STATE_MDL"
],
"grants": {
"authorization_code": {}
},
"credential_issuer_metadata": {
"nonce_endpoint": "https://nonce.my",
Expand Down
5 changes: 1 addition & 4 deletions matcher-rs/src/issuance_matcher.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,19 +36,16 @@ impl OpenId4VciFilter {
Self::Or { filters } => filters.iter().any(|f| f.matches(request)),
Self::Not { filter } => !filter.matches(request),
Self::AllowsIssuers { issuers } => {
issuers.contains(&request.credential_offer.credential_issuer)
issuers.contains(request.credential_issuer)
}
Self::AllowsConfigurationIds { configuration_ids } => request
.credential_offer
.credential_configuration_ids
.iter()
.any(|id| configuration_ids.contains(id)),
Self::SupportsAuthCodeFlow {} => request
.credential_offer
.grants
.contains_key("authorization_code"),
Self::SupportsPreAuthFlow {} => request
.credential_offer
.grants
.contains_key("urn:ietf:params:oauth:grant-type:pre-authorized_code"),
Self::SupportsNonceEndpoint {} => request
Expand Down
33 changes: 17 additions & 16 deletions matcher-rs/src/openid4vci.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#![allow(unused)]

use nanoserde::DeJson;
use std::collections::HashMap;

#[derive(DeJson, Debug, Default)]
#[nserde(default)]
Expand All @@ -18,16 +19,19 @@ pub struct OpenId4VciRequest {
#[derive(DeJson, Debug, Default)]
#[nserde(default)]
pub struct OpenId4VciRequestData {
pub credential_offer: credential_offer::CredentialOffer,
pub credential_issuer: String,
pub credential_configuration_ids: Vec<String>,
pub grants: HashMap<String, credential_offer::Grant>,
pub credential_issuer_metadata: Option<credential_issuer_metadata::CredentialIssuerMetadata>,
}

/**
* This correlates the `credential_configuration_ids` in the offer and `credential_configurations_supported` in the issuer metadata.
*/
pub struct RegularizedOpenId4VciRequestData<'a> {
// Borrow the offer
pub credential_offer: &'a credential_offer::CredentialOffer,
pub credential_issuer: &'a str,
pub credential_configuration_ids: &'a [String],
pub grants: &'a HashMap<String, credential_offer::Grant>,
// Borrow the metadata
pub credential_issuer_metadata:
Option<&'a credential_issuer_metadata::CredentialIssuerMetadata>,
Expand All @@ -37,19 +41,20 @@ pub struct RegularizedOpenId4VciRequestData<'a> {
// Implement From on a Reference
impl<'a> From<&'a OpenId4VciRequestData> for RegularizedOpenId4VciRequestData<'a> {
fn from(value: &'a OpenId4VciRequestData) -> Self {
let mut configurations =
Vec::with_capacity(value.credential_offer.credential_configuration_ids.len());
let mut configurations = Vec::with_capacity(value.credential_configuration_ids.len());

if let Some(metadata) = &value.credential_issuer_metadata {
for id in &value.credential_offer.credential_configuration_ids {
for id in &value.credential_configuration_ids {
if let Some(config) = metadata.credential_configurations_supported.get(id) {
configurations.push(config);
}
}
}

Self {
credential_offer: &value.credential_offer,
credential_issuer: &value.credential_issuer,
credential_configuration_ids: &value.credential_configuration_ids,
grants: &value.grants,
credential_issuer_metadata: value.credential_issuer_metadata.as_ref(),
credential_configurations: configurations,
}
Expand All @@ -58,19 +63,15 @@ impl<'a> From<&'a OpenId4VciRequestData> for RegularizedOpenId4VciRequestData<'a

pub mod credential_offer {
use nanoserde::DeJson;
use std::collections::HashMap;

#[derive(DeJson, Debug, Default)]
#[nserde(default)]
pub struct CredentialOffer {
pub credential_issuer: String,
pub credential_configuration_ids: Vec<String>,
pub grants: HashMap<String, Grant>,
pub struct Grant {
// Workaround for nanoserde bug:
// https://github.com/not-fl3/nanoserde/issues/157
#[allow(unused)]
pub _dummy_not_in_use: i32,
}

#[derive(DeJson, Debug, Default)]
#[nserde(default)]
pub struct Grant {}
}

mod credential_issuer_metadata {
Expand Down
Loading