Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 31 additions & 0 deletions src/bundle/Controller/SiteAccess/SiteAccessController.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<?php

/**
* @copyright Copyright (C) Ibexa AS. All rights reserved.
* @license For full copyright and license information view LICENSE file distributed with this source code.
*/
declare(strict_types=1);

namespace Ibexa\Bundle\AdminUi\Controller\SiteAccess;

use Ibexa\AdminUi\REST\Value\SiteAccess\SiteAccessesList;
use Ibexa\AdminUi\Siteaccess\SiteaccessResolverInterface;
use Ibexa\Contracts\Core\Repository\Values\Content\Location;
use Ibexa\Rest\Server\Controller as RestController;

final class SiteAccessController extends RestController
{
private SiteaccessResolverInterface $nonAdminSiteAccessResolver;

public function __construct(SiteaccessResolverInterface $nonAdminSiteAccessResolver)
{
$this->nonAdminSiteAccessResolver = $nonAdminSiteAccessResolver;
}

public function loadNonAdminSiteAccessesForLocation(Location $location): SiteAccessesList
{
return new SiteAccessesList(
$this->nonAdminSiteAccessResolver->getSiteAccessesListForLocation($location)
);
}
}
11 changes: 11 additions & 0 deletions src/bundle/Resources/config/routing_rest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -126,3 +126,14 @@ ibexa.rest.image.download:
methods: GET
requirements:
contentIdList: '^\d+(,\d+)*$'

#
# Site Access
#

ibexa.rest.site_access.load_for_location:
path: /site-access/load-non-admin-for-location/{locationId}
controller: 'Ibexa\Bundle\AdminUi\Controller\SiteAccess\SiteAccessController::loadNonAdminSiteAccessesForLocation'
methods: [GET]
options:
expose: true
8 changes: 8 additions & 0 deletions src/bundle/Resources/config/services/controllers.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -258,3 +258,11 @@ services:
$imageMappings: '%ibexa.dam_widget.image.mappings%'
tags:
- controller.service_arguments

Ibexa\Bundle\AdminUi\Controller\SiteAccess\SiteAccessController:
parent: Ibexa\Rest\Server\Controller
autowire: true
arguments:
$nonAdminSiteAccessResolver: '@Ibexa\AdminUi\Siteaccess\NonAdminSiteaccessResolver'
tags:
- controller.service_arguments
7 changes: 7 additions & 0 deletions src/bundle/Resources/config/services/rest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -96,3 +96,10 @@ services:
Ibexa\AdminUi\REST\Input\Parser\CriterionProcessor:
parent: Ibexa\Contracts\Rest\Input\Parser\Query\Criterion\BaseCriterionProcessor

#
# Site Accesses
#
Ibexa\AdminUi\REST\Output\ValueObjectVisitor\SiteAccess\SiteAccessesListVisitor:
parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
tags:
- { name: ibexa.rest.output.value_object.visitor, type: Ibexa\AdminUi\REST\Value\SiteAccess\SiteAccessesList }
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
<?php

/**
* @copyright Copyright (C) Ibexa AS. All rights reserved.
* @license For full copyright and license information view LICENSE file distributed with this source code.
*/
declare(strict_types=1);

namespace Ibexa\AdminUi\REST\Output\ValueObjectVisitor\SiteAccess;

use Ibexa\Contracts\Rest\Output\Generator;
use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
use Ibexa\Contracts\Rest\Output\Visitor;

final class SiteAccessesListVisitor extends ValueObjectVisitor
{
/**
* @param \Ibexa\AdminUi\REST\Value\SiteAccess\SiteAccessesList $data
*/
public function visit(Visitor $visitor, Generator $generator, $data): void
{
$generator->startObjectElement('SiteAccessesList');
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My preference here would be SiteAccessList similarly as we refer to it on other places afair and the same as ContentInfoList, LocationList, etc.

Copy link
Contributor Author

@barw4 barw4 Oct 28, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The issue is that we also use SiteAccessesList in a lot of places in directly related services, e.g.: https://github.com/ibexa/admin-ui/blob/main/src/lib/Siteaccess/NonAdminSiteaccessResolver.php#L33 (a lot of other places in admin-ui), therefore I wanted to stay consistent with it as I'm directly using this service. But obviously I can change it if you prefer it your way.

$visitor->setHeader('Content-Type', $generator->getMediaType('SiteAccessesList'));

$generator->startList('values');
foreach ($data->getSiteAccesses() as $siteAccess) {
$generator->startObjectElement('SiteAccess');

$generator->startValueElement('name', $siteAccess->name);
$generator->endValueElement('name');

$generator->endObjectElement('SiteAccess');
}
$generator->endList('values');

$generator->endObjectElement('SiteAccessesList');
}
}
33 changes: 33 additions & 0 deletions src/lib/REST/Value/SiteAccess/SiteAccessesList.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<?php

/**
* @copyright Copyright (C) Ibexa AS. All rights reserved.
* @license For full copyright and license information view LICENSE file distributed with this source code.
*/
declare(strict_types=1);

namespace Ibexa\AdminUi\REST\Value\SiteAccess;

use Ibexa\Rest\Value as RestValue;

final class SiteAccessesList extends RestValue
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

and the same remark for the object itself as in the previous comment.

