Merge pull request #2293 from dpfaffenbauer/issue/2290

[ResourceBundle] fix Pimcore 10.6 compatibility to find Admin User
coreshop · May 25, 2023 · cc3e66f · cc3e66f
2 parents 64208d8 + 17ae0dc
commit cc3e66f
Showing 1 changed file with 17 additions and 6 deletions.
diff --git a/src/CoreShop/Bundle/ResourceBundle/Controller/ResourceController.php b/src/CoreShop/Bundle/ResourceBundle/Controller/ResourceController.php
@@ -55,12 +55,23 @@ protected function isGrantedOr403(): void
  if ($this->metadata->hasParameter('permission')) {
  $permission = sprintf('%s_permission_%s', $this->metadata->getApplicationName(), $this->metadata->getParameter('permission'));
 
- /**
- * @var User $user
- *
- * @psalm-var User $user
- */
- $user = method_exists($this, 'getAdminUser') ? $this->getAdminUser() : $this->getUser();
+ $user = $this->getUser();
+
+ if (class_exists(\Pimcore\Security\User\User::class) && $user instanceof \Pimcore\Security\User\User) {
+ /**
+ * @psalm-suppress UndefinedClass, UndefinedInterfaceMethod
+ */
+ $user = $user->getUser();
+ }
+ else if (class_exists(\Pimcore\Bundle\AdminBundle\Security\User\User::class) && $user instanceof \Pimcore\Bundle\AdminBundle\Security\User\User) {
+ /**
+ * @psalm-suppress UndefinedClass, UndefinedInterfaceMethod
+ */
+ $user = $user->getUser();
+ }
+ else {
+ throw new \RuntimeException(sprintf('Unknown Pimcore Admin User Class given "%s"', get_class($user)));
+ }
 
  if ($user->isAllowed($permission)) {
  return;