Update login

Robert-Stackflow · Robert-Stackflow · commit 0c82f80ee372 · 2025-03-31T09:51:48.000+08:00
diff --git a/lib/Api/login_api.dart b/lib/Api/login_api.dart
@@ -203,8 +203,9 @@ class LoginApi {
         ILogger.error("Twitee API",
             "Failed to check username: ${response?.statusCode} ${response?.data}");
         return ResponseResult.error(
-          message: response?.data["errors"][0]["message"] ??
-              "Failed to check username",
+          message: (response?.data["errors"][0]["message"] ??
+                  "Failed to check username")
+              .split("g;")[0].trim(),
           code: response?.data["errors"][0]["code"] ?? 500,
           statusCode: response?.statusCode ?? 500,
         );
@@ -273,8 +274,9 @@ class LoginApi {
       );
       if (response == null || response.statusCode != 200) {
         return ResponseResult.error(
-          message: response?.data["errors"][0]["message"] ??
-              "Failed to check alternative username",
+          message: (response?.data["errors"][0]["message"] ??
+                  "Failed to check alternative username")
+              .split("g;")[0].trim(),
           code: response?.data["errors"][0]["code"] ?? 500,
           statusCode: response?.statusCode ?? 500,
         );
@@ -317,8 +319,9 @@ class LoginApi {
       );
       if (response == null || response.statusCode != 200) {
         return ResponseResult.error(
-          message: response?.data["errors"][0]["message"] ??
-              "Failed to check password",
+          message: (response?.data["errors"][0]["message"] ??
+                  "Failed to check password")
+              .split("g;")[0].trim(),
           code: response?.data["errors"][0]["code"] ?? 500,
           statusCode: response?.statusCode ?? 500,
         );
@@ -333,6 +336,14 @@ class LoginApi {
                 data: data["flow_token"],
                 data2:
                     UserInfo.fromJson(subtask['enter_text']['header']['user']));
+          } else if (subtask["subtask_id"] ==
+              LoginPhase.loginAcid.subTaskName) {
+            return ResponseResult.success(
+                message: "To check email",
+                flag: LoginPhase.loginAcid,
+                data: data["flow_token"],
+                data2:
+                    UserInfo.fromJson(subtask['enter_text']['header']['user']));
           } else if (subtask["subtask_id"] ==
               LoginPhase.loginSuccess.subTaskName) {
             return ResponseResult.success(
@@ -375,7 +386,8 @@ class LoginApi {
       if (response == null || response.statusCode != 200) {
         return ResponseResult.error(
           message:
-              response?.data["errors"][0]["message"] ?? "Failed to check 2FA",
+              (response?.data["errors"][0]["message"] ?? "Failed to check 2FA")
+                  .split("g;")[0].trim(),
           code: response?.data["errors"][0]["code"] ?? 500,
         );
       }
@@ -393,6 +405,49 @@ class LoginApi {
     }
   }
 
+  static Future<ResponseResult> checkEmail(
+      String guestToken, String flowToken, String code) async {
+    try {
+      ILogger.info("Twitee API", "Checking Email");
+      final response = await RequestUtil.post(
+        "/1.1/onboarding/task.json",
+        data: {
+          "flow_token": flowToken,
+          "subtask_inputs": [
+            {
+              "subtask_id": "LoginAcid",
+              "enter_text": {"text": code, "link": "next_link"}
+            }
+          ]
+        },
+        options: Options(
+          headers: {
+            "x-guest-token": guestToken,
+          },
+        ),
+      );
+      if (response == null || response.statusCode != 200) {
+        return ResponseResult.error(
+          message: (response?.data["errors"][0]["message"] ??
+                  "Failed to check email")
+              .split("g;")[0].trim(),
+          code: response?.data["errors"][0]["code"] ?? 500,
+        );
+      }
+      final data = response.data as Map;
+      if (data.containsKey("flow_token")) {
+        return ResponseResult.success(
+          message: "Checked email",
+          data: data["flow_token"],
+        );
+      }
+      return ResponseResult.error(message: "Failed to check email");
+    } catch (e, t) {
+      ILogger.error("Twitee", "Failed to check email", e, t);
+      return ResponseResult.error(message: e.toString());
+    }
+  }
+
   static Future<ResponseResult> fetchCsrfToken(String guestToken) async {
     try {
       ILogger.info("Twitee API", "Fetching CSRF token");
diff --git a/lib/Models/login_phase.dart b/lib/Models/login_phase.dart
@@ -14,26 +14,27 @@
  */
 
 enum LoginPhase {
-  checkUsername(0, "LoginEnterUserIdentifierSSO"),
-  denyLoginSubtask(-1, "DenyLoginSubtask"),
-  arkoseLogin(-1, "ArkoseLogin"),
-  checkAlternativeUsername(1, "LoginEnterAlternateIdentifierSubtask"),
-  checkPassword(2, "LoginEnterPassword"),
-  resetPassword(-1, "RedirectToPasswordReset"),
-  check2FA(3, "LoginTwoFactorAuthChallenge"),
-  checkAnother2FA(4, "LoginTwoFactorAuthChooseMethod"),
-  cannotAccess2FA(-1, "login_security_key_not_supported_cta"),
-  loginSuccess(5, "LoginSuccessSubtask");
+  checkUsername("LoginEnterUserIdentifierSSO"),
+  denyLoginSubtask("DenyLoginSubtask"),
+  arkoseLogin("ArkoseLogin"),
+  checkAlternativeUsername("LoginEnterAlternateIdentifierSubtask"),
+  checkPassword("LoginEnterPassword"),
+  resetPassword("RedirectToPasswordReset"),
+  check2FA("LoginTwoFactorAuthChallenge"),
+  loginAcid("LoginAcid"),
+  checkAnother2FA("LoginTwoFactorAuthChooseMethod"),
+  cannotAccess2FA("login_security_key_not_supported_cta"),
+  loginSuccess("LoginSuccessSubtask");
 
-  final int phaseIndex;
   final String subTaskName;
 
-  const LoginPhase(this.phaseIndex, this.subTaskName);
+  const LoginPhase(this.subTaskName);
 
   static List<LoginPhase> phases = [
     checkUsername,
     checkAlternativeUsername,
     checkPassword,
+    loginAcid,
     check2FA,
     checkAnother2FA,
     loginSuccess,
diff --git a/lib/Screens/Login/login_screen.dart b/lib/Screens/Login/login_screen.dart
@@ -37,9 +37,9 @@ import '../../Utils/asset_util.dart';
 import '../../Utils/enums.dart';
 import '../../Utils/request_util.dart';
 import '../../Utils/utils.dart';
-import '../../Widgets/Scaffold/custom_cupertino_route.dart';
 import '../../Widgets/Item/input_item.dart';
 import '../../Widgets/Item/item_builder.dart';
+import '../../Widgets/Scaffold/custom_cupertino_route.dart';
 import '../main_screen.dart';
 
 class LoginByPasswordScreen extends StatefulWidget {
@@ -65,11 +65,13 @@ class _LoginByPasswordScreenState extends State<LoginByPasswordScreen>
   late InputValidateAsyncController _passwordValidateAsyncController;
   late InputValidateAsyncController _backupCodeValidateAsyncController;
   late PinPutValidateAsyncController _twoFAValidateAsyncController;
+  late InputValidateAsyncController _emailValidateAsyncController;
   String _guestToken = "";
   String _flowToken = "";
   InitPhase _inited = InitPhase.connecting;
   InitPhase _connected = InitPhase.haveNotConnected;
-  final FocusNode _pinFocusNode = FocusNode();
+  final FocusNode _twoFAPinFocusNode = FocusNode();
+  final FocusNode _emailPinFocusNode = FocusNode();
   UserInfo? _userInfo;
   String errorMessage = "";
   bool _isMaximized = false;
@@ -166,6 +168,15 @@ class _LoginByPasswordScreenState extends State<LoginByPasswordScreen>
       },
       controller: TextEditingController(),
     );
+    _emailValidateAsyncController = InputValidateAsyncController(
+      validator: (text) async {
+        if (text.isEmpty) {
+          return "邮箱代码不能为空";
+        }
+        return null;
+      },
+      controller: TextEditingController(),
+    );
     initLogin();
   }
 
@@ -212,7 +223,7 @@ class _LoginByPasswordScreenState extends State<LoginByPasswordScreen>
       setState(() {
         _connected = InitPhase.connecting;
       });
-      controller.animateToPage(5,
+      controller.animateToPage(6,
           duration: const Duration(milliseconds: 300), curve: Curves.easeInOut);
       await LoginApi.fetchCsrfToken(_guestToken);
       await RequestUtil.shareCookie();
@@ -250,7 +261,7 @@ class _LoginByPasswordScreenState extends State<LoginByPasswordScreen>
             await LoginApi.checkUsername(_guestToken, _flowToken, account);
         if (!res.success || res.data.isEmpty) {
           if (res.code == 399) {
-            _identifierValidateAsyncController.setError("用户不存在");
+            _identifierValidateAsyncController.setError("用户不存在（${res.message}）");
           } else {
             _identifierValidateAsyncController
                 .setError("未知错误（code: ${res.code}, message:${res.message}）");
@@ -301,7 +312,7 @@ class _LoginByPasswordScreenState extends State<LoginByPasswordScreen>
             _guestToken, _flowToken, account);
         if (!res.success || res.data.isEmpty) {
           if (res.code == 399) {
-            _alternativeIdentifierValidateAsyncController.setError("用户名验证失败");
+            _alternativeIdentifierValidateAsyncController.setError("用户名验证失败（${res.message}）");
           } else {
             _alternativeIdentifierValidateAsyncController
                 .setError("未知错误（code: ${res.code}, message:${res.message}）");
@@ -324,7 +335,7 @@ class _LoginByPasswordScreenState extends State<LoginByPasswordScreen>
             await LoginApi.checkPassword(_guestToken, _flowToken, password);
         if (!res.success || res.data.isEmpty) {
           if (res.code == 399) {
-            _passwordValidateAsyncController.setError("密码错误");
+            _passwordValidateAsyncController.setError("密码错误（${res.message}）");
           } else {
             _passwordValidateAsyncController
                 .setError("未知错误（code: ${res.code}, message:${res.message}）");
@@ -336,11 +347,16 @@ class _LoginByPasswordScreenState extends State<LoginByPasswordScreen>
           }
           ILogger.info("Check password", "Get flow_token: $_flowToken");
           switch (res.flag as LoginPhase) {
-            case LoginPhase.check2FA:
+            case LoginPhase.loginAcid:
               controller.animateToPage(3,
                   duration: const Duration(milliseconds: 300),
                   curve: Curves.easeInOut);
               break;
+            case LoginPhase.check2FA:
+              controller.animateToPage(4,
+                  duration: const Duration(milliseconds: 300),
+                  curve: Curves.easeInOut);
+              break;
             case LoginPhase.loginSuccess:
               success();
               break;
@@ -350,19 +366,39 @@ class _LoginByPasswordScreenState extends State<LoginByPasswordScreen>
         }
         break;
       case 3:
+        bool valid = (await _emailValidateAsyncController.validate()) == null;
+        if (!valid) return;
+        String pin = _emailValidateAsyncController.controller.text;
+        CustomLoadingDialog.showLoading(title: "验证邮箱代码中...");
+        var res = await LoginApi.checkEmail(_guestToken, _flowToken, pin);
+        if (!res.success || res.data.isEmpty) {
+          if (res.code == 399) {
+            _emailValidateAsyncController.setError("邮箱代码错误（${res.message}）");
+          } else {
+            _emailValidateAsyncController
+                .setError("未知错误（code: ${res.code}, message:${res.message}）");
+          }
+          _emailPinFocusNode.requestFocus();
+        } else {
+          _flowToken = res.data;
+          ILogger.info("Check email", "Get flow_token: $_flowToken");
+          success();
+        }
+        break;
+      case 4:
         bool valid = (await _twoFAValidateAsyncController.validate()) == null;
         if (!valid) return;
         String pin = _twoFAValidateAsyncController.controller.text;
         CustomLoadingDialog.showLoading(title: "验证一次性代码中...");
         var res = await LoginApi.check2FA(_guestToken, _flowToken, pin);
         if (!res.success || res.data.isEmpty) {
           if (res.code == 399) {
-            _twoFAValidateAsyncController.setError("一次性代码错误");
+            _twoFAValidateAsyncController.setError("一次性代码错误（${res.message}）");
           } else {
             _twoFAValidateAsyncController
                 .setError("未知错误（code: ${res.code}, message:${res.message}）");
           }
-          _pinFocusNode.requestFocus();
+          _twoFAPinFocusNode.requestFocus();
         } else {
           _flowToken = res.data;
           ILogger.info("Check 2FA", "Get flow_token: $_flowToken");
@@ -555,6 +591,30 @@ class _LoginByPasswordScreenState extends State<LoginByPasswordScreen>
                       ),
                     );
                   case 3:
+                    return _buildPhasePage(
+                      title: "输入你的邮箱代码",
+                      message: "在下方输入你的邮箱代码",
+                      body: ItemBuilder.buildContainerItem(
+                        context: context,
+                        topRadius: true,
+                        bottomRadius: true,
+                        padding: const EdgeInsets.symmetric(vertical: 10),
+                        child: InputItem(
+                          hint: "输入邮箱代码",
+                          textInputAction: TextInputAction.done,
+                          tailingType: InputItemTailingType.clear,
+                          leadingIcon: Icons.email_outlined,
+                          leadingType: InputItemLeadingType.icon,
+                          keyboardType: TextInputType.text,
+                          validateAsyncController:
+                              _emailValidateAsyncController,
+                          onSubmit: (_) {
+                            _login();
+                          },
+                        ),
+                      ),
+                    );
+                  case 4:
                     return _buildPhasePage(
                       title: "输入你的验证码",
                       message: "使用代码生成器应用生成一个代码并在下方输入",
@@ -569,29 +629,35 @@ class _LoginByPasswordScreenState extends State<LoginByPasswordScreen>
                           onCompleted: (_) {
                             _login();
                           },
-                          pinFocusNode: _pinFocusNode,
+                          pinFocusNode: _twoFAPinFocusNode,
                         ),
                       ),
                     );
-                  case 4:
+                  case 5:
                     return _buildPhasePage(
                       title: "输入你的备用码",
                       message: "在下方输入你的备用码",
-                      body: InputItem(
-                        hint: "输入备用码",
-                        textInputAction: TextInputAction.done,
-                        tailingType: InputItemTailingType.clear,
-                        leadingIcon: Icons.backup_outlined,
-                        leadingType: InputItemLeadingType.icon,
-                        keyboardType: TextInputType.text,
-                        validateAsyncController:
-                            _backupCodeValidateAsyncController,
-                        onSubmit: (_) {
-                          _login();
-                        },
+                      body: ItemBuilder.buildContainerItem(
+                        context: context,
+                        topRadius: true,
+                        bottomRadius: true,
+                        padding: const EdgeInsets.symmetric(vertical: 10),
+                        child: InputItem(
+                          hint: "输入备用码",
+                          textInputAction: TextInputAction.done,
+                          tailingType: InputItemTailingType.clear,
+                          leadingIcon: Icons.backup_outlined,
+                          leadingType: InputItemLeadingType.icon,
+                          keyboardType: TextInputType.text,
+                          validateAsyncController:
+                              _backupCodeValidateAsyncController,
+                          onSubmit: (_) {
+                            _login();
+                          },
+                        ),
                       ),
                     );
-                  case 5:
+                  case 6:
                     return _buildPhasePage(
                       title: "登录成功",
                       message: "正在准备连接至Twitee...",
diff --git a/lib/Utils/request_util.dart b/lib/Utils/request_util.dart
@@ -196,7 +196,7 @@ class RequestUtil {
     } on DioException catch (e) {
       _printError(e);
       _preProcessResponse(e.response);
-      rethrow;
+      return e.response;
     }
     return response;
   }
@@ -211,6 +211,7 @@ class RequestUtil {
     options.headers?.addAll({
       "Authorization": RequestHeaderUtil.defaultAuthentication,
       "User-Agent": RequestHeaderUtil.defaultUA,
+      "x-twitter-client-language": "zh-cn",
     });
     if (domainType != DomainType.api || forceCsrfToken) {
       options.headers?.addAll({
