Skip to content

fix (desktop): reauth docker/auth flashing bug from race condition #1129

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
AviPeltz merged 1 commit into from
Feb 3, 2026
+5 −1
Merged

fix (desktop): reauth docker/auth flashing bug from race condition #1129

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
6 changes: 5 additions & 1 deletion apps/desktop/src/renderer/routes/_authenticated/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export const Route = createFileRoute("/_authenticated")({
});

function AuthenticatedLayout() {
const { data: session } = authClient.useSession();
const { data: session, isPending } = authClient.useSession();
const isSignedIn = env.SKIP_ENV_VALIDATION || !!session?.user;
const activeOrganizationId = env.SKIP_ENV_VALIDATION
? MOCK_ORG_ID
Expand Down Expand Up @@ -66,6 +66,10 @@ function AuthenticatedLayout() {
},
});

if (isPending) {
return null;
}

if (!isSignedIn) {
return <Navigate to="/sign-in" replace />;
}
Expand Down
Loading