[ResourceBundle] fix Pimcore 10.6 compatibility to find Admin User

coreshop · May 25, 2023 · fabfd90 · fabfd90
1 parent 4c5322f
commit fabfd90
Showing 1 changed file with 17 additions and 1 deletion.
diff --git a/src/CoreShop/Bundle/ResourceBundle/Controller/ResourceController.php b/src/CoreShop/Bundle/ResourceBundle/Controller/ResourceController.php
@@ -60,7 +60,23 @@ protected function isGrantedOr403(): void
  *
  * @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;