Merged branch 4.6

Author: barw4

src/bundle/Resources/config/routing.yml

@@ -1034,7 +1034,7 @@ ibexa.rest.load_root_user_group:
 
 ibexa.rest.create_root_user_group:
     path: /user/groups/subgroups
-    controller: Ibexa\Rest\Server\Controller\User\UserGroupCreateController::createUserGroup
+    controller: Ibexa\Rest\Server\Controller\User\UserGroupCreateController::createRootUserGroup
     methods: [POST]
 
 ibexa.rest.load_user_group:

src/lib/Server/Controller/User/UserBaseController.php

@@ -20,6 +20,7 @@
 use Ibexa\Contracts\Core\Repository\Values\Content\Language;
 use Ibexa\Contracts\Core\Repository\Values\User\User as RepositoryUser;
 use Ibexa\Contracts\Core\Repository\Values\User\UserRoleAssignment;
+use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface;
 use Ibexa\Contracts\Rest\Exceptions\NotFoundException;
 use Ibexa\Rest\Server\Controller as RestController;
 use Ibexa\Rest\Server\Values;
@@ -46,6 +47,8 @@ class UserBaseController extends RestController
 
     protected ContentService\RelationListFacadeInterface $relationListFacade;
 
+    protected ConfigResolverInterface $configResolver;
+
     public function __construct(
         UserService $userService,
         RoleService $roleService,
@@ -55,7 +58,8 @@ public function __construct(
         SectionService $sectionService,
         Repository $repository,
         PermissionResolver $permissionResolver,
-        ContentService\RelationListFacadeInterface $relationListFacade
+        ContentService\RelationListFacadeInterface $relationListFacade,
+        ConfigResolverInterface $configResolver
     ) {
         $this->userService = $userService;
         $this->roleService = $roleService;
@@ -66,6 +70,7 @@ public function __construct(
         $this->repository = $repository;
         $this->permissionResolver = $permissionResolver;
         $this->relationListFacade = $relationListFacade;
+        $this->configResolver = $configResolver;
     }
 
     /**

src/lib/Server/Controller/User/UserGroupCreateController.php

@@ -219,4 +219,20 @@ public function createUserGroup(string $groupPath, Request $request): Values\Cre
             ]
         );
     }
+
+    /**
+     * Create a new user group under the root location.
+     *
+     * @throws \Ibexa\Contracts\Rest\Exceptions\NotFoundException
+     * @throws \Ibexa\Contracts\Core\Repository\Exceptions\UnauthorizedException
+     * @throws \Ibexa\Contracts\Core\Repository\Exceptions\ContentFieldValidationException
+     * @throws \Ibexa\Contracts\Core\Repository\Exceptions\ContentValidationException
+     * @throws \Ibexa\Contracts\Core\Repository\Exceptions\InvalidArgumentException
+     */
+    public function createRootUserGroup(Request $request): Values\CreatedUserGroup
+    {
+        $rootPath = $this->configResolver->getParameter('users_group_root_subtree_path');
+
+        return $this->createUserGroup($rootPath, $request);
+    }
 }

tests/bundle/Functional/UserTest.php

@@ -72,6 +72,51 @@ public function testCreateUserGroup(): string
         return $href;
     }
 
+    /**
+     * Covers POST /user/groups/subgroups (user group creation under root subtree).
+     */
+    public function testCreateRootUserGroup(): void
+    {
+        $text = $this->addTestSuffix(__FUNCTION__);
+        $xml = <<< XML
+<?xml version="1.0" encoding="UTF-8"?>
+<UserGroupCreate>
+  <mainLanguageCode>eng-GB</mainLanguageCode>
+  <remoteId>{$text}</remoteId>
+  <fields>
+    <field>
+      <fieldDefinitionIdentifier>name</fieldDefinitionIdentifier>
+      <languageCode>eng-GB</languageCode>
+      <fieldValue>{$text}</fieldValue>
+    </field>
+    <field>
+      <fieldDefinitionIdentifier>description</fieldDefinitionIdentifier>
+      <languageCode>eng-GB</languageCode>
+      <fieldValue>Description of {$text}</fieldValue>
+    </field>
+  </fields>
+</UserGroupCreate>
+XML;
+        $request = $this->createHttpRequest(
+            'POST',
+            '/api/ibexa/v2/user/groups/subgroups',
+            'UserGroupCreate+xml',
+            'UserGroup+json',
+            $xml
+        );
+        $response = $this->sendHttpRequest($request);
+
+        self::assertHttpResponseCodeEquals($response, 201);
+        self::assertHttpResponseHasHeader($response, self::HEADER_LOCATION);
+
+        $href = $response->getHeader(self::HEADER_LOCATION)[0];
+
+        $trimmedHref = str_replace('/api/ibexa/v2/user/groups/', '', $href);
+        $parts = explode('/', $trimmedHref);
+
+        self::assertSame('1/5', $parts[0] . '/' . $parts[1]);
+    }
+
     /**
      * Covers GET /user/groups/{groupId}.
      *