Merge branch 'develop' into add-integration-tests

src/Controller/Component/CRUDComponent.php

@@ -442,6 +442,12 @@ class CRUDComponent extends Component
                 if (empty($data)) {
                     throw new NotFoundException(__('Invalid {0}.', $this->ObjectAlias));
                 }
+                if (isset($params['beforeSave'])) {
+                    $data = $params['beforeSave']($data);
+                    if ($data === false) {
+                        throw new NotFoundException(__('Could not save {0} due to the input failing to meet expectations. Your input is bad and you should feel bad.', $this->ObjectAlias));
+                    }
+                }
                 $this->Controller->set('id', $data['id']);
                 $this->Controller->set('data', $data);
                 $this->Controller->set('bulkEnabled', false);
@@ -453,6 +459,7 @@ class CRUDComponent extends Component
             $isBulk = count($ids) > 1;
             $bulkSuccesses = 0;
             foreach ($ids as $id) {
+                $skipExecution = false;
                 $data = $this->Table->find()->where([$this->Table->getAlias() . '.id' => $id]);
                 if (!empty($params['conditions'])) {
                     $data->where($params['conditions']);
@@ -460,6 +467,14 @@ class CRUDComponent extends Component
                 if (!empty($params['contain'])) {
                     $data->contain($params['contain']);
                 }
+                if (isset($params['beforeSave'])) {
+                    $data = $params['beforeSave']($data);
+                    if ($data === false) {
+                        $skipExecution = true;
+                        $success = false;
+                    }
+                }
+                if (!$skipExecution) {
                     $data = $data->first();
                     if (!empty($data)) {
                         $success = $this->Table->delete($data);
@@ -471,6 +486,7 @@ class CRUDComponent extends Component
                         $bulkSuccesses++;
                     }
                 }
+            }
             $message = $this->getMessageBasedOnResult(
                 $bulkSuccesses == count($ids),
                 $isBulk,

src/Controller/EncryptionKeysController.php

@@ -57,6 +57,7 @@ class EncryptionKeysController extends AppController
 
     private function buildBeforeSave(array $params, $currentUser, array &$orgConditions, array &$individualConditions, array &$dropdownData): array
     {
+        if (empty($currentUser['role']['perm_admin'])) {
             $orgConditions = [
                 'id' => $currentUser['organisation_id']
             ];
@@ -67,7 +68,9 @@ class EncryptionKeysController extends AppController
             }
             $params['beforeSave'] = function($entity) use($currentUser) {
                 if ($entity['owner_model'] === 'organisation') {
-                $entity['owner_id'] = $currentUser['organisation_id'];
+                    if ($entity['owner_id'] !== $currentUser['organisation_id']) {
+                        throw new MethodNotAllowedException(__('Selected organisation cannot be linked by the current user.'));
+                    }
                 } else {
                     if ($currentUser['role']['perm_org_admin']) {
                         $this->loadModel('Alignments');
@@ -87,17 +90,12 @@ class EncryptionKeysController extends AppController
                 }
                 return $entity;
             };
+        }
         $this->loadModel('Organisations');
         $this->loadModel('Individuals');
         $dropdownData = [
-            'organisation' => $this->Organisations->find('list', [
+            'organisation' => $this->Organisations->find('list')->order(['name' => 'asc'])->where($orgConditions)->all()->toArray(),
-                'sort' => ['name' => 'asc'],
+            'individual' => $this->Individuals->find('list')->order(['email' => 'asc'])->where($individualConditions)->all()->toArray()
-                'conditions' => $orgConditions
-            ]),
-            'individual' => $this->Individuals->find('list', [
-                'sort' => ['email' => 'asc'],
-                'conditions' => $individualConditions
-            ])
         ];
         return $params;
     }
@@ -111,9 +109,7 @@ class EncryptionKeysController extends AppController
         $params = [
             'redirect' => $this->referer()
         ];
-        if (empty($currentUser['role']['perm_admin'])) {
         $params = $this->buildBeforeSave($params, $currentUser, $orgConditions, $individualConditions, $dropdownData);
-        }
         $this->CRUD->add($params);
         $responsePayload = $this->CRUD->getResponsePayload();
         if (!empty($responsePayload)) {