IBX-7674: Skip redirection to user profile if user CT is edited via configuration view (#1143)

Author: konradoboza

src/bundle/Resources/config/services/events.yaml

@@ -66,7 +66,3 @@ services:
             $siteAccessGroups: '%ibexa.site_access.groups%'
         tags:
             - { name: kernel.event_subscriber }
-
-    Ibexa\AdminUi\EventListener\UserProfileListener:
-        tags:
-            - { name: kernel.event_subscriber }

src/lib/EventListener/UserProfileListener.php

@@ -22,6 +22,7 @@
 use Ibexa\Core\Repository\Repository;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpFoundation\RedirectResponse;
+use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 
 final class UserProfileListener implements EventSubscriberInterface
@@ -38,20 +39,24 @@ final class UserProfileListener implements EventSubscriberInterface
 
     private UserProfileConfigurationInterface $configuration;
 
+    private RequestStack $requestStack;
+
     public function __construct(
         Repository $repository,
         PermissionResolver $permissionResolver,
         ContentService $contentService,
         UserService $userService,
         UrlGeneratorInterface $urlGenerator,
-        UserProfileConfigurationInterface $configuration
+        UserProfileConfigurationInterface $configuration,
+        RequestStack $requestStack
     ) {
         $this->repository = $repository;
         $this->permissionResolver = $permissionResolver;
         $this->contentService = $contentService;
         $this->userService = $userService;
         $this->urlGenerator = $urlGenerator;
         $this->configuration = $configuration;
+        $this->requestStack = $requestStack;
     }
 
     public static function getSubscribedEvents(): array
@@ -67,15 +72,11 @@ public function onUserUpdate(FormActionEvent $event): void
         $form = $event->getForm();
         $data = $event->getData();
 
-        if (!($data instanceof UserUpdateData) || !$this->isUserProfileUpdate($data)) {
+        if (!($data instanceof UserUpdateData) || !$this->isSupported($data)) {
             return;
         }
 
         $user = $data->user;
-        if (!$this->canEditUserProfile($user)) {
-            return;
-        }
-
         $updateStruct = $this->createUpdateStruct($data, $form->getConfig()->getOption('languageCode'));
 
         // user / selfedit policy is enough to edit own profile (checked in
@@ -90,7 +91,6 @@ public function onUserUpdate(FormActionEvent $event): void
     public function onUserCancel(FormActionEvent $event): void
     {
         $data = $event->getData();
-
         if (!($data instanceof UserUpdateData) || !$this->isSupported($data)) {
             return;
         }
@@ -113,7 +113,10 @@ private function createRedirectToUserProfile(User $user): RedirectResponse
 
     private function isSupported(UserUpdateData $data): bool
     {
-        return $this->isUserProfileUpdate($data) && $this->canEditUserProfile($data->user);
+        return
+            $this->doesOriginateFromProfileEditing() &&
+            $this->isUserProfileUpdate($data) &&
+            $this->canEditUserProfile($data->user);
     }
 
     private function createUpdateStruct(UserUpdateData $data, string $languageCode): UserUpdateStruct
@@ -150,4 +153,14 @@ private function canEditUserProfile(User $user): bool
             $this->permissionResolver->canUser('user', 'selfedit', $user)
             && (new IsProfileAvailable($this->configuration))->isSatisfiedBy($user);
     }
+
+    private function doesOriginateFromProfileEditing(): bool
+    {
+        $request = $this->requestStack->getMainRequest();
+        if ($request === null) {
+            return false;
+        }
+
+        return $request->attributes->get('_route') === 'ibexa.user.profile.edit';
+    }
 }