add check for when definition format is empty

Signed-off-by: Ryan Tate <[email protected]>
spruceid · Oct 11, 2024 · 463b8b2 · 463b8b2
1 parent 7b9be0c
commit 463b8b2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 10 deletions.
diff --git a/src/credential/json_vc.rs b/src/credential/json_vc.rs
@@ -12,7 +12,7 @@ use uuid::Uuid;
 
 use crate::{CredentialType, KeyAlias};
 
-use super::{Credential, VcdmVersion};
+use super::{Credential, CredentialFormat, VcdmVersion};
 
 #[derive(uniffi::Object, Debug, Clone)]
 /// A verifiable credential secured as JSON.
@@ -125,10 +125,7 @@ impl JsonVc {
     pub fn check_presentation_definition(&self, definition: &PresentationDefinition) -> bool {
         // If the credential does not match the definition requested format,
         // then return false.
-        if !definition
-            .format()
-            .contains_key(&ClaimFormatDesignation::LdpVc)
-        {
+        if !definition.format().is_empty() && !definition.contains_format(CredentialFormat::LdpVc) {
             return false;
         }
 

diff --git a/src/credential/jwt_vc.rs b/src/credential/jwt_vc.rs
@@ -16,7 +16,7 @@ use uuid::Uuid;
 
 use crate::{CredentialType, KeyAlias};
 
-use super::{Credential, VcdmVersion};
+use super::{Credential, CredentialFormat, VcdmVersion};
 
 #[derive(uniffi::Object, Debug, Clone)]
 /// A verifiable credential secured as a JWT.
@@ -164,9 +164,8 @@ impl JwtVc {
     pub fn check_presentation_definition(&self, definition: &PresentationDefinition) -> bool {
         // If the credential does not match the definition requested format,
         // then return false.
-        if !definition
-            .format()
-            .contains_key(&ClaimFormatDesignation::JwtVcJson)
+        if !definition.format().is_empty()
+            && !definition.contains_format(CredentialFormat::JwtVcJson)
         {
             return false;
         }

diff --git a/src/credential/sd_jwt.rs b/src/credential/sd_jwt.rs
@@ -51,7 +51,7 @@ impl SdJwt {
     pub fn check_presentation_definition(&self, definition: &PresentationDefinition) -> bool {
         // If the credential does not match the definition requested format,
         // then return false.
-        if !definition.contains_format(CredentialFormat::SdJwt) {
+        if !definition.format().is_empty() && !definition.contains_format(CredentialFormat::SdJwt) {
             println!(
                 "Credential does not match the requested format: {:?}.",
                 definition.format()