Elgato_dark/fleet
1
0
Fork 0
mirror of https://github.com/fleetdm/fleet synced 2026-05-22 08:28:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 109

reset session for other user won't trigger logout (#2736)

Browse source
This commit is contained in:
Martavis Parker 2021-10-28 15:35:38 -07:00 committed by GitHub
parent e50ca4ece7
commit a7c1136877
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
frontend/pages/admin/UserManagementPage/UserManagementPage.jsx
View file

@ -267,15 +267,14 @@ export class UserManagementPage extends Component {
};
onResetSessions = () => {
const { LOGIN } = paths;
const { currentUser, dispatch } = this.props;
const { userEditing } = this.state;
const { toggleResetSessionsUserModal } = this;
dispatch(userActions.deleteSessions(userEditing))
const isResettingCurrentUser = currentUser.id === userEditing.id;
dispatch(userActions.deleteSessions(userEditing, isResettingCurrentUser))
.then(() => {
if (currentUser.id === userEditing.id) {
dispatch(push(LOGIN));
} else {
if (!isResettingCurrentUser) {
dispatch(renderFlash("success", "Sessions reset"));
}
})

7
frontend/redux/nodes/entities/users/actions.js
View file

@ -116,14 +116,17 @@ export const createUserWithoutInvitation = (formData) => {
};
};
export const deleteSessions = (user) => {
export const deleteSessions = (user, isResettingCurrentUser = false) => {
const { successAction, destroyFailure, destroySuccess } = actions;
return (dispatch) => {
return Fleet.users
.deleteSessions(user)
.then((userResponse) => {
dispatch(logoutSuccess);
if (isResettingCurrentUser) {
dispatch(logoutSuccess);
}
return dispatch(successAction(userResponse, destroySuccess));
})
.catch((response) => {