Merge branch 'main' into feat/api-client-crud

Author: mmarchois

assets/controllers/stats_map_controller.js

@@ -8,11 +8,11 @@ let cachedOrganizationsData = null;
 
 // Configuration des territoires d'outre-mer
 const OVERSEAS_TERRITORIES = [
-    { name: 'Guadeloupe', center: [-61.55, 16.25], zoom: 8.5 },
-    { name: 'Martinique', center: [-61.02, 14.64], zoom: 9 },
+    { name: 'Guadeloupe', center: [-61.55, 16.25], zoom: 7.5 },
+    { name: 'Martinique', center: [-61.02, 14.64], zoom: 8 },
     { name: 'Guyane', center: [-53.13, 3.93], zoom: 5 },
-    { name: 'La Réunion', center: [55.536, -21.115], zoom: 8 },
-    { name: 'Mayotte', center: [45.166244, -12.8275], zoom: 10 },
+    { name: 'La Réunion', center: [55.536, -21.115], zoom: 7.5 },
+    { name: 'Mayotte', center: [45.166244, -12.8275], zoom: 8 },
 ];
 
 // Bounding box de la France métropolitaine

src/Infrastructure/Controller/MyArea/Organization/ApiClient/CreateApiClientController.php

@@ -11,6 +11,7 @@
 use App\Application\User\Query\GetOrganizationUsersQuery;
 use App\Domain\Organization\Exception\UserAlreadyHasApiClientForOrganizationException;
 use App\Infrastructure\Controller\MyArea\Organization\AbstractOrganizationController;
+use App\Infrastructure\Form\Organization\CreateApiClientFormType;
 use App\Infrastructure\Security\Voter\OrganizationVoter;
 use Symfony\Bundle\SecurityBundle\Security;
 use Symfony\Component\Form\FormFactoryInterface;
@@ -52,7 +53,7 @@ public function __invoke(Request $request, string $uuid): Response
         }
 
         $users = $this->queryBus->handle(new GetOrganizationUsersQuery($uuid));
