Made login check for the NgJwtAuthCredentialsFailedException, removed…

… the #_=_ facebook return hash
spira · Aug 4, 2015 · c3e724b · c3e724b
1 parent cb1a670
commit c3e724b
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/app/src/app/guest/login/login.spec.ts b/app/src/app/guest/login/login.spec.ts
@@ -11,7 +11,7 @@ describe('Login', () => {
 
                 deferredCreds.promise.then(null, null, (creds) => {
                     if (creds.password == 'fail'){
-                        deferred.notify(new NgJwtAuth.NgJwtAuthException('error'));
+                        deferred.notify(new NgJwtAuth.NgJwtAuthCredentialsFailedException('error'));
                     }else{
                         deferred.resolve('success');
                         deferredCreds.resolve(creds);

diff --git a/app/src/app/guest/login/login.ts b/app/src/app/guest/login/login.ts
@@ -103,14 +103,16 @@ module app.guest.login {
                 (user) => $mdDialog.hide(user), //on success hide the dialog, pass through the returned user object
                 null,
                 (err:Error) => {
-                    if (err instanceof NgJwtAuth.NgJwtAuthException){
+                    if (err instanceof NgJwtAuth.NgJwtAuthCredentialsFailedException){
                         this.$mdToast.show(
                             (<any>$mdToast).simple() //<any> added so the parent method doesn't throw error, see https://github.com/borisyankov/DefinitelyTyped/issues/4843#issuecomment-124443371
                                 .hideDelay(2000)
                                 .position('top')
                                 .content(err.message)
                                 .parent('#loginDialog')
                         );
+                    }else{
+                        console.error(err);
                     }
                 }
             );

diff --git a/app/src/common/services/authService.ts b/app/src/common/services/authService.ts
@@ -62,8 +62,10 @@ module common.services.auth {
 
         private processQueryToken():ng.IPromise<any> {
 
+            this.removeFacebookHash();
             let queryParams = this.$location.search();
             if (queryParams.jwtAuthToken) {
+
                 let queryTokenPromise = this.ngJwtAuthService.processNewToken(queryParams.jwtAuthToken);
 
                 this.$location.search('jwtAuthToken', null);
@@ -75,6 +77,17 @@ module common.services.auth {
 
         }
 
+        /**
+         * Removes the facebook return hash `#_=_`
+         */
+        private removeFacebookHash():void {
+
+            if (this.$location.hash() == '_=_'){
+                this.$location.hash('');
+            }
+
+        }
+
         private processPasswordResetToken():ng.IPromise<any> {
 
             let queryParams = this.$location.search();