close connections when organization change

Kong · Jan 9, 2025 · 8f4715d · 8f4715d
1 parent 14a48cb
commit 8f4715d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/packages/insomnia/src/ui/hooks/use-close-connection.ts b/packages/insomnia/src/ui/hooks/use-close-connection.ts
@@ -8,7 +8,7 @@ import { useInsomniaTabContext } from '../context/app/insomnia-tab-context';
 import uiEventBus from '../eventBus';
 
 // this hook is use for control when to close connections(websocket & SSE & grpc stream & graphql subscription)
-export const useCloseConnection = () => {
+export const useCloseConnection = ({ organizationId }: { organizationId: string }) => {
 
   const closeConnectionById = async (id: string) => {
     if (isGrpcRequestId(id)) {
@@ -59,4 +59,13 @@ export const useCloseConnection = () => {
       uiEventBus.off('CHANGE_ACTIVE_ENV', handleActiveEnvironmentChange);
     };
   }, [handleTabClose, handleActiveEnvironmentChange]);
+
+  // close all connections when organizationId change
+  useEffect(() => {
+    return () => {
+      window.main.webSocket.closeAll();
+      window.main.grpc.closeAll();
+      window.main.curl.closeAll();
+    };
+  }, [organizationId]);
 };
diff --git a/packages/insomnia/src/ui/routes/debug.tsx b/packages/insomnia/src/ui/routes/debug.tsx
@@ -454,7 +454,9 @@ export const Debug: FC = () => {
     },
   });
 
-  useCloseConnection();
+  useCloseConnection({
+    organizationId,
+  });
 
   const isRealtimeRequest =
     activeRequest &&