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
3 changes: 2 additions & 1 deletion Classes/Configuration.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
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.26-site.compat.min.js';

Expand All @@ -25,6 +25,7 @@ public function __construct(?Site $site = null)
if ($site === null) {
$site = $GLOBALS['TYPO3_REQUEST']->getAttribute('site');
}

if ($site === null) {
return;
}
Expand Down
26 changes: 26 additions & 0 deletions Classes/ConfigurationInterface.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<?php

declare(strict_types=1);

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;
}
10 changes: 6 additions & 4 deletions Classes/Service/Api.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,25 +9,27 @@
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;
use TYPO3\CMS\Core\Utility\GeneralUtility;

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 = null
) {
$this->factory = $factory;
$this->client = $client;
$this->logger = $logger;
$this->configuration = new Configuration();
$this->configuration = $configuration ?? GeneralUtility::makeInstance(ConfigurationInterface::class);
}

public function verify(string $response = ''): bool
Expand Down
15 changes: 8 additions & 7 deletions Classes/ViewHelpers/ConfigurationViewHelper.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,21 @@

namespace StudioMitte\FriendlyCaptcha\ViewHelpers;

use StudioMitte\FriendlyCaptcha\Configuration;
use StudioMitte\FriendlyCaptcha\ConfigurationInterface;
use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;

class ConfigurationViewHelper extends AbstractViewHelper
{
public function __construct(private readonly ConfigurationInterface $configuration) {}

public function render(): array
{
$configuration = new Configuration();
return [
'siteKey' => $configuration->getSiteKey(),
'verifyUrl' => $configuration->getVerifyUrl(),
'useEuPuzzleEndpoint' => $configuration->useEuPuzzleEndpoint(),
'jsPath' => $configuration->getJsPath(),
'enabled' => $configuration->isEnabled(),
'siteKey' => $this->configuration->getSiteKey(),
'verifyUrl' => $this->configuration->getVerifyUrl(),
'useEuPuzzleEndpoint' => $this->configuration->useEuPuzzleEndpoint(),
'jsPath' => $this->configuration->getJsPath(),
'enabled' => $this->configuration->isEnabled(),
];
}
}
4 changes: 4 additions & 0 deletions Configuration/Services.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,7 @@ services:

StudioMitte\FriendlyCaptcha\Service\Api:
public: true

StudioMitte\FriendlyCaptcha\ConfigurationInterface:
alias: StudioMitte\FriendlyCaptcha\Configuration
public: true
9 changes: 8 additions & 1 deletion Tests/Unit/Service/ApiTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
use GuzzleHttp\Psr7\Response;
use PHPUnit\Framework\Attributes\Test;
use Psr\Log\NullLogger;
use StudioMitte\FriendlyCaptcha\ConfigurationInterface;
use StudioMitte\FriendlyCaptcha\Service\Api;
use StudioMitte\FriendlyCaptcha\Tests\RequestTrait;
use TYPO3\CMS\Core\Http\Client\GuzzleClientFactory;
Expand Down Expand Up @@ -39,8 +40,14 @@ public function verifyUrlIsCalledWithProperData(): void
} else {
$factory = new RequestFactory();
}
$api = new Api($factory, $client, new NullLogger());
$configuration = $this->createMock(ConfigurationInterface::class);
$configuration->method('isEnabled')->willReturn(true);
$configuration->method('getSiteSecretKey')->willReturn('ABCDE');
$configuration->method('getFirstVerifyUrl')->willReturn('https://verify');

$api = new Api($factory, $client, new NullLogger(), $configuration);
self::assertTrue($api->verify());
self::assertSame('https://verify', (string)$historyContainer[0]['request']->getUri());
}

#[Test]
Expand Down
13 changes: 8 additions & 5 deletions Tests/Unit/ViewHelpers/ConfigurationViewHelperTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,22 @@
namespace StudioMitte\FriendlyCaptcha\Tests\Unit\ViewHelpers;

use PHPUnit\Framework\Attributes\Test;
use StudioMitte\FriendlyCaptcha\Tests\RequestTrait;
use StudioMitte\FriendlyCaptcha\ConfigurationInterface;
use StudioMitte\FriendlyCaptcha\ViewHelpers\ConfigurationViewHelper;
use TYPO3\TestingFramework\Core\BaseTestCase;

class ConfigurationViewHelperTest extends BaseTestCase
{
use RequestTrait;

#[Test]
public function viewHelperReturnsProperConfiguration(): void
{
self::setupRequest();
$configurationViewHelper = new ConfigurationViewHelper();
$configuration = $this->createMock(ConfigurationInterface::class);
$configuration->method('getSiteKey')->willReturn('1234');
$configuration->method('getVerifyUrl')->willReturn('https://verify,https://verify2');
$configuration->method('useEuPuzzleEndpoint')->willReturn(false);
$configuration->method('getJsPath')->willReturn('EXT:friendlycaptcha_official/Resources/Public/JavaScript/lib/sdk@0.1.26-site.compat.min.js');
$configuration->method('isEnabled')->willReturn(true);
$configurationViewHelper = new ConfigurationViewHelper($configuration);

self::assertSame([
'siteKey' => '1234',
Expand Down