✨ Brand new sign in flow

assets/locales/en_us.json

@@ -3,6 +3,7 @@
   "hide": "Hide",
   "okay": "Okay",
   "next": "Next",
+  "prev": "Previous",
   "reset": "Reset",
   "page": "Page",
   "home": "Home",
@@ -70,8 +71,12 @@
   "forgotPassword": "Forgot password",
   "email": "Email",
   "username": "Username",
+  "usernameInputHint": "Also supports email and phone number",
   "nickname": "Nickname",
   "password": "Password",
+  "passwordOneTime": "One-time-password",
+  "passwordInputHint": "Forgot your password? Go back to the first step to reset your password",
+  "passwordOneTimeInputHint": "Check your inbox or authorizer for a verification code",
   "title": "Title",
   "description": "Description",
   "birthday": "Birthday",
@@ -103,6 +108,11 @@
   "signinRiskDetected": "Risk detected, click Next to open a webpage and signin through it to pass security check.",
   "signinResetPasswordHint": "Please enter username to request reset password.",
   "signinResetPasswordSent": "Reset password request sent, check your inbox!",
+  "signinPickFactor": "Pick a way\nfor verification",
+  "signinEnterPassword": "Enter your\npassword",
+  "signinMultiFactor": "@n step(s) verifications",
+  "authFactorEmail": "Email One-time-password",
+  "authFactorPassword": "Password",
   "signup": "Sign up",
   "signupGreeting": "Welcome onboard",
   "signupCaption": "Create an account on Solarpass and then get the access of entire Solar Network!",

assets/locales/zh_cn.json

@@ -4,6 +4,7 @@
   "okay": "确认",
   "home": "首页",
   "next": "下一步",
+  "prev": "上一步",
   "reset": "重置",
   "cancel": "取消",
   "confirm": "确认",
@@ -75,8 +76,12 @@
   "forgotPassword": "忘记密码",
   "email": "邮件地址",
   "username": "用户名",
+  "usernameInputHint": "同时支持邮箱 / 电话号码",
   "nickname": "显示名",
   "password": "密码",
+  "passwordOneTime": "一次性验证码",
+  "passwordInputHint": "忘记密码了？回到第一步以重置密码",
+  "passwordOneTimeInputHint": "检查你的收件箱或是授权器获得以验证码",
   "title": "标题",
   "description": "简介",
   "birthday": "生日",
@@ -108,6 +113,11 @@
   "signinRiskDetected": "检测到风险，点击下一步按钮来打开一个网页，并通过在其上面登录来通过安全检查。",
   "signinResetPasswordHint": "请先填写用户名以发送重置密码请求。",
   "signinResetPasswordSent": "重置密码请求已发送，在绑定邮件收件箱可收取一份包含重置密码链接的邮件。",
+  "signinPickFactor": "选择一个\n验证方式",
+  "signinEnterPassword": "输入密码\n或验证码",
+  "signinMultiFactor": "@n 步验证",
+  "authFactorEmail": "邮箱一次性密码",
+  "authFactorPassword": "账户密码",
   "signup": "注册",
   "signupGreeting": "欢迎加入\nSolar Network",
   "signupCaption": "在 Solarpass 注册一个账号以获得整个 Solar Network 的存取权！",

lib/models/auth.dart

