From 0472108cc3f4d5e4d25564c0fddc41acb77f74cd Mon Sep 17 00:00:00 2001
From: iglocska <andras.iklody@gmail.com>
Date: Mon, 28 Jun 2021 23:43:42 +0200
Subject: [PATCH 1/2] fix: [authkeys] correctly filter the api keys on the user
 view

---
 src/Controller/RolesController.php | 2 +-
 templates/Users/view.php           | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Controller/RolesController.php b/src/Controller/RolesController.php
index 7931536..e351ebb 100644
--- a/src/Controller/RolesController.php
+++ b/src/Controller/RolesController.php
@@ -15,7 +15,7 @@ class RolesController extends AppController
     public function index()
     {
         $this->CRUD->index([
-            'filters' => ['name', 'uuid', 'perm_admin'],
+            'filters' => ['name', 'uuid', 'perm_admin', 'Users.id'],
             'quickFilters' => ['name']
         ]);
         if ($this->ParamHandler->isRest()) {
diff --git a/templates/Users/view.php b/templates/Users/view.php
index 384a25a..d26bffb 100644
--- a/templates/Users/view.php
+++ b/templates/Users/view.php
@@ -43,12 +43,12 @@ echo $this->element(
         ],
         'children' => [
             [
-                'url' => '/AuthKeys/index?users_id={{0}}',
+                'url' => '/AuthKeys/index?Users.id={{0}}',
                 'url_params' => ['id'],
                 'title' => __('Authentication keys')
             ],
             [
-                'url' => '/EncryptionKeys/index?users_id={{0}}',
+                'url' => '/EncryptionKeys/index?Users.id={{0}}',
                 'url_params' => ['id'],
                 'title' => __('Encryption keys')
             ]

From f22ad575755f44190bb802b435c64564447d2b69 Mon Sep 17 00:00:00 2001
From: iglocska <andras.iklody@gmail.com>
Date: Mon, 28 Jun 2021 23:55:24 +0200
Subject: [PATCH 2/2] fix: [ACL] added all new functionalities

---
 src/Controller/Component/ACLComponent.php | 46 +++++++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/src/Controller/Component/ACLComponent.php b/src/Controller/Component/ACLComponent.php
index 8367536..6fd0556 100644
--- a/src/Controller/Component/ACLComponent.php
+++ b/src/Controller/Component/ACLComponent.php
@@ -51,15 +51,31 @@ class ACLComponent extends Component
         'Broods' => [
             'add' => ['perm_admin'],
             'delete' => ['perm_admin'],
+            'downloadIndividual' => ['perm_admin'],
+            'downloadOrg' => ['perm_admin'],
+            'downloadSharingGroup' => ['perm_admin'],
             'edit' => ['perm_admin'],
             'index' => ['perm_admin'],
+            'interconnectTools' => ['perm_admin'],
+            'previewIndex' => ['perm_admin'],
+            'testConnection' => ['perm_admin'],
             'view' => ['perm_admin']
         ],
         'EncryptionKeys' => [
             'add' => ['*'],
+            'edit' => ['*'],
             'delete' => ['*'],
             'index' => ['*']
         ],
+        'Inbox' => [
+            'createEntry' => ['perm_admin', 'perm_sync'],
+            'delete' => ['perm_admin'],
+            'filtering' => ['perm_admin'],
+            'index' => ['perm_admin'],
+            'listProcessors' => ['perm_admin', 'perm_sync'],
+            'process' => ['perm_admin'],
+            'view' => ['perm_admin'],
+        ],
         'Individuals' => [
             'add' => ['perm_admin'],
             'delete' => ['perm_admin'],
@@ -69,8 +85,25 @@ class ACLComponent extends Component
         ],
         'Instance' => [
             'home' => ['*'],
+            'migrate' => ['perm_admin'],
+            'migrationIndex' => ['perm_admin'],
+            'rollback' => ['perm_admin'],
             'status' => ['*']
         ],
+        'LocalTools' => [
+            'action' => ['perm_admin'],
+            'add' => ['perm_admin'],
+            'broodTools' => ['perm_admin'],
+            'connectionRequest' => ['perm_admin'],
+            'connectLocal' => ['perm_admin'],
+            'delete' => ['perm_admin'],
+            'edit' => ['perm_admin'],
+            'exposedTools' => ['perm_admin'],
+            'index' => ['perm_admin'],
+            'connectorIndex' => ['perm_admin'],
+            'view' => ['perm_admin'],
+            'viewConnector' => ['perm_admin']
+        ],
         'MetaTemplateFields' => [
             'index' => ['perm_admin']
         ],
@@ -79,15 +112,26 @@ class ACLComponent extends Component
             'enable' => ['perm_admin'],
             'index' => ['perm_admin'],
             'update' => ['perm_admin'],
+            'toggle' => ['perm_admin'],
             'view' => ['perm_admin']
         ],
         'Organisations' => [
             'add' => ['perm_admin'],
             'delete' => ['perm_admin'],
             'edit' => ['perm_admin'],
+            'filtering' => ['*'],
             'index' => ['*'],
             'view' => ['*']
         ],
+        'Outbox' => [
+            'createEntry' => ['perm_admin'],
+            'delete' => ['perm_admin'],
+            'filtering' => ['perm_admin'],
+            'index' => ['perm_admin'],
+            'listProcessors' => ['perm_admin'],
+            'process' => ['perm_admin'],
+            'view' => ['perm_admin']
+        ],
         'Pages' => [
             'display' => ['*']
         ],
@@ -115,6 +159,8 @@ class ACLComponent extends Component
             'index' => ['perm_admin'],
             'login' => ['*'],
             'logout' => ['*'],
+            'register' => ['*'],
+            'toggle' => ['perm_admin'],
             'view' => ['*']
         ]
     );