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

Web: Client: confirm: added passwordHash to co createUser, activateUser

Browse Source
This commit is contained in:
Artem Tarasov 2020-10-07 19:52:25 +03:00
parent 2547a70498
commit e2f3daacec
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -117,7 +117,7 @@ class Confirm extends React.PureComponent {
const loginData = { const loginData = {
userName: this.state.email, userName: this.state.email,
password: hash, passwordHash: hash,
}; };
const personalData = { const personalData = {

2
web/ASC.Web.Client/src/components/pages/Confirm/sub-components/createUser.js
View File

@ -127,7 +127,7 @@ class Confirm extends React.PureComponent {
const loginData = { const loginData = {
userName: this.state.email, userName: this.state.email,
password: hash, passwordHash: hash,
}; };
const personalData = { const personalData = {

6
web/ASC.Web.Client/src/store/confirm/actions.js
View File

@ -31,7 +31,7 @@ export function createConfirmUser(registerData, loginData, key) {
return api.people return api.people
.createUser(data, key) .createUser(data, key)
.then((user) => dispatch(setCurrentUser(user))) .then((user) => dispatch(setCurrentUser(user)))
.then(() => api.user.login(loginData.userName, loginData.password)) .then(() => api.user.login(loginData.userName, loginData.passwordHash))
.then(() => loadInitInfo(dispatch)); .then(() => loadInitInfo(dispatch));
}; };
} }
@ -51,12 +51,12 @@ export function activateConfirmUser(
return (dispatch) => { return (dispatch) => {
return api.people return api.people
.changePassword(userId, loginData.password, key) .changePassword(userId, loginData.passwordHash, key)
.then((data) => { .then((data) => {
return api.people.updateActivationStatus(activationStatus, userId, key); return api.people.updateActivationStatus(activationStatus, userId, key);
}) })
.then((data) => { .then((data) => {
return dispatch(login(loginData.userName, loginData.password)); return dispatch(login(loginData.userName, loginData.passwordHash));
}) })
.then((data) => { .then((data) => {
return api.people.updateUser(changedData); return api.people.updateUser(changedData);