Request body is now an object

src-tauri/.sqlx/query-55e4e8b66c18f85d17ada00b302720e5dcd35ec4288006e4a556448d59b63952.json

@@ -1,6 +1,6 @@
 {
   "db_name": "SQLite",
-  "query": "\n            SELECT\n                id,\n                model,\n                workspace_id,\n                folder_id,\n                created_at,\n                updated_at,\n                name,\n                url,\n                method,\n                body,\n                body_type,\n                authentication AS \"authentication!: Json<HashMap<String, JsonValue>>\",\n                authentication_type,\n                sort_priority,\n                headers AS \"headers!: sqlx::types::Json<Vec<HttpRequestHeader>>\"\n            FROM http_requests\n            WHERE workspace_id = ?\n        ",
+  "query": "\n            SELECT\n                id,\n                model,\n                workspace_id,\n                folder_id,\n                created_at,\n                updated_at,\n                name,\n                url,\n                method,\n                body AS \"body!: Json<HashMap<String, JsonValue>>\",\n                body_type,\n                authentication AS \"authentication!: Json<HashMap<String, JsonValue>>\",\n                authentication_type,\n                sort_priority,\n                headers AS \"headers!: sqlx::types::Json<Vec<HttpRequestHeader>>\"\n            FROM http_requests\n            WHERE workspace_id = ?\n        ",
   "describe": {
     "columns": [
       {
@@ -49,7 +49,7 @@
         "type_info": "Text"
       },
       {
-        "name": "body",
+        "name": "body!: Json<HashMap<String, JsonValue>>",
         "ordinal": 9,
         "type_info": "Text"
       },
@@ -92,7 +92,7 @@
       false,
       false,
       false,
-      true,
+      false,
       true,
       false,
       true,
@@ -100,5 +100,5 @@
       false
     ]
   },
-  "hash": "a558e182f40286fe52bed5f03b2dc367b7229ab6bd9cda0a7ce219a438ccd5fd"
+  "hash": "55e4e8b66c18f85d17ada00b302720e5dcd35ec4288006e4a556448d59b63952"
 }

src-tauri/.sqlx/query-ae31827b9576ffba83a9de05e30688df3c83e145860f8dd608410a9a9254659d.json

@@ -1,6 +1,6 @@
 {
   "db_name": "SQLite",
-  "query": "\n            SELECT\n                id,\n                model,\n                workspace_id,\n                folder_id,\n                created_at,\n                updated_at,\n                name,\n                url,\n                method,\n                body,\n                body_type,\n                authentication AS \"authentication!: Json<HashMap<String, JsonValue>>\",\n                authentication_type,\n                sort_priority,\n                headers AS \"headers!: sqlx::types::Json<Vec<HttpRequestHeader>>\"\n            FROM http_requests\n            WHERE id = ?\n        ",
+  "query": "\n            SELECT\n                id,\n                model,\n                workspace_id,\n                folder_id,\n                created_at,\n                updated_at,\n                name,\n                url,\n                method,\n                body AS \"body!: Json<HashMap<String, JsonValue>>\",\n                body_type,\n                authentication AS \"authentication!: Json<HashMap<String, JsonValue>>\",\n                authentication_type,\n                sort_priority,\n                headers AS \"headers!: sqlx::types::Json<Vec<HttpRequestHeader>>\"\n            FROM http_requests\n            WHERE id = ?\n        ",
   "describe": {
     "columns": [
       {
@@ -49,7 +49,7 @@
         "type_info": "Text"
       },
       {
-        "name": "body",
+        "name": "body!: Json<HashMap<String, JsonValue>>",
         "ordinal": 9,
         "type_info": "Text"
       },
@@ -92,7 +92,7 @@
       false,
       false,
       false,
-      true,
+      false,
       true,
       false,
       true,
@@ -100,5 +100,5 @@
       false
     ]
   },
-  "hash": "854536c80af3f86bb9a63b8ce059ad724374b545cb23481bb3b2ce07d7414220"
+  "hash": "ae31827b9576ffba83a9de05e30688df3c83e145860f8dd608410a9a9254659d"
 }