@@ -0,0 +1,103 @@
+import 'package:freezed_annotation/freezed_annotation.dart';
+import 'package:solian/models/account.dart';
+
+part 'auth.g.dart';
+
+@JsonSerializable()
+class AuthResult {
+  bool isFinished;
+  AuthTicket ticket;
+
+  AuthResult({
+    required this.isFinished,
+    required this.ticket,
+  });
+
+  factory AuthResult.fromJson(Map<String, dynamic> json) =>
+      _$AuthResultFromJson(json);
+
+  Map<String, dynamic> toJson() => _$AuthResultToJson(this);
+}
+
+@JsonSerializable()
+class AuthTicket {
+  int id;
+  DateTime createdAt;
+  DateTime updatedAt;
+  DateTime? deletedAt;
+  String location;
+  String ipAddress;
+  String userAgent;
+  int stepRemain;
+  List<String> claims;
+  List<String> audiences;
+  @JsonKey(defaultValue: [])
+  List<int> factorTrail;
+  String? grantToken;
+  String? accessToken;
+  String? refreshToken;
+  DateTime? expiredAt;
+  DateTime? availableAt;
+  DateTime? lastGrantAt;
+  String? nonce;
+  int? clientId;
+  Account account;
+  int accountId;
+
+  AuthTicket({
+    required this.id,
+    required this.createdAt,
+    required this.updatedAt,
+    required this.deletedAt,
+    required this.location,
+    required this.ipAddress,
+    required this.userAgent,
+    required this.stepRemain,
+    required this.claims,
+    required this.audiences,
+    required this.factorTrail,
+    required this.grantToken,
+    required this.accessToken,
+    required this.refreshToken,
+    required this.expiredAt,
+    required this.availableAt,
+    required this.lastGrantAt,
+    required this.nonce,
+    required this.clientId,
+    required this.account,
+    required this.accountId,
+  });
+
+  factory AuthTicket.fromJson(Map<String, dynamic> json) =>
+      _$AuthTicketFromJson(json);
+
+  Map<String, dynamic> toJson() => _$AuthTicketToJson(this);
+}
+
+@JsonSerializable()
+class AuthFactor {
+  int id;
+  DateTime createdAt;
+  DateTime updatedAt;
+  DateTime? deletedAt;
+  int type;
+  Map<String, dynamic>? config;
+  Account account;
+  int accountId;
+
+  AuthFactor({
+    required this.id,
+    required this.createdAt,
+    required this.updatedAt,
+    required this.deletedAt,
+    required this.type,
+    required this.config,
+    required this.account,
+    required this.accountId,
+  });
+
+  factory AuthFactor.fromJson(Map<String, dynamic> json) =>
+      _$AuthFactorFromJson(json);
+
+  Map<String, dynamic> toJson() => _$AuthFactorToJson(this);
+}

lib/models/auth.g.dart

