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

GUACAMOLE-680: Merge navigate user back to home screen upon clicking "re-login".

Browse Source
This commit is contained in:
Virtually Nick
2021-12-11 07:48:24 -05:00
committed by GitHub
parent 66e1f1f136 c232c17b71
commit dd563796e7
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
guacamole/src/main/frontend/src/app/index/controllers/indexController.js
View File

@@ -25,6 +25,7 @@ angular.module('index').controller('indexController', ['$scope', '$injector',
// Required services // Required services
const $document = $injector.get('$document'); const $document = $injector.get('$document');
const $location = $injector.get('$location');
const $route = $injector.get('$route'); const $route = $injector.get('$route');
const $window = $injector.get('$window'); const $window = $injector.get('$window');
const clipboardService = $injector.get('clipboardService'); const clipboardService = $injector.get('clipboardService');
@@ -220,13 +221,22 @@ angular.module('index').controller('indexController', ['$scope', '$injector',
}, true); }, true);
/** /**
* Reloads the current route and controller, effectively forcing * Navigates the user back to the root of the application (or reloads the
* reauthentication. If the user is not logged in, this will result in * current route and controller if the user is already there), effectively
* the login screen appearing. * forcing reauthentication. If the user is not logged in, this will result
* in the login screen appearing.
*/ */
$scope.reAuthenticate = function reAuthenticate() { $scope.reAuthenticate = function reAuthenticate() {
$scope.reAuthenticating = true; $scope.reAuthenticating = true;
$route.reload();
// Clear out URL state to conveniently bring user back to home screen
// upon relogin
if ($location.path() !== '/')
$location.url('/');
else
$route.reload();
}; };
// Display login screen if a whole new set of credentials is needed // Display login screen if a whole new set of credentials is needed