TW-2036: Fix missing some thing part when use `resetLocationPathWithL…

…oginToken`
linagora · Sep 21, 2024 · e22e7bf · e22e7bf
1 parent 398bb5d
commit e22e7bf
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/lib/presentation/mixins/connect_page_mixin.dart b/lib/presentation/mixins/connect_page_mixin.dart
@@ -295,6 +295,15 @@ mixin ConnectPageMixin {
   }) {
     final loginTokenExisted = getQueryParameter('loginToken') != null;
     if (!loginTokenExisted) return;
-    html.window.history.replaceState({}, '', '/#/${route ?? 'rooms'}');
+    html.window.history.replaceState(
+      {},
+      '',
+      '${getBaseUrlBeforeHash(html.window.location.href)}#/${route ?? 'rooms'}',
+    );
+  }
+
+  String getBaseUrlBeforeHash(String fullUrl) {
+    final fragmentIndex = fullUrl.indexOf('#/');
+    return fragmentIndex != -1 ? fullUrl.substring(0, fragmentIndex) : fullUrl;
   }
 }