Merge branch 'develop'

vlavrynovych · Aug 23, 2017 · 0d44c31 · 0d44c31
2 parents 3841426 + fedb4a1
commit 0d44c31
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 11 deletions.
diff --git a/bower.json b/bower.json
@@ -4,7 +4,7 @@
   "authors": [
     "Volodymyr Lavrynovych <volodyalavrynovych@gmail.com>"
   ],
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Provides ability to easily handle most of the logic related to the authentication process and page load for the AngularJS SPA",
   "main": "dist/angular-spa-auth.min.js",
   "keywords": [

diff --git a/dist/angular-spa-auth.js b/dist/angular-spa-auth.js
@@ -187,7 +187,9 @@
                         config.handlers.success(user);
                     })
                     .catch(function (err) {
-                        openLogin();
+                        if(!service.isPublic($location.path())) {
+                            openLogin();
+                        }
                         return onError(err);
                     });
             }

diff --git a/dist/angular-spa-auth.min.js b/dist/angular-spa-auth.min.js
diff --git a/dist/angular-spa-auth.min.js.map b/dist/angular-spa-auth.min.js.map
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "angular-spa-auth",
   "title": "Angular SPA Auth",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "author": "Volodymyr Lavrynovych <volodyalavrynovych@gmail.com>",
   "contributors": [
     "Volodymyr Lavrynovych <volodyalavrynovych@gmail.com>"

diff --git a/src/angular-spa-auth.js b/src/angular-spa-auth.js
@@ -187,7 +187,9 @@
                         config.handlers.success(user);
                     })
                     .catch(function (err) {
-                        openLogin();
+                        if(!service.isPublic($location.path())) {
+                            openLogin();
+                        }
                         return onError(err);
                     });
             }

diff --git a/test/public-methods/test.run.js b/test/public-methods/test.run.js
@@ -109,7 +109,6 @@ describe('Public methods:', function () {
             //then:
             expect(success).not.toBeNull();
             expect(success).toEqual(false);
-            expect($location.path()).toEqual(loginPage);
         });
 
         it('No config provided', function () {

diff --git a/test/test.app.js b/test/test.app.js
@@ -48,20 +48,22 @@ describe('angular-spa-auth', function () {
             expect($rootScope.currentUser).toBeUndefined();
             watch($location);
 
-            //when: isAuthenticated method is triggered but we still do not know status of user
+            //when: isAuthenticated method is triggered
             $location.path('/public');
+            $httpBackend.flush(1);
 
             //then: public page is always available
             expect($location.path()).toEqual('/public');
-            expect($rootScope.currentUser).toBeUndefined();
+            expect($rootScope.currentUser).toEqual(false);
             checkEvent(false, '/public');
 
-            //when: isAuthenticated method is triggered but we still do not know status of user
+            //when: isAuthenticated method is triggered
             $location.path('/private');
 
             //then: private page is rejected
             checkEvent(true, '/private');
-            expect($rootScope.currentUser).toBeUndefined();
+            expect($rootScope.currentUser).toEqual(false);
+            expect($location.path()).not.toEqual('/private');
 
             //when: trigger after init
             $httpBackend.flush();
@@ -188,6 +190,28 @@ describe('angular-spa-auth', function () {
             expect($rootScope.currentUser).toEqual(USER);
         });
 
+        it('User is not logged in on start, check home page', function () {
+            //given:
+            expect($rootScope.currentUser).toBeUndefined();
+            watch($location);
+
+            //when: isAuthenticated method is triggered but we still do not know status of user
+            $location.path(AuthService.config.uiRoutes.home);
+
+            //then: public page is always available
+            expect($location.path()).toEqual(AuthService.config.uiRoutes.home);
+            expect($rootScope.currentUser).toBeUndefined();
+            checkEvent(false, AuthService.config.uiRoutes.home);
+
+            //when: trigger after init
+            $httpBackend.flush();
+
+            //then: we are on login page and user is set to false, because we checked his authentication status
+            expect($location.path()).toEqual(AuthService.config.uiRoutes.home);
+            expect($rootScope.currentUser).toEqual(false);
+        });
+
+
         function watch($location) {
             events = [];
             $rootScope.$on("$routeChangeStart", function(e, next) {