修复工作人员端令牌失效后的登录恢复

apps/service_app/lib/app/auth_navigation.dart

@@ -0,0 +1,32 @@
+// 功能描述：提供工作人员端鉴权地址构造与站内回跳地址校验。
+// 版本：1.0.0
+
+/// 构造登录地址，并安全携带原目标页和会话失效原因。
+String buildAuthLocation({
+  String? redirectTarget,
+  bool sessionExpired = false,
+}) {
+  final safeTarget = sanitizeRedirectTarget(redirectTarget);
+  final query = <String, String>{
+    'redirect': ?safeTarget,
+    if (sessionExpired) 'reason': 'expired',
+  };
+  return Uri(
+    path: '/login',
+    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') return null;
+  return uri.toString();
+}

apps/service_app/lib/app/dependencies.dart

@@ -1,3 +1,5 @@
+// 功能描述：装配工作人员端依赖，并统一管理登录、退出和失效会话。
+// 版本：1.1.0
 import 'package:flutter/foundation.dart';
 import 'package:uuid/uuid.dart';
 
@@ -8,7 +10,7 @@ import '../data/services/location_service.dart';
 import '../data/services/secure_session_store.dart';
 
 class AppDependencies {
-  AppDependencies._({
+  AppDependencies({
     required this.session,
     required this.repository,
     required this.drafts,
@@ -22,15 +24,19 @@ class AppDependencies {
     final store = SecureSessionStore();
     final session = StaffSession(store);
     await session.restore();
-    final api = ApiClient(() => session.token);
-    return AppDependencies._(
+    final authenticatedApi = ApiClient(
+      () => session.token,
+      onUnauthorized: session.invalidate,
+    );
+    return AppDependencies(
       session: session,
-      repository: ServiceRepository(api, GeolocatorLocationService()),
+      repository: ServiceRepository(authenticatedApi, GeolocatorLocationService()),
       drafts: EncryptedDraftStore(),
     );
   }
 }
 
+/// 管理工作人员令牌、身份、角色、设备标识及会话失效通知。
 class StaffSession extends ChangeNotifier {
   StaffSession(this._store);
 
@@ -39,24 +45,29 @@ class StaffSession extends ChangeNotifier {
   static const _identityKey = 'service_app_identity';
   static const _roleKey = 'service_app_role';
   static const _deviceKey = 'service_app_device';
-  final SecureSessionStore _store;
+  final SessionStore _store;
 
   String _token = '';
   String _identity = '';
   String _roleCode = '';
   String _deviceIdentity = '';
+  bool _expired = false;
+  Future<void> _pendingClear = Future<void>.value();
 
   String get token => _token;
   String get identity => _identity;
   String get roleCode => _roleCode;
   String get deviceIdentity => _deviceIdentity;
   bool get isAuthenticated => _token.isNotEmpty;
+  bool get hasExpired => _expired;
 
+  /// 从安全存储恢复会话上下文；是否有效由后续受保护接口响应确认。
   Future<void> restore() async {
     _token = await _store.read(_tokenKey) ?? '';
     _identity = await _store.read(_identityKey) ?? '';
     _roleCode = await _store.read(_roleKey) ?? '';
     _deviceIdentity = await _store.read(_deviceKey) ?? '';
+    _expired = false;
     if (_deviceIdentity.isEmpty) {
       _deviceIdentity = const Uuid().v7();
       await _store.write(_deviceKey, _deviceIdentity);
@@ -72,15 +83,22 @@ class StaffSession extends ChangeNotifier {
         body: {'phone': phone, 'mode': 'password', 'password': password},
       ),
     );
-    _token = details['access_token'] as String? ?? '';
-    _identity = details['identity'] as String? ?? '';
-    _roleCode = details['role_code'] as String? ?? '';
-    if (_token.isEmpty || _identity.isEmpty || _roleCode.isEmpty) {
+    final token = details['access_token'] as String? ?? '';
+    final identity = details['identity'] as String? ?? '';
+    final roleCode = details['role_code'] as String? ?? '';
+    if (token.isEmpty || identity.isEmpty || roleCode.isEmpty) {
       throw const ApiException(500, '工作人员登录上下文缺失');
     }
-    await _store.write(_tokenKey, _token);
-    await _store.write(_identityKey, _identity);
-    await _store.write(_roleKey, _roleCode);
+
+    // 等待旧会话清理结束，避免迟到的删除任务误删刚写入的新会话。
+    await _pendingClear;
+    await _store.write(_tokenKey, token);
+    await _store.write(_identityKey, identity);
+    await _store.write(_roleKey, roleCode);
+    _token = token;
+    _identity = identity;
+    _roleCode = roleCode;
+    _expired = false;
     notifyListeners();
   }
 
@@ -88,9 +106,33 @@ class StaffSession extends ChangeNotifier {
     _token = '';
     _identity = '';
     _roleCode = '';
-    await _store.delete(_tokenKey);
-    await _store.delete(_identityKey);
-    await _store.delete(_roleKey);
+    _expired = false;
     notifyListeners();
+    _pendingClear = _clearStoredSession();
+    await _pendingClear;
+  }
+
+  /// 仅当服务端拒绝的仍是当前令牌时，使会话失效并通知路由。
+  void invalidate(String rejectedToken) {
+    if (rejectedToken.isEmpty || rejectedToken != _token || _expired) return;
+
+    _token = '';
+    _identity = '';
+    _roleCode = '';
+    _expired = true;
+    notifyListeners();
+    _pendingClear = _clearStoredSession();
+  }
+
+  /// 尽力删除会话字段并保留设备标识；单项失败不得阻塞返回登录页。
+  Future<void> _clearStoredSession() async {
+    for (final key in const [_tokenKey, _identityKey, _roleKey]) {
+      try {
+        await _store.delete(key);
+      } catch (error, stackTrace) {
+        debugPrint('清理工作人员失效会话失败（$key）：$error');
+        debugPrintStack(stackTrace: stackTrace);
+      }
+    }
   }
 }

apps/service_app/lib/app/router.dart

@@ -1,3 +1,5 @@
+// 功能描述：配置工作人员端路由、鉴权守卫及登录后安全回跳。
+// 版本：1.1.0
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
 
@@ -7,21 +9,35 @@ import '../ui/features/preflight/preflight_page.dart';
 import '../ui/features/profile/profile_page.dart';
 import '../ui/features/work/work_detail_page.dart';
 import '../ui/features/work/work_list_page.dart';
+import 'auth_navigation.dart';
 import 'dependencies.dart';
 
-GoRouter createRouter(AppDependencies dependencies) => GoRouter(
-  initialLocation: '/preflight',
+GoRouter createRouter(
+  AppDependencies dependencies, {
+  String initialLocation = '/preflight',
+}) => GoRouter(
+  initialLocation: initialLocation,
   refreshListenable: dependencies.session,
   redirect: (context, state) {
     final login = state.matchedLocation == '/login';
-    if (!dependencies.session.isAuthenticated && !login) return '/login';
-    if (dependencies.session.isAuthenticated && login) return '/preflight';
+    if (!dependencies.session.isAuthenticated && !login) {
+      return buildAuthLocation(
+        redirectTarget: state.uri.toString(),
+        sessionExpired: dependencies.session.hasExpired,
+      );
+    }
+    if (dependencies.session.isAuthenticated && login) {
+      return sanitizeRedirectTarget(state.uri.queryParameters['redirect']) ?? '/preflight';
+    }
     return null;
   },
   routes: [
     GoRoute(
       path: '/login',
-      builder: (context, state) => LoginPage(session: dependencies.session),
+      builder: (context, state) => LoginPage(
+        session: dependencies.session,
+        showSessionExpiredMessage: state.uri.queryParameters['reason'] == 'expired',
+      ),
     ),
     GoRoute(
       path: '/preflight',