new acl usage

application/Espo/Classes/Acl/ActionHistoryRecord/OwnershipChecker.php

@@ -27,17 +27,19 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Acl;
+namespace Espo\Classes\Acl\ActionHistoryRecord;
 
-use Espo\Entities\User as EntityUser;
+use Espo\Entities\User;
 
 use Espo\ORM\Entity;
 
-use Espo\Core\Acl\Acl;
+use Espo\Core\{
+    Acl\OwnershipOwnChecker,
+};
 
-class ActionHistoryRecord extends Acl
+class OwnershipChecker implements OwnershipOwnChecker
 {
-    public function checkIsOwner(EntityUser $user, Entity $entity)
+    public function checkOwn(User $user, Entity $entity): bool
     {
         return $entity->get('userId') === $user->getId();
     }

application/Espo/Classes/Acl/Email/AccessChecker.php

@@ -27,27 +27,36 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Acl;
+namespace Espo\Classes\Acl\Email;
 
-use Espo\Entities\User as EntityUser;
+use Espo\Entities\User;
 
 use Espo\ORM\Entity;
 
 use Espo\Core\{
-    Acl\Acl,
-    Acl\ScopeData,
     Acl\Table,
+    Acl\ScopeData,
+    Acl\DefaultAccessChecker,
+    Acl\AccessEntityCREDSChecker,
+    Acl\Traits\DefaultAccessCheckerDependency,
 };
 
-class Email extends Acl
+class AccessChecker implements AccessEntityCREDSChecker
 {
-    public function checkEntityRead(EntityUser $user, Entity $entity, ScopeData $data): bool
+    use DefaultAccessCheckerDependency;
+
+    public function __construct(DefaultAccessChecker $defaultAccessChecker)
     {
-        if ($this->checkEntity($user, $entity, $data, 'read')) {
+        $this->defaultAccessChecker = $defaultAccessChecker;
+    }
+
+    public function checkEntityRead(User $user, Entity $entity, ScopeData $data): bool
+    {
+        if ($this->defaultAccessChecker->checkEntityRead($user, $entity, $data)) {
             return true;
         }
 
-        if (!$data->isFalse()) {
+        if ($data->isFalse()) {
             return false;
         }
 
@@ -61,37 +70,20 @@ class Email extends Acl
 
         $userIdList = $entity->get('usersIds');
 
-        if (is_array($userIdList) && in_array($user->id, $userIdList)) {
+        if (is_array($userIdList) && in_array($user->getId(), $userIdList)) {
             return true;
         }
 
         return false;
     }
 
-    public function checkIsOwner(EntityUser $user, Entity $entity)
-    {
-        if ($user->getId() === $entity->get('assignedUserId')) {
-            return true;
-        }
-
-        if ($user->getId() === $entity->get('createdById')) {
-            return true;
-        }
-
-        if ($entity->hasLinkMultipleId('assignedUsers', $user->id)) {
-            return true;
-        }
-
-        return false;
-    }
-
-    public function checkEntityDelete(EntityUser $user, Entity $entity, ScopeData $data): bool
+    public function checkEntityDelete(User $user, Entity $entity, ScopeData $data): bool
     {
         if ($user->isAdmin()) {
             return true;
         }
 
-        if (!$data->isFalse()) {
+        if ($data->isFalse()) {
             return false;
         }
 
@@ -116,7 +108,7 @@ class Email extends Acl
             return false;
         }
 
-        if ($this->checkEntity($user, $entity, $data, Table::ACTION_DELETE)) {
+        if ($this->defaultAccessChecker->checkEntityDelete($user, $entity, $data)) {
             return true;
         }
 

application/Espo/Classes/Acl/Email/OwnershipChecker.php

@@ -0,0 +1,72 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Website: https://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Classes\Acl\Email;
+
+use Espo\Entities\User;
+
+use Espo\ORM\Entity;
+
+use Espo\Core\{
+    Acl\DefaultOwnershipChecker,
+    Acl\OwnershipOwnChecker,
+    Acl\OwnershipTeamChecker,
+};
+
+class OwnershipChecker implements OwnershipOwnChecker, OwnershipTeamChecker
+{
+    private $defaultOwnershipChecker;
+
+    public function __construct(DefaultOwnershipChecker $defaultOwnershipChecker)
+    {
+        $this->defaultOwnershipChecker = $defaultOwnershipChecker;
+    }
+
+    public function checkOwn(User $user, Entity $entity): bool
+    {
+        if ($user->getId() === $entity->get('assignedUserId')) {
+            return true;
+        }
+
+        if ($user->getId() === $entity->get('createdById')) {
+            return true;
+        }
+
+        if ($entity->hasLinkMultipleId('assignedUsers', $user->getId())) {
+            return true;
+        }
+
+        return false;
+    }
+
+    public function checkTeam(User $user, Entity $entity): bool
+    {
+        return $this->defaultOwnershipChecker->checkTeam($user, $entity);
+    }
+}

application/Espo/Resources/metadata/aclDefs/ActionHistoryRecord.json

@@ -0,0 +1,3 @@
+{
+    "ownershipCheckerClassName": "Espo\\Classes\\Acl\\ActionHistoryRecord\\OwnershipChecker"
+}

application/Espo/Resources/metadata/aclDefs/Email.json

@@ -1,3 +1,5 @@
 {
+    "accessCheckerClassName": "Espo\\Classes\\Acl\\Email\\AccessChecker",
+    "ownershipCheckerClassName": "Espo\\Classes\\Acl\\Email\\OwnershipChecker",
     "readOwnerUserField": "users"
 }