From 43242673fbe4f18555aad4efb8f37c84aee69359 Mon Sep 17 00:00:00 2001
From: edde746 <86283021+edde746@users.noreply.github.com>
Date: Sat, 2 May 2026 01:23:21 +0200
Subject: [PATCH] fix(profile): avoid PIN prompt on restart

---
 lib/profiles/active_profile_binder.dart       | 19 +++++++------------
 test/profiles/active_profile_binder_test.dart | 16 ++++------------
 2 files changed, 11 insertions(+), 24 deletions(-)

diff --git a/lib/profiles/active_profile_binder.dart b/lib/profiles/active_profile_binder.dart
index f90ca5d2..98a02070 100644
--- a/lib/profiles/active_profile_binder.dart
+++ b/lib/profiles/active_profile_binder.dart
@@ -23,8 +23,8 @@ typedef PlexHomePinPrompt = Future<String?> Function(Profile profile, {String? e
 typedef ShouldDeferInitialBind = FutureOr<bool> Function(Profile profile);
 
 @visibleForTesting
-bool shouldUsePlexHomeTokenCache({required bool preVerified, required bool hasBoundOnce, required bool plexProtected}) {
-  return preVerified || (!hasBoundOnce && !plexProtected);
+bool shouldUsePlexHomeTokenCache({required bool preVerified, required bool hasBoundOnce}) {
+  return preVerified || !hasBoundOnce;
 }
 
 /// Wires the active [Profile] into [MultiServerManager] + [MultiServerProvider].
@@ -285,17 +285,12 @@ class ActiveProfileBinder {
 
     // Fast path: reuse the previously-minted user-token from the
     // [ProfileConnection] row for this profile's parent connection.
-    // Cold-start auto-resume can use cached tokens for unprotected Plex Home
-    // users only. Protected users must revalidate their PIN unless
-    // activateProfileWithPin has already minted the token in this same
-    // activation (pre-verified flag), in which case using the cache once skips
-    // a redundant second prompt without weakening the security model.
+    // Cold-start auto-resume can use cached tokens. Once a profile is bound in
+    // this session, switches bypass the cache so Plex revalidates PINs where
+    // needed. A just-preverified activation also uses the fresh cache once to
+    // avoid a redundant second prompt.
     final preVerified = consumePlexHomePreVerified(profile.id);
-    final useCache = shouldUsePlexHomeTokenCache(
-      preVerified: preVerified,
-      hasBoundOnce: _hasBoundOnce,
-      plexProtected: profile.plexProtected,
-    );
+    final useCache = shouldUsePlexHomeTokenCache(preVerified: preVerified, hasBoundOnce: _hasBoundOnce);
     String? cachedToken;
     if (useCache) {
       final pc = await profileConnections.get(profile.id, parentId);
diff --git a/test/profiles/active_profile_binder_test.dart b/test/profiles/active_profile_binder_test.dart
index 27d801f5..4f4312d1 100644
--- a/test/profiles/active_profile_binder_test.dart
+++ b/test/profiles/active_profile_binder_test.dart
@@ -145,24 +145,16 @@ void main() {
   });
 
   group('Plex Home token cache policy', () {
-    test('protected cold start revalidates PIN even when profile selection is not required', () {
-      expect(shouldUsePlexHomeTokenCache(preVerified: false, hasBoundOnce: false, plexProtected: true), isFalse);
-    });
-
-    test('protected cold start revalidates PIN when profile selection is required', () {
-      expect(shouldUsePlexHomeTokenCache(preVerified: false, hasBoundOnce: false, plexProtected: true), isFalse);
+    test('cold start uses cached token instead of forcing PIN revalidation', () {
+      expect(shouldUsePlexHomeTokenCache(preVerified: false, hasBoundOnce: false), isTrue);
     });
 
     test('preverified activation uses cache once regardless of setting', () {
-      expect(shouldUsePlexHomeTokenCache(preVerified: true, hasBoundOnce: false, plexProtected: true), isTrue);
-    });
-
-    test('unprotected cold start can use cached token', () {
-      expect(shouldUsePlexHomeTokenCache(preVerified: false, hasBoundOnce: false, plexProtected: false), isTrue);
+      expect(shouldUsePlexHomeTokenCache(preVerified: true, hasBoundOnce: false), isTrue);
     });
 
     test('user-initiated switches bypass cache after first bind', () {
-      expect(shouldUsePlexHomeTokenCache(preVerified: false, hasBoundOnce: true, plexProtected: false), isFalse);
+      expect(shouldUsePlexHomeTokenCache(preVerified: false, hasBoundOnce: true), isFalse);
     });
 
     test('preverified activation flag is consumed once per profile', () {