Skip to content

add optional credential type arg #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

Closed
TJbrunk wants to merge 1 commit into from
Closed

add optional credential type arg #25

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
29 changes: 29 additions & 0 deletions integrity-vc/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,9 @@ pub type SignedVc = DataIntegrity<JsonCredential, AnySuite>;
/// `subject` must be a JSON object. Bare-identifier callers should wrap
/// as `serde_json::json!({"id": id})` before passing.
///
/// `credential_type`, when provided, is appended to the credential's
/// `type` array alongside the default `VerifiableCredential` entry.
///
/// All evidence entries are deserialized into the default
/// `MaybeIdentifiedTypedObject` evidence type, which keeps `type` typed
/// and routes any extra keys (`report`, `certificateChain`, …) into
Expand All @@ -62,6 +65,7 @@ pub fn build_unsigned_with_eqty_contexts(
id: &str,
issuer_did: &str,
subject: Value,
credential_type: Option<&str>,
valid_from: Option<DateTime<Utc>>,
valid_until: Option<DateTime<Utc>>,
evidence: Vec<Value>,
Expand All @@ -86,6 +90,23 @@ pub fn build_unsigned_with_eqty_contexts(
NonEmptyVec::new(subject_non_empty),
);

if let Some(credential_type) = credential_type {
let mut credential_json = serde_json::to_value(&credential)?;
let types = credential_json
.get_mut("type")
.and_then(Value::as_array_mut)
.ok_or_else(|| anyhow!("credential type must serialize as an array"))?;

if !types
.iter()
.any(|value| value.as_str() == Some(credential_type))
{
types.push(Value::String(credential_type.to_string()));
}

credential = serde_json::from_value(credential_json)?;
}

if let Some(dt) = valid_from {
credential.valid_from = Some(xsd_types::DateTimeStamp::from(dt).into());
}
Expand Down Expand Up @@ -1092,6 +1113,7 @@ mod tests {
serde_json::json!({ "id": "did:example:holder" }),
None,
None,
None,
vec![],
)
.unwrap();
Expand Down Expand Up @@ -1494,6 +1516,7 @@ mod tests {
"urn:uuid:11111111-1111-1111-1111-111111111111",
&issuer_did,
serde_json::json!({ "id": "urn:cid:subject" }),
Some("EqtyVCompCredential"),
Some(
chrono::DateTime::parse_from_rfc3339("2024-03-26T12:34:56Z")
.unwrap()
Expand All @@ -1516,6 +1539,10 @@ mod tests {
Some("urn:uuid:11111111-1111-1111-1111-111111111111")
);
assert_eq!(unsigned.evidence.len(), 1);
assert_eq!(
serde_json::to_value(&unsigned).unwrap()["type"],
serde_json::json!(["VerifiableCredential", "EqtyVCompCredential"])
);

// EQTY terms are carried by an inline `@vocab`, not a urn:cid:
// context document.
Expand Down Expand Up @@ -1560,6 +1587,7 @@ mod tests {
&issuer_did,
subject,
None,
None,
Some(
chrono::DateTime::parse_from_rfc3339("2030-07-04T23:59:59Z")
.unwrap()
Expand Down Expand Up @@ -1591,6 +1619,7 @@ mod tests {
serde_json::Value::String("urn:cid:not-an-object".to_string()),
None,
None,
None,
vec![],
);
assert!(
Expand Down
Loading