修复用户端令牌失效后的登录恢复

apps/user_app/lib/app/auth_navigation.dart

@@ -0,0 +1,33 @@
+// 功能描述：提供鉴权页面地址构造与站内回跳地址校验。
+// 版本：1.0.0
+
+/// 构造登录或注册地址，并安全携带原目标页和会话失效原因。
+String buildAuthLocation(
+  String authPath, {
+  String? redirectTarget,
+  bool sessionExpired = false,
+}) {
+  final safeTarget = sanitizeRedirectTarget(redirectTarget);
+  final query = <String, String>{
+    'redirect': ?safeTarget,
+    if (sessionExpired) 'reason': 'expired',
+  };
+  return Uri(
+    path: authPath,
+    queryParameters: query.isEmpty ? null : query,
+  ).toString();
+}
+
+/// 只接受站内绝对路径，阻止外部地址和鉴权页之间形成重定向循环。
+String? sanitizeRedirectTarget(String? value) {
+  final candidate = value?.trim() ?? '';
+  if (candidate.isEmpty) return null;
+
+  final uri = Uri.tryParse(candidate);
+  if (uri == null || uri.hasScheme || uri.hasAuthority || !uri.path.startsWith('/')) {
+    return null;
+  }
+  if (uri.path.startsWith('//') || uri.path.contains(r'\')) return null;
+  if (uri.path == '/login' || uri.path == '/register') return null;
+  return uri.toString();
+}

apps/user_app/lib/app/dependencies.dart

@@ -1,3 +1,6 @@
+// 功能描述：装配用户端依赖，并统一管理登录、退出和失效会话。
+// 版本：1.1.0
+
 import 'package:flutter/foundation.dart';
 
 import '../data/repositories/client_repository.dart';
@@ -5,7 +8,7 @@ import '../data/services/api_client.dart';
 import '../data/services/secure_session_store.dart';
 
 class AppDependencies {
-  AppDependencies._({
+  AppDependencies({
     required this.session,
     required this.repository,
   });
@@ -17,23 +20,32 @@ class AppDependencies {
     final store = SecureSessionStore();
     final session = UserSession(store);
     await session.restore();
-    final api = ApiClient(() => session.token);
-    return AppDependencies._(session: session, repository: ClientRepository(api));
+    final api = ApiClient(
+      () => session.token,
+      onUnauthorized: session.invalidate,
+    );
+    return AppDependencies(session: session, repository: ClientRepository(api));
   }
 }
 
+/// 管理内存令牌、持久化令牌以及会话失效通知。
 class UserSession extends ChangeNotifier {
   UserSession(this._store);
 
   static const _root = '/heqi/client/v1/user';
-  final SecureSessionStore _store;
+  final SessionStore _store;
   String _token = '';
+  bool _expired = false;
+  Future<void> _pendingClear = Future<void>.value();
 
   String get token => _token;
   bool get isAuthenticated => _token.isNotEmpty;
+  bool get hasExpired => _expired;
 
+  /// 从安全存储恢复令牌；是否有效由后续受保护接口响应确认。
   Future<void> restore() async {
     _token = await _store.readToken() ?? '';
+    _expired = false;
   }
 
   Future<void> login({
@@ -57,9 +69,14 @@ class UserSession extends ChangeNotifier {
         },
       ),
     );
-    _token = details['access_token'] as String? ?? '';
-    if (_token.isEmpty) throw const ApiException(500, '登录令牌缺失');
-    await _store.writeToken(_token);
+    final token = details['access_token'] as String? ?? '';
+    if (token.isEmpty) throw const ApiException(500, '登录令牌缺失');
+
+    // 等待旧令牌清理结束，避免迟到的删除任务误删刚写入的新令牌。
+    await _pendingClear;
+    await _store.writeToken(token);
+    _token = token;
+    _expired = false;
     notifyListeners();
   }
 
@@ -77,7 +94,29 @@ class UserSession extends ChangeNotifier {
 
   Future<void> logout() async {
     _token = '';
-    await _store.clear();
+    _expired = false;
     notifyListeners();
+    _pendingClear = _clearStoredToken();
+    await _pendingClear;
+  }
+
+  /// 仅当服务端拒绝的仍是当前令牌时，使会话失效并通知路由。
+  void invalidate(String rejectedToken) {
+    if (rejectedToken.isEmpty || rejectedToken != _token || _expired) return;
+
+    _token = '';
+    _expired = true;
+    notifyListeners();
+    _pendingClear = _clearStoredToken();
+  }
+
+  /// 尽力删除持久化令牌；失败不得阻塞用户返回登录页。
+  Future<void> _clearStoredToken() async {
+    try {
+      await _store.clear();
+    } catch (error, stackTrace) {
+      debugPrint('清理失效登录令牌失败：$error');
+      debugPrintStack(stackTrace: stackTrace);
+    }
   }
 }

apps/user_app/lib/app/router.dart

@@ -1,3 +1,5 @@
+// 功能描述：配置用户端路由、鉴权守卫及登录后安全回跳。
+// 版本：1.1.0
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
 
@@ -9,25 +11,45 @@ import '../ui/features/profile/profile_page.dart';
 import '../ui/features/shared/record_list_page.dart';
 import '../ui/features/shared/record_list_view_model.dart';
 import '../ui/features/shop/shop_page.dart';
+import 'auth_navigation.dart';
 import 'dependencies.dart';
 
-GoRouter createRouter(AppDependencies dependencies) => GoRouter(
-  initialLocation: '/home',
+GoRouter createRouter(
+  AppDependencies dependencies, {
+  String initialLocation = '/home',
+}) => GoRouter(
+  initialLocation: initialLocation,
   refreshListenable: dependencies.session,
   redirect: (context, state) {
     final authRoute = state.matchedLocation == '/login' || state.matchedLocation == '/register';
-    if (!dependencies.session.isAuthenticated && !authRoute) return '/login';
-    if (dependencies.session.isAuthenticated && state.matchedLocation == '/login') return '/home';
+    if (!dependencies.session.isAuthenticated && !authRoute) {
+      return buildAuthLocation(
+        '/login',
+        redirectTarget: state.uri.toString(),
+        sessionExpired: dependencies.session.hasExpired,
+      );
+    }
+    if (dependencies.session.isAuthenticated && state.matchedLocation == '/login') {
+      return sanitizeRedirectTarget(state.uri.queryParameters['redirect']) ?? '/home';
+    }
     return null;
   },
   routes: [
     GoRoute(
       path: '/login',
-      builder: (context, state) => LoginPage(session: dependencies.session),
+      builder: (context, state) => LoginPage(
+        session: dependencies.session,
+        redirectTarget: sanitizeRedirectTarget(state.uri.queryParameters['redirect']),
+        showSessionExpiredMessage: state.uri.queryParameters['reason'] == 'expired',
+      ),
     ),
     GoRoute(
       path: '/register',
-      builder: (context, state) => RegisterPage(session: dependencies.session),
+      builder: (context, state) => RegisterPage(
+        session: dependencies.session,
+        redirectTarget: sanitizeRedirectTarget(state.uri.queryParameters['redirect']),
+        showSessionExpiredMessage: state.uri.queryParameters['reason'] == 'expired',
+      ),
     ),
     GoRoute(
       path: '/records/contracts',