Merge branch 'develop' into feat/mcp-safe-abort

ZxBing0066 · web-flow · commit c2aa02851be0 · 2025-11-24T17:10:27.000+08:00
diff --git a/packages/insomnia/src/main/mcp/transport-streamable-http.ts b/packages/insomnia/src/main/mcp/transport-streamable-http.ts
@@ -256,10 +256,6 @@ const wrappedFetch = async (
           fetchFn: authFetchFn,
         });
       }
-      // Close the oauth authorization modal after authorization is complete
-      BrowserWindow.getAllWindows().forEach(window => {
-        window.webContents.send('hide-oauth-authorization-modal');
-      });
       if (authResult !== 'AUTHORIZED') {
         throw new UnauthorizedError();
       }
@@ -268,6 +264,10 @@ const wrappedFetch = async (
       // Wrap and throw MCPAuthError for better identification, some of the errors thrown by sdk are generic Error which is hard to identify
       throw new MCPAuthError(e.message || 'Authentication failed', { cause: e });
     } finally {
+      // Close the oauth authorization modal after authorization is complete
+      BrowserWindow.getAllWindows().forEach(window => {
+        window.webContents.send('hide-oauth-authorization-modal');
+      });
       unsubscribe();
     }
     return await wrappedFetch(url, init, context, authProvider, true);
diff --git a/packages/insomnia/src/network/network.ts b/packages/insomnia/src/network/network.ts
@@ -384,6 +384,10 @@ export const tryToExecutePreRequestScript = async (
     originalRequestGroups,
   });
 
