diff options
| author | manzerbredes <loic.guegan_secondary@yahoo.fr> | 2016-03-20 11:24:03 +0100 |
|---|---|---|
| committer | manzerbredes <loic.guegan_secondary@yahoo.fr> | 2016-03-20 11:24:03 +0100 |
| commit | 3216a69b752e8d8129913d24ced4cffbd794fef2 (patch) | |
| tree | 30822db71088c82cb662f0766cb2583c50674937 /client/js/services/Identity.js | |
| parent | 700a849da8a6905ba33ccf47cdbc5c031e1994f3 (diff) | |
| parent | 57006dba22e26273b6bcb75fff73522fb5f216f8 (diff) | |
Merge branch 'loic' into develop
Diffstat (limited to 'client/js/services/Identity.js')
| -rw-r--r-- | client/js/services/Identity.js | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/client/js/services/Identity.js b/client/js/services/Identity.js index db93e97..f9d1df4 100644 --- a/client/js/services/Identity.js +++ b/client/js/services/Identity.js @@ -27,9 +27,12 @@ mainApp.factory('Identity',[ '$http', '$cookies', function($http, $cookies){ && typeof tokenPart_1InCookie !== 'undefined' ){ - // If yes, put it into variables - angular.extend(profile, profileInCookie); - token=tokenPart_0InCookie+tokenPart_1InCookie; + if(token!==null){ + // If yes, put it into variables + angular.extend(profile, profileInCookie); + token=tokenPart_0InCookie+tokenPart_1InCookie; + + } // Return I'm Login return true; |
