add captcha type env parametre

Author: adil.slassi

components/CaptchEtatBundle/README.md

@@ -65,6 +65,7 @@ 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/Resources/config/default_settings.yaml

@@ -12,3 +12,4 @@ 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/services.yaml

@@ -27,6 +27,7 @@ services:
             $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:

…ources/public/js/captchetat-widget-v2.js …ources/public/js/captchetat-v2-widget.jscomponents/CaptchEtatBundle/src/bundle/Resources/public/js/captchetat-widget-v2.js renamed to components/CaptchEtatBundle/src/bundle/Resources/public/js/captchetat-v2-widget.js components/CaptchEtatBundle/src/bundle/Resources/public/js/captchetat-widget-v2.js renamed to components/CaptchEtatBundle/src/bundle/Resources/public/js/captchetat-v2-widget.js

@@ -1,3 +1,4 @@
+// Unminified version js https://static.piste.gouv.fr/captchEtat/libraries/captchetat-js-1.0.0.tgz
 !(function () {
     "use strict";
     let e, t, n, a, c;

components/CaptchEtatBundle/src/bundle/Resources/public/js/captchetat-widget.js

@@ -56,16 +56,40 @@ export const captchaEtat = (function () {
             }).then((data) => {
                 console.log('data ::', data);
                 //__________________  add img tag
-                const parsedData = JSON.parse(data);
+                const parsedData = JSON.parse(html);
                 const imageBase64 = parsedData.imageb64;
                 const imageId = parsedData.uuid;
                 const img = document.createElement('img');
                 img.src = imageBase64;
                 img.id = imageId;
                 img.classList = "captch-etat-v2";
+                let parent = htmlContainer
                 htmlContainer.appendChild(img);
                 console.log('okkk ::');
                 //__________________  add img tag
+
+
+                const tmp = document.createElement('div');
+                tmp.innerHTML = html;
+                addLinksToHead(tmp);
+                addScriptsToHead(tmp);
+                const originalIdInput = tmp.querySelector('[name^="BDC_VCID"]');
+                idInput.value = originalIdInput.value;
+
+                const tmpRoot = tmp.children.item(0);
+                tmpRoot.removeAttribute('id');
+                tmpRoot.classList.add('captcha-html');
+
+                htmlContainer.prepend(tmpRoot);
+
+                const soundLink = widget.querySelector('.BDC_SoundLink');
+                const answerInput = widget.querySelector('.captcha-input input[type="text"]');
+                soundLink.addEventListener('click', function (e) {
+                    if (answerInput) {
+                        answer.removeAttribute('disabled');
+                        answerInput.focus();
+                    }
+                });
             });
         }
     }

components/CaptchEtatBundle/src/lib/Api/Gateway.php

@@ -68,7 +68,7 @@ public function getSimpleCaptchaEndpoint(
 
         $queryParams = [
             'get' => $captchaType,
-            'c' => 'alphanumerique4to6LightCaptchaFR', // for test purpose TODO change to $type
+            'c' => $type
         ];
         if ($mode) {
             $queryParams['mode'] = $mode;

components/CaptchEtatBundle/src/lib/Challenge/ChallengeGenerator.php

@@ -21,19 +21,22 @@ class ChallengeGenerator
     protected TranslatorInterface $translator;
     protected CaptchEtatLogger $logger;
     protected Gateway $gateway;
+    protected string $captchetatType;
 
     public function __construct(
         LocaleConverterInterface $localeConverter,
         ConfigResolverInterface $configResolver,
         Gateway $gateway,
         TranslatorInterface $translator,
-        CaptchEtatLogger $logger
+        CaptchEtatLogger $logger,
+        string $captchetatType
     ) {
         $this->gateway = $gateway;
         $this->logger = $logger;
         $this->translator = $translator;
         $this->localeConverter = $localeConverter;
         $this->configResolver = $configResolver;
+        $this->captchetatType = $captchetatType;
     }
 
     public function __invoke()
@@ -113,6 +116,8 @@ public function getType(string $lang): string
             $type = 'numerique6_7CaptchaEN';
         }
 
+        $type = empty($this->captchetatType) ? $type : $this->captchetatType;
+
         return $type;
     }
 }