diff options
author | enahum <nahumhbl@gmail.com> | 2016-04-08 18:04:23 -0300 |
---|---|---|
committer | Corey Hulen <corey@hulen.com> | 2016-04-08 14:04:23 -0700 |
commit | df77179eccffbb77f684abde45cac743f5d0b414 (patch) | |
tree | 524312a7033c11a4daeb9fa2b4aa2283765bdd9d /webapp/components | |
parent | 77ee1ce7fee698847e211dc15d4673300901aa48 (diff) | |
download | chat-df77179eccffbb77f684abde45cac743f5d0b414.tar.gz chat-df77179eccffbb77f684abde45cac743f5d0b414.tar.bz2 chat-df77179eccffbb77f684abde45cac743f5d0b414.zip |
Fix email verification process (#2664)
- Fix email verification URL in login view
- Fix URL in email being sent for verification
- Add Email Verification on password reset
- Fix display of email in reset password
- Fix URL en team_signup_password_page
- Fix typo in webapp en loc
- Add missing es locs
- Removed extra es, fr and pt locs
Diffstat (limited to 'webapp/components')
-rw-r--r-- | webapp/components/login/login.jsx | 2 | ||||
-rw-r--r-- | webapp/components/password_reset_send_link.jsx | 4 | ||||
-rw-r--r-- | webapp/components/signup_team_complete/components/team_signup_password_page.jsx | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/webapp/components/login/login.jsx b/webapp/components/login/login.jsx index e867af47a..ed7495b13 100644 --- a/webapp/components/login/login.jsx +++ b/webapp/components/login/login.jsx @@ -90,7 +90,7 @@ export default class Login extends React.Component { }, (err) => { if (err.id === 'api.user.login.not_verified.app_error') { - browserHistory.push('/verify_email?teamname=' + encodeURIComponent(name) + '&email=' + encodeURIComponent(loginId)); + browserHistory.push('/should_verify_email?teamname=' + encodeURIComponent(team) + '&email=' + encodeURIComponent(loginId)); return; } this.setState({serverEmailError: err.message}); diff --git a/webapp/components/password_reset_send_link.jsx b/webapp/components/password_reset_send_link.jsx index a42b8935c..e3ab8949e 100644 --- a/webapp/components/password_reset_send_link.jsx +++ b/webapp/components/password_reset_send_link.jsx @@ -55,7 +55,9 @@ class PasswordResetSendLink extends React.Component { <FormattedHTMLMessage id='password_send.link' defaultMessage='<p>A password reset link has been sent to <b>{email}</b></p>' - email={email} + values={{ + email + }} /> <FormattedMessage id={'password_send.checkInbox'} diff --git a/webapp/components/signup_team_complete/components/team_signup_password_page.jsx b/webapp/components/signup_team_complete/components/team_signup_password_page.jsx index fbe8ab683..7b8b49e0c 100644 --- a/webapp/components/signup_team_complete/components/team_signup_password_page.jsx +++ b/webapp/components/signup_team_complete/components/team_signup_password_page.jsx @@ -81,7 +81,7 @@ class TeamSignupPasswordPage extends React.Component { }, (err) => { if (err.id === 'api.user.login.not_verified.app_error') { - browserHistory.push('/verify_email?email=' + encodeURIComponent(teamSignup.team.email) + '&teamname=' + encodeURIComponent(teamSignup.team.name)); + browserHistory.push('/should_verify_email?email=' + encodeURIComponent(teamSignup.team.email) + '&teamname=' + encodeURIComponent(teamSignup.team.name)); } else { this.setState({serverError: err.message}); $('#finish-button').button('reset'); |