Added type conformances and create_credential_request is accessible now

Author: goncalo-frade-iohk

uniffi/Cargo.toml

@@ -29,6 +29,7 @@ serde = { version = "1.0", features = ["derive"] }
 serde_json = '1.0'
 swift-bridge = "0.1.51"
 ursa = { version = "0.3.7", default-features = false, features = ["cl_native", "serde"] }
+thiserror = "1.0.30"
 
 [dev-dependencies.tokio]
 version = '1.9'

uniffi/src/anoncreds.udl

@@ -1,3 +1,10 @@
+[Error]
+enum AnoncredsError {
+  "ConversionError",
+  "SomethingWentWrong", 
+  "CreateCrentialRequestError",
+};
+
 enum SignatureType {
     "CL",
 };
@@ -14,7 +21,7 @@ dictionary CredentialDefinitionID {
     string id;
 };
 
-interface SecretLink {
+interface LinkSecret {
     constructor();
     string get_big_number();
 };
@@ -44,24 +51,38 @@ dictionary CredentialOffer {
     string? method_name;
 };
 
+interface CredentialRequest {
+    string get_blinded_credential_secrets_json();
+    string get_blinded_credential_secrets_correctness_proof_json();
+    Nonce get_nonce();
+    string get_json();
+};
+
+dictionary CredentialRequestMetadata {
+    string link_secret_blinding_data;
+    Nonce nonce;
+    string link_secret_name;
+};
+
 dictionary CreateCrendentialRequestResponse {
-    string request;
-    string metadata;
+    CredentialRequest request;
+    CredentialRequestMetadata metadata;
 };
 
 interface Prover {
   constructor();
 
-  string create_credential_request(
+  [Throws=AnoncredsError]
+  CreateCrendentialRequestResponse create_credential_request(
     [ByRef] string entropy,
     [ByRef] string prover_did,
     [ByRef] CredentialDefinition cred_def,
-    [ByRef] SecretLink link_secret,
+    [ByRef] LinkSecret link_secret,
     [ByRef] string link_secret_id,
     [ByRef] CredentialOffer credential_offer
   );
 
-  SecretLink create_link_secret();
+  LinkSecret create_link_secret();
 };
 
 namespace anoncreds {};

uniffi/src/prover/mod.rs

@@ -1,14 +1,12 @@
 use anoncreds_core::prover::*;
+use anoncreds_core::data_types::cred_request::{CredentialRequest as AnoncredsCredentialRequest, CredentialRequestMetadata as AnoncredsCredentialRequestMetadata};
 use super::types::*;
 use std::sync::Arc;
-
-enum AnoncredsError {
-    CreateCrentialRequestError
-}
+use std::convert::TryInto;
 
 pub struct CreateCrendentialRequestResponse {
-    pub request: String,
-    pub metadata: String,
+    pub request: Arc<CredentialRequest>,
+    pub metadata: CredentialRequestMetadata,
 }
 
 pub struct Prover {
@@ -22,37 +20,36 @@ impl Prover {
         }
     }
 
-    // pub fn create_credential_request(&self, schema_id: &SchemaID) -> String {
-    //     return self.str.clone();
-    // }
-
     pub fn create_credential_request(
         &self,
         entropy: &str,
         prover_did: &str,
         cred_def: &CredentialDefinition,
-        link_secret: &SecretLink,
+        link_secret: &LinkSecret,
         link_secret_id: &str,
         credential_offer: &CredentialOffer,
-    ) -> String {
-        let cred_def_core = cred_def.to_core().unwrap();
-        let link_secret_core = link_secret.to_core();
-        let cred_offer_core = credential_offer.to_core().unwrap();
+    ) -> Result<CreateCrendentialRequestResponse, AnoncredsError> {
+        let cred_def_core = cred_def.try_into()?;
+        let link_secret_core = link_secret.try_into()?;
+        let cred_offer_core = credential_offer.try_into()?;
 
-        let result = anoncreds_core::prover::create_credential_request(
+        let (request, metadata) = anoncreds_core::prover::create_credential_request(
             Some(entropy),
             Some(prover_did),
             &cred_def_core,
             &link_secret_core,
             link_secret_id,
             &cred_offer_core
-        );
+        ).map_err(|_| AnoncredsError::CreateCrentialRequestError)?;
 
-        return String::from("Hello world!")
+        return Ok(CreateCrendentialRequestResponse {
+            request: Arc::new(CredentialRequest { anoncreds_request: request }),
+            metadata: CredentialRequestMetadata::from(metadata)
+        })
     }
 
-    pub fn create_link_secret(&self) -> Arc<SecretLink> {
-        let secret = SecretLink::new();
+    pub fn create_link_secret(&self) -> Arc<LinkSecret> {
+        let secret = LinkSecret::new();
         Arc::new(secret)
     }
 }