Skip to content

fix(auth): Redirect to login if user session doesn't exist #4497

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
TheodoreSpeaks merged 2 commits into from
May 7, 2026
+5 −1
Merged

fix(auth): Redirect to login if user session doesn't exist #4497

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9d4bf16
feat(admin): Increase impersonation timeout to 100 years
TheodoreSpeaks May 7, 2026
f81eba9
fix(workspace): redirect to login on missing session instead of leavi…
TheodoreSpeaks May 7, 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
6 changes: 5 additions & 1 deletion apps/sim/app/workspace/[workspaceId]/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { redirect } from 'next/navigation'
import { ToastProvider } from '@/components/emcn'
import { getSession } from '@/lib/auth'
import { NavTour } from '@/app/workspace/[workspaceId]/components/product-tour'
Expand All @@ -13,8 +14,11 @@ import { getOrgWhitelabelSettings } from '@/ee/whitelabeling/org-branding'

export default async function WorkspaceLayout({ children }: { children: React.ReactNode }) {
const session = await getSession()
if (!session?.user) {
redirect('/login')
}
// The organization plugin is conditionally spread so TS can't infer activeOrganizationId on the base session type.
const orgId = (session?.session as { activeOrganizationId?: string } | null)?.activeOrganizationId
const orgId = (session.session as { activeOrganizationId?: string } | null)?.activeOrganizationId
const initialOrgSettings = orgId ? await getOrgWhitelabelSettings(orgId) : null

return (
Expand Down
Loading