cleanup

Author: Brendonovich

apps/desktop/src-tauri/src/web_api.rs

@@ -39,31 +39,35 @@ impl From<String> for AuthedApiError {
     }
 }
 
+fn apply_env_headers(req: reqwest::RequestBuilder) -> reqwest::RequestBuilder {
+    let mut req = req.header("X-Cap-Desktop-Version", env!("CARGO_PKG_VERSION"));
+
+    if let Ok(s) = std::env::var("VITE_VERCEL_AUTOMATION_BYPASS_SECRET") {
+        req = req.header("x-vercel-protection-bypass", s);
+    }
+
+    req
+}
+
 async fn do_authed_request(
     auth: &AuthStore,
     build: impl FnOnce(reqwest::Client, String) -> reqwest::RequestBuilder,
     url: String,
 ) -> Result<reqwest::Response, reqwest::Error> {
     let client = reqwest::Client::new();
 
-    let mut req = build(client, url)
-        .header(
-            "Authorization",
-            format!(
-                "Bearer {}",
-                match &auth.secret {
-                    AuthSecret::ApiKey { api_key } => api_key,
-                    AuthSecret::Session { token, .. } => token,
-                }
-            ),
-        )
-        .header("X-Cap-Desktop-Version", env!("CARGO_PKG_VERSION"));
-
-    if let Ok(s) = std::env::var("VITE_VERCEL_AUTOMATION_BYPASS_SECRET") {
-        req = req.header("x-vercel-protection-bypass", s);
-    }
-
-    req.send().await
+    let req = build(client, url).header(
+        "Authorization",
+        format!(
+            "Bearer {}",
+            match &auth.secret {
+                AuthSecret::ApiKey { api_key } => api_key,
+                AuthSecret::Session { token, .. } => token,
+            }
+        ),
+    );
+
+    apply_env_headers(req).send().await
 }
 
 pub trait ManagerExt<R: Runtime>: Manager<R> {
@@ -113,13 +117,7 @@ impl<T: Manager<R> + Emitter<R>, R: Runtime> ManagerExt<R> for T {
         let url = self.make_app_url(path.into()).await;
         let client = reqwest::Client::new();
 
-        let mut req = build(client, url).header("X-Cap-Desktop-Version", env!("CARGO_PKG_VERSION"));
-
-        if let Ok(s) = std::env::var("VITE_VERCEL_AUTOMATION_BYPASS_SECRET") {
-            req = req.header("x-vercel-protection-bypass", s);
-        }
-
-        req.send().await
+        apply_env_headers(build(client, url)).send().await
     }
 
     async fn make_app_url(&self, pathname: impl AsRef<str>) -> String {