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

Only store the preAuthUrl if the user is trying to navigate to a non-login/logout state

Browse Source
This commit is contained in:
Michael Abashian
2017-06-08 19:19:33 -04:00
parent 7768106d3f
commit cfc15dab37
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -364,7 +364,9 @@ 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
$cookies.put('preAuthUrl', $location.path()); if (!/^\/(login|logout)/.test($location.path())) {
$cookies.put('preAuthUrl', $location.path());
}
$location.path('/login'); $location.path('/login');
} else { } else {
var lastUser = $cookies.getObject('current_user'), var lastUser = $cookies.getObject('current_user'),