From d59ddc22146f89974fa22c5c8d266e8d00d02ea5 Mon Sep 17 00:00:00 2001
From: Hampus <hampus@fluxer.com>
Date: Sun, 11 Oct 2026 18:47:50 +0200
Subject: [PATCH] fix(app): wait for the session before redirecting from /app
 (#3404)

---
 fluxer_app/src/app/router/routes/RootRoutes.tsx | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/fluxer_app/src/app/router/routes/RootRoutes.tsx b/fluxer_app/src/app/router/routes/RootRoutes.tsx
index 78c289711..1da967ca5 100644
--- a/fluxer_app/src/app/router/routes/RootRoutes.tsx
+++ b/fluxer_app/src/app/router/routes/RootRoutes.tsx
@@ -9,6 +9,13 @@ import {getDefaultLandingPath} from '@app/features/navigation/utils/DefaultLandi
 import {createRootRoute, createRoute} from '@app/features/platform/components/router/RouterBuilder';
 import {Redirect} from '@app/features/platform/components/router/RouterTypes';
 
+const enterDefaultLanding = afterSessionInitialization(() => {
+	if (readAuthenticatedRuntimeContext() === null) {
+		return new Redirect(Routes.LOGIN);
+	}
+	return new Redirect(getDefaultLandingPath());
+});
+
 export const rootRoute = createRootRoute({
 	layout: ({children}) => (
 		<RootComponent data-flx="app.router.root-routes.layout.root-component">{children}</RootComponent>
@@ -23,16 +30,11 @@ export const homeRoute = createRoute({
 	getParentRoute: () => rootRoute,
 	id: 'home',
 	path: '/',
-	onEnter: afterSessionInitialization(() => {
-		if (readAuthenticatedRuntimeContext() === null) {
-			return new Redirect(Routes.LOGIN);
-		}
-		return new Redirect(getDefaultLandingPath());
-	}),
+	onEnter: enterDefaultLanding,
 });
 export const appRoute = createRoute({
 	getParentRoute: () => rootRoute,
 	id: 'app',
 	path: Routes.APP,
-	onEnter: () => new Redirect(getDefaultLandingPath()),
+	onEnter: enterDefaultLanding,
 });