cerebrate-project
/
cerebrate
mirror of https://github.com/cerebrate-project/cerebrate
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'main' into develop

pull/93/head
iglocska 2022-02-28 10:27:40 +01:00
parent a99a06b1c3 61cda0af33
commit fe8401313d
No known key found for this signature in database
GPG Key ID: BEA224F1FEF113AC
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Model/Behavior/AuthKeycloakBehavior.php
View File

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

2
src/Model/Table/SettingProviders/CerebrateSettingsProvider.php
View File

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