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-1780: Merge changes adding MFA compatibility to SSO support.

Browse Source
This commit is contained in:
Mike Jumper
2023-07-06 08:27:31 -07:00
committed by GitHub
parent 28ce49f8ec 97f93fa5c5
commit e46d06e6b8
11 changed files with 400 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
guacamole/src/main/frontend/src/app/login/directives/login.js
View File

@@ -66,6 +66,7 @@ angular.module('login').directive('guacLogin', [function guacLogin() {
var Field = $injector.get('Field');
// Required services
var $location = $injector.get('$location');
var $rootScope = $injector.get('$rootScope');
var $route = $injector.get('$route');
var authenticationService = $injector.get('authenticationService');
@@ -173,11 +174,24 @@ angular.module('login').directive('guacLogin', [function guacLogin() {
});
/**
* Submits the currently-specified username and password to the
* authentication service, redirecting to the main view if successful.
* Submits the currently-specified fields to the authentication service,
* as well as any URL parameters set for the current page, preferring
* the values from the fields, and redirecting to the main view if
* successful.
*/
$scope.login = function login() {
authenticationService.authenticate($scope.enteredValues)['catch'](requestService.IGNORE);
// Any values from URL paramters
const urlValues = $location.search();
// Values from the fields
const fieldValues = $scope.enteredValues;
// All the values to be submitted in the auth attempt, preferring
// any values from fields over those in the URL
const authParams = {...urlValues, ...fieldValues};
authenticationService.authenticate(authParams)['catch'](requestService.IGNORE);
};
/**