feat: upgrade to CaptchEtat V2

Author: erdnaxelaweb

components/CaptchEtatBundle/README.md

@@ -65,7 +65,6 @@ CAPTCHETAT_OAUTH_URL="https://sandbox-oauth.piste.gouv.fr"
 CAPTCHETAT_OAUTH_CLIENT_ID=~
 CAPTCHETAT_OAUTH_CLIENT_SECRET=~
 CAPTCHETAT_TIMEOUT="2.5"
-CAPTCHETAT_TYPE=""
 ```
 
 Depending on if you use "sandbox" (default) or "production" environment, you might want to change the urls to :

components/CaptchEtatBundle/src/bundle/Controller/CaptchEtatController.php

@@ -5,22 +5,16 @@
 namespace AlmaviaCX\Bundle\CaptchEtatBundle\Controller;
 
 use AlmaviaCX\Bundle\CaptchEtat\Api\Gateway;
-use AlmaviaCX\Bundle\CaptchEtat\Challenge\ChallengeGenerator;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\ResponseHeaderBag;
 
 class CaptchEtatController
 {
-    protected Gateway $gateway;
-    protected ChallengeGenerator $challengeGenerator;
-
     public function __construct(
-        Gateway $gateway,
-        ChallengeGenerator $challengeGenerator
+        Gateway $gateway
     ) {
         $this->gateway = $gateway;
-        $this->challengeGenerator = $challengeGenerator;
     }
 
     /**
@@ -31,34 +25,20 @@ public function apiSimpleCaptchaEndpointAction(Request $request): Response
         $get = $request->get('get');
         $tech = $request->get('t');
         $type = $request->get('c');
-        $content = $this->gateway->getSimpleCaptchaEndpoint($get, null, $tech, $type);
+        $content = $this->gateway->getSimpleCaptchaEndpoint($get, $tech, $type);
         $response = new Response($content);
-        if ('script-include' === $get) {
-            $response->headers->set('Content-Type', 'text/javascript');
-        } elseif ('image' === $get) {
-            $response->headers->set('Content-Disposition', $response->headers->makeDisposition(
-                ResponseHeaderBag::DISPOSITION_INLINE,
-                'captcha.png'
-            ));
-            $response->headers->set('Content-Type', 'image/png');
-        } elseif ('sound' === $get) {
+
+        if ('sound' === $get) {
             $response->headers->set('Content-Disposition', $response->headers->makeDisposition(
                 ResponseHeaderBag::DISPOSITION_INLINE,
                 'captcha-sound.wave'
             ));
-            $response->headers->set('Content-Type', 'audio/wave');
+            $response->headers->set('Content-Type', 'audio/x-wav');
+        } else {
+            $response->headers->set('Content-Type', 'application/json');
         }
         $response->setPrivate();
 
         return $response;
     }
-
-    public function getCaptcha(): Response
-    {
-        $challenge = ($this->challengeGenerator)();
-        $response = new Response($challenge);
-        $response->setPrivate();
-
-        return $response;
-    }
 }

components/CaptchEtatBundle/src/bundle/Resources/config/default_settings.yaml

@@ -12,4 +12,3 @@ parameters:
     captchetat_oauth_client_secret: '%env(string:CAPTCHETAT_OAUTH_CLIENT_SECRET)%'
     captchetat_api_url: '%env(string:CAPTCHETAT_API_URL)%'
     captchetat_timeout: '%env(float:CAPTCHETAT_TIMEOUT)%'
-    captchetat_type: '%env(string:CAPTCHETAT_TYPE)%'

components/CaptchEtatBundle/src/bundle/Resources/config/routes.yaml

@@ -2,8 +2,3 @@ captchetat.endpoint:
     path: /api/simple-captcha-endpoint
     defaults:
         _controller: 'AlmaviaCX\Bundle\CaptchEtatBundle\Controller\CaptchEtatController::apiSimpleCaptchaEndpointAction'
-
-captchetat.html:
-    path: /api/simple-captcha
-    defaults:
-        _controller: 'AlmaviaCX\Bundle\CaptchEtatBundle\Controller\CaptchEtatController::getCaptcha'

components/CaptchEtatBundle/src/bundle/Resources/config/services.yaml

@@ -20,15 +20,6 @@ services:
             $url: '%captchetat_api_url%'
             $timeout: '%captchetat_timeout%'
 
-    AlmaviaCX\Bundle\CaptchEtat\Challenge\ChallengeGenerator:
-        arguments:
-            $configResolver: '@Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface'
-            $localeConverter: '@Ibexa\Core\MVC\Symfony\Locale\LocaleConverterInterface'
-            $gateway: '@AlmaviaCX\Bundle\CaptchEtat\Api\Gateway'
-            $translator: '@Symfony\Contracts\Translation\TranslatorInterface'
-            $logger: '@AlmaviaCX\Bundle\CaptchEtat\Logger\CaptchEtatLogger'
-            $captchetatType: '%captchetat_type%'
-
     AlmaviaCX\Bundle\CaptchEtat\Challenge\ChallengeValidator:
         arguments:
             $gateway: '@AlmaviaCX\Bundle\CaptchEtat\Api\Gateway'
@@ -48,10 +39,16 @@ services:
     AlmaviaCX\Bundle\CaptchEtatBundle\Controller\CaptchEtatController:
         arguments:
             $gateway: '@AlmaviaCX\Bundle\CaptchEtat\Api\Gateway'
-            $challengeGenerator: '@AlmaviaCX\Bundle\CaptchEtat\Challenge\ChallengeGenerator'
         tags:
             - controller.service_arguments
 
+    AlmaviaCX\Bundle\CaptchEtat\Twig\CaptchEtatExtension:
+        arguments:
+            $configResolver: '@Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface'
+            $localeConverter: '@Ibexa\Core\MVC\Symfony\Locale\LocaleConverterInterface'
+        tags:
+            - { name: twig.extension }
+
 #    AlmaviaCX\Bundle\CaptchEtat\FormBuilder\FieldType\Field\Mapper\ButtonFieldMapperDecorator:
 #        decorates: Ibexa\FormBuilder\FieldType\Field\Mapper\ButtonFieldMapper
 #        arguments: