From eb6be2f289111fdfdfdfa306cfa3d452475d1225 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=ABl=20Poyet?= <joel.poyet1@swisscom.com>
Date: Fri, 22 Aug 2025 23:42:59 +0200
Subject: [PATCH] fix: fix sso redirect issue

---
 apps/web/src/vector/app.tsx | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/apps/web/src/vector/app.tsx b/apps/web/src/vector/app.tsx
index db5d0e4e99..3361905cca 100644
--- a/apps/web/src/vector/app.tsx
+++ b/apps/web/src/vector/app.tsx
@@ -127,6 +127,13 @@ export async function loadApp(urlParams: URLParams, matrixChatRef: React.Ref<Mat
         autoRedirect = true;
     }
 
+    // If user has a session and is on welcome/landing, redirect to home
+    if (hasPossibleToken && isWelcomeOrLanding && !isReturningFromSso) {
+        logger.log("User has session, redirecting from welcome to home");
+        window.location.hash = "#/home";
+        // Continue loading the app normally
+    }
+
     // getInitialScreenAfterLogin has a side effect to write to sessionStorage, perform it before auto-redirect
     const initialScreenAfterLogin = getInitialScreenAfterLogin(window.location);