commit 0520f5a6a0ce51a343b53e286fd444ebc793ece5
author Matteo Scandolo <teo@opennetworking.org> Wed Oct 11 17:09:27 2017 -0700
committer Matteo Scandolo <teo@opennetworking.org> Thu Oct 12 14:39:14 2017 -0700
tree e5bedcfe7759aef2b39bca256dd67c9647ad7ce6
parent 71d74a418e8976b0ff700b4cfb571970e261b62e

Fixing login issue when session expires (or containers are rebuilt)

Change-Id: Ibd41d92bbccadfd1529f01d0b84a5a3c8e10f7ee
(cherry picked from commit afd05d7fd951df52bfe32a15cd8a3d79a9bd9049)

src/index.ts

diff --git a/src/index.ts b/src/index.ts
index 2a287d5..68920b0 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -83,11 +83,12 @@
   .component('xos', main)
   .provider('XosConfig', function(){
     // save the last visited state before reload
-    const lastVisitedUrl = window.location.hash.replace('#', '');
+    let lastVisitedUrl = window.location.hash.replace('#', '');
     this.$get = [() => {
-      return {
-        lastVisitedUrl
-      };
+      if (lastVisitedUrl === '/login' || lastVisitedUrl === '/loader') {
+        lastVisitedUrl = '/dashboard';
+      }
+      return {lastVisitedUrl};
     }] ;
     return this;
   })
@@ -129,11 +130,15 @@
     // if the user is authenticated
     $log.info(`[XOS] Is user authenticated? ${AuthService.isAuthenticated()}`);
     if (AuthService.isAuthenticated()) {
+      $log.info(`[XOS] Redirect to "loader"`);
       $state.go('loader');
+      $rootScope.$apply();
     }
     else {
       AuthService.clearUser();
+      $log.info(`[XOS] Redirect to "login"`);
       $state.go('login');
+      $rootScope.$apply();
     }
 
     // register keyboard shortcut