Merge branch 'main' into develop

pull/93/head
iglocska 2022-02-28 10:27:40 +01:00
commit fe8401313d
No known key found for this signature in database
GPG Key ID: BEA224F1FEF113AC
2 changed files with 2 additions and 3 deletions

View File

@ -134,8 +134,7 @@ class AuthKeycloakBehavior extends Behavior
'headers' => [
'Content-Type' => 'application/json',
'Authorization' => 'Bearer ' . $token
],
'ssl_verify_peer' => false
]
]
);
$logChange = [

View File

@ -398,7 +398,7 @@ class CerebrateSettingValidator extends SettingValidator
$foundEnabledAuth = __('Cannot make change - this would disable every possible authentication method.');
foreach ($providers as $provider) {
if ($provider !== $setting['authentication_type']) {
if (Configure::read($provider . '.enable')) {
if (Configure::read($provider . '.enabled')) {
$foundEnabledAuth = true;
}
}