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

Merge branch 'develop' of github.com:cerebrate-project/cerebrate into develop-unstable

pull/93/head
Sami Mokaddem 2022-03-01 09:52:57 +01:00
parent 505e9a0973 fe8401313d
commit bb94765243
No known key found for this signature in database
GPG Key ID: 164C473F627A06FA
2 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -137,6 +137,30 @@ class AuthKeycloakBehavior extends Behavior
]
]
);
$logChange = [
'username' => $data['username'],
'individual_id' => $data['individual_id'],
'role_id' => $data['role_id']
];
if (!$response->isOk()) {
$logChange['error_code'] = $response->getStatusCode();
$logChange['error_body'] = $response->getStringBody();
$this->_table->auditLogs()->insert([
'request_action' => 'enrollUser',
'model' => 'User',
'model_id' => 0,
'model_title' => __('Failed Keycloak enrollment for user {0}', $data['username']),
'changed' => $logChange
]);
} else {
$this->_table->auditLogs()->insert([
'request_action' => 'enrollUser',
'model' => 'User',
'model_id' => 0,
'model_title' => __('Successful Keycloak enrollment for user {0}', $data['username']),
'changed' => $logChange
]);
}
return true;
}

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.');
foreach ($providers as $provider) {
if ($provider !== $setting['authentication_type']) {
if (Configure::read($provider . '.enable')) {
if (Configure::read($provider . '.enabled')) {
$foundEnabledAuth = true;
}
}