shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-11-02 01:21:21 +03:00
Code Releases Activity

Starting timer after config response returns

Browse Source 
b/c timer depends on the 'auth-token-timeout' from the /config response
This commit is contained in:
Jared Tabor 2016-06-02 16:04:38 -07:00
parent 7c489ae4c8
commit 0ae30d14e9
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
awx/ui/client/src/app.js
View File

@ -872,10 +872,10 @@ var tower = angular.module('Tower', [
$rootScope.user_is_superuser = Authorization.getUserInfo('is_superuser'); $rootScope.user_is_superuser = Authorization.getUserInfo('is_superuser');
// state the user refreshes we want to open the socket, except if the user is on the login page, which should happen after the user logs in (see the AuthService module for that call to OpenSocket) // state the user refreshes we want to open the socket, except if the user is on the login page, which should happen after the user logs in (see the AuthService module for that call to OpenSocket)
if(!_.contains($location.$$url, '/login')){ if(!_.contains($location.$$url, '/login')){
Timer.init().then(function(timer){ ConfigService.getConfig().then(function(){
$rootScope.sessionTimer = timer; Timer.init().then(function(timer){
$rootScope.$emit('OpenSocket'); $rootScope.sessionTimer = timer;
ConfigService.getConfig().then(function(){ $rootScope.$emit('OpenSocket');
pendoService.issuePendoIdentity(); pendoService.issuePendoIdentity();
CheckLicense.test(); CheckLicense.test();
FeaturesService.get(); FeaturesService.get();

2
awx/ui/client/src/login/authenticationServices/timer.factory.js
View File

@ -62,7 +62,7 @@ export default
now = new Date().getTime()/1000, now = new Date().getTime()/1000,
diff = stime-now; diff = stime-now;
if(diff < 61){ if(diff < 60){
return diff; return diff;
} }
else { else {