Skip to content

Update Rust matcher to support entry ID #220

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

Open
netheril96 wants to merge 1 commit into
base: wasm
Choose a base branch
from
Open

Update Rust matcher to support entry ID #220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 8 additions & 6 deletions CredentialProvider/wasm/matcher-rs/src/issuance.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ use nanoserde::{DeJson, SerJson};

#[derive(SerJson)]
struct IssuanceMetadata {
eidx: usize,
eid: String,
ridx: usize,
}

Expand Down Expand Up @@ -125,7 +125,7 @@ pub fn issuance_main(credman: &mut impl CredmanApi) -> Result<(), Box<dyn std::e
if version >= 9 {
log::debug!("Adding issuance entry (v>=9): {}", entry_id);
let metadata = SerJson::serialize_json(&IssuanceMetadata {
eidx: index,
eid: if entry.id.is_empty() { index.to_string() } else { entry.id.clone() },
ridx: req_index,
});
let explainer = entry.explainer.per_issuer.get(issuer_id)
Expand Down Expand Up @@ -792,7 +792,7 @@ mod test {
assert!(entry.icon.is_none());
assert_eq!(entry.call_type, CallType::Issuance);
assert_eq!(entry.explainer.as_ref().unwrap(), c"Issuer explainer");
assert_eq!(entry.metadata.as_ref().unwrap(), c"{\"eidx\":0,\"ridx\":0}");
assert_eq!(entry.metadata.as_ref().unwrap(), c"{\"eid\":\"0\",\"ridx\":0}");
assert!(credman.declared_package_info.is_none());
}

Expand Down Expand Up @@ -824,6 +824,7 @@ mod test {
"entry_id": "C",
"entries": [
{
"id": "id_1",
"title": "TTTT1",
"subtitle": "SSSSS1",
"icon": [0, 0],
Expand All @@ -835,6 +836,7 @@ mod test {
}
},
{
"id": "id_2",
"title": "TTTT2",
"subtitle": "SSSSS2",
"icon": [0, 0],
Expand Down Expand Up @@ -862,11 +864,11 @@ mod test {
assert_eq!(credman.added_entries[0].entry_id, c"C_0");
assert!(credman.added_entries[0].title.is_none());
assert_eq!(credman.added_entries[0].explainer.as_ref().unwrap(), c"Explainer 1");
assert_eq!(credman.added_entries[0].metadata.as_ref().unwrap(), c"{\"eidx\":0,\"ridx\":0}");
assert_eq!(credman.added_entries[0].metadata.as_ref().unwrap(), c"{\"eid\":\"id_1\",\"ridx\":0}");
assert_eq!(credman.added_entries[1].entry_id, c"C_1");
assert!(credman.added_entries[1].title.is_none());
assert_eq!(credman.added_entries[1].explainer.as_ref().unwrap(), c"Default 2");
assert_eq!(credman.added_entries[1].metadata.as_ref().unwrap(), c"{\"eidx\":1,\"ridx\":0}");
assert_eq!(credman.added_entries[1].metadata.as_ref().unwrap(), c"{\"eid\":\"id_2\",\"ridx\":0}");
assert!(credman.declared_package_info.is_none());
}

Expand Down Expand Up @@ -934,7 +936,7 @@ mod test {
assert_eq!(credman.added_entries.len(), 1);
let entry = &credman.added_entries[0];
assert_eq!(entry.entry_id, c"C_0");
assert_eq!(entry.metadata.as_ref().unwrap(), c"{\"eidx\":0,\"ridx\":1}");
assert_eq!(entry.metadata.as_ref().unwrap(), c"{\"eid\":\"0\",\"ridx\":1}");
}

#[test]
Expand Down
1 change: 1 addition & 0 deletions CredentialProvider/wasm/matcher-rs/src/issuance_matcher.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ pub struct IssuanceExplainer {
#[derive(DeJson, Debug, Default)]
#[nserde(default)]
pub struct IssuanceDisplayData {
pub id: String,
pub subtitle: String,
pub explainer: IssuanceExplainer,
}
Expand Down