Merge pull request #1 from arkus7/refactor

Refactor

Cargo.toml

@@ -8,11 +8,12 @@ edition = "2021"
 
 [dependencies]
 anyhow = "1.0.56"
+async-trait = "0.1.53"
 base64 = "0.13.0"
 clap = { version = "3.1.8", features = ["derive"] }
 dialoguer = { version = "0.10.0", features = ["fuzzy-select"] }
+futures = "0.3.21"
 indicatif = "0.17.0-rc.10"
-lazy_static = "1.4.0"
 regex = "1.5.5"
 reqwest = { version = "0.11.10", features = ["json"] }
 serde = { version = "1.0.136", features = ["derive"] }

src/api.rs

@@ -0,0 +1,91 @@
+use async_trait::async_trait;
+use reqwest::header::HeaderMap;
+use reqwest::{IntoUrl, Method, RequestBuilder};
+use serde::de::DeserializeOwned;
+use serde::Serialize;
+
+pub(crate) struct BasicAuth<'a>(&'a str, &'a str);
+impl<'a> BasicAuth<'a> {
+    pub fn new(username: &'a str, password: &'a str) -> Self {
+        Self(username, password)
+    }
+}
+
+#[async_trait]
+pub(crate) trait ApiClient {
+    fn basic_auth(&self) -> Option<BasicAuth>;
+    fn headers(&self) -> Option<HeaderMap>;
+
+    async fn get<T, U>(&self, url: U) -> reqwest::Result<T>
+    where
+        T: DeserializeOwned,
+        U: IntoUrl + Send,
+    {
+        self.request(Method::GET, url, Option::<serde_json::Value>::None)
+            .await
+    }
+
+    async fn post<T, U, B>(&self, url: U, body: Option<B>) -> reqwest::Result<T>
+    where
+        T: DeserializeOwned,
+        U: IntoUrl + Send,
+        B: Serialize + Send,
+    {
+        self.request(Method::POST, url, body).await
+    }
+
+    async fn put<T, U, B>(&self, url: U, body: Option<B>) -> reqwest::Result<T>
+    where
+        T: DeserializeOwned,
+        U: IntoUrl + Send,
+        B: Serialize + Send,
+    {
+        self.request(Method::PUT, url, body).await
+    }
+
+    async fn patch<T, U, B>(&self, url: U, body: Option<B>) -> reqwest::Result<T>
+    where
+        T: DeserializeOwned,
+        U: IntoUrl + Send,
+        B: Serialize + Send,
+    {
+        self.request(Method::PATCH, url, body).await
+    }
+
+    async fn request<T, U, B>(&self, method: Method, url: U, body: Option<B>) -> reqwest::Result<T>
+    where
+        T: DeserializeOwned,
+        U: IntoUrl + Send,
+        B: Serialize + Send,
+    {
+        let client = reqwest::Client::new().request(method, url);
+        let mut builder = self.build_common_parts(client);
+        if let Some(body) = body {
+            builder = builder.json(&body);
+        }
+
+        let response = builder.send().await?.error_for_status()?;
+
+        let mut body = response.text().await?;
+        if body.is_empty() {
+            body = "{}".to_string();
+        }
+
+        let response = serde_json::from_str(&body).unwrap();
+
+        Ok(response)
+    }
+
+    #[inline]
+    fn build_common_parts(&self, builder: RequestBuilder) -> RequestBuilder {
+        let mut builder = builder;
+        if let Some(headers) = self.headers() {
+            builder = builder.headers(headers);
+        }
+        if let Some(basic) = self.basic_auth() {
+            builder = builder.basic_auth(basic.0, Some(basic.1));
+        }
+
+        builder
+    }
+}