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

Redirect the user to the link they clicked on after authentication

Browse Source
This commit is contained in:
Michael Abashian
2017-06-08 18:40:12 -04:00
parent d3c9b57133
commit fc312398cd
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -364,6 +364,8 @@ 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
$rootScope.lastPath = $location.path();
$cookies.put('lastPath', $location.path());
$location.path('/login'); $location.path('/login');
} else { } else {
var lastUser = $cookies.getObject('current_user'), var lastUser = $cookies.getObject('current_user'),

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

@@ -103,7 +103,7 @@ export default
Store('sessionTime', x); Store('sessionTime', x);
if ($cookies.getObject('current_user')) { if ($cookies.getObject('current_user')) {
$rootScope.lastUser = $cookies.getObject('current_user').id; $cookies.put( 'lastUser', $cookies.getObject('current_user').id);
} }
ConfigService.delete(); ConfigService.delete();
SocketService.disconnect(); SocketService.disconnect();

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

@@ -80,7 +80,8 @@ export default ['$log', '$cookies', '$compile', '$rootScope',
}; };
lastUser = function(){ lastUser = function(){
if(!Empty($rootScope.lastUser) && $rootScope.lastUser === $rootScope.current_user.id){ let lastUser = $cookies.get('lastUser');
if(!Empty(lastUser) && parseInt(lastUser) === $rootScope.current_user.id){
return true; return true;
} }
else { else {