Merge pull request #4809 from dignow/refact/login_dialog

Immediately show the login dialog

flutter/lib/common/widgets/login.dart

@@ -378,7 +378,10 @@ Future<bool?> loginDialog() async {
   var isInProgress = false;
   final RxString curOP = ''.obs;
 
-  final loginOptions = await UserModel.queryLoginOptions();
+  final loginOptions = [].obs;
+  Future.delayed(Duration.zero, () async {
+    loginOptions.value = await UserModel.queryLoginOptions();
+  });
 
   final res = await gFFI.dialogManager.show<bool>((setState, close, context) {
     username.addListener(() {
@@ -451,12 +454,12 @@ Future<bool?> loginDialog() async {
       setState(() => isInProgress = false);
     }
 
+    thirdAuthWidget() => Obx(() {
           final oidcOptions = loginOptions
               .where((opt) => opt.startsWith(kAuthReqTypeOidc))
               .map((opt) => opt.substring(kAuthReqTypeOidc.length))
               .toList();
-
+          return Offstage(
-    thirdAuthWidget() => Offstage(
             offstage: oidcOptions.isEmpty,
             child: Column(
               children: [
@@ -485,7 +488,8 @@ Future<bool?> loginDialog() async {
                       // access_token is already stored in the rust side.
                       gFFI.userModel.getLoginResponseFromAuthBody(authBody);
                     } catch (e) {
-                    debugPrint('Failed too parse oidc login body: "$authBody"');
+                      debugPrint(
+                          'Failed to parse oidc login body: "$authBody"');
                     }
                     close(true);
                   },
@@ -493,6 +497,7 @@ Future<bool?> loginDialog() async {
               ],
             ),
           );
+        });
 
     return CustomAlertDialog(
       title: Text(translate('Login')),

flutter/lib/models/user_model.dart

@@ -10,7 +10,7 @@ import '../common.dart';
 import 'model.dart';
 import 'platform_model.dart';
 
-bool refresing_user = false;
+bool refreshingUser = false;
 
 class UserModel {
   final RxString userName = ''.obs;
@@ -31,16 +31,16 @@ class UserModel {
       'id': await bind.mainGetMyId(),
       'uuid': await bind.mainGetUuid()
     };
-    if (refresing_user) return;
+    if (refreshingUser) return;
     try {
-      refresing_user = true;
+      refreshingUser = true;
       final response = await http.post(Uri.parse('$url/api/currentUser'),
           headers: {
             'Content-Type': 'application/json',
             'Authorization': 'Bearer $token'
           },
           body: json.encode(body));
-      refresing_user = false;
+      refreshingUser = false;
       final status = response.statusCode;
       if (status == 401 || status == 400) {
         reset();
@@ -57,7 +57,7 @@ class UserModel {
     } catch (e) {
       debugPrint('Failed to refreshCurrentUser: $e');
     } finally {
-      refresing_user = false;
+      refreshingUser = false;
       await updateOtherModels();
     }
   }