Hotfix: Update auth path for build

linagora · Oct 18, 2024 · cb4ed59 · cb4ed59
1 parent 6285c22
commit cb4ed59
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 5 deletions.
diff --git a/config.sample.json b/config.sample.json
@@ -12,5 +12,6 @@
   "app_grid_dashboard_available": true,
   "homeserver": "https://example.com/",
   "platform": "platform",
-  "default_max_upload_avatar_size_in_bytes": 1000000
+  "default_max_upload_avatar_size_in_bytes": 1000000,
+  "dev_mode": false
 }
diff --git a/lib/config/app_config.dart b/lib/config/app_config.dart
@@ -124,6 +124,8 @@ abstract class AppConfig {
 
   static int defaultMaxUploadAvtarSizeInBytes = 10 * (1024 * 1024);
 
+  static bool devMode = false;
+
   static const String appGridConfigurationPath =
       "configurations/app_dashboard.json";
 
@@ -243,5 +245,8 @@ abstract class AppConfig {
       defaultMaxUploadAvtarSizeInBytes =
           json['default_max_upload_avatar_size_in_bytes'];
     }
+    if (json['dev_mode'] is bool) {
+      devMode = json['dev_mode'];
+    }
   }
 }
diff --git a/lib/presentation/mixins/connect_page_mixin.dart b/lib/presentation/mixins/connect_page_mixin.dart
@@ -217,9 +217,11 @@ mixin ConnectPageMixin {
   String _generatePostLogoutRedirectUrl() {
     if (kIsWeb) {
       if (AppConfig.issueId != null && AppConfig.issueId!.isNotEmpty) {
-        return '${html.window.location.href.getBaseUrlBeforeHash()}/twake-on-matrix/${AppConfig.issueId}/auth.html';
+        return '${html.window.location.href.getBaseUrlBeforeHash()}auth.html';
       }
-      return '${html.window.location.href.getBaseUrlBeforeHash()}web/auth.html';
+      return html.window.location.href
+          .getBaseUrlBeforeHash()
+          .generateAuthPath(isDevMode: AppConfig.devMode);
     }
     return '${AppConfig.appOpenUrlScheme.toLowerCase()}://redirect';
   }
@@ -231,9 +233,12 @@ mixin ConnectPageMixin {
         homeserverParam = '?homeserver=$homeserver';
       }
       if (AppConfig.issueId != null && AppConfig.issueId!.isNotEmpty) {
-        return '${html.window.location.href.getBaseUrlBeforeHash()}/twake-on-matrix/${AppConfig.issueId}/auth.html$homeserverParam';
+        return '${html.window.location.href.getBaseUrlBeforeHash()}auth.html$homeserverParam';
       }
-      return '${html.window.location.href.getBaseUrlBeforeHash()}web/auth.html$homeserverParam';
+      return html.window.location.href.getBaseUrlBeforeHash().generateAuthPath(
+            homeserverParams: homeserverParam,
+            isDevMode: AppConfig.devMode,
+          );
     }
     return '${AppConfig.appOpenUrlScheme.toLowerCase()}://login';
   }

diff --git a/lib/utils/string_extension.dart b/lib/utils/string_extension.dart
@@ -381,4 +381,15 @@ extension StringCasingExtension on String {
     final fragmentIndex = indexOf('#/');
     return fragmentIndex != -1 ? substring(0, fragmentIndex) : this;
   }
+
+  String generateAuthPath({
+    String? homeserverParams,
+    bool isDevMode = false,
+  }) {
+    if (isDevMode) {
+      return '${this}web/auth.html$homeserverParams';
+    } else {
+      return '${this}auth.html$homeserverParams';
+    }
+  }
 }