merge: maestro/tsk__bm21nctbhWF into main (bulk integration)

# Conflicts: # client/lib/widgets/auth_screen.dart
2026-06-17 00:47:54 +08:00
parent 5eaabea358 f3cc2dfc2d
commit bcee7f92ed
3 changed files with 10 additions and 7 deletions
@@ -53,13 +53,6 @@ class AuthNotifier extends StateNotifier<AuthState> {
    await _store.clear();
    state = const AuthState();
  }
-
-  /// Dev-only：仅设置内存登录态，不写 keychain。
-  /// 用于 debug 测试账户旁路，规避 flutter_secure_storage 在未签名
-  /// macOS app 上的 keychain entitlement 问题（-34018）。
-  void devLogin(String token) {
-    state = AuthState(accessToken: token);
-  }
 }

 // ── Providers ────────────────────────────────────────────────────────
@@ -10,5 +10,10 @@
 	<true/>
 	<key>com.apple.security.network.server</key>
 	<true/>
+	<!-- flutter_secure_storage: Data Protection Keychain 需要此 entitlement，否则返回 -34018 -->
+	<key>keychain-access-groups</key>
+	<array>
+		<string>$(AppIdentifierPrefix)com.pangolin.pangolinVpn</string>
+	</array>
 </dict>
 </plist>
@@ -6,5 +6,10 @@
 	<false/>
 	<key>com.apple.security.network.client</key>
 	<true/>
+	<!-- flutter_secure_storage: Data Protection Keychain 需要此 entitlement，否则返回 -34018 -->
+	<key>keychain-access-groups</key>
+	<array>
+		<string>$(AppIdentifierPrefix)com.pangolin.pangolinVpn</string>
+	</array>
 </dict>
 </plist>