Skip to content

EspoCRM – Open Source CRM Application

ACL events

Yurii64edd68c7607
diff --git a/application/Espo/Core/Acl/Cache/Clearer.php b/application/Espo/Core/Acl/Cache/Clearer.php
index 0e18376a27..a808dc58c1 100644
--- a/application/Espo/Core/Acl/Cache/Clearer.php
+++ b/application/Espo/Core/Acl/Cache/Clearer.php
@@ -29,8 +29,8 @@
namespace Espo\Core\Acl\Cache;
-use Espo\Core\Acl\Events\InvalidatePortalUserCache;
-use Espo\Core\Acl\Events\InvalidateUserCache;
+use Espo\Core\Portal\Acl\Events\PortalUserRoleUpdate;
+use Espo\Core\Acl\Events\UserRoleUpdate;
use Espo\Core\Utils\Event\EventDispatcher;
use Espo\Core\Utils\File\Manager as FileManager;
use Espo\Core\Utils\System\SystemState;
@@ -80,7 +80,7 @@ class Clearer
$this->fileManager->remove('data/cache/application/acl/' . $part);
$this->fileManager->remove('data/cache/application/aclMap/' . $part);
- $this->eventDispatcher->dispatch(new InvalidateUserCache($user->getId()));
+ $this->eventDispatcher->dispatch(new UserRoleUpdate($user->getId()));
}
private function clearForPortalUser(User $user): void
@@ -96,7 +96,7 @@ class Clearer
$this->fileManager->remove('data/cache/application/aclPortal/' . $part);
$this->fileManager->remove('data/cache/application/aclPortalMap/' . $part);
- $event = new InvalidatePortalUserCache(
+ $event = new PortalUserRoleUpdate(
userId: $user->getId(),
portalId: $portal->getId(),
);
diff --git a/application/Espo/Core/Acl/Events/UserRoleUpdate.php b/application/Espo/Core/Acl/Events/UserRoleUpdate.php
index ee4d009fc2..4275e88bed 100644
--- a/application/Espo/Core/Acl/Events/UserRoleUpdate.php
+++ b/application/Espo/Core/Acl/Events/UserRoleUpdate.php
@@ -36,7 +36,7 @@ use UnexpectedValueException;
/**
* @since 10.1.0
*/
-readonly class InvalidateUserCache implements CrossInstanceEvent
+readonly class UserRoleUpdate implements CrossInstanceEvent
{
public function __construct(
public string $userId,
diff --git a/application/Espo/Core/AclManager.php b/application/Espo/Core/AclManager.php
index 832018e1a0..f132700f72 100644
--- a/application/Espo/Core/AclManager.php
+++ b/application/Espo/Core/AclManager.php
@@ -29,9 +29,11 @@
namespace Espo\Core;
+use Espo\Core\Acl\Events\UserRoleUpdate;
use Espo\Core\Acl\OwnershipSharedChecker;
use Espo\Core\Acl\Permission;
use Espo\Core\Name\Field;
+use Espo\Core\Utils\Event\EventDispatcher;
use Espo\ORM\Entity;
use Espo\ORM\EntityManager;
use Espo\Entities\User;
@@ -119,12 +121,15 @@ class AclManager
MapFactory $mapFactory,
protected GlobalRestriction $globalRestriction,
protected OwnerUserFieldProvider $ownerUserFieldProvider,
- protected EntityManager $entityManager
+ protected EntityManager $entityManager,
+ protected EventDispatcher $eventDispatcher,
) {
$this->accessCheckerFactory = $accessCheckerFactory;
$this->ownershipCheckerFactory = $ownershipCheckerFactory;
$this->tableFactory = $tableFactory;
$this->mapFactory = $mapFactory;
+
+ $this->initEventHandling();
}
/**
@@ -782,4 +787,14 @@ class AclManager
return false;
}
+
+ protected function initEventHandling(): void
+ {
+ $this->eventDispatcher->subscribe(UserRoleUpdate::class, function (UserRoleUpdate $event) {
+ $userId = $event->userId;
+
+ unset($this->tableHashMap[$userId]);
+ unset($this->mapHashMap[$userId]);
+ });
+ }
}
diff --git a/application/Espo/Core/Portal/Acl/Events/PortalUserRoleUpdate.php b/application/Espo/Core/Portal/Acl/Events/PortalUserRoleUpdate.php
index 535a88cb6e..69b9250679 100644
--- a/application/Espo/Core/Portal/Acl/Events/PortalUserRoleUpdate.php
+++ b/application/Espo/Core/Portal/Acl/Events/PortalUserRoleUpdate.php
@@ -27,7 +27,7 @@
* these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
************************************************************************/
-namespace Espo\Core\Acl\Events;
+namespace Espo\Core\Portal\Acl\Events;
use Espo\Core\Utils\Event\CrossInstanceEvent;
use stdClass;
@@ -36,7 +36,7 @@ use UnexpectedValueException;
/**
* @since 10.1.0
*/
-class InvalidatePortalUserCache implements CrossInstanceEvent
+class PortalUserRoleUpdate implements CrossInstanceEvent
{
public function __construct(
public string $userId,
diff --git a/application/Espo/Core/Portal/AclManager.php b/application/Espo/Core/Portal/AclManager.php
index e79a10a4a5..3d9ab994d6 100644
--- a/application/Espo/Core/Portal/AclManager.php
+++ b/application/Espo/Core/Portal/AclManager.php
@@ -30,12 +30,12 @@
namespace Espo\Core\Portal;
use Espo\Core\Acl\Permission;
+use Espo\Core\Portal\Acl\Events\PortalUserRoleUpdate;
+use Espo\Core\Utils\Event\EventDispatcher;
use Espo\ORM\Entity;
use Espo\ORM\EntityManager;
-
use Espo\Entities\Portal;
use Espo\Entities\User;
-
use Espo\Core\Acl\GlobalRestriction;
use Espo\Core\Acl\Map\Map;
use Espo\Core\Acl\OwnerUserFieldProvider;
@@ -70,7 +70,8 @@ class AclManager extends InternalAclManager
GlobalRestriction $globalRestriction,
OwnerUserFieldProvider $ownerUserFieldProvider,
EntityManager $entityManager,
- InternalAclManager $internalAclManager
+ InternalAclManager $internalAclManager,
+ EventDispatcher $eventDispatcher,
) {
$this->accessCheckerFactory = $accessCheckerFactory;
$this->ownershipCheckerFactory = $ownershipCheckerFactory;
@@ -80,6 +81,9 @@ class AclManager extends InternalAclManager
$this->ownerUserFieldProvider = $ownerUserFieldProvider;
$this->entityManager = $entityManager;
$this->internalAclManager = $internalAclManager;
+ $this->eventDispatcher = $eventDispatcher;
+
+ $this->initEventHandling();
}
public function setPortal(Portal $portal): void
@@ -338,4 +342,18 @@ class AclManager extends InternalAclManager
{
return $this->getPermissionLevel($user, $permission);
}
+
+ protected function initEventHandling(): void
+ {
+ $this->eventDispatcher->subscribe(PortalUserRoleUpdate::class, function (PortalUserRoleUpdate $event) {
+ if ($this->portal?->getId() !== $event->portalId) {
+ return;
+ }
+
+ $userId = $event->userId;
+
+ unset($this->tableHashMap[$userId]);
+ unset($this->mapHashMap[$userId]);
+ });
+ }
}
diff --git a/application/Espo/Core/Utils/Event/EventDispatcher.php b/application/Espo/Core/Utils/Event/EventDispatcher.php
index ba8e52fd72..2cff79e73b 100644
--- a/application/Espo/Core/Utils/Event/EventDispatcher.php
+++ b/application/Espo/Core/Utils/Event/EventDispatcher.php
@@ -48,11 +48,14 @@ class EventDispatcher
) {}
/**
- * @param class-string<Event> $className
- * @param Closure(Event, Context): void $callback
+ * @template T of Event
+ * @param class-string<T> $className
+ * @param Closure(T, Context): void $callback
*/
public function subscribe(string $className, Closure $callback): void
{
+ /** @var Closure(Event, Context): void $callback */
+
$this->callbacks[$className] ??= [];
$this->callbacks[$className][] = $callback;
@@ -65,11 +68,14 @@ class EventDispatcher
}
/**
- * @param class-string<Event> $className
- * @param Closure(Event, Context): void $callback
+ * @template T of Event
+ * @param class-string<T> $className
+ * @param Closure(T, Context): void $callback
*/
public function unsubscribe(string $className, Closure $callback): void
{
+ /** @var Closure(Event, Context): void $callback */
+
if (!array_key_exists($className, $this->callbacks)) {
return;
}
diff --git a/tests/unit/Espo/Core/AclManagerTest.php b/tests/unit/Espo/Core/AclManagerTest.php
index bb18c3779a..6f5184cffa 100644
--- a/tests/unit/Espo/Core/AclManagerTest.php
+++ b/tests/unit/Espo/Core/AclManagerTest.php
@@ -40,6 +40,7 @@ use Espo\Core\Acl\Table\TableFactory;
use Espo\Core\AclManager;
use Espo\Core\ORM\EntityManager;
+use Espo\Core\Utils\Event\EventDispatcher;
use Espo\Entities\User;
use PHPUnit\Framework\TestCase;
@@ -66,13 +67,14 @@ class AclManagerTest extends TestCase
$globalRestriction = $this->createMock(GlobalRestriction::class);
$this->aclManager = new AclManager(
- $accessCheckerFactory,
- $ownershipCheckerFactory,
- $this->tableFactory,
- $mapFactory,
- $globalRestriction,
- $this->createMock(OwnerUserFieldProvider::class),
- $this->createMock(EntityManager::class)
+ accessCheckerFactory: $accessCheckerFactory,
+ ownershipCheckerFactory: $ownershipCheckerFactory,
+ tableFactory: $this->tableFactory,
+ mapFactory: $mapFactory,
+ globalRestriction: $globalRestriction,
+ ownerUserFieldProvider: $this->createMock(OwnerUserFieldProvider::class),
+ entityManager: $this->createMock(EntityManager::class),
+ eventDispatcher: $this->createMock(EventDispatcher::class),
);
}