Merge pull request #51 from Relayz-io/silvestr/fix-url-slash-duplication

Fixed duplication at the end of url origin

web-client/src/lib.rs

@@ -140,7 +140,7 @@ impl KeyProvisioner {
         wasm_bindgen_futures::future_to_promise(async move {
             let exchange_uuid = uuid::Uuid::new_v4();
             let (contract_id, owner_pk) =
-                { (handler.contract_id.clone(), Public::from(&handler.owner_sk)) };
+                (handler.contract_id.clone(), Public::from(&handler.owner_sk));
 
             let res: Vec<Result<String>> = participants_set
                 .keys()
@@ -195,7 +195,7 @@ impl KeyProvisioner {
                 .as_ref()
                 .ok_or_else(|| ApiError::new(ErrorType::Other, "Empty participants".to_owned()))?;
 
-            let (contract_id, url) = { (handler.contract_id.clone(), handler.url.to_string()) };
+            let (contract_id, url) = (handler.contract_id.clone(), &handler.url);
 
             let participants_keys =
                 futures::future::try_join_all(participants.iter().map(|participant| {
@@ -251,11 +251,15 @@ impl KeyProvisioner {
                 })
                 .try_collect()?;
 
+            let meeting_url = url
+                .join("meeting")
+                .map_err(|err| ApiError::new(ErrorType::Other, err.to_string()))?;
+
             let _: Vec<reqwest::Response> = futures::future::try_join_all(
                 encrypted_keys.into_iter().map(|(bytes, participant_id)| {
                     let client = reqwest::ClientBuilder::new().build().unwrap();
                     client
-                        .post(format!("{url}/meeting"))
+                        .post(meeting_url.clone())
                         .query(&[
                             ("id", serde_json::to_value(meeting_id.clone()).unwrap()),
                             ("participant", serde_json::to_value(participant_id).unwrap()),
@@ -284,17 +288,17 @@ impl KeyProvisioner {
 
         wasm_bindgen_futures::future_to_promise(async move {
             let signer = signer.lock().await;
-            let (contract_id, sk, url) = {
-                (
-                    handler.contract_id.clone(),
-                    &handler.owner_sk,
-                    handler.url.to_string(),
-                )
-            };
+            let (contract_id, sk, url) =
+                (handler.contract_id.clone(), &handler.owner_sk, &handler.url);
+
+            let meeting_url = url
+                .join("meeting")
+                .map_err(|err| ApiError::new(ErrorType::Other, err.to_string()))?;
+
             loop {
                 let http_client = reqwest::ClientBuilder::new().build().unwrap();
                 let msg = http_client
-                    .get(format!("{}/meeting", &url))
+                    .get(meeting_url.clone())
                     .query(&[
                         ("id", serde_json::to_value(meeting_id.clone()).unwrap()),
                         (
@@ -350,8 +354,7 @@ impl KeyProvisioner {
         let client = self.client();
         let signer = self.signer();
         wasm_bindgen_futures::future_to_promise(async move {
-            let (contract_id, pk) =
-                { (handler.contract_id.clone(), Public::from(&handler.owner_sk)) };
+            let (contract_id, pk) = (handler.contract_id.clone(), Public::from(&handler.owner_sk));
             client
                 .function_call(signer.lock().await.deref_mut(), &contract_id, "set_key")
                 .gas(near_units::parse_gas!("300 T") as u64)