From 4c7dc85d0e8a67a3fe0fcff6f2a7d2ef629b7ebe Mon Sep 17 00:00:00 2001
From: iglocska <andras.iklody@gmail.com>
Date: Wed, 1 Dec 2021 15:24:08 +0100
Subject: [PATCH] fix: [encryptions] fixed adding encryption keys

---
 src/Controller/EncryptionKeysController.php | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/Controller/EncryptionKeysController.php b/src/Controller/EncryptionKeysController.php
index ae2a55b..bafe8ce 100644
--- a/src/Controller/EncryptionKeysController.php
+++ b/src/Controller/EncryptionKeysController.php
@@ -62,16 +62,18 @@ class EncryptionKeysController extends AppController
                     'id' => $currentUser['individual_id']
                 ];
             }
-            $params['beforeSave'] = function($entity) {
+            $params['beforeSave'] = function($entity) use($currentUser) {
                 if ($entity['owner_model'] === 'organisation') {
                     $entity['owner_id'] = $currentUser['organisation_id'];
                 } else {
                     if ($currentUser['role']['perm_org_admin']) {
-                        $validIndividuals = $this->Organisations->find('list', [
-                            'fields' => ['distinct(id)'],
+                        $this->loadModel('Alignments');
+                        $validIndividuals = $this->Alignments->find('list', [
+                            'keyField' => 'individual_id',
+                            'valueField' => 'id',
                             'conditions' => ['organisation_id' => $currentUser['organisation_id']]
-                        ]);
-                        if (!in_array($entity['owner_id'], $validIndividuals)) {
+                        ])->toArray();
+                        if (!isset($validIndividuals[$entity['owner_id']])) {
                             throw new MethodNotAllowedException(__('Selected individual cannot be linked by the current user.'));
                         }
                     } else {
@@ -80,6 +82,7 @@ class EncryptionKeysController extends AppController
                         }
                     }
                 }
+                return $entity;
             };
         }
         $this->CRUD->add($params);