feature #15 use http-foundation instead of PSR-7 (azjezz)

This PR was merged into the 0.1-dev branch. Discussion ---------- use http-foundation instead of PSR-7 closes #14 Commits ------- 2a7c34f use http-foundation instead of PSR-7
thephpleague · Apr 19, 2021 · 9f9edd0 · 9f9edd0
2 parents 93c4078 + 2a7c34f
commit 9f9edd0
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 23 deletions.
diff --git a/src/Controller/AuthorizationController.php b/src/Controller/AuthorizationController.php
@@ -13,7 +13,6 @@
 use League\OAuth2\Server\AuthorizationServer;
 use League\OAuth2\Server\Exception\OAuthServerException;
 use Psr\Http\Message\ResponseFactoryInterface;
-use Psr\Http\Message\ResponseInterface;
 use Symfony\Bridge\PsrHttpMessage\HttpFoundationFactoryInterface;
 use Symfony\Bridge\PsrHttpMessage\HttpMessageFactoryInterface;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
@@ -106,11 +105,8 @@ public function indexAction(Request $request): Response
 
             $authRequest->setUser($this->userConverter->toLeague($event->getUser()));
 
-            if ($event->hasResponse()) {
-                /** @var ResponseInterface $response */
-                $response = $event->getResponse();
-
-                return $this->httpFoundationFactory->createResponse($response);
+            if ($response = $event->getResponse()) {
+                return $response;
             }
 
             $authRequest->setAuthorizationApproved($event->getAuthorizationResolution());

diff --git a/src/Event/AuthorizationRequestResolveEvent.php b/src/Event/AuthorizationRequestResolveEvent.php
@@ -7,7 +7,7 @@
 use League\Bundle\OAuth2ServerBundle\Model\Client;
 use League\Bundle\OAuth2ServerBundle\Model\Scope;
 use League\OAuth2\Server\RequestTypes\AuthorizationRequest;
-use Psr\Http\Message\ResponseInterface;
+use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Security\Core\User\UserInterface;
 use Symfony\Contracts\EventDispatcher\Event;
 
@@ -37,7 +37,7 @@ final class AuthorizationRequestResolveEvent extends Event
     private $authorizationResolution = self::AUTHORIZATION_DENIED;
 
     /**
-     * @var ResponseInterface|null
+     * @var Response|null
      */
     private $response;
 
@@ -70,20 +70,15 @@ public function resolveAuthorization(bool $authorizationResolution): self
         return $this;
     }
 
-    public function hasResponse(): bool
-    {
-        return $this->response instanceof ResponseInterface;
-    }
-
     /**
      * @psalm-mutation-free
      */
-    public function getResponse(): ?ResponseInterface
+    public function getResponse(): ?Response
     {
         return $this->response;
     }
 
-    public function setResponse(ResponseInterface $response): self
+    public function setResponse(Response $response): self
     {
         $this->response = $response;
         $this->stopPropagation();

diff --git a/src/Resources/config/routes.php b/src/Resources/config/routes.php
@@ -10,7 +10,6 @@
     $routes
         ->add('oauth2_authorize', '/authorize')
         ->controller([AuthorizationController::class, 'indexAction'])
-        ->methods(['GET'])
 
         ->add('oauth2_token', '/token')
         ->controller([TokenController::class, 'indexAction'])

diff --git a/tests/Acceptance/AuthorizationEndpointTest.php b/tests/Acceptance/AuthorizationEndpointTest.php
@@ -14,7 +14,7 @@
 use League\Bundle\OAuth2ServerBundle\OAuth2Events;
 use League\Bundle\OAuth2ServerBundle\Tests\Fixtures\FixtureFactory;
 use League\Bundle\OAuth2ServerBundle\Tests\TestHelper;
-use Nyholm\Psr7\Response;
+use Symfony\Component\HttpFoundation\Response;
 
 final class AuthorizationEndpointTest extends AbstractAcceptanceTest
 {
@@ -303,8 +303,9 @@ public function testCodeRequestRedirectToResolutionUri(): void
             ->getContainer()
             ->get('event_dispatcher')
             ->addListener(OAuth2Events::AUTHORIZATION_REQUEST_RESOLVE, static function (AuthorizationRequestResolveEvent $event): void {
-                $response = (new Response())->withStatus(302)->withHeader('Location', '/authorize/consent');
-                $event->setResponse($response);
+                $event->setResponse(new Response(null, 302, [
+                    'Location' => '/authorize/consent',
+                ]));
             });
 
         $this->client->request(
@@ -335,8 +336,9 @@ public function testAuthorizationRequestEventIsStoppedAfterSettingAResponse(): v
             $event->resolveAuthorization(AuthorizationRequestResolveEvent::AUTHORIZATION_APPROVED);
         }, 100);
         $eventDispatcher->addListener(OAuth2Events::AUTHORIZATION_REQUEST_RESOLVE, static function (AuthorizationRequestResolveEvent $event): void {
-            $response = (new Response())->withStatus(302)->withHeader('Location', '/authorize/consent');
-            $event->setResponse($response);
+            $event->setResponse(new Response(null, 302, [
+                'Location' => '/authorize/consent',
+            ]));
         }, 200);
 
         $this->client->request(
@@ -365,8 +367,11 @@ public function testAuthorizationRequestEventIsStoppedAfterResolution(): void
             $event->resolveAuthorization(AuthorizationRequestResolveEvent::AUTHORIZATION_APPROVED);
         }, 200);
         $eventDispatcher->addListener(OAuth2Events::AUTHORIZATION_REQUEST_RESOLVE, static function (AuthorizationRequestResolveEvent $event): void {
-            $response = (new Response())->withStatus(302)->withHeader('Location', '/authorize/consent');
-            $event->setResponse($response);
+            $event->setResponse(
+                new Response(null, 302, [
+                    'Location' => '/authorize/consent',
+                ])
+            );
         }, 100);
 
         $this->client->request(