Fix sso-only server login

commetchat · Jun 28, 2024 · 48b7fc1 · 48b7fc1
1 parent e43f385
commit 48b7fc1
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 22 deletions.
diff --git a/commet/lib/client/matrix/matrix_client.dart b/commet/lib/client/matrix/matrix_client.dart
@@ -274,7 +274,10 @@ class MatrixClient extends Client {
         "m.room.power_levels",
         "m.room.join_rules"
       },
-      supportedLoginTypes: {matrix.AuthenticationTypes.password},
+      supportedLoginTypes: {
+        matrix.AuthenticationTypes.password,
+        matrix.AuthenticationTypes.sso
+      },
       nativeImplementations: nativeImplementations,
       databaseBuilder: (client) => getMatrixDatabase(client.clientName),
       logLevel: BuildConfig.RELEASE ? matrix.Level.warning : matrix.Level.info,
@@ -574,7 +577,8 @@ class MatrixClient extends Client {
         true,
         resultFlows,
       );
-    } catch (_) {
+    } catch (error, trace) {
+      Log.onError(error, trace);
       return (false, null);
     }
   }

diff --git a/commet/lib/ui/pages/login/login_page.dart b/commet/lib/ui/pages/login/login_page.dart
@@ -78,6 +78,8 @@ class LoginPageState extends State<LoginPage> {
       isLoggingIn: isLoggingIn,
       loadingServerInfo: loadingServerInfo,
       hasSsoSupport: loginFlows?.whereType<SsoLoginFlow>().isNotEmpty == true,
+      hasPasswordSupport:
+          loginFlows?.whereType<PasswordLoginFlow>().isNotEmpty == true,
       isServerValid: isServerValid,
     );
   }

diff --git a/commet/lib/ui/pages/login/login_page_view.dart b/commet/lib/ui/pages/login/login_page_view.dart
@@ -26,6 +26,7 @@ class LoginPageView extends StatefulWidget {
       this.loadingServerInfo = false,
       this.isServerValid = false,
       this.hasSsoSupport = false,
+      this.hasPasswordSupport = false,
       this.updateHomeserver});
   final bool canNavigateBack;
   final bool isLoggingIn;
@@ -35,6 +36,7 @@ class LoginPageView extends StatefulWidget {
   final bool loadingServerInfo;
   final bool isServerValid;
   final bool hasSsoSupport;
+  final bool hasPasswordSupport;
   final Future<void> Function(SsoLoginFlow flow)? doSsoLogin;
   final Future<void> Function(
           PasswordLoginFlow flow, String username, String password)?
@@ -76,7 +78,6 @@ class _LoginPageViewState extends State<LoginPageView> {
         _onHomeserverTextUpdated();
       });
     }
-
     super.initState();
   }
 
@@ -221,7 +222,7 @@ class _LoginPageViewState extends State<LoginPageView> {
       const SizedBox(height: 16),
       homeserverEntry(),
       const SizedBox(height: 16),
-      usenamePasswordLoginInputs(),
+      if (widget.hasPasswordSupport) usenamePasswordLoginInputs(),
       SizedBox(
         height: 15,
         child: Center(
@@ -238,23 +239,24 @@ class _LoginPageViewState extends State<LoginPageView> {
       if (widget.hasSsoSupport)
         Column(
           children: [
-            Row(
-              mainAxisAlignment: MainAxisAlignment.center,
-              crossAxisAlignment: CrossAxisAlignment.center,
-              children: [
-                const SizedBox(
-                  width: 100,
-                  height: 10,
-                  child: tiamat.Seperator(),
-                ),
-                tiamat.Text.labelLow(CommonStrings.labelOr),
-                const SizedBox(
-                  width: 100,
-                  height: 10,
-                  child: tiamat.Seperator(),
-                ),
-              ],
-            ),
+            if (widget.hasPasswordSupport)
+              Row(
+                mainAxisAlignment: MainAxisAlignment.center,
+                crossAxisAlignment: CrossAxisAlignment.center,
+                children: [
+                  const SizedBox(
+                    width: 100,
+                    height: 10,
+                    child: tiamat.Seperator(),
+                  ),
+                  tiamat.Text.labelLow(CommonStrings.labelOr),
+                  const SizedBox(
+                    width: 100,
+                    height: 10,
+                    child: tiamat.Seperator(),
+                  ),
+                ],
+              ),
             Padding(
               padding: const EdgeInsets.all(8.0),
               child: Wrap(
@@ -377,7 +379,7 @@ class _LoginPageViewState extends State<LoginPageView> {
       height: 50,
       child: SvgPicture.asset(
         "assets/images/app_icon/icon.svg",
-        theme: SvgTheme(currentColor: Theme.of(context).colorScheme.onPrimary),
+        theme: SvgTheme(currentColor: Theme.of(context).colorScheme.onSurface),
       ),
     );
   }