Merge branch 'develop'

vlavrynovych · Aug 16, 2017 · 3841426 · 3841426
2 parents 68a6e68 + cdabb6f
commit 3841426
Show file tree

Hide file tree

Showing 7 changed files with 163 additions and 55 deletions.
diff --git a/bower.json b/bower.json
@@ -4,7 +4,7 @@
   "authors": [
     "Volodymyr Lavrynovych <volodyalavrynovych@gmail.com>"
   ],
-  "version": "0.7.1",
+  "version": "1.0.0",
   "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
@@ -49,7 +49,7 @@
                 return $rootScope.currentUser !== undefined;
             }
         }])
-        .service('AuthService', ['$rootScope', '$q', '$http', '$location', function ($rootScope, $q, $http, $location) {
+        .service('AuthService', ['$rootScope', '$q', '$http', '$location', '$route', function ($rootScope, $q, $http, $location, $route) {
 
             // ------------------------------------------------------------------------/// Config
             var config = {
@@ -137,7 +137,7 @@
 
             // ------------------------------------------------------------------------/// Private
             function info(message) {
-                _log(console.info, message)
+                _log(console.info, 'AuthService: ' + message)
             }
 
             function error(err) {
@@ -151,8 +151,15 @@
             }
 
             function goTo(route) {
+                info(($location.path() || 'unknown') + ' -----> ' + route);
                 if(route == config.uiRoutes.login && service.isAuthenticated()) {
-                    $location.path(getHome());
+                    info('User is already authenticated and cannot open login page: ' + route);
+                    route = getHome();
+                    $location.path(route);
+                    info('Redirected to the ' + route);
+                } else if(route == $location.path()) {
+                    info('Reload: ' + route);
+                    $route.reload()
                 } else {
                     $location.path(route);
                     info('Redirected to the ' + route);
@@ -173,6 +180,7 @@
             }
 
             function init() {
+                info('init');
                 isAuthenticated()
                     .then(service.refreshCurrentUser)
                     .then(function (user) {
@@ -235,6 +243,7 @@
                  */
                 openTarget: function () {
                     var target = config.uiRoutes.target || getHome();
+                    info('Open target: ' + target);
                     goTo(target);
                     service.clearTarget()
                 },

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": "0.7.1",
+  "version": "1.0.0",
   "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
@@ -49,7 +49,7 @@
                 return $rootScope.currentUser !== undefined;
             }
         }])
-        .service('AuthService', ['$rootScope', '$q', '$http', '$location', function ($rootScope, $q, $http, $location) {
+        .service('AuthService', ['$rootScope', '$q', '$http', '$location', '$route', function ($rootScope, $q, $http, $location, $route) {
 
             // ------------------------------------------------------------------------/// Config
             var config = {
@@ -137,7 +137,7 @@
 
             // ------------------------------------------------------------------------/// Private
             function info(message) {
-                _log(console.info, message)
+                _log(console.info, 'AuthService: ' + message)
             }
 
             function error(err) {
@@ -151,8 +151,15 @@
             }
 
             function goTo(route) {
+                info(($location.path() || 'unknown') + ' -----> ' + route);
                 if(route == config.uiRoutes.login && service.isAuthenticated()) {
-                    $location.path(getHome());
+                    info('User is already authenticated and cannot open login page: ' + route);
+                    route = getHome();
+                    $location.path(route);
+                    info('Redirected to the ' + route);
+                } else if(route == $location.path()) {
+                    info('Reload: ' + route);
+                    $route.reload()
                 } else {
                     $location.path(route);
                     info('Redirected to the ' + route);
@@ -173,6 +180,7 @@
             }
 
             function init() {
+                info('init');
                 isAuthenticated()
                     .then(service.refreshCurrentUser)
                     .then(function (user) {
@@ -235,6 +243,7 @@
                  */
                 openTarget: function () {
                     var target = config.uiRoutes.target || getHome();
+                    info('Open target: ' + target);
                     goTo(target);
                     service.clearTarget()
                 },