External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-15 11:50:42 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2756 from wenottingham/logged-out-damn-spot

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

Reviewed-by: John Hill <johill@redhat.com>
             https://github.com/unlikelyzero
This commit is contained in:
softwarefactory-project-zuul[bot] 2018-11-27 15:13:45 +00:00 committed by GitHub
commit 50b0a5a54d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 1 deletions
Show Stats 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);
$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();
}

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

@ -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>