Move request-related settings to workspace

src-tauri/src/http.rs

@@ -15,7 +15,7 @@ use tauri::{AppHandle, Wry};
 
 use crate::{emit_side_effect, models, render, response_err};
 
-pub async fn actually_send_request(
+pub async fn send_http_request(
     request: models::HttpRequest,
     response: &models::HttpResponse,
     environment_id: &str,
@@ -35,12 +35,8 @@ pub async fn actually_send_request(
         url_string = format!("http://{}", url_string);
     }
 
-    let settings = models::get_or_create_settings(pool)
-        .await
-        .expect("Failed to get settings");
-
     let mut client_builder = reqwest::Client::builder()
-        .redirect(match settings.follow_redirects {
+        .redirect(match workspace.setting_follow_redirects {
             true => Policy::limited(10), // TODO: Handle redirects natively
             false => Policy::none(),
         })
@@ -48,13 +44,13 @@ pub async fn actually_send_request(
         .brotli(true)
         .deflate(true)
         .referer(false)
-        .danger_accept_invalid_certs(!settings.validate_certificates)
+        .danger_accept_invalid_certs(!workspace.setting_validate_certificates)
         .connection_verbose(true) // TODO: Capture this log somehow
         .tls_info(true);
 
-    if settings.request_timeout > 0 {
+    if workspace.setting_request_timeout > 0 {
         client_builder = client_builder.timeout(Duration::from_millis(
-            settings.request_timeout.unsigned_abs(),
+            workspace.setting_request_timeout.unsigned_abs(),
         ));
     }
 

src-tauri/src/main.rs

@@ -33,14 +33,14 @@ use window_ext::TrafficLightWindowExt;
 
 use crate::analytics::{AnalyticsAction, AnalyticsResource};
 use crate::plugin::{ImportResources, ImportResult};
-use crate::send::actually_send_request;
+use crate::http::send_http_request;
 use crate::updates::{update_mode_from_str, UpdateMode, YaakUpdater};
 
 mod analytics;
 mod models;
 mod plugin;
 mod render;
-mod send;
+mod http;
 mod updates;
 mod window_ext;
 mod window_menu;
@@ -84,7 +84,7 @@ async fn send_ephemeral_request(
     let response = models::HttpResponse::new();
     let environment_id2 = environment_id.unwrap_or("n/a").to_string();
     request.id = "".to_string();
-    actually_send_request(request, &response, &environment_id2, &app_handle, pool).await
+    send_http_request(request, &response, &environment_id2, &app_handle, pool).await
 }
 
 #[tauri::command]
@@ -199,7 +199,7 @@ async fn send_request(
 
     tokio::spawn(async move {
         if let Err(e) =
-            actually_send_request(req, &response2, &environment_id2, &app_handle2, &pool2).await
+            send_http_request(req, &response2, &environment_id2, &app_handle2, &pool2).await
         {
             response_err(&response2, e, &app_handle2, &pool2)
                 .await

src-tauri/src/models.rs

@@ -15,13 +15,8 @@ pub struct Settings {
     pub model: String,
     pub created_at: NaiveDateTime,
     pub updated_at: NaiveDateTime,
-
-    // Settings
-    pub validate_certificates: bool,
-    pub follow_redirects: bool,
     pub theme: String,
     pub appearance: String,
-    pub request_timeout: i64,
 }
 
 #[derive(sqlx::FromRow, Debug, Clone, Serialize, Deserialize, Default)]
@@ -34,6 +29,11 @@ pub struct Workspace {
     pub name: String,
     pub description: String,
     pub variables: Json<Vec<EnvironmentVariable>>,
+
+    // Settings
+    pub setting_validate_certificates: bool,
+    pub setting_follow_redirects: bool,
+    pub setting_request_timeout: i64,
 }
 
 #[derive(sqlx::FromRow, Debug, Clone, Serialize, Deserialize, Default)]
@@ -228,7 +228,16 @@ pub async fn find_workspaces(pool: &Pool<Sqlite>) -> Result<Vec<Workspace>, sqlx
     sqlx::query_as!(
         Workspace,
         r#"
-            SELECT id, model, created_at, updated_at, name, description,
+            SELECT
+                id,
+                model,
+                created_at,
+                updated_at,
+                name,
+                description,
+                setting_request_timeout,
+                setting_follow_redirects,
+                setting_validate_certificates,
                 variables AS "variables!: sqlx::types::Json<Vec<EnvironmentVariable>>"
             FROM workspaces
         "#,
@@ -241,7 +250,16 @@ pub async fn get_workspace(id: &str, pool: &Pool<Sqlite>) -> Result<Workspace, s
     sqlx::query_as!(
         Workspace,
         r#"
-            SELECT id, model, created_at, updated_at, name, description,
+            SELECT
+                id,
+                model,
+                created_at,
+                updated_at,
+                name,
+                description,
+                setting_request_timeout,
+                setting_follow_redirects,
+                setting_validate_certificates,
                 variables AS "variables!: sqlx::types::Json<Vec<EnvironmentVariable>>"
             FROM workspaces WHERE id = ?
         "#,
@@ -312,9 +330,6 @@ async fn get_settings(pool: &Pool<Sqlite>) -> Result<Settings, sqlx::Error> {
                 model,
                 created_at,
                 updated_at,
-                follow_redirects,
-                validate_certificates,
-                request_timeout,
                 theme,
                 appearance
             FROM settings
@@ -349,14 +364,10 @@ pub async fn update_settings(
     sqlx::query!(
         r#"
             UPDATE settings SET (
-                follow_redirects,
-                validate_certificates,
                 theme,
                 appearance
-            ) = (?, ?, ?, ?) WHERE id = 'default';
+            ) = (?, ?) WHERE id = 'default';
         "#,
-        settings.follow_redirects,
-        settings.validate_certificates,
         settings.theme,
         settings.appearance,
     )
@@ -750,18 +761,32 @@ pub async fn upsert_workspace(
     let trimmed_name = workspace.name.trim();
     sqlx::query!(
         r#"
-            INSERT INTO workspaces (id, name, description, variables)
-            VALUES (?, ?, ?, ?)
+            INSERT INTO workspaces (
+                id,
+                name,
+                description,
+                variables,
+                setting_request_timeout,
+                setting_follow_redirects,
+                setting_validate_certificates
+             )
+            VALUES (?, ?, ?, ?, ?, ?, ?)
             ON CONFLICT (id) DO UPDATE SET
                updated_at = CURRENT_TIMESTAMP,
                name = excluded.name,
                description = excluded.description,
-               variables = excluded.variables
+               variables = excluded.variables,
+               setting_request_timeout = excluded.setting_request_timeout,
+               setting_follow_redirects = excluded.setting_follow_redirects,
+               setting_validate_certificates = excluded.setting_validate_certificates
         "#,
         id,
         trimmed_name,
         workspace.description,
         workspace.variables,
+        workspace.setting_request_timeout,
+        workspace.setting_follow_redirects,
+        workspace.setting_validate_certificates,
     )
     .execute(pool)
     .await?;