🪟 🐛 Fix issue with opener window closed (#22107)

* Fix issue with opener window closed * Close popup tab on original close
airbytehq · Jan 31, 2023 · 860dd1c · 860dd1c
1 parent 92c1a23
commit 860dd1c
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/airbyte-webapp/src/hooks/services/useConnectorAuth.tsx b/airbyte-webapp/src/hooks/services/useConnectorAuth.tsx
@@ -197,7 +197,13 @@ export function useRunOauthFlow(
     [completeOauth]
   );
 
+  const onCloseWindow = useCallback(() => {
+    windowObjectReference?.close();
+  }, []);
+
   useEvent("message", onOathGranted);
+  // Close popup oauth window when we close the original tab
+  useEvent("beforeunload", onCloseWindow);
 
   return {
     loading: loadingCompleteOauth || loading,
@@ -210,7 +216,7 @@ export function useResolveNavigate(): void {
   const query = useQuery();
 
   useEffectOnce(() => {
-    window.opener.postMessage(query);
+    window.opener?.postMessage(query);
     window.close();
   });
 }