External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-23 11:55:04 -02:30
Code Issues Packages Projects Releases Wiki Activity

Add a message to the resulting login dialog when a user explicitly logs out.

Browse Source
This commit is contained in:
Bill Nottingham
2018-11-19 17:16:55 -05:00
parent 932a1c6386
commit ce3d3c3490
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,6 +29,7 @@ export default
$cookies.put('sessionExpired', false); $cookies.put('sessionExpired', false);
$rootScope.userLoggedIn = true; $rootScope.userLoggedIn = true;
$rootScope.userLoggedOut = false;
$rootScope.token_expires = expires; $rootScope.token_expires = expires;
$rootScope.sessionExpired = false; $rootScope.sessionExpired = false;
}, },
@@ -110,6 +111,7 @@ export default
$rootScope.token_expires = null; $rootScope.token_expires = null;
$rootScope.login_username = null; $rootScope.login_username = null;
$rootScope.login_password = null; $rootScope.login_password = null;
$rootScope.userLoggedOut = true;
if ($rootScope.sessionTimer) { if ($rootScope.sessionTimer) {
$rootScope.sessionTimer.clearTimers(); $rootScope.sessionTimer.clearTimers();
} }

8
awx/ui/client/src/login/loginModal/loginModal.partial.html
View File

@@ -14,7 +14,7 @@
ng-src="{{ customLogo }}" > ng-src="{{ customLogo }}" >
</div> </div>
<div class="LoginModal-body"> <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. Welcome to Ansible {{BRAND_NAME}}! &nbsp;Please sign in.
</div> </div>
<div class="LoginModal-alert LoginModal-alert--error" ng-show="sessionExpired"> <div class="LoginModal-alert LoginModal-alert--error" ng-show="sessionExpired">
@@ -23,6 +23,12 @@
Your session timed out due to inactivity. Please sign in. Your session timed out due to inactivity. Please sign in.
</div> </div>
</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"> <div class="LoginModal-alert LoginModal-alert--error" ng-show="sessionLimitExpired">
<i class="LoginModal-alertIcon fa fa-exclamation-triangle"></i> <i class="LoginModal-alertIcon fa fa-exclamation-triangle"></i>
<div class="LoginModal-alertText" translate> <div class="LoginModal-alertText" translate>