refactor: remove client-webapi (#1041)

Signed-off-by: Naian <[email protected]>

Cargo.toml

@@ -11,7 +11,6 @@ members = [
     "shared_vcx",
     "diddoc_legacy",
     "agents/rust/mediator",
-    "agents/rust/mediator/client-webapi",
     "agents/rust/mediator/client-tui",
     "agents/rust/aries-vcx-agent",
     "wrappers/vcx-napi-rs",

agents/rust/mediator/client-tui/Cargo.toml

@@ -10,13 +10,13 @@ aries_vcx_core = { path = "../../../../aries_vcx_core", features = [
     "vdrtools_wallet",
 ] }
 axum = "0.6.20"
-client-webapi = { path = "../client-webapi" }
 cursive = { version = "0.20.0", features = ["crossterm-backend"] }
 futures = "0.3.28"
 log = "0.4.20"
 mediation = { path = "../mediation" }
 mediator = { path = ".." }
 messages = { path = "../../../../messages" }
+reqwest = "0.11.22"
 serde_json = "1.0.107"
 
 tokio = { version = "1", features = ["rt-multi-thread", "macros"] }

agents/rust/mediator/client-tui/src/lib.rs

@@ -0,0 +1,25 @@
+use std::collections::VecDeque;
+
+use aries_vcx_core::wallet::base_wallet::BaseWallet;
+use mediation::storage::MediatorPersistence;
+use mediator::aries_agent::{transports::AriesReqwest, ArcAgent};
+use messages::msg_fields::protocols::out_of_band::invitation::Invitation as OOBInvitation;
+use serde_json::{json, Value};
+
+pub async fn handle_register(
+    agent: ArcAgent<impl BaseWallet + 'static, impl MediatorPersistence>,
+    oob_invite: OOBInvitation,
+) -> Result<Value, String> {
+    let mut aries_transport = AriesReqwest {
+        response_queue: VecDeque::new(),
+        client: reqwest::Client::new(),
+    };
+    let state = agent
+        .establish_connection(oob_invite, &mut aries_transport)
+        .await
+        .map_err(|err| format!("{err:?}"))?;
+    Ok(json!({
+        "status": "success",
+        "connection_completed": state
+    }))
+}

agents/rust/mediator/client-tui/src/main.rs

@@ -1,5 +1,6 @@
-/// Aries Agent TUI
 mod tui;
+
+/// Aries Agent TUI
 #[tokio::main]
 async fn main() {
     use mediator::{

agents/rust/mediator/client-tui/src/tui.rs

@@ -1,8 +1,7 @@
 use std::sync::Arc;
 
 use aries_vcx_core::wallet::base_wallet::BaseWallet;
-use axum::{extract::State, Json};
-use client_webapi::http_routes::handle_register;
+use client_tui::handle_register;
 use cursive::{
     direction::Orientation,
     event::Key,
@@ -103,8 +102,8 @@ pub fn client_register_connect_cb<T: BaseWallet + 'static, P: MediatorPersistenc
     let agent: &mut Arc<Agent<T, P>> = s.user_data().expect("Userdata should contain Agent");
 
     output.set_content(format!("{:#?}", oob_invite));
-    match block_on(handle_register(State(agent.to_owned()), Json(oob_invite))) {
-        Ok(Json(res_json)) => output.set_content(serde_json::to_string_pretty(&res_json).unwrap()),
+    match block_on(handle_register(agent.to_owned(), oob_invite)) {
+        Ok(res_json) => output.set_content(serde_json::to_string_pretty(&res_json).unwrap()),
         Err(err) => output.set_content(err),
     };
 }