Skip to content

fix(expo): dismiss browser after SSO/OAuth flow to prevent stuck sessions on re-login #8126

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

Draft
chriscanin wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

fix(expo): dismiss browser after SSO/OAuth flow to prevent stuck sessions on re-login #8126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions .changeset/fix-sso-browser-dismissal.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@clerk/expo': patch
---

Fix SSO/OAuth browser not being dismissed after authentication completes. On some platforms the in-app browser would remain open in the background after a successful flow, causing subsequent sign-in attempts to fail or appear frozen. `WebBrowser.dismissBrowser()` is now called unconditionally after `openAuthSessionAsync` resolves in both `useSSO` and `useOAuth`.
16 changes: 10 additions & 6 deletions packages/expo/src/hooks/useOAuth.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,13 +77,17 @@ export function useOAuth(useOAuthParams: UseOAuthFlowParams) {

const { externalVerificationRedirectURL } = signIn.firstFactorVerification;

const authSessionResult = await WebBrowserModule.openAuthSessionAsync(
// @ts-ignore
externalVerificationRedirectURL.toString(),
oauthRedirectUrl,
);
let authSessionResult: WebBrowser.WebBrowserAuthSessionResult;
try {
authSessionResult = await WebBrowserModule.openAuthSessionAsync(
// @ts-ignore
externalVerificationRedirectURL.toString(),
oauthRedirectUrl,
);
} finally {
WebBrowserModule.dismissBrowser();
}

// @ts-expect-error
const { type, url } = authSessionResult || {};

// TODO: Check all the possible AuthSession results
Expand Down
19 changes: 14 additions & 5 deletions packages/expo/src/hooks/useSSO.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,11 +86,20 @@ export function useSSO() {
return errorThrower.throw('Missing external verification redirect URL for SSO flow');
}

const authSessionResult = await WebBrowserModule.openAuthSessionAsync(
externalVerificationRedirectURL.toString(),
redirectUrl,
authSessionOptions,
);
let authSessionResult: WebBrowser.WebBrowserAuthSessionResult;
try {
authSessionResult = await WebBrowserModule.openAuthSessionAsync(
externalVerificationRedirectURL.toString(),
redirectUrl,
authSessionOptions,
);
} finally {
// Ensure the browser is always dismissed after the auth session completes or fails.
// Without this, the browser can remain open in the background on some platforms,
// causing subsequent SSO attempts to fail or the browser to appear frozen.
WebBrowserModule.dismissBrowser();
}

if (authSessionResult.type !== 'success' || !authSessionResult.url) {
return {
createdSessionId: null,
Expand Down
Loading