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

Merge pull request #473 from jaredevantabor/session-fixes

Browse Source 
fixing timer issue that would log user out on each page refresh
This commit is contained in:
jaredevantabor
2015-10-13 12:37:04 -07:00
parent a27a620bcf 7e95b3cde7
commit d0888c1bcb
1 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,14 +23,24 @@
*/ */
export default export default
['$rootScope', '$cookieStore', 'transitionTo', 'CreateDialog', 'Authorization', ['$rootScope', '$cookieStore', 'transitionTo', 'CreateDialog', 'Authorization',
function ($rootScope, $cookieStore, transitionTo, CreateDialog, Authorization) { 'Store',
function ($rootScope, $cookieStore, transitionTo, CreateDialog, Authorization,
Store) {
return { return {
sessionTime: null, sessionTime: null,
timeout: null, timeout: null,
getSessionTime: function () { getSessionTime: function () {
return (this.sessionTime) ? this.sessionTime : $cookieStore.get('sessionTime'); // var sessionTime;
// if(this.sessionTime){
// return this.sessionTime;
// }
// else {
// sessionTime = Store('sessionTime').time;
// return sessionTime;
// }
return (this.sessionTime) ? this.sessionTime : Store('sessionTime');//$cookieStore.get('sessionTime');
}, },
isExpired: function () { isExpired: function () {
@@ -76,10 +86,11 @@ export default
moveForward: function () { moveForward: function () {
var tm, t; var tm, t;
tm = ($AnsibleConfig) ? $AnsibleConfig.session_timeout : 1800; tm = ($AnsibleConfig.session_timeout) ? $AnsibleConfig.session_timeout : 1800;
t = new Date().getTime() + (tm * 1000); t = new Date().getTime() + (tm * 1000);
this.sessionTime = t; this.sessionTime = t;
$cookieStore.put('sessionTime', t); // $cookieStore.put('sessionTime', t);
Store('sessionTime', t);
$rootScope.sessionExpired = false; $rootScope.sessionExpired = false;
$cookieStore.put('sessionExpired', false); $cookieStore.put('sessionExpired', false);
@@ -88,7 +99,7 @@ export default
startTimers: function() { startTimers: function() {
var that = this, var that = this,
tm = ($AnsibleConfig) ? $AnsibleConfig.session_timeout : 1800, tm = ($AnsibleConfig.session_timeout) ? $AnsibleConfig.session_timeout : 1800,
t = tm - 60; t = tm - 60;
this.clearTimers(); this.clearTimers();