@@ -0,0 +1,105 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'auth.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+AuthResult _$AuthResultFromJson(Map<String, dynamic> json) => AuthResult(
+      isFinished: json['is_finished'] as bool,
+      ticket: AuthTicket.fromJson(json['ticket'] as Map<String, dynamic>),
+    );
+
+Map<String, dynamic> _$AuthResultToJson(AuthResult instance) =>
+    <String, dynamic>{
+      'is_finished': instance.isFinished,
+      'ticket': instance.ticket.toJson(),
+    };
+
+AuthTicket _$AuthTicketFromJson(Map<String, dynamic> json) => AuthTicket(
+      id: (json['id'] as num).toInt(),
+      createdAt: DateTime.parse(json['created_at'] as String),
+      updatedAt: DateTime.parse(json['updated_at'] as String),
+      deletedAt: json['deleted_at'] == null
+          ? null
+          : DateTime.parse(json['deleted_at'] as String),
+      location: json['location'] as String,
+      ipAddress: json['ip_address'] as String,
+      userAgent: json['user_agent'] as String,
+      stepRemain: (json['step_remain'] as num).toInt(),
+      claims:
+          (json['claims'] as List<dynamic>).map((e) => e as String).toList(),
+      audiences:
+          (json['audiences'] as List<dynamic>).map((e) => e as String).toList(),
+      factorTrail: (json['factor_trail'] as List<dynamic>?)
+              ?.map((e) => (e as num).toInt())
+              .toList() ??
+          [],
+      grantToken: json['grant_token'] as String?,
+      accessToken: json['access_token'] as String?,
+      refreshToken: json['refresh_token'] as String?,
+      expiredAt: json['expired_at'] == null
+          ? null
+          : DateTime.parse(json['expired_at'] as String),
+      availableAt: json['available_at'] == null
+          ? null
+          : DateTime.parse(json['available_at'] as String),
+      lastGrantAt: json['last_grant_at'] == null
+          ? null
+          : DateTime.parse(json['last_grant_at'] as String),
+      nonce: json['nonce'] as String?,
+      clientId: (json['client_id'] as num?)?.toInt(),
+      account: Account.fromJson(json['account'] as Map<String, dynamic>),
+      accountId: (json['account_id'] as num).toInt(),
+    );
+
+Map<String, dynamic> _$AuthTicketToJson(AuthTicket instance) =>
+    <String, dynamic>{
+      'id': instance.id,
+      'created_at': instance.createdAt.toIso8601String(),
+      'updated_at': instance.updatedAt.toIso8601String(),
+      'deleted_at': instance.deletedAt?.toIso8601String(),
+      'location': instance.location,
+      'ip_address': instance.ipAddress,
+      'user_agent': instance.userAgent,
+      'step_remain': instance.stepRemain,
+      'claims': instance.claims,
+      'audiences': instance.audiences,
+      'factor_trail': instance.factorTrail,
+      'grant_token': instance.grantToken,
+      'access_token': instance.accessToken,
+      'refresh_token': instance.refreshToken,
+      'expired_at': instance.expiredAt?.toIso8601String(),
+      'available_at': instance.availableAt?.toIso8601String(),
+      'last_grant_at': instance.lastGrantAt?.toIso8601String(),
+      'nonce': instance.nonce,
+      'client_id': instance.clientId,
+      'account': instance.account.toJson(),
+      'account_id': instance.accountId,
+    };
+
+AuthFactor _$AuthFactorFromJson(Map<String, dynamic> json) => AuthFactor(
+      id: (json['id'] as num).toInt(),
+      createdAt: DateTime.parse(json['created_at'] as String),
+      updatedAt: DateTime.parse(json['updated_at'] as String),
+      deletedAt: json['deleted_at'] == null
+          ? null
+          : DateTime.parse(json['deleted_at'] as String),
+      type: (json['type'] as num).toInt(),
+      config: json['config'] as Map<String, dynamic>?,
+      account: Account.fromJson(json['account'] as Map<String, dynamic>),
+      accountId: (json['account_id'] as num).toInt(),
+    );
+
+Map<String, dynamic> _$AuthFactorToJson(AuthFactor instance) =>
+    <String, dynamic>{
+      'id': instance.id,
+      'created_at': instance.createdAt.toIso8601String(),
+      'updated_at': instance.updatedAt.toIso8601String(),
+      'deleted_at': instance.deletedAt?.toIso8601String(),
+      'type': instance.type,
+      'config': instance.config,
+      'account': instance.account.toJson(),
+      'account_id': instance.accountId,
+    };

lib/providers/auth.dart

@@ -9,6 +9,7 @@ import 'package:get/get_connect/http/src/request/request.dart';
 import 'package:solian/background.dart';
 import 'package:solian/exceptions/request.dart';
 import 'package:solian/exceptions/unauthorized.dart';
+import 'package:solian/models/auth.dart';
 import 'package:solian/providers/database/database.dart';
 import 'package:solian/providers/websocket.dart';
 import 'package:solian/services.dart';
