chore: Follow up matrix native oidc

lib/utils/sign_in_flows/calc_redirect_url.dart

@@ -0,0 +1,27 @@
+import 'package:flutter/foundation.dart';
+
+import 'package:universal_html/html.dart' as html;
+
+import 'package:fluffychat/config/app_config.dart';
+import 'package:fluffychat/utils/platform_infos.dart';
+
+(Uri redirectUrl, String urlScheme) calcRedirectUrl({
+  bool withAuthHtmlPath = false,
+}) {
+  var redirectUrl = kIsWeb
+      ? Uri.parse(html.window.location.href.split('#').first.split('?').first)
+      : (PlatformInfos.isMobile || PlatformInfos.isMacOS)
+      ? Uri.parse('${AppConfig.appOpenUrlScheme.toLowerCase()}:/login')
+      : Uri.parse('http://localhost:3001/login');
+
+  if (kIsWeb && withAuthHtmlPath) {
+    redirectUrl = redirectUrl.resolveUri(Uri(pathSegments: ['auth.html']));
+  }
+
+  final urlScheme =
+      (PlatformInfos.isMobile || PlatformInfos.isWeb || PlatformInfos.isMacOS)
+      ? redirectUrl.scheme
+      : 'http://localhost:3001';
+
+  return (redirectUrl, urlScheme);
+}

lib/utils/sign_in_flows/check_homeserver.dart

@@ -2,6 +2,7 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 
 import 'package:go_router/go_router.dart';
+import 'package:matrix/matrix.dart';
 import 'package:url_launcher/url_launcher_string.dart';
 
 import 'package:fluffychat/config/setting_keys.dart';
@@ -73,6 +74,7 @@ Future<void> connectToHomeserverFlow(
       context.go('/backup');
     }
   } catch (e, s) {
+    Logs().w('Unable to login', e, s);
     setState(AsyncSnapshot.withError(ConnectionState.done, e, s));
     if (!context.mounted) return;
     ScaffoldMessenger.of(context).showSnackBar(

lib/utils/sign_in_flows/oidc_login.dart

@@ -6,12 +6,11 @@ import 'package:flutter/material.dart';
 import 'package:flutter_web_auth_2/flutter_web_auth_2.dart';
 import 'package:matrix/matrix.dart';
 import 'package:shared_preferences/shared_preferences.dart';
-import 'package:universal_html/html.dart' as html;
 
-import 'package:fluffychat/config/app_config.dart';
 import 'package:fluffychat/config/setting_keys.dart';
 import 'package:fluffychat/utils/matrix_sdk_extensions/oidc_session_json_extension.dart';
 import 'package:fluffychat/utils/platform_infos.dart';
+import 'package:fluffychat/utils/sign_in_flows/calc_redirect_url.dart';
 
 Future<void> oidcLoginFlow(
   Client client,
@@ -19,24 +18,16 @@ Future<void> oidcLoginFlow(
   bool signUp,
 ) async {
   Logs().i('Starting Matrix Native OIDC Flow...');
-  final redirectUrl = kIsWeb
-      ? Uri.parse(html.window.location.href.split('#').first.split('?').first)
-      : (PlatformInfos.isMobile || PlatformInfos.isMacOS)
-      ? Uri.parse('${AppConfig.appOpenUrlScheme.toLowerCase()}:/login')
-      : Uri.parse('http://localhost:3001/login');
 
-  final urlScheme =
-      (PlatformInfos.isMobile || PlatformInfos.isWeb || PlatformInfos.isMacOS)
-      ? redirectUrl.scheme
-      : 'http://localhost:3001';
+  final (redirectUrl, urlScheme) = calcRedirectUrl();
 
-  final clientUri = Uri.parse(AppConfig.website);
+  final clientUri = Uri.parse(AppSettings.website.value);
   final supportWebPlatform =
       kIsWeb &&
       kReleaseMode &&
       redirectUrl.scheme == 'https' &&
       redirectUrl.host.contains(clientUri.host);
-  if (!supportWebPlatform) {
+  if (kIsWeb && !supportWebPlatform) {
     Logs().w(
       'OIDC Application Type web is not supported. Using native now. Please use this instance not in production!',
     );
@@ -50,9 +41,9 @@ Future<void> oidcLoginFlow(
     clientInformation: OidcClientInformation(
       clientName: AppSettings.applicationName.value,
       clientUri: clientUri,
-      logoUri: Uri.parse('https://fluffy.chat/assets/favicon.png'),
-      tosUri: null,
-      policyUri: AppConfig.privacyUrl,
+      logoUri: Uri.parse(AppSettings.logoUrl.value),
+      tosUri: Uri.parse(AppSettings.tos.value),
+      policyUri: Uri.parse(AppSettings.privacyPolicy.value),
     ),
   );
 

lib/utils/sign_in_flows/sso_login.dart

@@ -1,40 +1,28 @@
-import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 
 import 'package:flutter_web_auth_2/flutter_web_auth_2.dart';
 import 'package:matrix/matrix.dart';
-import 'package:universal_html/html.dart' as html;
 
-import 'package:fluffychat/config/app_config.dart';
 import 'package:fluffychat/utils/platform_infos.dart';
+import 'package:fluffychat/utils/sign_in_flows/calc_redirect_url.dart';
 
 Future<void> ssoLoginFlow(
   Client client,
   BuildContext context,
   bool signUp,
 ) async {
-  final redirectUrl = kIsWeb
-      ? Uri.parse(
-          html.window.location.href,
-        ).resolveUri(Uri(pathSegments: ['auth.html'])).toString()
-      : (PlatformInfos.isMobile || PlatformInfos.isMacOS)
-      ? '${AppConfig.appOpenUrlScheme.toLowerCase()}://login'
-      : 'http://localhost:3001//login';
+  final (redirectUrl, urlScheme) = calcRedirectUrl(withAuthHtmlPath: true);
 
   Logs().i('Starting legacy SSO Flow with redirect URL', redirectUrl);
 
   final url = client.homeserver!.replace(
     path: '/_matrix/client/v3/login/sso/redirect',
     queryParameters: {
-      'redirectUrl': redirectUrl,
+      'redirectUrl': redirectUrl.toString(),
       'action': signUp ? 'register' : 'login',
     },
   );
 
-  final urlScheme =
-      (PlatformInfos.isMobile || PlatformInfos.isWeb || PlatformInfos.isMacOS)
-      ? Uri.parse(redirectUrl).scheme
-      : 'http://localhost:3001';
   final result = await FlutterWebAuth2.authenticate(
     url: url.toString(),
     callbackUrlScheme: urlScheme,