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

Store the preAuthUrl on rootScope instead of in the cookie

Browse Source
This commit is contained in:
Michael Abashian
2017-06-09 09:20:49 -04:00
parent cfc15dab37
commit 555c1dcb88
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -365,7 +365,7 @@ var tower = angular.module('Tower', [
if (!Authorization.getToken() || !Authorization.isUserLoggedIn()) { if (!Authorization.getToken() || !Authorization.isUserLoggedIn()) {
// User not authenticated, redirect to login page // User not authenticated, redirect to login page
if (!/^\/(login|logout)/.test($location.path())) { if (!/^\/(login|logout)/.test($location.path())) {
$cookies.put('preAuthUrl', $location.path()); $rootScope.preAuthUrl = $location.path();
} }
$location.path('/login'); $location.path('/login');
} else { } else {

4
awx/ui/client/src/login/loginModal/loginModal.controller.js
View File

@@ -88,7 +88,7 @@ export default ['$log', '$cookies', '$compile', '$rootScope',
} }
}; };
preAuthUrl = $cookies.get('preAuthUrl'); preAuthUrl = $rootScope.preAuthUrl;
$log.debug('User session expired: ' + sessionExpired); $log.debug('User session expired: ' + sessionExpired);
$log.debug('Last URL: ' + lastPath()); $log.debug('Last URL: ' + lastPath());
@@ -116,7 +116,7 @@ export default ['$log', '$cookies', '$compile', '$rootScope',
Wait("stop"); Wait("stop");
if(!Empty(preAuthUrl)){ if(!Empty(preAuthUrl)){
$location.path(preAuthUrl); $location.path(preAuthUrl);
$cookies.remove('preAuthUrl'); delete $rootScope.preAuthUrl;
} }
else { else {
if (lastPath() && lastUser()) { if (lastPath() && lastUser()) {