Skip to content

A free and open source instant messaging and VoIP chat app built for friends, groups, and communities.

TypeScript fluxerfluxerapp

fix(app): wait for the session before redirecting from /app (#3404)

Hampusd59ddc22146f
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,
});