Skip to content

fix(ENG-12551): fix popup close not resetting state without COOP #133

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adefreitas merged 2 commits into from
Apr 16, 2026
Merged

fix(ENG-12551): fix popup close not resetting state without COOP #133

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ecb7ae6
fix(ENG-12551): detect COOP to fix popup close behavior without it
adefreitas Apr 16, 2026
21fecd6
fix: capture attemptId before teardownOAuth clears the ref
adefreitas Apr 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 16 additions & 3 deletions src/modules/integration-picker/hooks/useIntegrationPicker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ export const useIntegrationPicker = ({
const storageListenerRef = useRef<((event: StorageEvent) => void) | null>(null);
const connectionAttemptIdRef = useRef<string | null>(null);
const pollingIntervalRef = useRef<number | null>(null);
const coopDetectedRef = useRef(false);
const oauthResolvedRef = useRef(false);
const [connectionState, setConnectionState] = useState<{
loading: boolean;
Expand Down Expand Up @@ -590,6 +591,7 @@ export const useIntegrationPicker = ({
console.debug('[hub] OAuth popup closed', {
resolved: oauthResolvedRef.current,
pollingActive: !!pollingIntervalRef.current,
coopDetected: coopDetectedRef.current,
});
}
connectWindow.current = null;
Expand All @@ -600,15 +602,21 @@ export const useIntegrationPicker = ({
if (oauthResolvedRef.current) return;

window.removeEventListener('message', processMessageCallback, false);
if (pollingIntervalRef.current) return;

if (coopDetectedRef.current && pollingIntervalRef.current) return;

const connectionAttemptId = connectionAttemptIdRef.current;
teardownOAuth();
if (connectionAttemptId) {
void cancelConnectionAttempt(baseUrl, connectionAttemptId);
}
if (debugRef.current) {
console.debug('[hub] popup closed with no active poll, resetting state');
console.debug('[hub] popup closed, resetting state');
}
setConnectionState({ loading: false, success: false });
};
checkStateTimeoutRef.current = window.setTimeout(check, 1000);
}, [processMessageCallback]);
}, [processMessageCallback, teardownOAuth, baseUrl]);

const handleConnect = useCallback(async () => {
if (!selectedIntegration) {
Expand Down Expand Up @@ -732,6 +740,11 @@ export const useIntegrationPicker = ({
return;
}

coopDetectedRef.current = connectWindow.current.closed === true;
if (debugRef.current && coopDetectedRef.current) {
console.debug('[hub] COOP detected: popup appears closed immediately');
}

if (typeof connectWindow.current.focus === 'function') {
connectWindow.current.focus();
}
Expand Down
Loading