Skip to content

Commit 928aac1

Browse files
logout timer issue fix
1 parent 836b863 commit 928aac1

1 file changed

Lines changed: 4 additions & 1 deletion

File tree

src/components/Auth/PermissionWatcher.jsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,12 +100,15 @@ function PermissionWatcher() {
100100
if (!isAuthenticated || !flagReady) return;
101101
if (userProfile === null || userProfile === undefined) return; // Wait for profile to load
102102
if (isInitialLogin) return; // Skip mid-session checks during initial login
103+
// Don't trigger when permissions haven't been loaded yet (e.g. on /bmdashboard/login before profile fetch)
104+
if (userProfile?.permissions === undefined || userProfile?.permissions === null) return;
103105

104106
// User permissions changed when logged in → start timer
105107
// Detected by: permissions were acknowledged (or was null/true), then became unacknowledged
106108
// AND user was already logged in (not initial login)
109+
// Use isAcknowledged === false to avoid treating undefined (profile not loaded) as unacknowledged
107110
const permissionsChangedMidSession =
108-
!isAcknowledged && !forceLogoutAt && initialAcknowledgedState !== false; // Was acknowledged or null before (not explicitly false)
111+
isAcknowledged === false && !forceLogoutAt && initialAcknowledgedState !== false; // Was acknowledged or null before (not explicitly false)
109112

110113
if (permissionsChangedMidSession) {
111114
dispatch(startForceLogout(20000));

0 commit comments

Comments
 (0)