-        $form = $this->formFactory->create(\App\Infrastructure\Form\Organization\CreateApiClientFormType::class, null, [
+        $form = $this->formFactory->create(CreateApiClientFormType::class, null, [
             'users' => $users,
             'organization_uuid' => $uuid,
         ]);

…ine/Migrations/Version20250318120000.php …ine/Migrations/Version20250926120000.phpsrc/Infrastructure/Persistence/Doctrine/Migrations/Version20250318120000.php renamed to src/Infrastructure/Persistence/Doctrine/Migrations/Version20250926120000.php src/Infrastructure/Persistence/Doctrine/Migrations/Version20250318120000.php renamed to src/Infrastructure/Persistence/Doctrine/Migrations/Version20250926120000.php

@@ -7,7 +7,7 @@
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
-final class Version20250318120000 extends AbstractMigration
+final class Version20250926120000 extends AbstractMigration
 {
     public function getDescription(): string
     {

templates/my_area/organization/api_client/create.html.twig

@@ -19,6 +19,7 @@
                 <h3 class="fr-h5 fr-x-text--default-grey">{{ 'api_client.create.title'|trans }}</h3>
                 <p class="fr-x-text">{{ 'api_client.create.description'|trans }}</p>
                 {{ form_start(form) }}
+                {{ form_errors(form) }}
                 {{ form_row(form.user, { group_class: 'fr-input-group', widget_class: 'fr-select' }) }}
                 <a href="{{ path('app_config_api_clients_list', {uuid: organization.uuid}) }}" class="fr-btn fr-btn--tertiary fr-mr-3w">
                     {{ "common.cancel"|trans }}

tests/Integration/Infrastructure/Controller/MyArea/Organization/ApiClient/CreateApiClientControllerTest.php

@@ -17,7 +17,7 @@ public function testCreateApiClientForm(): void
 
         $this->assertResponseStatusCodeSame(200);
         $this->assertSecurityHeaders();
-        $this->assertSame('Créer une clé d\'API', $crawler->filter('h3')->first()->text());
+        $this->assertSame('Créer une clé d' . "\u{2019}" . 'API', $crawler->filter('h3')->first()->text());
 
         $submitButton = $crawler->selectButton('Créer la clé');
         $form = $submitButton->form();

tests/Integration/Infrastructure/Controller/MyArea/Organization/ApiClient/DeleteApiClientControllerTest.php

@@ -8,9 +8,12 @@
 use App\Infrastructure\Persistence\Doctrine\Fixtures\OrganizationFixture;
 use App\Infrastructure\Persistence\Doctrine\Fixtures\UserFixture;
 use App\Tests\Integration\Infrastructure\Controller\AbstractWebTestCase;
+use App\Tests\SessionHelper;
 
 final class DeleteApiClientControllerTest extends AbstractWebTestCase
 {
+    use SessionHelper;
+
     public function testDeleteRedirectsToList(): void
     {
         $client = $this->login(UserFixture::DEPARTMENT_93_ADMIN_EMAIL);
@@ -19,7 +22,7 @@ public function testDeleteRedirectsToList(): void
             '/mon-espace/organizations/' . OrganizationFixture::SEINE_SAINT_DENIS_ID . '/api-clients/' . ApiClientFixture::SEINE_SAINT_DENIS_API_CLIENT_UUID,
             [
                 '_method' => 'DELETE',
-                '_token' => $client->getContainer()->get('security.csrf.token_manager')->getToken('delete-api-client')->getValue(),
+                '_token' => $this->generateCsrfToken($client, 'delete-api-client'),
             ],
         );
         $client->followRedirect();
@@ -36,7 +39,7 @@ public function testDeleteWhenNotEditDenied(): void
             '/mon-espace/organizations/' . OrganizationFixture::REGION_IDF_ID . '/api-clients/' . ApiClientFixture::SAINT_OUEN_API_CLIENT_UUID,
             [
                 '_method' => 'DELETE',
-                '_token' => $client->getContainer()->get('security.csrf.token_manager')->getToken('delete-api-client')->getValue(),
+                '_token' => $this->generateCsrfToken($client, 'delete-api-client'),
             ],
         );
         $this->assertResponseStatusCodeSame(403);

tests/Integration/Infrastructure/Controller/MyArea/Organization/ApiClient/RegenerateApiClientControllerTest.php

@@ -8,17 +8,20 @@
 use App\Infrastructure\Persistence\Doctrine\Fixtures\OrganizationFixture;
 use App\Infrastructure\Persistence\Doctrine\Fixtures\UserFixture;
 use App\Tests\Integration\Infrastructure\Controller\AbstractWebTestCase;
+use App\Tests\SessionHelper;
 
 final class RegenerateApiClientControllerTest extends AbstractWebTestCase
 {
+    use SessionHelper;
+
     public function testRegenerateRedirectsToList(): void
     {
         $client = $this->login(UserFixture::DEPARTMENT_93_ADMIN_EMAIL);
         $client->request(
             'POST',
             '/mon-espace/organizations/' . OrganizationFixture::SEINE_SAINT_DENIS_ID . '/api-clients/' . ApiClientFixture::SEINE_SAINT_DENIS_API_CLIENT_UUID . '/regenerate',
             [
-                '_token' => $client->getContainer()->get('security.csrf.token_manager')->getToken('regenerate-api-client')->getValue(),
+                '_token' => $this->generateCsrfToken($client, 'regenerate-api-client'),
             ],
         );
         $client->followRedirect();
@@ -34,7 +37,7 @@ public function testRegenerateWhenNotEditDenied(): void
             'POST',
             '/mon-espace/organizations/' . OrganizationFixture::REGION_IDF_ID . '/api-clients/' . ApiClientFixture::SAINT_OUEN_API_CLIENT_UUID . '/regenerate',
             [
-                '_token' => $client->getContainer()->get('security.csrf.token_manager')->getToken('regenerate-api-client')->getValue(),
+                '_token' => $this->generateCsrfToken($client, 'regenerate-api-client'),
             ],
         );
         $this->assertResponseStatusCodeSame(403);

tests/Unit/Application/Organization/ApiClient/Command/DeleteApiClientCommandHandlerTest.php

@@ -26,7 +26,7 @@ public function testRemovesApiClient(): void
         $apiClientUuid = 'a1b2c3d4-e5f6-7890-abcd-ef1234567890';
         $apiClient = new ApiClient($apiClientUuid);
 
-        $this->apiClientRepository->method('find')->with($apiClientUuid)->willReturn($apiClient);
+        $this->apiClientRepository->method('findOneByUuid')->with($apiClientUuid)->willReturn($apiClient);
         $this->apiClientRepository->expects(self::once())->method('remove')->with($apiClient);
 
         $handler = new DeleteApiClientCommandHandler(
@@ -38,7 +38,7 @@ public function testRemovesApiClient(): void
 
     public function testThrowsWhenApiClientNotFound(): void
     {
-        $this->apiClientRepository->method('find')->willReturn(null);
+        $this->apiClientRepository->method('findOneByUuid')->willReturn(null);
         $this->apiClientRepository->expects(self::never())->method('remove');
 
         $handler = new DeleteApiClientCommandHandler(

tests/Unit/Application/Organization/ApiClient/Command/RegenerateApiClientSecretCommandHandlerTest.php

@@ -31,7 +31,7 @@ public function testRegeneratesSecretAndReturnsView(): void
         $apiClient = new ApiClient($apiClientUuid);
         $apiClient->setClientId('client-123')->setClientSecret('old-hash')->setIsActive(true);
 
-        $this->apiClientRepository->method('find')->with($apiClientUuid)->willReturn($apiClient);
+        $this->apiClientRepository->method('findOneByUuid')->with($apiClientUuid)->willReturn($apiClient);
         $hasher = $this->createMock(PasswordHasherInterface::class);
         $hasher->method('hash')->willReturn('new-hashed-secret');
         $this->passwordHasherFactory->method('getPasswordHasher')->willReturn($hasher);
@@ -50,7 +50,7 @@ public function testRegeneratesSecretAndReturnsView(): void
 
     public function testThrowsWhenApiClientNotFound(): void
     {
-        $this->apiClientRepository->method('find')->willReturn(null);
+        $this->apiClientRepository->method('findOneByUuid')->willReturn(null);
 
         $handler = new RegenerateApiClientSecretCommandHandler(
             $this->apiClientRepository,