Scoped OAuth 2 tokens

src-web/components/DynamicForm.tsx

@@ -182,23 +182,24 @@ function FormInputs<T extends Record<string, JsonPrimitive>>({
             );
           case 'accordion':
             return (
-              <DetailsBanner
-                key={i}
-                summary={input.label}
-                className={classNames(disabled && 'opacity-disabled')}
-              >
-                <div className="mb-3 px-3">
-                  <FormInputs
-                    data={data}
-                    disabled={disabled}
-                    inputs={input.inputs}
-                    setDataAttr={setDataAttr}
-                    stateKey={stateKey}
-                    autocompleteFunctions={autocompleteFunctions || false}
-                    autocompleteVariables={autocompleteVariables}
-                  />
-                </div>
-              </DetailsBanner>
+              <div key={i}>
+                <DetailsBanner
+                  summary={input.label}
+                  className={classNames('!mb-auto', disabled && 'opacity-disabled')}
+                >
+                  <div className="mb-3 px-3">
+                    <FormInputs
+                      data={data}
+                      disabled={disabled}
+                      inputs={input.inputs}
+                      setDataAttr={setDataAttr}
+                      stateKey={stateKey}
+                      autocompleteFunctions={autocompleteFunctions || false}
+                      autocompleteVariables={autocompleteVariables}
+                    />
+                  </div>
+                </DetailsBanner>
+              </div>
             );
           case 'banner':
             return (
@@ -309,6 +310,7 @@ function EditorArg({
           autocomplete={arg.completionOptions ? { options: arg.completionOptions } : undefined}
           disabled={arg.disabled}
           language={arg.language}
+          readOnly={arg.readOnly}
           onChange={onChange}
           heightMode="auto"
           defaultValue={value === DYNAMIC_FORM_NULL_ARG ? arg.defaultValue : value}
@@ -329,9 +331,9 @@ function EditorArg({
                   showDialog({
                     id: 'id',
                     size: 'full',
-                    title: 'Edit Value',
+                    title: arg.readOnly ? 'View Value' : 'Edit Value',
                     className: '!max-w-[50rem] !max-h-[60rem]',
-                    description: (
+                    description: arg.label && (
                       <Label
                         htmlFor={id}
                         required={!arg.optional}
@@ -355,6 +357,7 @@ function EditorArg({
                           }
                           disabled={arg.disabled}
                           language={arg.language}
+                          readOnly={arg.readOnly}
                           onChange={onChange}
                           defaultValue={value === DYNAMIC_FORM_NULL_ARG ? arg.defaultValue : value}
                           placeholder={arg.placeholder ?? undefined}

src-web/hooks/useHttpAuthenticationConfig.ts

@@ -12,12 +12,16 @@ import { useAtomValue } from 'jotai';
 import { md5 } from 'js-md5';
 import { useState } from 'react';
 import { invokeCmd } from '../lib/tauri';
+import { activeEnvironmentIdAtom } from './useActiveEnvironment';
+import { activeWorkspaceIdAtom } from './useActiveWorkspace';
 
 export function useHttpAuthenticationConfig(
   authName: string | null,
   values: Record<string, JsonPrimitive>,
   requestId: string,
 ) {
+  const workspaceId = useAtomValue(activeWorkspaceIdAtom);
+  const environmentId = useAtomValue(activeEnvironmentIdAtom);
   const responses = useAtomValue(httpResponsesAtom);
   const [forceRefreshCounter, setForceRefreshCounter] = useState<number>(0);
 
@@ -38,6 +42,8 @@ export function useHttpAuthenticationConfig(
       values,
       responseKey,
       forceRefreshCounter,
+      workspaceId,
+      environmentId,
     ],
     placeholderData: (prev) => prev, // Keep previous data on refetch
     queryFn: async () => {
@@ -48,6 +54,8 @@ export function useHttpAuthenticationConfig(
           authName,
           values,
           requestId,
+          workspaceId,
+          environmentId,
         },
       );
 
@@ -64,6 +72,8 @@ export function useHttpAuthenticationConfig(
               authName,
               values,
               modelId,
+              environmentId,
+              workspaceId,
             });
 
             // Ensure the config is refreshed after the action is done