External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-04-14 14:39:26 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #458 from gconsidine/ui/fix/login-auth-token

Browse Source 
Fix login and authorization token errors
This commit is contained in:
Greg Considine
2017-09-25 10:14:47 -04:00
committed by GitHub
parent c9ce751bf0 4ad2af30cf
commit 2ad26008cc
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
awx/ui/client/src/login/authenticationServices/authentication.service.js
View File

@@ -45,7 +45,13 @@ export default
}, },
getToken: function () { getToken: function () {
return ($rootScope.token) ? $rootScope.token : $cookies.get('token'); if ($rootScope.token) {
return $rootScope.token;
}
let token = $cookies.get('token');
return token ? token.replace(/"/g, '') : undefined;
}, },
retrieveToken: function (username, password) { retrieveToken: function (username, password) {
@@ -101,7 +107,7 @@ export default
$rootScope.lastPath = '/home'; $rootScope.lastPath = '/home';
} }
x = Store('sessionTime'); x = Store('sessionTime');
if ($rootScope.current_user) { if ($rootScope.current_user && x && x[$rootScope.current_user.id]) {
x[$rootScope.current_user.id].loggedIn = false; x[$rootScope.current_user.id].loggedIn = false;
} }
Store('sessionTime', x); Store('sessionTime', x);