Merge pull request #8489 from RocketChat/hotfix/reset-password-messag…

…e-with-2fa [FIX] Wrong message when reseting password and 2FA is enabled
RocketChat · Oct 17, 2017 · 342ed3a · 342ed3a
1 parent aea9c73
commit 342ed3a
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/packages/rocketchat-ui-login/client/reset-password/resetPassword.js b/packages/rocketchat-ui-login/client/reset-password/resetPassword.js
@@ -44,10 +44,16 @@ Template.resetPassword.events({
 				RocketChat.Button.reset(button);
 				if (error) {
 					console.log(error);
-					swal({
-						title: t('Error_changing_password'),
-						type: 'error'
-					});
+					if (error.error === 'totp-required') {
+						toastr.success(t('Password_changed_successfully'));
+						RocketChat.callbacks.run('userPasswordReset');
+						FlowRouter.go('login');
+					} else {
+						swal({
+							title: t('Error_changing_password'),
+							type: 'error'
+						});
+					}
 				} else {
 					FlowRouter.go('home');
 					toastr.success(t('Password_changed_successfully'));