builder httpclient for auth

Author: Ximik

client/src/auth.rs

@@ -1,5 +1,9 @@
 use base64::Engine;
-use hyper::{Body, HeaderMap, Request, Response, StatusCode};
+use hyper::{http::HeaderValue, Body, HeaderMap, Request, Response, StatusCode};
+use jsonrpsee::{
+    core::ClientError,
+    http_client::{HttpClient, HttpClientBuilder},
+};
 use std::{
     error::Error,
     future::Future,
@@ -99,3 +103,12 @@ pub fn auth_token_from_cookie(cookie: &str) -> String {
 pub fn auth_token_from_creds(user: &str, password: &str) -> String {
     base64::prelude::BASE64_STANDARD.encode(auth_cookie(user, password))
 }
+
+pub fn http_client_with_auth(url: &str, auth_token: &str) -> Result<HttpClient, ClientError> {
+    let mut headers = hyper::http::HeaderMap::new();
+    headers.insert(
+        "Authorization",
+        HeaderValue::from_str(&format!("Basic {auth_token}")).unwrap(),
+    );
+    HttpClientBuilder::default().set_headers(headers).build(url)
+}

client/src/bin/space-cli.rs

@@ -16,11 +16,11 @@ use domain::{
 };
 use jsonrpsee::{
     core::{client::Error, ClientError},
-    http_client::{HttpClient, HttpClientBuilder},
+    http_client::HttpClient,
 };
 use serde::{Deserialize, Serialize};
 use spaces_client::{
-    auth::{auth_token_from_cookie, auth_token_from_creds},
+    auth::{auth_token_from_cookie, auth_token_from_creds, http_client_with_auth},
     config::{default_cookie_path, default_spaces_rpc_port, ExtendedNetwork},
     deserialize_base64,
     format::{
@@ -415,16 +415,7 @@ impl SpaceCli {
             })?;
             auth_token_from_cookie(&cookie)
         };
-        let client = {
-            let mut headers = hyper::http::HeaderMap::new();
-            headers.insert(
-                "Authorization",
-                hyper::http::HeaderValue::from_str(&format!("Basic {auth_token}")).unwrap(),
-            );
-            HttpClientBuilder::default()
-                .set_headers(headers)
-                .build(args.spaced_rpc_url.clone().unwrap())?
-        };
+        let client = http_client_with_auth(args.spaced_rpc_url.as_ref().unwrap(), &auth_token)?;
 
         Ok((
             Self {

testutil/src/spaced.rs

@@ -8,11 +8,8 @@ use anyhow::Result;
 use assert_cmd::cargo::CommandCargoExt;
 use bitcoind::{anyhow, anyhow::anyhow, get_available_port, tempfile::tempdir};
 use spaces_client::{
-    auth::auth_token_from_creds,
-    jsonrpsee::{
-        http_client::{HttpClient, HttpClientBuilder},
-        tokio,
-    },
+    auth::{auth_token_from_creds, http_client_with_auth},
+    jsonrpsee::{http_client::HttpClient, tokio},
     log::{debug, error},
     rpc::RpcClient,
 };
@@ -64,17 +61,8 @@ impl SpaceD {
         .await
         .expect("spawn blocking task")?;
 
-        let client = {
-            let auth_token = auth_token_from_creds("user", "pass");
-            let mut headers = hyper::http::HeaderMap::new();
-            headers.insert(
-                "Authorization",
-                hyper::http::HeaderValue::from_str(&format!("Basic {auth_token}")).unwrap(),
-            );
-            HttpClientBuilder::default()
-                .set_headers(headers)
-                .build(rpc_url(rpc_port))?
-        };
+        let client =
+            http_client_with_auth(&rpc_url(rpc_port), &auth_token_from_creds("user", "pass"))?;
 
         let mut spaced = Self {
             process,