Web.Client: in addition to 6c3dc95c80

This commit is contained in:
Daniil Senkiv 2019-09-25 16:44:47 +03:00
parent 6c3dc95c80
commit 6840945d00

View File

@ -3,7 +3,7 @@ import { withRouter } from "react-router";
import { withTranslation } from 'react-i18next'; import { withTranslation } from 'react-i18next';
import { PageLayout, Loader } from 'asc-web-components'; import { PageLayout, Loader } from 'asc-web-components';
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import { logout, validateChangingEmail } from '../../../../store/auth/actions'; import { logout, validateActivatingEmail } from '../../../../store/auth/actions';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
@ -17,12 +17,12 @@ class ActivateEmail extends React.PureComponent {
} }
componentDidMount() { componentDidMount() {
const { history, logout, validateChangingEmail } = this.props; const { history, logout, validateActivatingEmail } = this.props;
const queryParams = this.state.queryString.split('&'); const queryParams = this.state.queryString.split('&');
const arrayOfQueryParams = queryParams.map(queryParam => queryParam.split('=')); const arrayOfQueryParams = queryParams.map(queryParam => queryParam.split('='));
const linkParams = Object.fromEntries(arrayOfQueryParams); const linkParams = Object.fromEntries(arrayOfQueryParams);
logout(); logout();
validateChangingEmail(linkParams) validateActivatingEmail(linkParams)
.then((res) => { .then((res) => {
const email = decodeURIComponent(res.data.response.email); const email = decodeURIComponent(res.data.response.email);
history.push(`/login/confirmed-email=${email}`); history.push(`/login/confirmed-email=${email}`);
@ -47,4 +47,4 @@ ActivateEmail.propTypes = {
const ActivateEmailForm = (props) => (<PageLayout sectionBodyContent={<ActivateEmail {...props} />} />); const ActivateEmailForm = (props) => (<PageLayout sectionBodyContent={<ActivateEmail {...props} />} />);
export default connect(null, { logout, validateChangingEmail })(withRouter(withTranslation()(ActivateEmailForm))); export default connect(null, { logout, validateActivatingEmail })(withRouter(withTranslation()(ActivateEmailForm)));