fix: there was a probelm with CredentialValues this fixes it

Author: goncalo-frade-iohk

uniffi/src/anoncreds.udl

@@ -10,8 +10,6 @@ typedef string CredentialDefinitionId;
 typedef string RevocationRegistryDefinitionId;
 [Custom]
 typedef string RevocationRegistryId;
-[Custom]
-typedef string CredentialValues;
 
 [Error]
 enum AnoncredsError {
@@ -56,6 +54,15 @@ dictionary Schema {
     IssuerId issuer_id;
 };
 
+dictionary CredentialValues {
+    record<string, AttributeValues> values;
+};
+
+dictionary AttributeValues {
+    string raw;
+    string encoded;
+};
+
 dictionary CredentialDefinitionData {
     string primary;
     string? revocation;
@@ -252,7 +259,7 @@ interface Issuer {
         CredentialDefinitionPrivate cred_def_private,
         CredentialOffer cred_offer,
         CredentialRequest cred_request,
-        CredentialValues cred_values,
+        sequence<AttributeValues> cred_values,
         RevocationRegistryId? rev_reg_id,
         RevocationStatusList? rev_status_list,
         CredentialRevocationConfig? revocation_config

uniffi/src/issuer/mod.rs

@@ -5,14 +5,15 @@ use crate::types::credential::{Credential};
 use crate::CredentialRequest;
 use crate::types::rev_status_list::RevocationStatusList;
 use crate::types::rev_reg_def::{RevocationRegistryDefinition, RevocationRegistryDefinitionPrivate};
+use crate::custom_types::AttributeValues;
 
 use anoncreds_core::types::CredentialRevocationConfig as AnoncredsCredentialRevocationConfig;
 use anoncreds_core::data_types::rev_reg::RevocationRegistryId;
 use anoncreds_core::data_types::rev_reg_def::RegistryType;
 use anoncreds_core::data_types::schema::Schema;
 use anoncreds_core::issuer::{create_credential, create_credential_definition, create_credential_offer, create_revocation_registry_def, create_revocation_status_list, create_schema, update_revocation_status_list, update_revocation_status_list_timestamp_only};
 use anoncreds_core::tails::{TailsFileWriter, TailsFileReader};
-use anoncreds_core::types::{AttributeNames, CredentialDefinitionConfig, CredentialValues, SignatureType};
+use anoncreds_core::types::{AttributeNames, CredentialValues, CredentialDefinitionConfig, SignatureType, MakeCredentialValues};
 use std::collections::BTreeSet;
 use std::iter::FromIterator;
 use std::sync::Arc;
@@ -184,17 +185,22 @@ impl Issuer {
         cred_def_private: Arc<CredentialDefinitionPrivate>,
         cred_offer: Arc<CredentialOffer>,
         cred_request: Arc<CredentialRequest>,
-        cred_values: CredentialValues,
+        cred_values: Vec<AttributeValues>,
         rev_reg_id: Option<RevocationRegistryId>,
         rev_status_list: Option<Arc<RevocationStatusList>>,
         revocation_config: Option<CredentialRevocationConfig>
     ) -> Result<Arc<Credential>, AnoncredsError> {
+        let mut values = MakeCredentialValues::default();
+        for val in cred_values.iter() {
+            values.add_raw(val.raw.to_owned(), val.encoded.to_owned()).expect("Something went wrong");
+        }
+        let _cred_values = CredentialValues::from(values);
         let credential = create_credential(
             &(*cred_def).core,
             &(*cred_def_private).core,
             &(*cred_offer).core,
             &(*cred_request).core,
-            cred_values,
+            _cred_values,
             rev_reg_id,
             rev_status_list.as_ref().map(|list| &(*list).core),
             revocation_config.as_ref().map(|config| config.to_cred_rev_config()),

uniffi/src/lib.rs

@@ -7,7 +7,6 @@ pub use anoncreds_core::data_types::cred_def::CredentialDefinitionId;
 pub use anoncreds_core::data_types::issuer_id::IssuerId;
 pub use anoncreds_core::data_types::rev_reg::RevocationRegistryId;
 pub use anoncreds_core::data_types::rev_reg_def::RevocationRegistryDefinitionId;
-pub use anoncreds_core::data_types::credential::CredentialValues;
 pub use anoncreds_core::data_types::schema::{Schema, SchemaId};
 pub use anoncreds_core::types::{AttributeNames, CredentialDefinitionConfig, SignatureType, RegistryType};
 pub use crate::types::cred_def::{CredentialDefinition, CredentialDefinitionData, CredentialKeyCorrectnessProof};
@@ -23,6 +22,7 @@ pub use crate::types::rev_reg_def::RevocationRegistryDefinitionValuePublicKeys;
 pub use crate::types::rev_reg_def::RevocationRegistryDefinitionValue;
 pub use crate::types::rev_status_list::RevocationStatusList;
 pub use crate::cred_def::CredentialDefinitionPrivate;
+pub use crate::custom_types::{AttributeValues, CredentialValues};
 
 pub use types::*;
 pub use issuer::CredentialRevocationConfig;

uniffi/src/types/credential.rs

@@ -1,13 +1,13 @@
 use crate::types::error::AnoncredsError;
 use crate::types::nonce::Nonce;
+pub use crate::custom_types::CredentialValues;
 use anoncreds_core::data_types::schema::SchemaId;
 use anoncreds_core::data_types::cred_def::{
     CredentialDefinitionId,
     SignatureType
 };
 use anoncreds_core::data_types::rev_reg::RevocationRegistryId;
 use anoncreds_core::data_types::credential::Credential as AnoncredsCredential;
-use anoncreds_core::types::CredentialValues;
 
 pub struct Credential {
     pub core: AnoncredsCredential
@@ -32,7 +32,7 @@ impl Credential {
     }
 
     pub fn get_values(&self) -> CredentialValues {
-        self.core.values.clone()
+        self.core.values.clone().into()
     }
 
     pub fn get_signature_json(&self) -> String {

uniffi/src/types/custom_types.rs

@@ -6,10 +6,12 @@ use anoncreds_core::data_types::rev_reg_def::RevocationRegistryDefinitionId;
 use anoncreds_core::data_types::cred_def::CredentialDefinitionId;
 use anoncreds_core::types::{
     AttributeNames, 
-    AttributeValues
+    AttributeValues as AnoncredsAttributeValues
 };
-use anoncreds_core::data_types::credential::CredentialValues;
+use anoncreds_core::data_types::credential::CredentialValues as AnoncredsCredentialValues;
 use crate::UniffiCustomTypeConverter;
+use std::convert::TryFrom;
+use std::convert::TryInto;
 use std::collections::HashMap;
 use serde::{Deserialize, Serialize};
 use serde_json::Result as SerdeResult;
@@ -84,31 +86,55 @@ impl UniffiCustomTypeConverter for RevocationRegistryDefinitionId {
     }
 }
 
-// /// Make sure [CredentialValues] implements [UniffiCustomTypeConverter] so that UniFFI can use it as
-// /// it is a Tuple Struct in Rust
-impl UniffiCustomTypeConverter for CredentialValues {
+/// Make sure [RevocationRegistryId] implements [UniffiCustomTypeConverter] so that UniFFI can use it as
+/// it is a Tuple Struct in Rust
+impl UniffiCustomTypeConverter for RevocationRegistryId {
     type Builtin = String;
 
     fn into_custom(val: Self::Builtin) -> uniffi::Result<Self> {
-        let json: HashMap<String, AttributeValues> = serde_json::from_str(&val).map_err(|_| AnoncredsError::ConversionError)?;
-        Ok(CredentialValues(json))
+        Ok(RevocationRegistryId(val))
     }
 
     fn from_custom(obj: Self) -> Self::Builtin {
-        serde_json::to_string(&obj.0).unwrap()
+        obj.0
     }
 }
 
-/// Make sure [RevocationRegistryId] implements [UniffiCustomTypeConverter] so that UniFFI can use it as
-/// it is a Tuple Struct in Rust
-impl UniffiCustomTypeConverter for RevocationRegistryId {
-    type Builtin = String;
+pub struct CredentialValues {
+    pub values: HashMap<String, AttributeValues>
+}
 
-    fn into_custom(val: Self::Builtin) -> uniffi::Result<Self> {
-        Ok(RevocationRegistryId(val))
+impl From<AnoncredsCredentialValues> for CredentialValues {
+    fn from(acr: AnoncredsCredentialValues) -> Self {
+        let mapped: HashMap<String, AttributeValues> = acr.0.iter()
+            .map(|(k, v)| (k.clone(), v.clone().into()))
+            .collect();
+        return CredentialValues { values: mapped }
     }
+}
 
-    fn from_custom(obj: Self) -> Self::Builtin {
-        obj.0
+impl From<CredentialValues> for AnoncredsCredentialValues {
+    fn from(def: CredentialValues) -> AnoncredsCredentialValues {
+        let mapped: HashMap<String, AnoncredsAttributeValues> = def.values.into_iter()
+            .map(|(k, v)| (k, v.into()))
+            .collect();
+        AnoncredsCredentialValues(mapped)
+    }
+}
+
+pub struct AttributeValues {
+    pub raw: String,
+    pub encoded: String,
+}
+
+impl From<AnoncredsAttributeValues> for AttributeValues {
+    fn from(acr: AnoncredsAttributeValues) -> Self {
+        return AttributeValues { raw: acr.raw, encoded: acr.encoded }
+    }
+}
+
+impl From<AttributeValues> for AnoncredsAttributeValues {
+    fn from(def: AttributeValues) -> AnoncredsAttributeValues {
+        AnoncredsAttributeValues { raw: def.raw, encoded: def.encoded }
     }
 }