Merge pull request #167 from liayn/typo3-request-usage

[BUGFIX] Use TYPO3 request factory and request

Classes/Factory/GenericOAuthProviderFactory.php

@@ -19,13 +19,27 @@
 
 use League\OAuth2\Client\Provider\AbstractProvider;
 use League\OAuth2\Client\Provider\GenericProvider;
+use TYPO3\CMS\Core\Http\Client\GuzzleClientFactory;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 
 final class GenericOAuthProviderFactory implements OAuthProviderFactoryInterface
 {
+    private RequestFactory $requestFactory;
+
+    public function __construct(RequestFactory $requestFactory)
+    {
+        $this->requestFactory = $requestFactory;
+    }
 
     public function create(array $settings): AbstractProvider
     {
+        // @todo Use DI for GuzzleClientFactory once TYPO3 v11 support is dropped
+        $clientFactory = GeneralUtility::makeInstance(GuzzleClientFactory::class);
+        $collaborators = [
+            'httpClient' => $clientFactory->getClient(),
+            'requestFactory' => $this->requestFactory,
+        ];
+
         return new GenericProvider([
                 'clientId' => $settings['oidcClientKey'],
                 'clientSecret' => $settings['oidcClientSecret'],
@@ -34,6 +48,8 @@ public function create(array $settings): AbstractProvider
                 'urlAccessToken' => $settings['oidcEndpointToken'],
                 'urlResourceOwnerDetails' => $settings['oidcEndpointUserInfo'],
                 'scopes' => GeneralUtility::trimExplode(',', $settings['oidcClientScopes'], true),
-            ]);
+            ],
+            $collaborators
+        );
     }
 }

Classes/Factory/RequestFactory.php

@@ -0,0 +1,36 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Causal\Oidc\Factory;
+
+use GuzzleHttp\Psr7\Utils;
+use League\OAuth2\Client\Tool\RequestFactory as Oauth2RequestFactory;
+use Psr\Http\Message\RequestFactoryInterface;
+
+class RequestFactory extends Oauth2RequestFactory
+{
+    protected RequestFactoryInterface $requestFactory;
+
+    public function __construct(RequestFactoryInterface $requestFactory)
+    {
+        $this->requestFactory = $requestFactory;
+    }
+
+    public function getRequest(
+        $method,
+        $uri,
+        array $headers = [],
+        $body = null,
+        $version = '1.1'
+    ) {
+        $request = $this->requestFactory->createRequest($method, $uri);
+        foreach ($headers as $name => $value) {
+            $request = $request->withHeader((string)$name, $value);
+        }
+        if ($body !== '' && $body !== null) {
+            $request = $request->withBody(Utils::streamFor($body));
+        }
+        return $request->withProtocolVersion($version);
+    }
+}

Configuration/Services.yaml

@@ -20,6 +20,12 @@ services:
   Causal\Oidc\Service\OpenIdConnectService:
     public: true
 
+  Causal\Oidc\Factory\RequestFactory:
+    public: true
+
+  Causal\Oidc\Factory\GenericOAuthProviderFactory:
+    public: true
+
   Causal\Oidc\EventListener\ProcessRequestTokenListener:
     tags:
       - name: event.listener