Skip to content

Commit d65df99

Browse files
committed
refactor:resolved [CMG-699] login switch issue
1 parent 9c9d4ac commit d65df99

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

ui/src/pages/Login/index.tsx

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { FC, useEffect, useState } from 'react';
33
import { useNavigate, useLocation } from 'react-router-dom';
44
import { useDispatch, useSelector } from 'react-redux';
55

6-
import { getUserDetails, setAuthToken, setUser } from '../../store/slice/authSlice';
6+
import { getUserDetails, setAuthToken, setUser, clearOrganisationData } from '../../store/slice/authSlice';
77
import {
88
Button,
99
Field,
@@ -157,6 +157,11 @@ const Login: FC<IProps> = () => {
157157
if (response?.status === 200 && response?.data?.message === LOGIN_SUCCESSFUL_MESSAGE) {
158158
setIsLoading(false);
159159
setDataInLocalStorage('app_token', response?.data?.app_token);
160+
161+
// Clear any previous organization data to ensure fresh organization selection for new user
162+
localStorage.removeItem('organization');
163+
dispatch(clearOrganisationData());
164+
160165
const authenticationObj = {
161166
authToken: response?.data?.app_token,
162167
isAuthenticated: true

ui/src/store/slice/authSlice.tsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,10 @@ const authSlice = createSlice({
9797
},
9898
setSelectedOrganisation: (state, action) => {
9999
state.selectedOrganisation = action?.payload;
100+
},
101+
clearOrganisationData: (state) => {
102+
state.organisationsList = [];
103+
state.selectedOrganisation = DEFAULT_DROPDOWN;
100104
}
101105

102106

@@ -116,7 +120,7 @@ const authSlice = createSlice({
116120

117121
},
118122
})
119-
export const { setAuthToken, reInitiliseState, setOrganisationsList, setSelectedOrganisation, setUser } = authSlice.actions;
123+
export const { setAuthToken, reInitiliseState, setOrganisationsList, setSelectedOrganisation, setUser, clearOrganisationData } = authSlice.actions;
120124

121125
export {getUserDetails};
122126
export default authSlice.reducer;

0 commit comments

Comments
 (0)