Skip to content

EspoCRM – Open Source CRM Application

access checker factory bind entityType

Yuri Kuznetsov6cbf6cea7339
diff --git a/application/Espo/Core/Acl/AccessChecker/AccessCheckerFactory.php b/application/Espo/Core/Acl/AccessChecker/AccessCheckerFactory.php
index 71a48abce5..3bbeceb265 100644
--- a/application/Espo/Core/Acl/AccessChecker/AccessCheckerFactory.php
+++ b/application/Espo/Core/Acl/AccessChecker/AccessCheckerFactory.php
@@ -58,7 +58,7 @@ class AccessCheckerFactory
{
$className = $this->getClassName($scope);
- $bindingContainer = $this->createBindingContainer($aclManager);
+ $bindingContainer = $this->createBindingContainer($className, $aclManager, $scope);
return $this->injectableFactory->createWithBinding($className, $bindingContainer);
}
@@ -77,19 +77,27 @@ class AccessCheckerFactory
}
if (!$this->metadata->get(['scopes', $scope])) {
- throw new NotImplemented("Access checker is not implemented for '{$scope}'.");
+ throw new NotImplemented("Access checker is not implemented for '$scope'.");
}
return $this->defaultClassName;
}
- private function createBindingContainer(AclManager $aclManager): BindingContainer
+ /**
+ * @param class-string<AccessChecker> $className
+ */
+ private function createBindingContainer(string $className, AclManager $aclManager, string $scope): BindingContainer
{
$bindingData = new BindingData();
$binder = new Binder($bindingData);
+
$binder->bindInstance(AclManager::class, $aclManager);
+ $binder
+ ->for($className)
+ ->bindValue('$entityType', $scope);
+
return new BindingContainer($bindingData);
}
}
diff --git a/application/Espo/Core/Acl/OwnershipChecker/OwnershipCheckerFactory.php b/application/Espo/Core/Acl/OwnershipChecker/OwnershipCheckerFactory.php
index fb60003944..dddb213def 100644
--- a/application/Espo/Core/Acl/OwnershipChecker/OwnershipCheckerFactory.php
+++ b/application/Espo/Core/Acl/OwnershipChecker/OwnershipCheckerFactory.php
@@ -58,7 +58,7 @@ class OwnershipCheckerFactory
{
$className = $this->getClassName($scope);
- $bindingContainer = $this->createBindingContainer($aclManager);
+ $bindingContainer = $this->createBindingContainer($className, $aclManager, $scope);
return $this->injectableFactory->createWithBinding($className, $bindingContainer);
}
@@ -83,7 +83,10 @@ class OwnershipCheckerFactory
return $this->defaultClassName;
}
- private function createBindingContainer(AclManager $aclManager): BindingContainer
+ /**
+ * @param class-string<OwnershipChecker> $className
+ */
+ private function createBindingContainer(string $className, AclManager $aclManager, string $scope): BindingContainer
{
$bindingData = new BindingData();
@@ -91,6 +94,10 @@ class OwnershipCheckerFactory
$binder->bindInstance(AclManager::class, $aclManager);
+ $binder
+ ->for($className)
+ ->bindValue('$entityType', $scope);
+
return new BindingContainer($bindingData);
}
}
diff --git a/application/Espo/Core/Portal/Acl/AccessChecker/AccessCheckerFactory.php b/application/Espo/Core/Portal/Acl/AccessChecker/AccessCheckerFactory.php
index 76ff3d5857..76b214d444 100644
--- a/application/Espo/Core/Portal/Acl/AccessChecker/AccessCheckerFactory.php
+++ b/application/Espo/Core/Portal/Acl/AccessChecker/AccessCheckerFactory.php
@@ -31,6 +31,7 @@ namespace Espo\Core\Portal\Acl\AccessChecker;
use Espo\Core\Acl\AccessChecker;
use Espo\Core\Acl\Exceptions\NotImplemented;
+use Espo\Core\AclManager;
use Espo\Core\Binding\Binder;
use Espo\Core\Binding\BindingContainer;
use Espo\Core\Binding\BindingData;
@@ -58,7 +59,7 @@ class AccessCheckerFactory
{
$className = $this->getClassName($scope);
- $bindingContainer = $this->createBindingContainer($aclManager);
+ $bindingContainer = $this->createBindingContainer($className, $aclManager, $scope);
return $this->injectableFactory->createWithBinding($className, $bindingContainer);
}
@@ -82,12 +83,25 @@ class AccessCheckerFactory
return $this->defaultClassName;
}
- private function createBindingContainer(PortalAclManager $aclManager): BindingContainer
- {
+ /**
+ * @param class-string<AccessChecker> $className
+ */
+ private function createBindingContainer(
+ string $className,
+ PortalAclManager $aclManager,
+ string $scope
+ ): BindingContainer {
+
$bindingData = new BindingData();
$binder = new Binder($bindingData);
- $binder->bindInstance(PortalAclManager::class, $aclManager);
+ $binder
+ ->bindInstance(PortalAclManager::class, $aclManager)
+ ->bindInstance(AclManager::class, $aclManager);
+
+ $binder
+ ->for($className)
+ ->bindValue('$entityType', $scope);
return new BindingContainer($bindingData);
}
diff --git a/application/Espo/Core/Portal/Acl/OwnershipChecker/OwnershipCheckerFactory.php b/application/Espo/Core/Portal/Acl/OwnershipChecker/OwnershipCheckerFactory.php
index 4a26ddc31b..bae13f66bf 100644
--- a/application/Espo/Core/Portal/Acl/OwnershipChecker/OwnershipCheckerFactory.php
+++ b/application/Espo/Core/Portal/Acl/OwnershipChecker/OwnershipCheckerFactory.php
@@ -31,6 +31,7 @@ namespace Espo\Core\Portal\Acl\OwnershipChecker;
use Espo\Core\Acl\Exceptions\NotImplemented;
use Espo\Core\Acl\OwnershipChecker;
+use Espo\Core\AclManager;
use Espo\Core\Binding\Binder;
use Espo\Core\Binding\BindingContainer;
use Espo\Core\Binding\BindingData;
@@ -58,7 +59,7 @@ class OwnershipCheckerFactory
{
$className = $this->getClassName($scope);
- $bindingContainer = $this->createBindingContainer($aclManager);
+ $bindingContainer = $this->createBindingContainer($className, $aclManager, $scope);
return $this->injectableFactory->createWithBinding($className, $bindingContainer);
}
@@ -82,13 +83,26 @@ class OwnershipCheckerFactory
return $this->defaultClassName;
}
- private function createBindingContainer(PortalAclManager $aclManager): BindingContainer
- {
+ /**
+ * @param class-string<OwnershipChecker> $className
+ */
+ private function createBindingContainer(
+ string $className,
+ PortalAclManager $aclManager,
+ string $scope
+ ): BindingContainer {
+
$bindingData = new BindingData();
$binder = new Binder($bindingData);
- $binder->bindInstance(PortalAclManager::class, $aclManager);
+ $binder
+ ->bindInstance(PortalAclManager::class, $aclManager)
+ ->bindInstance(AclManager::class, $aclManager);
+
+ $binder
+ ->for($className)
+ ->bindValue('$entityType', $scope);
return new BindingContainer($bindingData);
}