External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-17 06:17:36 -02:30
Code Issues Packages Projects Releases Wiki Activity

Fix login and authorization token errors

Browse Source 
* Remove extraneous quotes when authroization token is retrieved
from a cookie
* Fix thrown error when invalid creds are supplied on login due to
attempt to access property of an undefined value
This commit is contained in:
gconsidine
2017-09-22 17:58:16 -04:00
parent 9e9692971f
commit 4ad2af30cf
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);