Skip to content

Commit 860dd1c

Browse files
author
Tim Roes
authored
🪟 🐛 Fix issue with opener window closed (#22107)
* Fix issue with opener window closed * Close popup tab on original close
1 parent 92c1a23 commit 860dd1c

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

airbyte-webapp/src/hooks/services/useConnectorAuth.tsx

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,13 @@ export function useRunOauthFlow(
197197
[completeOauth]
198198
);
199199

200+
const onCloseWindow = useCallback(() => {
201+
windowObjectReference?.close();
202+
}, []);
203+
200204
useEvent("message", onOathGranted);
205+
// Close popup oauth window when we close the original tab
206+
useEvent("beforeunload", onCloseWindow);
201207

202208
return {
203209
loading: loadingCompleteOauth || loading,
@@ -210,7 +216,7 @@ export function useResolveNavigate(): void {
210216
const query = useQuery();
211217

212218
useEffectOnce(() => {
213-
window.opener.postMessage(query);
219+
window.opener?.postMessage(query);
214220
window.close();
215221
});
216222
}

0 commit comments

Comments
 (0)