From 6567a19c23b21e5d352ef8eb2a308225fa052a0d Mon Sep 17 00:00:00 2001 From: siemiatj Date: Sun, 22 Jul 2018 19:25:59 +0200 Subject: [PATCH] - get avatar and user data when loading resetPass form #1878 --- src/components/app/PasswordRecovery.js | 68 ++++++++++++++++++-------- 1 file changed, 48 insertions(+), 20 deletions(-) diff --git a/src/components/app/PasswordRecovery.js b/src/components/app/PasswordRecovery.js index bd85ac016..162429af5 100644 --- a/src/components/app/PasswordRecovery.js +++ b/src/components/app/PasswordRecovery.js @@ -21,14 +21,48 @@ class PasswordRecovery extends Component { err: '', pending: false, resetEmailSent: false, + avatarSrc: '', + form: {}, }; } componentDidMount() { - console.log('this.props when mounting: ', this.props) + const { token } = this.props; + const resetPassword = token ? true : false; + + if (resetPassword) { + this.getAvatar(); + this.getUserData(); + } + this.focusField.focus(); } + getAvatar = () => { + const { token } = this.props; + + resetPasswordGetAvatar(token).then(({ data }) => { + this.setState({ + avatarSrc: data, + }); + }); + }; + + getUserData = () => { + const { token } = this.props; + const { form } = this.state; + + getResetPasswordInfo(token).then(resp => { + this.setState({ + form: { + ...form, + email: resp.data.email, + fullname: resp.data.fullname + }, + }); + }); + }; + handleKeyPress = e => { // console.log('keypressed: ', e.key) // if (e.key === 'Enter') { @@ -51,9 +85,9 @@ class PasswordRecovery extends Component { handleSubmit = e => { e.preventDefault(); - const { path, dispatch } = this.props; + const { dispatch, token } = this.props; const { form, resetEmailSent } = this.state; - const resetPassword = path === 'resetPassword' ? true : false; + const resetPassword = token ? true : false; if (resetEmailSent) { return; @@ -67,10 +101,8 @@ class PasswordRecovery extends Component { pending: true, }, () => { - console.log('pending: ', form); resetPasswordRequest(form) .then(response => { - console.log('response from reset !: ', response); this.setState({ resetEmailSent: true, pending: false, @@ -238,10 +270,9 @@ class PasswordRecovery extends Component { }; render() { - const { path } = this.props; - const { pending, resetEmailSent } = this.state; - const avatar = ''; - const resetPassword = path === 'resetPassword' ? true : false; + const { token } = this.props; + const { pending, resetEmailSent, avatarSrc, form } = this.state; + const resetPassword = token ? true : false; let buttonMessage = counterpart.translate( 'forgotPassword.changePassword.caption' ); @@ -266,9 +297,14 @@ class PasswordRecovery extends Component {
- {avatar && ( -
- + {avatarSrc && ( +
+
+ +
+
+ {form.fullname} +
)}
(this.form = c)} onSubmit={this.handleSubmit}> @@ -290,12 +326,4 @@ class PasswordRecovery extends Component { } } -// LoginPasswordRecoveryForm.propTypes = { -// dispatch: PropTypes.func.isRequired, -// }; - -// LogiPasswordRecoverynForm.contextTypes = { -// router: PropTypes.object.isRequired, -// }; - export default connect()(PasswordRecovery);