Basic import of request body and bearer auth

src-web/components/RequestPane.tsx

@@ -4,9 +4,10 @@ import classNames from 'classnames';
 import type { CSSProperties } from 'react';
 import { memo, useCallback, useMemo, useState } from 'react';
 import { createGlobalState } from 'react-use';
+import { useActiveEnvironmentId } from '../hooks/useActiveEnvironmentId';
 import { useActiveRequest } from '../hooks/useActiveRequest';
-import { useRequestUpdateKey } from '../hooks/useRequestUpdateKey';
 import { useListenToTauriEvent } from '../hooks/useListenToTauriEvent';
+import { useRequestUpdateKey } from '../hooks/useRequestUpdateKey';
 import { useUpdateRequest } from '../hooks/useUpdateRequest';
 import { tryFormatJson } from '../lib/formatters';
 import type { HttpHeader, HttpRequest } from '../lib/models';
@@ -30,7 +31,6 @@ import { GraphQLEditor } from './GraphQLEditor';
 import { HeaderEditor } from './HeaderEditor';
 import { ParametersEditor } from './ParameterEditor';
 import { UrlBar } from './UrlBar';
-import { useActiveEnvironmentId } from '../hooks/useActiveEnvironmentId';
 
 interface Props {
   style?: CSSProperties;
@@ -88,7 +88,7 @@ export const RequestPane = memo(function RequestPane({ style, fullHeight, classN
                   // Force update header editor so any changed headers are reflected
                   setTimeout(() => setForceUpdateHeaderEditorKey((u) => u + 1), 100);
 
-                  await updateRequest.mutate(patch);
+                  updateRequest.mutate(patch);
                 },
               },
             },
@@ -125,7 +125,7 @@ export const RequestPane = memo(function RequestPane({ style, fullHeight, classN
                       token: authentication.token ?? '',
                     };
                   }
-                  await updateRequest.mutate({ authenticationType, authentication });
+                  updateRequest.mutate({ authenticationType, authentication });
                 },
               },
             },
@@ -146,7 +146,10 @@ export const RequestPane = memo(function RequestPane({ style, fullHeight, classN
     'send_request',
     async ({ windowLabel }) => {
       if (windowLabel !== appWindow.label) return;
-      await invoke('send_request', { requestId: activeRequestId, environmentId: activeEnvironmentId });
+      await invoke('send_request', {
+        requestId: activeRequestId,
+        environmentId: activeEnvironmentId,
+      });
     },
     [activeRequestId, activeEnvironmentId],
   );

src-web/lib/models.ts

@@ -1,4 +1,3 @@
-
 export const BODY_TYPE_NONE = null;
 export const BODY_TYPE_GRAPHQL = 'graphql';
 export const BODY_TYPE_JSON = 'application/json';
@@ -61,8 +60,6 @@ export interface HttpRequest extends BaseModel {
   bodyType: string | null;
   authentication: Record<string, string | number | boolean | null | undefined>;
   authenticationType: string | null;
-  auth: Record<string, string | number | null>;
-  authType: string | null;
   method: string;
   headers: HttpHeader[];
 }

src-web/lib/sendEphemeralRequest.ts

@@ -1,8 +1,11 @@
 import { invoke } from '@tauri-apps/api';
 import type { HttpRequest, HttpResponse } from './models';
 
-export async function sendEphemeralRequest(request: HttpRequest, environmentId: string | null): Promise<HttpResponse> {
+export async function sendEphemeralRequest(
+  request: HttpRequest,
+  environmentId: string | null,
+): Promise<HttpResponse> {
   // Remove some things that we don't want to associate
-  const newRequest = { ...request, id: '', requestId: '', workspaceId: '' };
+  const newRequest = { ...request };
   return invoke('send_ephemeral_request', { request: newRequest, environmentId });
 }