Merge pull request #1288 from eciis/fix-reload-page-when-password-inc…

…orrect Fix reload page when user place incorrect password
eciis · Oct 25, 2018 · 97b6bed · 97b6bed
2 parents 34e8eaf + b657c41
commit 97b6bed
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/frontend/auth/authService.js b/frontend/auth/authService.js
@@ -129,9 +129,6 @@
                     service.sendEmailVerification(user);
                     throw "Error! Email not verified.";
                 }
-            }).catch(function(error) {
-                MessageService.showToast(error);
-                return error;
             });
         }
 

diff --git a/frontend/auth/loginController.js b/frontend/auth/loginController.js
@@ -4,7 +4,7 @@
     var app = angular.module("app");
 
     app.controller("LoginController", function LoginController(AuthService, $state, $mdDialog, 
-            $stateParams, $window) {
+            $stateParams, $window, MessageService) {
         var loginCtrl = this;
 
         loginCtrl.user = {};
@@ -17,6 +17,8 @@
             var promise = AuthService.loginWithGoogle();
             promise.then(function success() {
                 redirectTo(redirectPath);
+            }).catch(function(error) {
+                MessageService.showToast(error);
             });
             return promise;
         };
@@ -30,7 +32,9 @@
                 function success() {
                     redirectTo(redirectPath);
                 }
-            );
+            ).catch(function(error) {
+                MessageService.showToast(error);
+            });
         };
 
         loginCtrl.redirect = function success() {