@@ -148,27 +149,13 @@ class AuthProvider extends GetConnect {
 
   Future<TokenSet> signin(
     BuildContext context,
-    String username,
+    AuthTicket ticket,
-    String password,
   ) async {
     userProfile.value = null;
 
-    final client = ServiceFinder.configureClient('auth');
-
-    // Create ticket
-    final resp = await client.post('/auth', {
-      'username': username,
-      'password': password,
-    });
-    if (resp.statusCode != 200) {
-      throw RequestException(resp);
-    } else if (resp.body['is_finished'] == false) {
-      throw RiskyAuthenticateException(resp.body['ticket']['id']);
-    }
-
     // Assign token
     final tokenResp = await post('/auth/token', {
-      'code': resp.body['ticket']['grant_token'],
+      'code': ticket.grantToken!,
       'grant_type': 'grant_token',
     });
     if (tokenResp.statusCode != 200) {

lib/screens/auth/signin.dart

@@ -1,15 +1,15 @@
+import 'package:animations/animations.dart';
 import 'package:flutter/material.dart';
 import 'package:gap/gap.dart';
 import 'package:get/get.dart';
-import 'package:protocol_handler/protocol_handler.dart';
 import 'package:solian/background.dart';
+import 'package:solian/exceptions/request.dart';
 import 'package:solian/exts.dart';
-import 'package:solian/providers/websocket.dart';
+import 'package:solian/models/auth.dart';
 import 'package:solian/providers/auth.dart';
+import 'package:solian/providers/websocket.dart';
 import 'package:solian/services.dart';
 import 'package:solian/widgets/sized_container.dart';
-import 'package:url_launcher/url_launcher.dart';
-import 'package:url_launcher/url_launcher_string.dart';
 
 class SignInScreen extends StatefulWidget {
   const SignInScreen({super.key});
@@ -18,12 +18,28 @@ class SignInScreen extends StatefulWidget {
   State<SignInScreen> createState() => _SignInScreenState();
 }
 
-class _SignInScreenState extends State<SignInScreen> with ProtocolListener {
+class _SignInScreenState extends State<SignInScreen> {
   bool _isBusy = false;
 
+  AuthTicket? _currentTicket;
+
+  List<AuthFactor>? _factors;
+  int? _factorPicked;
+  int? _factorPickedType;
+
+  int _period = 0;
+
   final _usernameController = TextEditingController();
   final _passwordController = TextEditingController();
 
+  final Map<int, (String label, IconData icon, bool isOtp)> _factorLabelMap = {
+    0: ('authFactorPassword'.tr, Icons.password, false),
+    1: ('authFactorEmail'.tr, Icons.email, true),
+  };
+
+  Color get _unFocusColor =>
+      Theme.of(context).colorScheme.onSurface.withOpacity(0.75);
+
   void _requestResetPassword() async {
     final username = _usernameController.value.text;
     if (username.isEmpty) {
@@ -54,78 +70,141 @@ class _SignInScreenState extends State<SignInScreen> with ProtocolListener {
     context.showModalDialog('done'.tr, 'signinResetPasswordSent'.tr);
   }
 
-  void _performAction() async {
+  void _performNewTicket() async {
-    final AuthProvider auth = Get.find();
-
     final username = _usernameController.value.text;
-    final password = _passwordController.value.text;
+    if (username.isEmpty) return;
-    if (username.isEmpty || password.isEmpty) return;
+
+    final client = ServiceFinder.configureClient('auth');
 
     setState(() => _isBusy = true);
 
     try {
-      await auth.signin(context, username, password);
+      // Create ticket
-      await Future.delayed(const Duration(milliseconds: 250), () async {
+      final resp = await client.post('/auth', {
-        await auth.refreshAuthorizeStatus();
+        'username': username,
-        await auth.refreshUserProfile();
       });
-    } on RiskyAuthenticateException catch (e) {
+      if (resp.statusCode != 200) {
-      showDialog(
+        throw RequestException(resp);
-        context: context,
+      } else {
-        builder: (context) {
+        final result = AuthResult.fromJson(resp.body);
-          return AlertDialog(
+        _currentTicket = result.ticket;
-            title: Text('riskDetection'.tr),
+      }
-            content: Text('signinRiskDetected'.tr),
+
-            actions: [
+      // Pull factors
-              TextButton(
+      final factorResp = await client.get('/auth/factors',
-                child: Text('next'.tr),
+          query: {'ticketId': _currentTicket!.id.toString()});
-                onPressed: () {
+      if (factorResp.statusCode != 200) {
-                  const redirect = 'solink://auth?status=done';
+        throw RequestException(factorResp);
-                  launchUrlString(
+      } else {
-                    ServiceFinder.buildUrl('capital',
+        final result = List<AuthFactor>.from(
-                        '/auth/mfa?redirect_uri=$redirect&ticketId=${e.ticketId}'),
+          factorResp.body.map((x) => AuthFactor.fromJson(x)),
-                    mode: LaunchMode.inAppWebView,
         );
-                  Navigator.pop(context);
+        _factors = result;
-                },
+      }
-              )
+
-            ],
+      setState(() => _period++);
-          );
-        },
-      );
-      return;
     } catch (e) {
       context.showErrorDialog(e);
       return;
     } finally {
       setState(() => _isBusy = false);
     }
+  }
+
+  void _performGetFactorCode() async {
+    if (_factorPicked == null) return;
+
+    final client = ServiceFinder.configureClient('auth');
+
+    setState(() => _isBusy = true);
+
+    try {
+      // Request one-time-password code
+      final resp = await client.post('/auth/factors/$_factorPicked', {});
+      if (resp.statusCode != 200 && resp.statusCode != 204) {
+        throw RequestException(resp);
+      } else {
+        _factorPickedType = _factors!
+            .where(
+              (x) => x.id == _factorPicked,
+            )
+            .first
+            .type;
+      }
+
+      setState(() => _period++);
+    } catch (e) {
+      context.showErrorDialog(e);
+      return;
+    } finally {
+      setState(() => _isBusy = false);
+    }
+  }
+
+  void _performCheckTicket() async {
+    final AuthProvider auth = Get.find();
+
+    final password = _passwordController.value.text;
+    if (password.isEmpty) return;
+
+    final client = ServiceFinder.configureClient('auth');
+
+    setState(() => _isBusy = true);
+
+    try {
+      // Check ticket
+      final resp = await client.patch('/auth', {
+        'ticket_id': _currentTicket!.id,
+        'factor_id': _factorPicked!,
+        'code': password,
+      });
+      if (resp.statusCode != 200) {
+        throw RequestException(resp);
+      }
+
+      final result = AuthResult.fromJson(resp.body);
+      _currentTicket = result.ticket;
+
+      // Finish sign in if possible
+      if (result.isFinished) {
+        await auth.signin(context, _currentTicket!);
+
+        await Future.delayed(const Duration(milliseconds: 250), () async {
+          await auth.refreshAuthorizeStatus();
+          await auth.refreshUserProfile();
 
           Get.find<WebSocketProvider>().registerPushNotifications();
           autoConfigureBackgroundNotificationService();
           autoStartBackgroundNotificationService();
 
           Navigator.pop(context, true);
+        });
+      } else {
+        // Skip the first step
+        _factorPicked = null;
+        _factorPickedType = null;
+        setState(() => _period += 2);
+      }
+    } catch (e) {
+      context.showErrorDialog(e);
+      return;
+    } finally {
+      setState(() => _isBusy = false);
+    }
   }
 
-  @override
+  void _previousStep() {
-  void initState() {
+    assert(_period > 0);
-    protocolHandler.addListener(this);
+    switch (_period % 3) {
-    super.initState();
+      case 1:
-  }
+        _currentTicket = null;
-
+        _factors = null;
-  @override
+        _factorPicked = null;
-  void dispose() {
+      case 2:
-    protocolHandler.removeListener(this);
+        _passwordController.clear();
-    super.dispose();
+        _factorPickedType = null;
-  }
+      default:
-
+        setState(() => _period--);
-  @override
-  void onProtocolUrlReceived(String url) {
-    final uri = url.replaceFirst('solink://', '');
-    if (uri == 'auth?status=done') {
-      closeInAppWebView();
-      _performAction();
     }
   }
 
@@ -135,14 +214,189 @@ class _SignInScreenState extends State<SignInScreen> with ProtocolListener {
       color: Theme.of(context).colorScheme.surface,
       child: CenteredContainer(
         maxWidth: 360,
-        child: Column(
+        child: PageTransitionSwitcher(
-          mainAxisSize: MainAxisSize.min,
+          transitionBuilder: (
+            Widget child,
+            Animation<double> primaryAnimation,
+            Animation<double> secondaryAnimation,
+          ) {
+            return SharedAxisTransition(
+              animation: primaryAnimation,
+              secondaryAnimation: secondaryAnimation,
+              transitionType: SharedAxisTransitionType.horizontal,
+              child: child,
+            );
+          },
+          child: switch (_period % 3) {
+            1 => Column(
+                key: const ValueKey<int>(1),
+                mainAxisAlignment: MainAxisAlignment.center,
                 crossAxisAlignment: CrossAxisAlignment.start,
                 children: [
                   ClipRRect(
                     borderRadius: const BorderRadius.all(Radius.circular(8)),
-              child: Image.asset('assets/logo.png', width: 64, height: 64),
+                    child:
-            ).paddingOnly(bottom: 4),
+                        Image.asset('assets/logo.png', width: 64, height: 64),
+                  ).paddingOnly(bottom: 8, left: 4),
+                  Text(
+                    'signinPickFactor'.tr,
+                    style: const TextStyle(
+                      fontSize: 28,
+                      fontWeight: FontWeight.w900,
+                    ),
+                  ).paddingOnly(left: 4, bottom: 16),
+                  Card(
+                    margin: const EdgeInsets.symmetric(vertical: 4),
+                    child: Column(
+                      children: _factors
+                              ?.map(
+                                (x) => CheckboxListTile(
+                                  shape: const RoundedRectangleBorder(
+                                    borderRadius: BorderRadius.all(
+                                      Radius.circular(8),
+                                    ),
+                                  ),
+                                  secondary: Icon(
+                                    _factorLabelMap[x.type]?.$2 ??
+                                        Icons.question_mark,
+                                  ),
+                                  title: Text(
+                                    _factorLabelMap[x.type]?.$1 ?? 'unknown'.tr,
+                                  ),
+                                  enabled: !_currentTicket!.factorTrail
+                                      .contains(x.id),
+                                  value: _factorPicked == x.id,
+                                  onChanged: (value) {
+                                    if (value == true) {
+                                      setState(() => _factorPicked = x.id);
+                                    }
+                                  },
+                                ),
+                              )
+                              .toList() ??
+                          List.empty(),
+                    ),
+                  ),
+                  Text(
+                    'signinMultiFactor'.trParams(
+                      {'n': _currentTicket!.stepRemain.toString()},
+                    ),
+                    style: TextStyle(color: _unFocusColor, fontSize: 12),
+                  ).paddingOnly(left: 16, right: 16),
+                  const Gap(12),
+                  Row(
+                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                    children: [
+                      TextButton(
+                        onPressed: _isBusy ? null : () => _previousStep(),
+                        style:
+                            TextButton.styleFrom(foregroundColor: Colors.grey),
+                        child: Row(
+                          mainAxisSize: MainAxisSize.min,
+                          children: [
+                            const Icon(Icons.chevron_left),
+                            Text('prev'.tr),
+                          ],
+                        ),
+                      ),
+                      TextButton(
+                        onPressed:
+                            _isBusy ? null : () => _performGetFactorCode(),
+                        child: Row(
+                          mainAxisSize: MainAxisSize.min,
+                          children: [
+                            Text('next'.tr),
+                            const Icon(Icons.chevron_right),
+                          ],
+                        ),
+                      ),
+                    ],
+                  ),
+                ],
+              ),
+            2 => Column(
+                key: const ValueKey<int>(2),
+                mainAxisAlignment: MainAxisAlignment.center,
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  ClipRRect(
+                    borderRadius: const BorderRadius.all(Radius.circular(8)),
+                    child:
+                        Image.asset('assets/logo.png', width: 64, height: 64),
+                  ).paddingOnly(bottom: 8, left: 4),
+                  Text(
+                    'signinEnterPassword'.tr,
+                    style: const TextStyle(
+                      fontSize: 28,
+                      fontWeight: FontWeight.w900,
+                    ),
+                  ).paddingOnly(left: 4, bottom: 16),
+                  TextField(
+                    autocorrect: false,
+                    enableSuggestions: false,
+                    controller: _passwordController,
+                    obscureText: true,
+                    autofillHints: [
+                      (_factorLabelMap[_factorPickedType]?.$3 ?? true)
+                          ? AutofillHints.password
+                          : AutofillHints.oneTimeCode
+                    ],
+                    decoration: InputDecoration(
+                      isDense: true,
+                      border: const OutlineInputBorder(),
+                      labelText:
+                          (_factorLabelMap[_factorPickedType]?.$3 ?? true)
+                              ? 'passwordOneTime'.tr
+                              : 'password'.tr,
+                      helperText:
+                          (_factorLabelMap[_factorPickedType]?.$3 ?? true)
+                              ? 'passwordOneTimeInputHint'.tr
+                              : 'passwordInputHint'.tr,
+                    ),
+                    onTapOutside: (_) =>
+                        FocusManager.instance.primaryFocus?.unfocus(),
+                    onSubmitted: _isBusy ? null : (_) => _performCheckTicket(),
+                  ),
+                  const Gap(12),
+                  Row(
+                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                    children: [
+                      TextButton(
+                        onPressed: _isBusy ? null : () => _previousStep(),
+                        style:
+                            TextButton.styleFrom(foregroundColor: Colors.grey),
+                        child: Row(
+                          mainAxisSize: MainAxisSize.min,
+                          children: [
+                            const Icon(Icons.chevron_left),
+                            Text('prev'.tr),
+                          ],
+                        ),
+                      ),
+                      TextButton(
+                        onPressed: _isBusy ? null : () => _performCheckTicket(),
+                        child: Row(
+                          mainAxisSize: MainAxisSize.min,
+                          children: [
+                            Text('next'.tr),
+                            const Icon(Icons.chevron_right),
+                          ],
+                        ),
+                      ),
+                    ],
+                  ),
+                ],
+              ),
+            _ => Column(
+                key: const ValueKey<int>(0),
+                mainAxisAlignment: MainAxisAlignment.center,
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  ClipRRect(
+                    borderRadius: const BorderRadius.all(Radius.circular(8)),
+                    child:
+                        Image.asset('assets/logo.png', width: 64, height: 64),
+                  ).paddingOnly(bottom: 8, left: 4),
                   Text(
                     'signinGreeting'.tr,
                     style: const TextStyle(
@@ -159,37 +413,25 @@ class _SignInScreenState extends State<SignInScreen> with ProtocolListener {
                       isDense: true,
                       border: const OutlineInputBorder(),
                       labelText: 'username'.tr,
+                      helperText: 'usernameInputHint'.tr,
                     ),
                     onTapOutside: (_) =>
                         FocusManager.instance.primaryFocus?.unfocus(),
-            ),
+                    onSubmitted: _isBusy ? null : (_) => _performNewTicket(),
-            const Gap(12),
-            TextField(
-              obscureText: true,
-              autocorrect: false,
-              enableSuggestions: false,
-              autofillHints: const [AutofillHints.password],
-              controller: _passwordController,
-              decoration: InputDecoration(
-                isDense: true,
-                border: const OutlineInputBorder(),
-                labelText: 'password'.tr,
-              ),
-              onTapOutside: (_) =>
-                  FocusManager.instance.primaryFocus?.unfocus(),
-              onSubmitted: (_) => _performAction(),
                   ),
                   const Gap(12),
                   Row(
                     mainAxisAlignment: MainAxisAlignment.spaceBetween,
                     children: [
                       TextButton(
-                  onPressed: _isBusy ? null : () => _requestResetPassword(),
+                        onPressed:
-                  style: TextButton.styleFrom(foregroundColor: Colors.grey),
+                            _isBusy ? null : () => _requestResetPassword(),
+                        style:
+                            TextButton.styleFrom(foregroundColor: Colors.grey),
                         child: Text('forgotPassword'.tr),
                       ),
                       TextButton(
-                  onPressed: _isBusy ? null : () => _performAction(),
+                        onPressed: _isBusy ? null : () => _performNewTicket(),
                         child: Row(
                           mainAxisSize: MainAxisSize.min,
                           children: [
@@ -202,6 +444,8 @@ class _SignInScreenState extends State<SignInScreen> with ProtocolListener {
                   ),
                 ],
               ),
+          },
+        ),
       ),
     );
   }

lib/screens/auth/signup.dart

@@ -73,7 +73,7 @@ class _SignUpScreenState extends State<SignUpScreen> {
             ClipRRect(
               borderRadius: const BorderRadius.all(Radius.circular(8)),
               child: Image.asset('assets/logo.png', width: 64, height: 64),
-            ).paddingOnly(bottom: 4),
+            ).paddingOnly(bottom: 8, left: 4),
             Text(
               'signupGreeting'.tr,
               style: const TextStyle(

lib/services.dart

@@ -1,7 +1,7 @@
 import 'package:get/get.dart';
 
 abstract class ServiceFinder {
-  static const bool devFlag = false;
+  static const bool devFlag = true;
 
   static const String dealerUrl =
       devFlag ? 'http://localhost:8442' : 'https://api.sn.solsynth.dev';