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

Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces

Browse Source
This commit is contained in:
TatianaLopaeva 2021-03-18 13:30:53 +03:00
commit 80247cbb1a
2 changed files with 11 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,9 +17,8 @@ import PasswordInput from "@appserver/components/password-input";
import toastr from "@appserver/components/toast/toastr";
import Loader from "@appserver/components/loader";
import PageLayout from "@appserver/common/components/PageLayout";
import constants from "@appserver/common/constants";
import { EmployeeActivationStatus } from "@appserver/common/constants";
import { createPasswordHash } from "@appserver/common/utils";
const { EmployeeActivationStatus } = constants;
const inputWidth = "400px";
@ -65,7 +64,6 @@ class Confirm extends React.PureComponent {
super(props);
this.state = {
isConfirmLoaded: false,
email: props.linkData.email,
firstName: props.linkData.firstname,
firstNameValid: true,
@ -192,16 +190,10 @@ class Confirm extends React.PureComponent {
const { getSettings, getPortalPasswordSettings, history } = this.props;
const requests = [getSettings(), getPortalPasswordSettings(this.state.key)];
axios
.all(requests)
.then(() => {
this.setState({ isConfirmLoaded: true });
console.log("get settings success");
})
.catch((e) => {
console.error("get settings error", e);
history.push(`/login/error=${e}`);
});
axios.all(requests).catch((e) => {
console.error("get settings error", e);
history.push(`/login/error=${e}`);
});
window.addEventListener("keydown", this.onKeyPress);
window.addEventListener("keyup", this.onKeyPress);
@ -235,8 +227,8 @@ class Confirm extends React.PureComponent {
render() {
console.log("ActivateUser render");
const { settings, isConfirmLoaded, t, greetingTitle } = this.props;
return !isConfirmLoaded ? (
const { settings, t, greetingTitle } = this.props;
return !settings ? (
<Loader className="pageLoader" type="rombs" size="40px" />
) : (
<ConfirmContainer>
@ -364,8 +356,6 @@ class Confirm extends React.PureComponent {
}
Confirm.propTypes = {
getConfirmationInfo: PropTypes.func.isRequired,
activateConfirmUser: PropTypes.func.isRequired,
location: PropTypes.object.isRequired,
history: PropTypes.object.isRequired,
};

14
web/ASC.Web.Client/src/components/pages/Confirm/sub-components/changeEmail.js
View File

@ -14,13 +14,11 @@ class ChangeEmail extends React.PureComponent {
changeEmail(userId, email, key)
.then((res) => {
console.log("change client email success", res);
tryRedirectTo(
`${window.location.origin}/products/people/view/@self?email_change=success`
);
tryRedirectTo(`/products/people/view/@self?email_change=success`);
})
.catch((e) => {
console.log("change client email error", e);
tryRedirectTo(`${window.location.origin}/error=${e}`);
tryRedirectTo(`/error=${e}`);
});
}
}
@ -32,13 +30,9 @@ class ChangeEmail extends React.PureComponent {
changeEmail(userId, email, key)
.then((res) => {
console.log("change client email success", res);
tryRedirectTo(
`${window.location.origin}/products/people/view/@self?email_change=success`
);
tryRedirectTo(`/products/people/view/@self?email_change=success`);
})
.catch((e) => {
console.log("change client email error", e);
});
.catch((e) => console.log("change client email error", e));
} else {
tryRedirectTo(defaultPage);
}