[FEATURE] Use a ConfigurationInterface to add the ability to extend/o…

Classes/Configuration.php

@@ -6,10 +6,9 @@
 
 use TYPO3\CMS\Core\Core\Environment;
 use TYPO3\CMS\Core\Http\ServerRequest;
-use TYPO3\CMS\Core\Site\Entity\Site;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 
-class Configuration
+class Configuration implements ConfigurationInterface
 {
     public const DEFAULT_JS_PATH = 'EXT:friendlycaptcha_official/Resources/Public/JavaScript/lib/sdk@0.1.8-site.compat.min.js';
 
@@ -20,11 +19,10 @@ class Configuration
     protected string $jsPath = '';
     protected bool $skipDevValidation = false;
 
-    public function __construct(Site $site = null)
+    public function __construct()
     {
-        if ($site === null) {
-            $site = $GLOBALS['TYPO3_REQUEST']->getAttribute('site');
-        }
+        $site = $GLOBALS['TYPO3_REQUEST']->getAttribute('site');
+
         if ($site === null) {
             return;
         }

Classes/ConfigurationInterface.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace StudioMitte\FriendlyCaptcha;
+
+interface ConfigurationInterface
+{
+    public function isEnabled(): bool;
+
+    public function getSiteKey(): string;
+
+    public function getSiteSecretKey(): string;
+
+    public function useEuPuzzleEndpoint(): bool;
+
+    public function getVerifyUrl(): string;
+
+    public function getFirstVerifyUrl(): string;
+
+    public function getJsPath(): string;
+
+    public function hasSkipDevValidation(): bool;
+
+    public function hasSkipHeaderValidation(): bool;
+}

Classes/Service/Api.php

@@ -9,25 +9,26 @@
 use Psr\Http\Client\ClientInterface;
 use Psr\Http\Message\RequestFactoryInterface;
 use Psr\Log\LoggerInterface;
-use StudioMitte\FriendlyCaptcha\Configuration;
+use StudioMitte\FriendlyCaptcha\ConfigurationInterface;
 use TYPO3\CMS\Core\Http\ServerRequest;
 
 class Api
 {
     protected RequestFactoryInterface $factory;
     protected ClientInterface $client;
     protected LoggerInterface $logger;
-    protected Configuration $configuration;
+    protected ConfigurationInterface $configuration;
 
     public function __construct(
         RequestFactoryInterface $factory,
         ClientInterface $client,
-        LoggerInterface $logger
+        LoggerInterface $logger,
+        ConfigurationInterface $configuration
     ) {
         $this->factory = $factory;
         $this->client = $client;
         $this->logger = $logger;
-        $this->configuration = new Configuration();
+        $this->configuration = $configuration;
     }
 
     public function verify(string $response = ''): bool

Classes/ViewHelpers/ConfigurationViewHelper.php

@@ -4,7 +4,8 @@
 
 namespace StudioMitte\FriendlyCaptcha\ViewHelpers;
 
-use StudioMitte\FriendlyCaptcha\Configuration;
+use StudioMitte\FriendlyCaptcha\ConfigurationInterface;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
 use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic;
 
@@ -14,7 +15,7 @@ class ConfigurationViewHelper extends AbstractViewHelper
 
     public static function render()
     {
-        $configuration = new Configuration();
+        $configuration = GeneralUtility::makeInstance(ConfigurationInterface::class);
         return [
             'siteKey' => $configuration->getSiteKey(),
             'verifyUrl' => $configuration->getVerifyUrl(),

Configuration/Services.yaml

@@ -9,3 +9,7 @@ services:
 
   StudioMitte\FriendlyCaptcha\Service\Api:
     public: true
+
+  StudioMitte\FriendlyCaptcha\ConfigurationInterface:
+    alias: StudioMitte\FriendlyCaptcha\Configuration
+    public: true