External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-07 11:41:08 -03:30
Code Issues Packages Projects Releases Wiki Activity

fix for session timeout

Browse Source
This commit is contained in:
Jared Tabor
2016-05-26 13:49:30 -07:00
parent 7c68f18060
commit ef935768a5
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -101,7 +101,7 @@ export default
$rootScope.current_user = {}; $rootScope.current_user = {};
$rootScope.license_tested = undefined; $rootScope.license_tested = undefined;
$rootScope.userLoggedIn = false; $rootScope.userLoggedIn = false;
$rootScope.sessionExpired = false; // $rootScope.sessionExpired = false;
$rootScope.licenseMissing = true; $rootScope.licenseMissing = true;
$rootScope.token = null; $rootScope.token = null;
$rootScope.token_expires = null; $rootScope.token_expires = null;

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

@@ -23,9 +23,9 @@
*/ */
export default export default
['$rootScope', '$cookieStore', 'CreateDialog', 'Authorization', ['$rootScope', '$cookieStore', 'CreateDialog', 'Authorization',
'Store', '$interval', '$location', '$q', 'Store', '$interval', '$state', '$q',
function ($rootScope, $cookieStore, CreateDialog, Authorization, function ($rootScope, $cookieStore, CreateDialog, Authorization,
Store, $interval, $location, $q) { Store, $interval, $state, $q) {
return { return {
sessionTime: null, sessionTime: null,
@@ -157,13 +157,13 @@ export default
$('#idle-modal').dialog('close'); $('#idle-modal').dialog('close');
} }
that.expireSession('idle'); that.expireSession('idle');
$location.url('/login'); $state.go('signOut');
} }
if(Store('sessionTime') && if(Store('sessionTime') &&
Store('sessionTime')[$rootScope.current_user.id] && Store('sessionTime')[$rootScope.current_user.id] &&
Store('sessionTime')[$rootScope.current_user.id].loggedIn === false){ Store('sessionTime')[$rootScope.current_user.id].loggedIn === false){
that.expireSession(); that.expireSession();
$location.url('/login'); $state.go('signOut');
} }

4
awx/ui/client/src/login/logout.route.js
View File

@@ -9,9 +9,9 @@
export default { export default {
name: 'signOut', name: 'signOut',
route: '/logout', route: '/logout',
controller: ['Authorization', '$location', function(Authorization, $location) { controller: ['Authorization', '$state', function(Authorization, $state) {
Authorization.logout(); Authorization.logout();
$location.path('/login'); $state.go('signIn');
}], }],
ncyBreadcrumb: { ncyBreadcrumb: {
skip: true skip: true

2
awx/ui/client/src/shared/config/config.service.js
View File

@@ -20,7 +20,7 @@ export default
delete: function(){ delete: function(){
delete(this.config); delete(this.config);
}, },
getConfig: function () { getConfig: function () {
var config = this.get(), var config = this.get(),
that = this, that = this,