+  const preTestResults: RequestTestResult[] = (mutatedContext.requestTestResults || []).map(result => ({
+    ...result,
+    category: 'pre-request',
+  }));
   return {
     request: mutatedContext.request,
     environment: mutatedContext.environment,
@@ -393,7 +397,7 @@ export const tryToExecutePreRequestScript = async (
     globals: mutatedContext.globals,
     baseGlobals: mutatedContext.baseGlobals,
     cookieJar: mutatedContext.cookieJar,
-    requestTestResults: mutatedContext.requestTestResults,
+    requestTestResults: preTestResults,
     userUploadEnvironment: mutatedContext.userUploadEnvironment,
     execution: mutatedContext.execution,
     transientVariables: mutatedContext.transientVariables,
@@ -483,7 +487,7 @@ export async function savePatchesMadeByScript(patches: {
   });
 }
 
-export const tryToExecuteScript = async (context: RequestAndContextAndOptionalResponse) => {
+const tryToExecuteScript = async (context: RequestAndContextAndOptionalResponse) => {
   const {
     script,
     request,
@@ -757,7 +761,12 @@ export async function tryToExecuteAfterResponseScript(context: RequestAndContext
     });
   }
 
-  return postMutatedContext;
+  const postTestResults: RequestTestResult[] = (postMutatedContext?.requestTestResults || []).map(result => ({
+    ...result,
+    category: 'after-response',
+  }));
+
+  return { ...postMutatedContext, requestTestResults: postTestResults };
 }
 
 export const tryToInterpolateRequest = async ({
diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.send.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.send.tsx
@@ -281,13 +281,8 @@ export const sendActionImplementation = async (options: {
 
   window.main.completeExecutionStep({ requestId });
 
-  const preTestResults = (mutatedContext.requestTestResults || []).map(
-    (result: RequestTestResult): RequestTestResult => ({ ...result, category: 'pre-request' }),
-  );
-  const postTestResults =
-    (postMutatedContext?.requestTestResults || []).map(
-      (result: RequestTestResult): RequestTestResult => ({ ...result, category: 'after-response' }),
-    ) || [];
+  const preTestResults = mutatedContext.requestTestResults || [];
+  const postTestResults = postMutatedContext?.requestTestResults || [];
   if (testResultCollector) {
     testResultCollector.results = [...testResultCollector.results, ...preTestResults, ...postTestResults];
     const timingSteps = await window.main.getExecution({ requestId });
diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.runner.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.runner.tsx
@@ -620,7 +620,7 @@ export const Runner: FC = () => {
                           <TooltipTrigger key={`parent-folder-${id}=${name}`}>
                             <Tooltip message={name}>
                               <i className="fa fa-folder fa-1x mr-0.3 h-4 text-[--color-font]" />
-                              <i className="fa fa-caret-right fa-1x mr-0.3 text-[--color-font]-50 h-4 opacity-50" />
+                              <i className="fa fa-caret-right fa-1x mr-0.3 h-4 opacity-50" />
                             </Tooltip>
                           </TooltipTrigger>
                         );
diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mock-server.mock-route.$mockRouteId.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mock-server.mock-route.$mockRouteId.tsx
@@ -262,7 +262,7 @@ export const MockRouteRoute = () => {
             >
               Mock Headers{' '}
               {headersCount > 0 && (
-                <span className="color-inherit shadow-small flex aspect-square items-center justify-between overflow-hidden rounded-lg border border-solid border-[--hl-md] p-2 text-xs">
+                <span className="color-inherit flex aspect-square items-center justify-between overflow-hidden rounded-lg border border-solid border-[--hl-md] p-2 text-xs">
                   {headersCount}
                 </span>
               )}
diff --git a/packages/insomnia/src/ui/components/modals/cloud-credential-modal/cloud-credential-modal.tsx b/packages/insomnia/src/ui/components/modals/cloud-credential-modal/cloud-credential-modal.tsx
@@ -187,7 +187,7 @@ export const CloudCredentialModal = (props: CloudCredentialModalProps) => {
                         onChange={e => setManualInputUrl(e.target.value)}
                       />{' '}
                       <button
-                        className="btn btn--super-compact btn--outlined gap-[--padding-xs flex items-center"
+                        className="btn btn--super-compact btn--outlined gap-[--padding-xs] flex items-center"
                         type="submit"
                         disabled={isAuthenticating}
                         onClick={exchangeAzureCode}
diff --git a/packages/insomnia/src/ui/components/modals/invite-modal/invite-modal.tsx b/packages/insomnia/src/ui/components/modals/invite-modal/invite-modal.tsx
@@ -438,7 +438,7 @@ const MemberListItem: FC<{
           <div className="flex min-w-[88px] items-center justify-center">
             <Button
               aria-label="Manage collaborators"
-              className="pressed:bg-opacity-40 flex min-w-[70px] cursor-pointer items-center justify-center gap-2 rounded-sm bg-[rgba(var(--color-surprise-rgb),var(--tw-bg-opacity))] bg-opacity-100 bg-clip-padding p-1 text-sm text-[--color-font-surprise] outline-none transition-all hover:bg-opacity-80 focus-visible:ring-2 focus-visible:ring-white/75"
+              className="flex min-w-[70px] cursor-pointer items-center justify-center gap-2 rounded-sm bg-[rgba(var(--color-surprise-rgb),var(--tw-bg-opacity))] bg-opacity-100 bg-clip-padding p-1 text-sm text-[--color-font-surprise] outline-none transition-all hover:bg-opacity-80 focus-visible:ring-2 focus-visible:ring-white/75 data-[pressed]:bg-opacity-40"
               onPress={() => {
                 if (!permissionRef.current['own:organization']) {
                   showModal(AlertModal, {
diff --git a/packages/insomnia/src/ui/components/modals/oauth-authorization-status-modal.tsx b/packages/insomnia/src/ui/components/modals/oauth-authorization-status-modal.tsx
@@ -15,6 +15,7 @@ export const OAuthAuthorizationStatusModal: FC = () => {
   const [authCodeUrlStr, setAuthCodeUrlStr] = useState<string | undefined>();
   const [submitting, setSubmitting] = useState<boolean>(false);
   const { submit: redirectToDefaultBrowserSubmit } = useDefaultBrowserRedirectActionFetcher();
+  const [error, setError] = useState<string | null>(null);
 
   useEffect(() => {
     const unsubscribe = window.main.on('show-oauth-authorization-modal', (_, authCodeUrlStr: string) => {
@@ -65,6 +66,7 @@ export const OAuthAuthorizationStatusModal: FC = () => {
     } else if (status === 'getting_code') {
       modalRef.current?.show();
       setSubmitting(false);
+      setError(null);
     }
   }, [status]);
 
@@ -84,7 +86,7 @@ export const OAuthAuthorizationStatusModal: FC = () => {
         {status === 'getting_code' && (
           <>
             <p className="text-[rgba(var(--color-font-rgb),0.8))] text-start">
-              See your browser to finish authorization, if the browser didn’t open automatically, copy and paste this
+              See your browser to finish authorization, if the browser didn't open automatically, copy and paste this
               URL into your browser to authorize.
             </p>
             <div className="form-control form-control--outlined no-pad-top flex">
@@ -110,29 +112,36 @@ export const OAuthAuthorizationStatusModal: FC = () => {
             </p>
             <form
               onSubmit={e => {
-                e.preventDefault();
-                const form = e.currentTarget;
-                const data = new FormData(form);
+                try {
+                  e.preventDefault();
+                  const form = e.currentTarget;
+                  const data = new FormData(form);
 
-                const url = data.get('url');
-                invariant(typeof url === 'string', 'Expected code to be a string');
-                if (url.length === 0) {
-                  return;
-                }
-                setSubmitting(true);
-                const parsedUrl = new URL(url);
-                const params = Object.fromEntries(parsedUrl.searchParams);
-                const { encryptedUrl: encryptedRedirectUrl, encryptedKey, iv } = params;
-                if (encryptedRedirectUrl && encryptedKey && iv) {
+                  const url = data.get('url');
+                  invariant(typeof url === 'string', 'Expected code to be a string');
+                  if (url.length === 0) {
+                    return;
+                  }
+                  setError(null);
+                  setSubmitting(true);
+                  const parsedUrl = new URL(url);
+                  const params = Object.fromEntries(parsedUrl.searchParams);
+                  const { encryptedUrl: encryptedRedirectUrl, encryptedKey, iv } = params;
+                  if (encryptedRedirectUrl && encryptedKey && iv) {
+                    return redirectToDefaultBrowserSubmit({
+                      encryptedRedirectUrl,
+                      encryptedKey,
+                      iv,
+                    });
+                  }
                   return redirectToDefaultBrowserSubmit({
-                    encryptedRedirectUrl,
-                    encryptedKey,
-                    iv,
+                    redirectUrl: url,
                   });
+                } catch (error) {
+                  setError(error instanceof Error ? error.message : String(error));
+                  setSubmitting(false);
+                  return;
                 }
-                return redirectToDefaultBrowserSubmit({
-                  redirectUrl: url,
-                });
               }}
             >
               <div className="form-control form-control--outlined no-pad-top" style={{ display: 'flex' }}>
@@ -151,6 +160,7 @@ export const OAuthAuthorizationStatusModal: FC = () => {
                   Proceed
                 </button>
               </div>
+              {error && <p className="text-danger">Error: {error}</p>}
             </form>
           </>
         )}
diff --git a/packages/insomnia/src/ui/components/panes/request-pane.tsx b/packages/insomnia/src/ui/components/panes/request-pane.tsx
@@ -202,7 +202,7 @@ export const RequestPane: FC<Props> = ({ environmentId, settings, onPaste }) =>
                     <Button
                       isDisabled={!urlHasQueryParameters}
                       onPress={handleImportQueryFromUrl}
-                      className="asma-pressed:bg-[--hl-sm] flex h-full w-[14ch] flex-shrink-0 items-center justify-start gap-2 rounded-sm px-2 py-1 text-sm text-[--color-font] ring-1 ring-transparent transition-colors hover:bg-[--hl-xs] focus:bg-[--hl-sm] focus:ring-inset focus:ring-[--hl-md] aria-selected:bg-[--hl-xs] aria-selected:hover:bg-[--hl-sm] aria-selected:focus:bg-[--hl-sm]"
+                      className="flex h-full w-[14ch] flex-shrink-0 items-center justify-start gap-2 rounded-sm px-2 py-1 text-sm text-[--color-font] ring-1 ring-transparent transition-colors hover:bg-[--hl-xs] focus:bg-[--hl-sm] focus:ring-inset focus:ring-[--hl-md] aria-selected:bg-[--hl-xs] aria-selected:hover:bg-[--hl-sm] aria-selected:focus:bg-[--hl-sm] data-[pressed]:bg-[--hl-sm]"
                     >
                       Import from URL
                     </Button>
diff --git a/packages/insomnia/src/ui/components/panes/response-pane.tsx b/packages/insomnia/src/ui/components/panes/response-pane.tsx
@@ -186,7 +186,7 @@ export const ResponsePane: FC<Props> = ({ activeRequestId }) => {
           >
             Headers
             {activeResponse.headers.length > 0 && (
-              <span className="shadow-small flex aspect-square items-center justify-between overflow-hidden rounded-lg border border-solid border-[--hl-md] p-2 text-xs">
+              <span className="flex aspect-square items-center justify-between overflow-hidden rounded-lg border border-solid border-[--hl-md] p-2 text-xs">
                 {activeResponse.headers.length}
               </span>
             )}
@@ -197,7 +197,7 @@ export const ResponsePane: FC<Props> = ({ activeRequestId }) => {
           >
             Cookies
             {cookieHeaders.length > 0 && (
-              <span className="shadow-small flex aspect-square items-center justify-between overflow-hidden rounded-lg border border-solid border-[--hl-md] p-2 text-xs">
+              <span className="flex aspect-square items-center justify-between overflow-hidden rounded-lg border border-solid border-[--hl-md] p-2 text-xs">
                 {cookieHeaders.length}
               </span>
             )}
diff --git a/packages/insomnia/src/ui/components/socket-io/request-pane.tsx b/packages/insomnia/src/ui/components/socket-io/request-pane.tsx
@@ -207,7 +207,7 @@ export const SocketIORequestPane: FC<Props> = ({ environment }) => {
                     <Button
                       isDisabled={disabled || !urlHasQueryParameters}
                       onPress={handleImportQueryFromUrl}
-                      className="asma-pressed:bg-[--hl-sm] flex h-full w-[14ch] flex-shrink-0 items-center justify-start gap-2 rounded-sm px-2 py-1 text-sm text-[--color-font] ring-1 ring-transparent transition-colors hover:bg-[--hl-xs] focus:bg-[--hl-sm] focus:ring-inset focus:ring-[--hl-md] aria-selected:bg-[--hl-xs] aria-selected:hover:bg-[--hl-sm] aria-selected:focus:bg-[--hl-sm]"
+                      className="flex h-full w-[14ch] flex-shrink-0 items-center justify-start gap-2 rounded-sm px-2 py-1 text-sm text-[--color-font] ring-1 ring-transparent transition-colors hover:bg-[--hl-xs] focus:bg-[--hl-sm] focus:ring-inset focus:ring-[--hl-md] aria-selected:bg-[--hl-xs] aria-selected:hover:bg-[--hl-sm] aria-selected:focus:bg-[--hl-sm] data-[pressed]:bg-[--hl-sm]"
                     >
                       Import from URL
                     </Button>
diff --git a/packages/insomnia/src/ui/components/websockets/realtime-response-pane.tsx b/packages/insomnia/src/ui/components/websockets/realtime-response-pane.tsx
diff --git a/packages/insomnia/src/ui/components/websockets/websocket-request-pane.tsx b/packages/insomnia/src/ui/components/websockets/websocket-request-pane.tsx

Original file line number	Diff line number	Diff line change
`@@ -262,7 +262,7 @@ export const MockRouteRoute = () => {`
`262`	`262`	`>`
`263`	`263`	`Mock Headers{' '}`
`264`	`264`	`{headersCount > 0 && (`
`265`		`- <span className="color-inherit shadow-small flex aspect-square items-center justify-between overflow-hidden rounded-lg border border-solid border-[--hl-md] p-2 text-xs">`
	`265`	`+ <span className="color-inherit flex aspect-square items-center justify-between overflow-hidden rounded-lg border border-solid border-[--hl-md] p-2 text-xs">`
`266`	`266`	`{headersCount}`
`267`	`267`	`</span>`
`268`	`268`	`)}`
Original file line number	Diff line number	Diff line change
`@@ -202,7 +202,7 @@ export const RequestPane: FC<Props> = ({ environmentId, settings, onPaste }) =>`
`202`	`202`	`<Button`
`203`	`203`	`isDisabled={!urlHasQueryParameters}`
`204`	`204`	`onPress={handleImportQueryFromUrl}`
`205`		`- className="asma-pressed:bg-[--hl-sm] flex h-full w-[14ch] flex-shrink-0 items-center justify-start gap-2 rounded-sm px-2 py-1 text-sm text-[--color-font] ring-1 ring-transparent transition-colors hover:bg-[--hl-xs] focus:bg-[--hl-sm] focus:ring-inset focus:ring-[--hl-md] aria-selected:bg-[--hl-xs] aria-selected:hover:bg-[--hl-sm] aria-selected:focus:bg-[--hl-sm]"`
	`205`	`+ className="flex h-full w-[14ch] flex-shrink-0 items-center justify-start gap-2 rounded-sm px-2 py-1 text-sm text-[--color-font] ring-1 ring-transparent transition-colors hover:bg-[--hl-xs] focus:bg-[--hl-sm] focus:ring-inset focus:ring-[--hl-md] aria-selected:bg-[--hl-xs] aria-selected:hover:bg-[--hl-sm] aria-selected:focus:bg-[--hl-sm] data-[pressed]:bg-[--hl-sm]"`
`206`	`206`	`>`
`207`	`207`	`Import from URL`
`208`	`208`	`</Button>`