From 555c1dcb887448c7f74442d4e4e55750b5dee9d6 Mon Sep 17 00:00:00 2001
From: Michael Abashian <mabashian@ansible.com>
Date: Fri, 9 Jun 2017 09:20:49 -0400
Subject: [PATCH] Store the preAuthUrl on rootScope instead of in the cookie

---
 awx/ui/client/src/app.js                                    | 2 +-
 awx/ui/client/src/login/loginModal/loginModal.controller.js | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/awx/ui/client/src/app.js b/awx/ui/client/src/app.js
index 800846af35..02b13f0f40 100644
--- a/awx/ui/client/src/app.js
+++ b/awx/ui/client/src/app.js
@@ -365,7 +365,7 @@ var tower = angular.module('Tower', [
                 if (!Authorization.getToken() || !Authorization.isUserLoggedIn()) {
                     // User not authenticated, redirect to login page
                     if (!/^\/(login|logout)/.test($location.path())) {
-                        $cookies.put('preAuthUrl', $location.path());
+                        $rootScope.preAuthUrl = $location.path();
                     }
                     $location.path('/login');
                 } else {
diff --git a/awx/ui/client/src/login/loginModal/loginModal.controller.js b/awx/ui/client/src/login/loginModal/loginModal.controller.js
index b070798d92..e65728cb21 100644
--- a/awx/ui/client/src/login/loginModal/loginModal.controller.js
+++ b/awx/ui/client/src/login/loginModal/loginModal.controller.js
@@ -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('Last URL: ' + lastPath());
@@ -116,7 +116,7 @@ export default ['$log', '$cookies', '$compile', '$rootScope',
                 Wait("stop");
                 if(!Empty(preAuthUrl)){
                     $location.path(preAuthUrl);
-                    $cookies.remove('preAuthUrl');
+                    delete $rootScope.preAuthUrl;
                 }
                 else {
                     if (lastPath() && lastUser()) {