ElyBy-Mirror/accounts-frontend
1
0
Fork 0
mirror of https://github.com/elyby/accounts-frontend.git synced 2025-02-17 07:48:16 +05:30
Code Issues Packages Projects Releases Wiki Activity

#330: do not alter payload in ForgotPasswordState. Just pass it through

Browse Source
This commit is contained in:
SleepWalker 2017-04-21 08:28:19 +03:00
parent 852e073d37
commit 692e9b0ccd
3 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/components/auth/forgotPassword/ForgotPasswordBody.jsx
View File

@ -18,7 +18,7 @@ export default class ForgotPasswordBody extends BaseAuthBody {
isLoginEdit: !this.getLogin() isLoginEdit: !this.getLogin()
}; };
autoFocusField = this.state.isLoginEdit ? 'email' : null; autoFocusField = this.state.isLoginEdit ? 'login' : null;
render() { render() {
const login = this.getLogin(); const login = this.getLogin();
@ -37,7 +37,7 @@ export default class ForgotPasswordBody extends BaseAuthBody {
<p className={styles.descriptionText}> <p className={styles.descriptionText}>
<Message {...messages.specifyEmail} /> <Message {...messages.specifyEmail} />
</p> </p>
<Input {...this.bindField('email')} <Input {...this.bindField('login')}
icon="envelope" icon="envelope"
color="lightViolet" color="lightViolet"
required required
@ -63,8 +63,8 @@ export default class ForgotPasswordBody extends BaseAuthBody {
serialize() { serialize() {
const data = super.serialize(); const data = super.serialize();
if (!data.email) { if (!data.login) {
data.email = this.getLogin(); data.login = this.getLogin();
} }
return data; return data;
@ -83,6 +83,6 @@ export default class ForgotPasswordBody extends BaseAuthBody {
this.context.requestRedraw(); this.context.requestRedraw();
// TODO: requestRedraw должен возвращать promise, по которому нужно ставить фокус на поле // TODO: requestRedraw должен возвращать promise, по которому нужно ставить фокус на поле
// иначе же, если фокус ставить сразу, то форма скачет // иначе же, если фокус ставить сразу, то форма скачет
setTimeout(() => {this.form.focus('email');}, 300); setTimeout(() => {this.form.focus('login');}, 300);
}; };
} }

6
src/services/authFlow/ForgotPasswordState.js
View File

@ -10,11 +10,9 @@ export default class ForgotPasswordState extends AbstractState {
} }
resolve(context, payload = {}) { resolve(context, payload = {}) {
const login = payload.email; context.run('forgotPassword', payload)
context.run('forgotPassword', {login})
.then(() => { .then(() => {
context.run('setLogin', login); context.run('setLogin', payload.login);
context.setState(new RecoverPasswordState()); context.setState(new RecoverPasswordState());
}) })
.catch((err = {}) => .catch((err = {}) =>

6
tests/services/authFlow/ForgotPasswordState.test.js
View File

@ -43,7 +43,7 @@ describe('ForgotPasswordState', () => {
}) })
).returns(Promise.resolve()); ).returns(Promise.resolve());
state.resolve(context, {email: expectedLogin}); state.resolve(context, {login: expectedLogin});
}); });
it('should transition to recoverPassword state on success', () => { it('should transition to recoverPassword state on success', () => {
@ -53,7 +53,7 @@ describe('ForgotPasswordState', () => {
mock.expects('run').twice().returns(promise); mock.expects('run').twice().returns(promise);
expectState(mock, RecoverPasswordState); expectState(mock, RecoverPasswordState);
state.resolve(context, {email: expectedLogin}); state.resolve(context, {login: expectedLogin});
return promise; return promise;
}); });
@ -66,7 +66,7 @@ describe('ForgotPasswordState', () => {
expectState(mock, RecoverPasswordState); expectState(mock, RecoverPasswordState);
mock.expects('run').withArgs('setLogin', expectedLogin); mock.expects('run').withArgs('setLogin', expectedLogin);
state.resolve(context, {email: expectedLogin}); state.resolve(context, {login: expectedLogin});
return promise; return promise;
}); });