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

config/bootstrap.php

@@ -94,6 +94,10 @@ if (file_exists(CONFIG . 'app_local.php')) {
         $settings = file_get_contents(CONFIG . 'config.json');
         $settings = json_decode($settings, true);
         foreach ($settings as $path => $setting) {
+            if($path == 'debug') {
+                Configure::write($path, (bool) $setting);
+                continue;
+            }
             Configure::write($path, $setting);
         }
     }

src/Model/Behavior/AuthKeycloakBehavior.php

@@ -199,6 +199,9 @@ class AuthKeycloakBehavior extends Behavior
                 'model_title' => __('Successful Keycloak enrollment for user {0}', $user['username']),
                 'changed' => $logChange
             ]);
+            $saved_user = $this->getCerebrateUsers($user['id']);
+            $clientId = $this->getClientId();
+            $this->syncUsers($saved_user, $clientId);
             $response = $this->restApiRequest(
                 '%s/admin/realms/%s/users/' . urlencode($newUserId) . '/execute-actions-email',
                 ['UPDATE_PASSWORD'],
@@ -335,7 +338,7 @@ class AuthKeycloakBehavior extends Behavior
 
     public function getParsedKeycloakUser(): array
     {
-        $response = $this->restApiRequest('%s/admin/realms/%s/users', [], 'get');
+        $response = $this->restApiRequest('%s/admin/realms/%s/users/?max=999999', [], 'get');
         $keycloakUsers = json_decode($response->getStringBody(), true);
         $keycloakUsersParsed = [];
         $mappers = array_merge(['role_name', 'role_uuid', 'org_uuid', 'org_name'], $this->getMappedFieldList());
@@ -357,10 +360,10 @@ class AuthKeycloakBehavior extends Behavior
         return $keycloakUsersParsed;
     }
 
-    private function getCerebrateUsers(): array
+    private function getCerebrateUsers($id = null): array
     {
         $metaFieldsSelector = ['fields' => ['MetaFields.field', 'MetaFields.parent_id', 'MetaFields.value']];
-        $results = $this->_table->find()->contain(['Individuals', 'Organisations', 'Roles', 'MetaFields' => $metaFieldsSelector])->select([
+        $query = $this->_table->find()->contain(['Individuals', 'Organisations', 'Roles', 'MetaFields' => $metaFieldsSelector])->select([
             'id',
             'uuid',
             'username',
@@ -373,7 +376,11 @@ class AuthKeycloakBehavior extends Behavior
             'Roles.uuid',
             'Organisations.name',
             'Organisations.uuid'
-        ])->disableHydration()->toArray();
+        ]);
+        if ($id) {
+            $query->where(['User.id' => $id]);
+        }
+        $results = $query->disableHydration()->toArray();
         foreach ($results as &$result) {
             if (!empty($result['meta_fields'])) {
                 $temp = [];

src/Model/Table/SettingProviders/CerebrateSettingsProvider.php

@@ -316,9 +316,8 @@ class CerebrateSettingsProvider extends BaseSettingsProvider
                             'description' => __('The debug level of the instance'),
                             'default' => 0,
                             'options' => [
-                                0 => __('Debug Off'),
+                                false => __('Debug Off'),
-                                1 => __('Debug On'),
+                                true => __('Debug On'),
-                                2 => __('Debug On + SQL Dump'),
                             ],
                             'test' => function ($value, $setting, $validator) {
                                 $validator->range('value', [0, 2]);