{
/** @var \Ibexa\Core\MVC\Symfony\SiteAccess[] */
private array $siteAccesses;

/**
* @param \Ibexa\Core\MVC\Symfony\SiteAccess[] $siteAccesses
*/
public function __construct(array $siteAccesses = [])
{
$this->siteAccesses = $siteAccesses;
}

/**
* @return \Ibexa\Core\MVC\Symfony\SiteAccess[]
*/
public function getSiteAccesses(): array
{
return $this->siteAccesses;
}
}
57 changes: 57 additions & 0 deletions tests/integration/REST/GetSiteAccessesListTest.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
<?php

/**
* @copyright Copyright (C) Ibexa AS. All rights reserved.
* @license For full copyright and license information view LICENSE file distributed with this source code.
*/
declare(strict_types=1);

namespace Ibexa\Tests\Integration\AdminUi\REST;

use Ibexa\Contracts\Test\Rest\Request\Value\EndpointRequestDefinition;

/**
* Coverage for /site-access/load-non-admin-for-location/{locationId} REST endpoint.
*/
final class GetSiteAccessesListTest extends BaseAdminUiRestWebTestCase
{
/**
* @throws \Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException
* @throws \Ibexa\Contracts\Core\Repository\Exceptions\UnauthorizedException
* @throws \Ibexa\Contracts\Core\Repository\Exceptions\ForbiddenException
*/
protected function setUp(): void
{
parent::setUp();

// to create a new user before logging-in via REST
$this->getIbexaTestCore()->setAdministratorUser();

$this->loginAsUser(
$this->createUserWithPolicies(
'editor',
[
'user/login' => [],
'content/read' => [],
'content/versionread' => [],
]
)
);
}

protected static function getEndpointsToTest(): iterable
{
foreach (self::REQUIRED_FORMATS as $format) {
yield new EndpointRequestDefinition(
'GET',
'/api/ibexa/v2/site-access/load-non-admin-for-location/2',
'SiteAccessesList',
"application/vnd.ibexa.api.SiteAccessesList+$format",
['HTTP_X-SiteAccess' => 'admin'],
null,
null,
'SiteAccessesList'
);
}
}
}
41 changes: 41 additions & 0 deletions tests/integration/Resources/REST/Schemas/SiteAccessesList.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
{
"$schema": "http://json-schema.org/draft-04/schema#",
"type": "object",
"properties": {
"SiteAccessesList": {
"type": "object",
"properties": {
"_media-type": {
"type": "string"
},
"values": {
"type": "array",
"items": [
{
"type": "object",
"properties": {
"_media-type": {
"type": "string"
},
"name": {
"type": "string"
}
},
"required": [
"_media-type",
"name"
]
}
]
}
},
"required": [
"_media-type",
"values"
]
}
},
"required": [
"SiteAccessesList"
]
}
18 changes: 18 additions & 0 deletions tests/integration/Resources/REST/Schemas/SiteAccessesList.xsd
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
<xs:element name="SiteAccessesList">
<xs:complexType>
<xs:sequence>
<xs:element name="SiteAccess" maxOccurs="unbounded" minOccurs="0">
<xs:complexType>
<xs:sequence>
<xs:element name="name" type="xs:string" />
</xs:sequence>
<xs:attribute name="media-type" type="xs:string" use="required" />
</xs:complexType>
</xs:element>
</xs:sequence>
<xs:attribute name="media-type" type="xs:string" use="required" />
</xs:complexType>
</xs:element>
</xs:schema>
27 changes: 27 additions & 0 deletions tests/integration/Resources/REST/Snapshots/SiteAccessesList.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{
"SiteAccessesList": {
"_media-type": "application/vnd.ibexa.api.SiteAccessesList+json",
"values": [
{
"_media-type": "application/vnd.ibexa.api.SiteAccess+json",
"name": "__default_site_access__"
},
{
"_media-type": "application/vnd.ibexa.api.SiteAccess+json",
"name": "__second_site_access__"
},
{
"_media-type": "application/vnd.ibexa.api.SiteAccess+json",
"name": "ger"
},
{
"_media-type": "application/vnd.ibexa.api.SiteAccess+json",
"name": "eng"
},
{
"_media-type": "application/vnd.ibexa.api.SiteAccess+json",
"name": "ku6\"H"
}
]
}
}
18 changes: 18 additions & 0 deletions tests/integration/Resources/REST/Snapshots/SiteAccessesList.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<SiteAccessesList media-type="application/vnd.ibexa.api.SiteAccessesList+xml">
<SiteAccess media-type="application/vnd.ibexa.api.SiteAccess+xml">
<name>__default_site_access__</name>
</SiteAccess>
<SiteAccess media-type="application/vnd.ibexa.api.SiteAccess+xml">
<name>__second_site_access__</name>
</SiteAccess>
<SiteAccess media-type="application/vnd.ibexa.api.SiteAccess+xml">
<name>ger</name>
</SiteAccess>
<SiteAccess media-type="application/vnd.ibexa.api.SiteAccess+xml">
<name>eng</name>
</SiteAccess>
<SiteAccess media-type="application/vnd.ibexa.api.SiteAccess+xml">
<name>ku6&quot;H</name>
</SiteAccess>
</SiteAccessesList>
Loading