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

use isEmpty check for valid object on session limit

Browse Source
This commit is contained in:
Jared Tabor
2015-10-02 00:43:41 -04:00
parent 4570535477
commit 2056ac16d5
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -94,8 +94,7 @@ export default
$rootScope.token_expires = null; $rootScope.token_expires = null;
$rootScope.login_username = null; $rootScope.login_username = null;
$rootScope.login_password = null; $rootScope.login_password = null;
clearTimeout($rootScope.idleTimer); $rootScope.sessionTimer.expireSession();
clearTimeout($rootScope.endTimer);
}, },
getLicense: function () { getLicense: function () {

2
awx/ui/client/src/rest/interceptors.service.js
View File

@@ -21,7 +21,7 @@
return config; return config;
}, },
responseError: function(rejection){ responseError: function(rejection){
if(rejection.data.detail && rejection.data.detail === "Maximum per-user sessions reached"){ if( !_.isEmpty(rejection.data.detail) && rejection.data.detail === "Maximum per-user sessions reached"){
$rootScope.sessionTimer.expireSession('session_limit'); $rootScope.sessionTimer.expireSession('session_limit');
return rejection; return rejection;
} }