Skip to content

fix(oauth-web): start onboarding before login to avoid home-feed flash #146

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
flo-bit merged 1 commit into from
Jul 13, 2026
Merged

fix(oauth-web): start onboarding before login to avoid home-feed flash #146

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
34 changes: 20 additions & 14 deletions src/state/session/oauth-web-callback.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,26 @@ export async function tryFinishWebOAuthSignIn(
const client = getWebOAuthClient()
const result = await client.init()
if (result?.session) {
// A fresh signup (prompt=create) is created on the external PDS page, which
// never runs our in-app signup wizard - so start onboarding here, the same
// way that wizard does. Plain sign-ins carry no state and are untouched.
//
// Start it BEFORE login() so onboarding is already active the instant the
// session appears. login() never touches onboarding state ('skip' only fires
// on logout / account switch), and persisted onboarding defaults to 'Home'
// (inactive) for a new account - so starting it AFTER login left a gap in
// which the shell rendered the default home feed for ~1-2s before the wizard.
//
// We drive the in-memory onboarding reducer (startOnboarding) rather than
// only writing persisted state. OnboardingProvider is mounted above the
// session, so login() never remounts it, and on web persisted.write() does
// not fire onUpdate listeners in the same tab (its cross-tab BroadcastChannel
// never echoes back to the sender). A bare write would leave the onboarding
// context stale and the wizard would not appear until a manual reload. The
// reducer's 'start' action persists the step itself.
if (result.state === OAUTH_SIGNUP_STATE) {
startOnboarding()
}
// For a handle step-up the DID is unchanged, so login() replaces the
// existing session in place with the upgraded (identity:handle) tokens.
await login(
Expand All @@ -62,20 +82,6 @@ export async function tryFinishWebOAuthSignIn(
},
'LoginForm',
)
// A fresh signup (prompt=create) is created on the external PDS page, which
// never runs our in-app signup wizard - so start onboarding here, the same
// way that wizard does. Plain sign-ins carry no state and are untouched.
//
// We drive the in-memory onboarding reducer (startOnboarding) rather than
// only writing persisted state. OnboardingProvider is mounted above the
// session, so login() never remounts it, and on web persisted.write() does
// not fire onUpdate listeners in the same tab (its cross-tab
// BroadcastChannel never echoes back to the sender). A bare write would
// leave the onboarding context stale and the wizard would not appear until
// a manual reload. The reducer's 'start' action persists the step itself.
if (result.state === OAUTH_SIGNUP_STATE) {
startOnboarding()
}
if (result.state === OAUTH_HANDLE_STEPUP_STATE) {
// The redirect lands at the site root; rewrite the path before the
// navigator reads it so web linking resolves to account settings, where
Expand Down
Loading