reset session for other user won't trigger logout (#2736)
This commit is contained in:
@@ -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"));
|
||||
}
|
||||
})
|
||||
|
||||
@@ -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) => {
|
||||
|
||||
Reference in New Issue
Block a user