Code cleanup

Classes/Domain/Model/FrontendUser.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the TYPO3 CMS project.
  *

Classes/Domain/Model/FrontendUserGroup.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the TYPO3 CMS project.
  *

Classes/Domain/Oauth/GrantTypes.php

@@ -1,7 +1,20 @@
 <?php
 
+declare(strict_types=1);
+
 namespace R3H6\Oauth2Server\Domain\Oauth;
 
+/***
+ *
+ * This file is part of the "OAuth2 Server" Extension for TYPO3 CMS.
+ *
+ * For the full copyright and license information, please read the
+ * LICENSE.txt file that was distributed with this source code.
+ *
+ *  (c) 2020
+ *
+ ***/
+
 enum GrantTypes: string
 {
     case AUTHORIZATION_CODE = 'authorization_code';

Classes/Domain/Oauth/TokenTypes.php

@@ -1,7 +1,20 @@
 <?php
 
+declare(strict_types=1);
+
 namespace R3H6\Oauth2Server\Domain\Oauth;
 
+/***
+ *
+ * This file is part of the "OAuth2 Server" Extension for TYPO3 CMS.
+ *
+ * For the full copyright and license information, please read the
+ * LICENSE.txt file that was distributed with this source code.
+ *
+ *  (c) 2020
+ *
+ ***/
+
 enum TokenTypes: string
 {
     case ACCESS_TOKEN = 'access_token';

Classes/Event/BeforeAssembleAuthorizationServerEvent.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace R3H6\Oauth2Server\Event;
 
 use League\OAuth2\Server\Repositories\AccessTokenRepositoryInterface;
@@ -8,6 +10,17 @@
 use League\OAuth2\Server\ResponseTypes\ResponseTypeInterface;
 use R3H6\Oauth2Server\Configuration\Configuration;
 
+/***
+ *
+ * This file is part of the "OAuth2 Server" Extension for TYPO3 CMS.
+ *
+ * For the full copyright and license information, please read the
+ * LICENSE.txt file that was distributed with this source code.
+ *
+ *  (c) 2020
+ *
+ ***/
+
 final class BeforeAssembleAuthorizationServerEvent
 {
     public function __construct(

Classes/Event/FinalizeScopesEvent.php

@@ -1,10 +1,23 @@
 <?php
 
+declare(strict_types=1);
+
 namespace R3H6\Oauth2Server\Event;
 
 use League\OAuth2\Server\Entities\ClientEntityInterface;
 use R3H6\Oauth2Server\Configuration\Configuration;
 
+/***
+ *
+ * This file is part of the "OAuth2 Server" Extension for TYPO3 CMS.
+ *
+ * For the full copyright and license information, please read the
+ * LICENSE.txt file that was distributed with this source code.
+ *
+ *  (c) 2020
+ *
+ ***/
+
 final class FinalizeScopesEvent
 {
     public function __construct(

Classes/Event/ModifyAuthenticationRedirectEvent.php

@@ -1,11 +1,24 @@
 <?php
 
+declare(strict_types=1);
+
 namespace R3H6\Oauth2Server\Event;
 
 use Psr\Http\Message\ResponseInterface;
 use R3H6\Oauth2Server\Configuration\Configuration;
 use R3H6\Oauth2Server\Mvc\Controller\AuthorizationContext;
 
+/***
+ *
+ * This file is part of the "OAuth2 Server" Extension for TYPO3 CMS.
+ *
+ * For the full copyright and license information, please read the
+ * LICENSE.txt file that was distributed with this source code.
+ *
+ *  (c) 2020
+ *
+ ***/
+
 final class ModifyAuthenticationRedirectEvent
 {
     public function __construct(

Classes/Event/ModifyAuthorizationServerRoutesEvent.php

@@ -1,10 +1,23 @@
 <?php
 
+declare(strict_types=1);
+
 namespace R3H6\Oauth2Server\Event;
 
 use R3H6\Oauth2Server\Configuration\Configuration;
 use Symfony\Component\Routing\RouteCollection;
 
+/***
+ *
+ * This file is part of the "OAuth2 Server" Extension for TYPO3 CMS.
+ *
+ * For the full copyright and license information, please read the
+ * LICENSE.txt file that was distributed with this source code.
+ *
+ *  (c) 2020
+ *
+ ***/
+
 final class ModifyAuthorizationServerRoutesEvent
 {
     public function __construct(

Classes/Event/ModifyConsentRedirectEvent.php

@@ -1,11 +1,24 @@
 <?php
 
+declare(strict_types=1);
+
 namespace R3H6\Oauth2Server\Event;
 
 use Psr\Http\Message\ResponseInterface;
 use R3H6\Oauth2Server\Configuration\Configuration;
 use R3H6\Oauth2Server\Mvc\Controller\AuthorizationContext;
 
+/***
+ *
+ * This file is part of the "OAuth2 Server" Extension for TYPO3 CMS.
+ *
+ * For the full copyright and license information, please read the
+ * LICENSE.txt file that was distributed with this source code.
+ *
+ *  (c) 2020
+ *
+ ***/
+
 final class ModifyConsentRedirectEvent
 {
     public function __construct(

Classes/Event/ModifyResourceServerRoutesEvent.php

@@ -1,10 +1,23 @@
 <?php
 
+declare(strict_types=1);
+
 namespace R3H6\Oauth2Server\Event;
 
 use R3H6\Oauth2Server\Configuration\Configuration;
 use Symfony\Component\Routing\RouteCollection;
 
+/***
+ *
+ * This file is part of the "OAuth2 Server" Extension for TYPO3 CMS.
+ *
+ * For the full copyright and license information, please read the
+ * LICENSE.txt file that was distributed with this source code.
+ *
+ *  (c) 2020
+ *
+ ***/
+
 final class ModifyResourceServerRoutesEvent
 {
     public function __construct(

Classes/Middleware/Dispatcher.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace R3H6\Oauth2Server\Middleware;
 
 use League\OAuth2\Server\Exception\OAuthServerException;

Classes/Middleware/Initializer.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace R3H6\Oauth2Server\Middleware;
 
 use League\OAuth2\Server\ResourceServer;
@@ -49,13 +51,6 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
             return $handler->handle($request);
         }
 
-        $this->logger->debug('Initializing oauth2 server');
-
-        $typoscript = GeneralUtility::makeInstance(FrontendTypoScript::class, new RootNode(), [], [], []);
-        $typoscript->setSetupArray([]);
-        $request = $request->withAttribute('frontend.typoscript', $typoscript);
-        $GLOBALS['TYPO3_REQUEST'] = $request;
-
         $this->configuration->merge($this->extensionConfiguration->get('oauth2_server'));
         $this->configuration->merge($siteConfiguration);
 
@@ -68,6 +63,7 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
             return $handler->handle($request);
         }
 
+        $request = $this->prepareExtbase($request);
         $request = $request->withAttribute(RequestAttributes::OAUTH2_ROUTE, $route);
 
         $validateAuthenticatedRequest = $route->getOptions()['oauth2_validateAuthenticatedRequest'] ?? true;
@@ -85,6 +81,15 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
         return $handler->handle($request);
     }
 
+    private function prepareExtbase(ServerRequestInterface $request): ServerRequestInterface
+    {
+        $typoscript = GeneralUtility::makeInstance(FrontendTypoScript::class, new RootNode(), [], [], []);
+        $typoscript->setSetupArray([]);
+        $request = $request->withAttribute('frontend.typoscript', $typoscript);
+        $GLOBALS['TYPO3_REQUEST'] = $request;
+        return $request;
+    }
+
     private function processAuthorizationRequest(ServerRequestInterface $request): ServerRequestInterface
     {
         $this->logger->debug('Process authorization request');

Classes/RequestAttributes.php

@@ -4,6 +4,17 @@
 
 namespace R3H6\Oauth2Server;
 
+/***
+ *
+ * This file is part of the "OAuth2 Server" Extension for TYPO3 CMS.
+ *
+ * For the full copyright and license information, please read the
+ * LICENSE.txt file that was distributed with this source code.
+ *
+ *  (c) 2020
+ *
+ ***/
+
 final class RequestAttributes
 {
     public const OAUTH2_ROUTE = 'oauth2.route';

Classes/Routing/AbstractRouter.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace R3H6\Oauth2Server\Routing;
 
 use Psr\Http\Message\ServerRequestInterface;

Classes/Routing/AuthorizationRouter.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace R3H6\Oauth2Server\Routing;
 
 use Psr\EventDispatcher\EventDispatcherInterface;

Classes/Routing/ResourceRouter.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace R3H6\Oauth2Server\Routing;
 
 use Psr\EventDispatcher\EventDispatcherInterface;
@@ -17,7 +19,7 @@
  * For the full copyright and license information, please read the
  * LICENSE.txt file that was distributed with this source code.
  *
- *  (c) 2020
+ *  (c) 2024
  *
  ***/
 

Classes/Routing/RouterFactory.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace R3H6\Oauth2Server\Routing;
 
 use Psr\EventDispatcher\EventDispatcherInterface;

Classes/Routing/RouterInterface.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace R3H6\Oauth2Server\Routing;
 
 use Psr\Http\Message\ServerRequestInterface;

Classes/Service/TokenService.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace R3H6\Oauth2Server\Service;
 
 use Lcobucci\JWT\Encoding\JoseEncoder;
@@ -8,6 +10,17 @@
 use League\OAuth2\Server\CryptTrait;
 use R3H6\Oauth2Server\Domain\Oauth\TokenTypes;
 
+/***
+ *
+ * This file is part of the "OAuth2 Server" Extension for TYPO3 CMS.
+ *
+ * For the full copyright and license information, please read the
+ * LICENSE.txt file that was distributed with this source code.
+ *
+ *  (c) 2020
+ *
+ ***/
+
 class TokenService
 {
     use CryptTrait;

Classes/Session/Session.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace R3H6\Oauth2Server\Session;
 
 use League\OAuth2\Server\RequestTypes\AuthorizationRequest;

Tests/Functional/ApplicationTestCase.php

@@ -1,10 +1,23 @@
 <?php
 
+declare(strict_types=1);
+
 namespace R3H6\Oauth2Server\Tests\Functional;
 
 use Symfony\Component\Mailer\Transport\NullTransport;
 use TYPO3\TestingFramework\Core\Functional\FunctionalTestCase;
 
+/***
+ *
+ * This file is part of the "OAuth2 Server" Extension for TYPO3 CMS.
+ *
+ * For the full copyright and license information, please read the
+ * LICENSE.txt file that was distributed with this source code.
+ *
+ *  (c) 2020
+ *
+ ***/
+
 abstract class ApplicationTestCase extends FunctionalTestCase
 {
     /**