Mercurial Mercurial > ammico / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
client/app/app.js
changeset 114 e4ffc4e13a8e
parent 100 537d330ad7f0
child 172 ffdfe491869c 
--- a/client/app/app.js	Thu Jun 04 20:09:20 2015 +0200
+++ b/client/app/app.js	Thu Jun 04 20:10:38 2015 +0200
@@ -74,11 +74,12 @@
             redirectTo: '/'
         });
     })
-    .run( function($rootScope, $location, $window, $http, authApi) {
+    .run( function($rootScope, $location, $window, $http, authApi, context) {
         $rootScope.globals = {};
-        if (localStorage.getItem('token')) {
+        if (localStorage.getItem('token') || context['token']) {
             $rootScope.globals.userLogged = true;
-            $http.defaults.headers.common.Authorization = 'Token ' + localStorage.getItem('token');
+            localStorage.setItem('token', (localStorage.getItem('token') || context['token']));
+            $http.defaults.headers.common.Authorization = 'Token ' + (localStorage.getItem('token') || context['token']);
         }
         $rootScope.$on( '$routeChangeStart', function(event, next) {
             if (next.authRequired && !$rootScope.globals.userLogged) {
ammico