From ce3d3c349036fbb682d94228786eef5c3179f7e2 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@splat.cc>
Date: Mon, 19 Nov 2018 17:16:55 -0500
Subject: [PATCH] Add a message to the resulting login dialog when a user
 explicitly logs out.

---
 .../authenticationServices/authentication.service.js      | 2 ++
 .../client/src/login/loginModal/loginModal.partial.html   | 8 +++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/awx/ui/client/src/login/authenticationServices/authentication.service.js b/awx/ui/client/src/login/authenticationServices/authentication.service.js
index fa7ff2a2fa..a80441f798 100644
--- a/awx/ui/client/src/login/authenticationServices/authentication.service.js
+++ b/awx/ui/client/src/login/authenticationServices/authentication.service.js
@@ -29,6 +29,7 @@ export default
                 $cookies.put('sessionExpired', false);
 
                 $rootScope.userLoggedIn = true;
+                $rootScope.userLoggedOut = false;
                 $rootScope.token_expires = expires;
                 $rootScope.sessionExpired = false;
             },
@@ -110,6 +111,7 @@ export default
                     $rootScope.token_expires = null;
                     $rootScope.login_username = null;
                     $rootScope.login_password = null;
+                    $rootScope.userLoggedOut = true;
                     if ($rootScope.sessionTimer) {
                         $rootScope.sessionTimer.clearTimers();
                     }
diff --git a/awx/ui/client/src/login/loginModal/loginModal.partial.html b/awx/ui/client/src/login/loginModal/loginModal.partial.html
index af9f006d9c..3b6c04454b 100644
--- a/awx/ui/client/src/login/loginModal/loginModal.partial.html
+++ b/awx/ui/client/src/login/loginModal/loginModal.partial.html
@@ -14,7 +14,7 @@
                         ng-src="{{ customLogo }}" >
             </div>
             <div class="LoginModal-body">
-                <div class="LoginModal-alert" ng-show="!sessionExpired && !sessionLimitExpired && !attemptFailed && !thirdPartyAttemptFailed" translate>
+                <div class="LoginModal-alert" ng-show="!sessionExpired && !sessionLimitExpired && !attemptFailed && !thirdPartyAttemptFailed && !userLoggedOut" translate>
                     Welcome to Ansible {{BRAND_NAME}}! &nbsp;Please sign in.
                 </div>
                 <div class="LoginModal-alert LoginModal-alert--error" ng-show="sessionExpired">
@@ -23,6 +23,12 @@
                         Your session timed out due to inactivity. Please sign in.
                     </div>
                 </div>
+                <div class="LoginModal-alert LoginModal-alert--error" ng-show="userLoggedOut">
+                    <i class="LoginModal-alertIcon fa fa-exclamation-triangle"></i>
+                    <div class="LoginModal-alertText" translate>
+                        You have been logged out. Please sign in.
+                    </div>
+                </div>
                 <div class="LoginModal-alert LoginModal-alert--error" ng-show="sessionLimitExpired">
                     <i class="LoginModal-alertIcon fa fa-exclamation-triangle"></i>
                     <div class="LoginModal-alertText" translate>