safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-06 05:07:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUACAMOLE-680: Ensure the "guacLogout" event is specific to manual logouts.

Browse Source
This commit is contained in:
Michael Jumper
2021-06-13 21:27:48 -07:00
parent 823970eb7f
commit 529e19729b
1 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
guacamole/src/main/frontend/src/app/auth/service/authenticationService.js
View File

@@ -175,7 +175,7 @@ angular.module('auth').factory('authenticationService', ['$injector',
// If an old token existed, request that the token be revoked
if (currentToken) {
service.logout().catch(angular.noop)
service.revokeToken(currentToken).catch(angular.noop);
}
// Notify of login and new token
@@ -252,6 +252,24 @@ angular.module('auth').factory('authenticationService', ['$injector',
};
/**
* Makes a request to revoke an authentication token using the token REST
* API endpoint, returning a promise succeeds only if the token was
* successfully revoked.
*
* @param {string} token
* The authentication token to revoke.
*
* @returns {Promise}
* A promise which succeeds only if the token was successfully revoked.
*/
service.revokeToken = function revokeToken(token) {
return requestService({
method: 'DELETE',
url: 'api/tokens/' + token
});
};
/**
* Makes a request to authenticate a user using the token REST API endpoint
* with a username and password, ignoring any currently-stored token,
@@ -276,7 +294,7 @@ angular.module('auth').factory('authenticationService', ['$injector',
};
/**
* Makes a request to logout a user using the login REST API endpoint,
* Makes a request to logout a user using the token REST API endpoint,
* returning a promise succeeds only if the logout operation was
* successful.
*
@@ -294,10 +312,7 @@ angular.module('auth').factory('authenticationService', ['$injector',
$rootScope.$broadcast('guacLogout', token);
// Delete old token
return requestService({
method: 'DELETE',
url: 'api/tokens/' + token
});
return service.revokeToken(token);
};