Merge branch '2.4' into develop

app/Controller/AuthKeysController.php

@@ -83,6 +83,7 @@ class AuthKeysController extends AppController
                 return $authKey;
             },
             'fields' => ['comment', 'allowed_ips', 'expiration'],
+            'contain' => ['User.id', 'User.org_id']
         ]);
         if ($this->IndexFilter->isRest()) {
             return $this->restResponsePayload;

app/Controller/Component/CRUDComponent.php

@@ -161,7 +161,7 @@ class CRUDComponent extends Component
         $query = isset($params['get']) ? $params['get'] : [
             'recursive' => -1,
             'conditions' => [
-                'id' => $id
+                $modelName . '.id' => $id
             ],
         ];
         if (!empty($params['conditions'])) {

docs/generic/Synchronisation/README.md

@@ -1,4 +1,4 @@
-# Data visibility for Sync-users
+# Data visibility for Sync-users and MISP synchronisation
 
 Sync-users are used to serve as the point of connection between instances.
 Typically, events pushed to an instance are created via a sync-user account residing on the remote instance.