Merge branch 'development' into som-fix/ending-after-figma-mismatch

Author: somramnani

config-overrides.js

@@ -1,3 +1,4 @@
+// eslint-disable-next-line import/no-extraneous-dependencies
 const webpack = require('webpack');
 
 module.exports = function override(config) {

src/actions/__tests__/authActions.js.test.js

@@ -13,7 +13,7 @@ import {
   setCurrentUser, // Import setCurrentUser action
   setHeaderData, // Import setHeaderData action
 } from '../authActions'; // Import actions from authActions
-import { SET_CURRENT_USER, SET_HEADER_DATA } from '../../constants/auth'; // Import constants
+import { SET_CURRENT_USER, SET_HEADER_DATA, STOP_FORCE_LOGOUT } from '../../constants/auth'; // Import constants
 
 
 const middlewares = [thunk]; // Define middlewares
@@ -35,7 +35,10 @@ describe('authActions', () => {
     httpService.post.mockResolvedValue({ data: { token } }); // Mock the httpService post method
     jwtDecode.mockReturnValue(decodedToken); // Mock the jwtDecode function
 
-    const expectedActions = [{ type: SET_CURRENT_USER, payload: decodedToken }]; // Define expected actions
+    const expectedActions = [
+      { type: STOP_FORCE_LOGOUT }, // Ensure any existing timers are cleared
+      { type: SET_CURRENT_USER, payload: decodedToken },
+    ]; // Define expected actions
 
     await store.dispatch(loginUser(credentials)); // Dispatch the loginUser action
     expect(store.getActions()).toEqual(expectedActions); // Assert the actions
@@ -68,7 +71,10 @@ describe('authActions', () => {
 
   it('creates SET_CURRENT_USER with null when logoutUser is called', () => {
     const store = mockStore({}); // Create a mock store
-    const expectedActions = [{ type: SET_CURRENT_USER, payload: null }]; // Define expected actions
+    const expectedActions = [
+      { type: STOP_FORCE_LOGOUT }, // Clear any active force-logout timer
+      { type: SET_CURRENT_USER, payload: null },
+    ]; // Define expected actions
 
     store.dispatch(logoutUser()); // Dispatch the logoutUser action
     expect(store.getActions()).toEqual(expectedActions); // Assert the actions

src/actions/authActions.js

@@ -8,6 +8,7 @@ import {
   SET_CURRENT_USER,
   SET_HEADER_DATA,
   START_FORCE_LOGOUT,
+  STOP_FORCE_LOGOUT,
 } from '../constants/auth';
 
 const { tokenKey } = config;
@@ -22,6 +23,21 @@ export const setHeaderData = data => ({
   payload: data,
 });
 
+/**
+ * Stops any active force logout timer and clears related state
+ */
+export const stopForceLogout = () => (dispatch, getState) => {
+  const { auth } = getState();
+  if (auth?.timerId) {
+    try {
+      clearTimeout(auth.timerId);
+    } catch (e) {
+      // Timer already cleared or invalid
+    }
+  }
+  dispatch({ type: STOP_FORCE_LOGOUT });
+};
+
 export const loginUser = credentials => dispatch => {
   return httpService
     .post(ENDPOINTS.LOGIN, credentials)
@@ -33,6 +49,8 @@ export const loginUser = credentials => dispatch => {
       localStorage.setItem(tokenKey, res.data.token);
       httpService.setjwt(res.data.token);
       const decoded = jwtDecode(res.data.token);
+      // Ensure any existing timers from a previous session are cleared
+      dispatch(stopForceLogout());
       dispatch(setCurrentUser(decoded));
       return { success: true };
     })
@@ -98,6 +116,8 @@ export const getHeaderData = userId => {
 };
 
 export const logoutUser = () => dispatch => {
+  // Clear any active force-logout timer before logging out
+  dispatch(stopForceLogout());
   localStorage.removeItem(tokenKey);
   httpService.setjwt(false);
   dispatch(setCurrentUser(null));
@@ -134,6 +154,9 @@ export const startForceLogout = (delayMs = 20000) => (dispatch, getState) => {
       // eslint-disable-next-line no-console
       console.error('Error acknowledging permissions during force logout:', error);
     } finally {
+      // Set flag to indicate user was force logged out due to permission changes
+      // This helps distinguish "force logged out" vs "first login after permission change"
+      sessionStorage.setItem('wasForceLoggedOut', 'true');
       dispatch(logoutUser());
     }
   }, delayMs);