IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Web.Client: Confirm: added logout in activateUser component

Browse Source
This commit is contained in:
Daniil Senkiv 2019-10-02 14:53:15 +03:00
parent b348c918ad
commit 7208b56dde
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
web/ASC.Web.Client/src/components/pages/Confirm/sub-components/activateUser.js
View File

@ -7,7 +7,7 @@ import { Collapse } from 'reactstrap';
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import { welcomePageTitle } from './../../../../helpers/customNames'; import { welcomePageTitle } from './../../../../helpers/customNames';
import { EmployeeActivationStatus } from './../../../../helpers/constants'; import { EmployeeActivationStatus } from './../../../../helpers/constants';
import { getConfirmationInfo, activateConfirmUser } from '../../../../store/auth/actions'; import { getConfirmationInfo, activateConfirmUser, logout } from '../../../../store/auth/actions';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
const inputWidth = '400px'; const inputWidth = '400px';
@ -74,7 +74,7 @@ class Confirm extends React.PureComponent {
onSubmit = (e) => { onSubmit = (e) => {
this.setState({ isLoading: true }, function () { this.setState({ isLoading: true }, function () {
const { activateConfirmUser } = this.props; const { activateConfirmUser, logout } = this.props;
this.setState({ errorText: "" }); this.setState({ errorText: "" });
@ -111,7 +111,7 @@ class Confirm extends React.PureComponent {
firstname: this.state.firstName, firstname: this.state.firstName,
lastname: this.state.lastName lastname: this.state.lastName
}; };
logout();
activateConfirmUser(personalData, loginData, this.state.key, this.state.userId, EmployeeActivationStatus.Activated) activateConfirmUser(personalData, loginData, this.state.key, this.state.userId, EmployeeActivationStatus.Activated)
.then(() => window.location.href = '/') .then(() => window.location.href = '/')
.catch(e => { .catch(e => {
@ -321,4 +321,4 @@ function mapStateToProps(state) {
}; };
} }
export default connect(mapStateToProps, { getConfirmationInfo, activateConfirmUser })(withRouter(withTranslation()(ActivateUserForm))); export default connect(mapStateToProps, { getConfirmationInfo, activateConfirmUser,logout })(withRouter(withTranslation()(ActivateUserForm)));