src-tauri/migrations/20231112180500_body_object.sql

@@ -0,0 +1,16 @@
+-- Rename old column to backup name
+ALTER TABLE http_requests
+    RENAME COLUMN body TO body_old;
+
+-- Create desired new body column
+ALTER TABLE http_requests
+    ADD COLUMN body TEXT NOT NULL DEFAULT '{}';
+
+-- Copy data from old to new body, in new JSON format
+UPDATE http_requests
+SET body = CASE WHEN body_old IS NULL THEN '{}' ELSE JSON_OBJECT('text', body_old) END
+WHERE TRUE;
+
+-- Drop old column
+ALTER TABLE http_requests
+    DROP COLUMN body_old;

src-tauri/src/main.rs

@@ -17,7 +17,7 @@ use base64::Engine;
 use fern::colors::ColoredLevelConfig;
 use http::header::{HeaderName, ACCEPT, USER_AGENT};
 use http::{HeaderMap, HeaderValue, Method};
-use log::info;
+use log::{info, warn};
 use rand::random;
 use reqwest::redirect::Policy;
 use serde::Serialize;
@@ -182,17 +182,23 @@ async fn actually_send_request(
 
     let m = Method::from_bytes(request.method.to_uppercase().as_bytes())
         .expect("Failed to create method");
-    let builder = client.request(m, url_string.to_string()).headers(headers);
 
-    let sendable_req_result = match (request.body, request.body_type) {
+    let mut request_builder = client.request(m, url_string.to_string()).headers(headers);
-        (Some(raw_body), Some(_)) => {
+
-            let body = render::render(&raw_body, &workspace, environment_ref);
+    if let Some(t) = &request.body_type {
-            builder.body(body).build()
+        let empty_value = &serde_json::to_value("").unwrap();
+        let b = request.body.0;
+
+        if t == "basic" {
+            let raw_text = b.get("text").unwrap_or(empty_value).as_str().unwrap_or("");
+            let body = render::render(raw_text, &workspace, environment_ref);
+            request_builder = request_builder.body(body);
+        } else {
+            warn!("Unsupported body type: {}", t);
         }
-        _ => builder.build(),
+    }
-    };
 
-    let sendable_req = match sendable_req_result {
+    let sendable_req = match request_builder.build() {
         Ok(r) => r,
         Err(e) => {
             return response_err(response, e.to_string(), app_handle, pool).await;
@@ -648,9 +654,11 @@ async fn list_requests(
     db_instance: State<'_, Mutex<Pool<Sqlite>>>,
 ) -> Result<Vec<models::HttpRequest>, String> {
     let pool = &*db_instance.lock().await;
-    models::find_requests(workspace_id, pool)
+    let requests = models::find_requests(workspace_id, pool)
         .await
-        .map_err(|e| e.to_string())
+        .expect("Failed to find requests");
+    // .map_err(|e| e.to_string())
+    Ok(requests)
 }
 
 #[tauri::command]

src-tauri/src/models.rs

@@ -72,7 +72,7 @@ pub struct HttpRequest {
     pub url: String,
     #[serde(default = "default_http_request_method")]
     pub method: String,
-    pub body: Option<String>,
+    pub body: Json<HashMap<String, JsonValue>>,
     pub body_type: Option<String>,
     pub authentication: Json<HashMap<String, JsonValue>>,
     pub authentication_type: Option<String>,
@@ -497,7 +497,7 @@ pub async fn find_requests(
                 name,
                 url,
                 method,
-                body,
+                body AS "body!: Json<HashMap<String, JsonValue>>",
                 body_type,
                 authentication AS "authentication!: Json<HashMap<String, JsonValue>>",
                 authentication_type,
@@ -526,7 +526,7 @@ pub async fn get_request(id: &str, pool: &Pool<Sqlite>) -> Result<HttpRequest, s
                 name,
                 url,
                 method,
-                body,
+                body AS "body!: Json<HashMap<String, JsonValue>>",
                 body_type,
                 authentication AS "authentication!: Json<HashMap<String, JsonValue>>",
                 authentication_type,

src-web/components/App.tsx

@@ -1,4 +1,5 @@
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
+import { ReactQueryDevtools } from '@tanstack/react-query-devtools';
 import { MotionConfig } from 'framer-motion';
 import { Suspense } from 'react';
 import { DndProvider } from 'react-dnd';
@@ -23,10 +24,10 @@ export function App() {
       <MotionConfig transition={{ duration: 0.1 }}>
         <HelmetProvider>
           <DndProvider backend={HTML5Backend}>
-              <Suspense>
+            <Suspense>
-                <AppRouter />
+              <AppRouter />
-                {/*<ReactQueryDevtools initialIsOpen={false} />*/}
+              <ReactQueryDevtools initialIsOpen={false} />
-              </Suspense>
+            </Suspense>
           </DndProvider>
         </HelmetProvider>
       </MotionConfig>

src-web/components/RequestPane.tsx

@@ -133,8 +133,8 @@ export const RequestPane = memo(function RequestPane({ style, fullHeight, classN
     [activeRequest, updateRequest],
   );
 
-  const handleBodyChange = useCallback(
+  const handleBodyTextChange = useCallback(
-    (body: string) => updateRequest.mutate({ body }),
+    (text: string) => updateRequest.mutate({ body: { text } }),
     [updateRequest],
   );
   const handleHeadersChange = useCallback(
@@ -211,9 +211,9 @@ export const RequestPane = memo(function RequestPane({ style, fullHeight, classN
                   placeholder="..."
                   className="!bg-gray-50"
                   heightMode={fullHeight ? 'full' : 'auto'}
-                  defaultValue={activeRequest.body ?? ''}
+                  defaultValue={`${activeRequest?.body?.text}` ?? ''}
                   contentType="application/json"
-                  onChange={handleBodyChange}
+                  onChange={handleBodyTextChange}
                   format={(v) => tryFormatJson(v)}
                 />
               ) : activeRequest.bodyType === BODY_TYPE_XML ? (
@@ -224,17 +224,17 @@ export const RequestPane = memo(function RequestPane({ style, fullHeight, classN
                   placeholder="..."
                   className="!bg-gray-50"
                   heightMode={fullHeight ? 'full' : 'auto'}
-                  defaultValue={activeRequest.body ?? ''}
+                  defaultValue={`${activeRequest?.body?.text}` ?? ''}
                   contentType="text/xml"
-                  onChange={handleBodyChange}
+                  onChange={handleBodyTextChange}
                 />
               ) : activeRequest.bodyType === BODY_TYPE_GRAPHQL ? (
                 <GraphQLEditor
                   forceUpdateKey={forceUpdateKey}
                   baseRequest={activeRequest}
                   className="!bg-gray-50"
-                  defaultValue={activeRequest?.body ?? ''}
+                  defaultValue={`${activeRequest?.body?.text}` ?? ''}
-                  onChange={handleBodyChange}
+                  onChange={handleBodyTextChange}
                 />
               ) : (
                 <EmptyStateText>No Body</EmptyStateText>

src-web/components/WorkspaceActionsDropdown.tsx

@@ -2,7 +2,6 @@ import { invoke } from '@tauri-apps/api';
 import classNames from 'classnames';
 import { memo, useMemo } from 'react';
 import { useActiveWorkspace } from '../hooks/useActiveWorkspace';
-import { useAlert } from '../hooks/useAlert';
 import { useAppRoutes } from '../hooks/useAppRoutes';
 import { useCreateWorkspace } from '../hooks/useCreateWorkspace';
 import { useDeleteWorkspace } from '../hooks/useDeleteWorkspace';
@@ -39,7 +38,6 @@ export const WorkspaceActionsDropdown = memo(function WorkspaceActionsDropdown({
   const { appearance, toggleAppearance } = useTheme();
   const dialog = useDialog();
   const prompt = usePrompt();
-  const alert = useAlert();
   const routes = useAppRoutes();
 
   const items: DropdownItem[] = useMemo(() => {

src-web/components/responseViewers/TextViewer.tsx

@@ -1,4 +1,3 @@
-import { w } from '@tauri-apps/api/clipboard-79413165';
 import { useResponseBodyText } from '../../hooks/useResponseBodyText';
 import { useResponseContentType } from '../../hooks/useResponseContentType';
 import { tryFormatJson } from '../../lib/formatters';

src-web/hooks/useActiveEnvironment.ts

@@ -1,4 +1,4 @@
-import { useCallback, useMemo } from 'react';
+import { useMemo } from 'react';
 import type { Environment } from '../lib/models';
 import { useActiveEnvironmentId } from './useActiveEnvironmentId';
 import { useEnvironments } from './useEnvironments';
@@ -6,10 +6,5 @@ import { useEnvironments } from './useEnvironments';
 export function useActiveEnvironment(): Environment | null {
   const id = useActiveEnvironmentId();
   const environments = useEnvironments();
-  const environment = useMemo(
+  return useMemo(() => environments.find((w) => w.id === id) ?? null, [environments, id]);
-    () => environments.find((w) => w.id === id) ?? null,
-    [environments, id],
-  );
-
-  return environment;
 }

src-web/hooks/useActiveEnvironmentId.ts

@@ -1,5 +1,4 @@
-import { useCallback } from 'react';
+import { useParams } from 'react-router-dom';
-import { useParams, useSearchParams } from 'react-router-dom';
 import type { RouteParamsRequest } from './useAppRoutes';
 
 export function useActiveEnvironmentId(): string | null {

src-web/hooks/useFolders.ts

@@ -1,6 +1,6 @@
 import { useQuery } from '@tanstack/react-query';
 import { invoke } from '@tauri-apps/api';
-import type { Folder, HttpRequest } from '../lib/models';
+import type { Folder } from '../lib/models';
 import { useActiveWorkspaceId } from './useActiveWorkspaceId';
 
 export function foldersQueryKey({ workspaceId }: { workspaceId: string }) {

src-web/hooks/useIntrospectGraphQL.ts

@@ -32,7 +32,11 @@ export function useIntrospectGraphQL(baseRequest: HttpRequest) {
     const fetchIntrospection = async () => {
       setIsLoading(true);
       setError(undefined);
-      const args = { ...baseRequest, body: introspectionRequestBody };
+      const args = {
+        ...baseRequest,
+        bodyType: 'graphql',
+        body: { text: introspectionRequestBody },
+      };
       const response = await minPromiseMillis(sendEphemeralRequest(args, activeEnvironmentId), 700);
 
       if (response.error) {

src-web/hooks/useUpdateAnyFolder.ts

@@ -1,8 +1,7 @@
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 import { invoke } from '@tauri-apps/api';
-import type { Folder, HttpRequest } from '../lib/models';
+import type { Folder } from '../lib/models';
-import { getFolder, getRequest } from '../lib/store';
+import { getFolder } from '../lib/store';
-import { requestsQueryKey } from './useRequests';
 import { foldersQueryKey } from './useFolders';
 
 export function useUpdateAnyFolder() {

src-web/hooks/useVariables.ts

@@ -1,6 +1,6 @@
 import { useQuery } from '@tanstack/react-query';
 import { invoke } from '@tauri-apps/api';
-import type { Variable } from '../lib/models';
+import type { EnvironmentVariable } from '../lib/models';
 
 export function variablesQueryKey({ environmentId }: { environmentId: string }) {
   return ['variables', { environmentId }];
@@ -11,7 +11,7 @@ export function useVariables({ environmentId }: { environmentId: string }) {
     useQuery({
       queryKey: variablesQueryKey({ environmentId }),
       queryFn: async () => {
-        return (await invoke('list_variables', { environmentId })) as Variable[];
+        return (await invoke('list_variables', { environmentId })) as EnvironmentVariable[];
       },
     }).data ?? []
   );

src-web/lib/models.ts

@@ -56,7 +56,7 @@ export interface HttpRequest extends BaseModel {
   sortPriority: number;
   name: string;
   url: string;
-  body: string | null;
+  body: Record<string, string | number | boolean | null | undefined>;
   bodyType: string | null;
   authentication: Record<string, string | number | boolean | null | undefined>;
   authenticationType: string | null;