Merge pull request #374 from Ener-Getick/SF3

[Extended] Add symfony 3.0 support

Author: GuilhemN

.travis.yml

@@ -1,5 +1,7 @@
 language: php
 
+sudo: false
+
 php:
   - 5.3
   - 5.4
@@ -16,29 +18,22 @@ matrix:
     - php: 5.6
       env: SYMFONY_VERSION=2.3.*
     - php: 5.6
-      env: SYMFONY_VERSION=2.5.*
-    - php: 5.6
-      env: SYMFONY_VERSION=2.6.*
-    - php: 5.6
-      env: SYMFONY_VERSION=2.7.*@dev
+      env: SYMFONY_VERSION=2.7.*
     - php: 5.6
-      env: SYMFONY_VERSION=2.8.*@dev
+      env: SYMFONY_VERSION=2.8.*
     - php: 5.6
-      env: SYMFONY_VERSION="3.0.x-dev as 2.6"
+      env: SYMFONY_VERSION=3.0.*
   allow_failures:
     - php: hhvm
     - php: nightly
-    - env: SYMFONY_VERSION=2.7.*@dev
-    - env: SYMFONY_VERSION=2.8.*@dev
-    - env: SYMFONY_VERSION="3.0.x-dev as 2.6"
 
 cache:
   directories:
     - vendor
     - $HOME/.composer/cache
 
 before_script:
-  - echo "extension=mongo.so" >> `php --ini | grep "Loaded Configuration" | sed -e "s|.*:\s*||"`
+  - echo "extension = mongo.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
   - composer selfupdate
   - if [ "$SYMFONY_VERSION" != "" ]; then composer require "symfony/symfony:${SYMFONY_VERSION}" --no-update; fi;
   - composer update --prefer-dist --no-interaction $COMPOSER_FLAGS

Controller/AuthorizeController.php

@@ -13,10 +13,13 @@
 
 use FOS\OAuthServerBundle\Event\OAuthEvent;
 use FOS\OAuthServerBundle\Form\Handler\AuthorizeFormHandler;
-use OAuth2\OAuth2;
+use FOS\OAuthServerBundle\Model\ClientInterface;
 use OAuth2\OAuth2ServerException;
-use Symfony\Component\DependencyInjection\ContainerAware;
+use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Symfony\Component\Security\Core\Exception\AccessDeniedException;
 use Symfony\Component\Security\Core\User\UserInterface;
@@ -26,19 +29,34 @@
  *
  * @author Chris Jones <[email protected]>
  */
-class AuthorizeController extends ContainerAware
+class AuthorizeController implements ContainerAwareInterface
 {
     /**
      * @var \FOS\OAuthServerBundle\Model\ClientInterface
      */
     private $client;
 
+    /**
+     * @var ContainerInterface
+     */
+    protected $container;
+
+    /**
+     * Sets the container.
+     *
+     * @param ContainerInterface|null $container A ContainerInterface instance or null
+     */
+    public function setContainer(ContainerInterface $container = null)
+    {
+        $this->container = $container;
+    }
+
     /**
      * Authorize
      */
     public function authorizeAction(Request $request)
     {
-        $user = $this->container->get('security.context')->getToken()->getUser();
+        $user = $this->getTokenStorage()->getToken()->getUser();
 
         if (!$user instanceof UserInterface) {
             throw new AccessDeniedException('This user does not have access to this section.');
@@ -58,7 +76,7 @@ public function authorizeAction(Request $request)
         );
 
         if ($event->isAuthorizedClient()) {
-            $scope = $this->container->get('request')->get('scope', null);
+            $scope = $request->get('scope', null);
 
             return $this->container
                 ->get('fos_oauth_server.server')
@@ -81,13 +99,14 @@ public function authorizeAction(Request $request)
     /**
      * @param UserInterface        $user
      * @param AuthorizeFormHandler $formHandler
+     * @param Request $request
      *
      * @return Response
      */
     protected function processSuccess(UserInterface $user, AuthorizeFormHandler $formHandler, Request $request)
     {
         if (true === $this->container->get('session')->get('_fos_oauth_server.ensure_logout')) {
-            $this->container->get('security.context')->setToken(null);
+            $this->getTokenStorage()->setToken(null);
             $this->container->get('session')->invalidate();
         }
 
@@ -127,16 +146,20 @@ protected function getRedirectionUrl(UserInterface $user)
     protected function getClient()
     {
         if (null === $this->client) {
-            if (null === $clientId = $this->container->get('request')->get('client_id')) {
-                $form = $this->container->get('fos_oauth_server.authorize.form');
-                $clientId = $this->container->get('request')
-                    ->get(sprintf('%s[client_id]', $form->getName()), null, true);
+            $request = $this->getCurrentRequest();
+
+            $client = null;
+            if (null !== $request) {
+                if (null === $clientId = $request->get('client_id')) {
+                    $form = $this->container->get('fos_oauth_server.authorize.form');
+                    $clientId = $request->get(sprintf('%s[client_id]', $form->getName()), null, true);
+                }
+
+                $client = $this->container
+                    ->get('fos_oauth_server.client_manager')
+                    ->findClientByPublicId($clientId);
             }
 
-            $client = $this->container
-                ->get('fos_oauth_server.client_manager')
-                ->findClientByPublicId($clientId);
-
             if (null === $client) {
                 throw new NotFoundHttpException('Client not found.');
             }
@@ -146,4 +169,26 @@ protected function getClient()
 
         return $this->client;
     }
+
+    private function getCurrentRequest() {
+        if($this->container->has('request_stack')) {
+            $request = $this->container->get('request_stack')->getCurrentRequest();
+            if(null === $request) {
+                throw new \RuntimeException('No current request.');
+            }
+
+            return $request;
+        } else {
+            return $this->container->get('request');
+        }
+    }
+
+    private function getTokenStorage()
+    {
+        if($this->container->has('security.token_storage')) {
+            return $this->container->get('security.token_storage');
+        }
+
+        return $this->container->get('security.context');
+    }
 }

DependencyInjection/Compiler/RequestStackCompilerPass.php

@@ -0,0 +1,37 @@
+<?php
+
+/*
+ * This file is part of the FOSOAuthServerBundle package.
+ *
+ * (c) FriendsOfSymfony <http://friendsofsymfony.github.com/>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace FOS\OAuthServerBundle\DependencyInjection\Compiler;
+
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Reference;
+
+/**
+ * @author Ener-Getick <[email protected]>
+ *
+ * @internal
+ */
+final class RequestStackCompilerPass implements CompilerPassInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function process(ContainerBuilder $container)
+    {
+        if($container->has('request_stack')) {
+            return;
+        }
+
+        $definition = $container->getDefinition('fos_oauth_server.authorize.form.handler.default');
+        $definition->addMethodCall('setContainer', array(new Reference('service_container')));
+    }
+}

DependencyInjection/Compiler/TokenStorageCompilerPass.php

@@ -0,0 +1,34 @@
+<?php
+
+/*
+ * This file is part of the FOSOAuthServerBundle package.
+ *
+ * (c) FriendsOfSymfony <http://friendsofsymfony.github.com/>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace FOS\OAuthServerBundle\DependencyInjection\Compiler;
+
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Reference;
+
+/**
+ * @author Andras Ratz <[email protected]>
+ */
+class TokenStorageCompilerPass implements CompilerPassInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function process(ContainerBuilder $container)
+    {
+        $definition = $container->getDefinition('fos_oauth_server.security.authentication.listener');
+
+        if ($container->hasDefinition('security.token_storage') === false) {
+            $definition->replaceArgument(0, new Reference('security.context'));
+        }
+    }
+}

FOSOAuthServerBundle.php

@@ -11,6 +11,8 @@
 
 namespace FOS\OAuthServerBundle;
 
+use FOS\OAuthServerBundle\DependencyInjection\Compiler\TokenStorageCompilerPass;
+use FOS\OAuthServerBundle\DependencyInjection\Compiler\RequestStackCompilerPass;
 use FOS\OAuthServerBundle\DependencyInjection\FOSOAuthServerExtension;
 use FOS\OAuthServerBundle\DependencyInjection\Security\Factory\OAuthFactory;
 use FOS\OAuthServerBundle\DependencyInjection\Compiler\GrantExtensionsCompilerPass;
@@ -35,5 +37,7 @@ public function build(ContainerBuilder $container)
         }
 
         $container->addCompilerPass(new GrantExtensionsCompilerPass());
+        $container->addCompilerPass(new TokenStorageCompilerPass());
+        $container->addCompilerPass(new RequestStackCompilerPass());
     }
 }

Form/Handler/AuthorizeFormHandler.php

@@ -11,22 +11,55 @@
 
 namespace FOS\OAuthServerBundle\Form\Handler;
 
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
 use FOS\OAuthServerBundle\Form\Model\Authorize;
 
 /**
  * @author Chris Jones <[email protected]>
  */
 class AuthorizeFormHandler
 {
-    protected $request;
+    /**
+     * @var FormInterface
+     */
     protected $form;
 
-    public function __construct(FormInterface $form, Request $request)
+    /**
+     * @var ContainerInterface
+     */
+    protected $container;
+
+    /**
+     * @var RequestStack|Request|null
+     */
+    private $requestStack;
+
+    /**
+     * @param FormInterface        $form
+     * @param Request|RequestStack $requestStack
+     */
+    public function __construct(FormInterface $form, $requestStack = null)
     {
+        if(null !== $requestStack && !$requestStack instanceof RequestStack && !$requestStack instanceof Request) {
+            throw new \InvalidArgumentException(sprintf('Argument 2 of %s must be an instanceof RequestStack or Request', __CLASS__));
+        }
+
         $this->form = $form;
-        $this->request = $request;
+        $this->requestStack = $requestStack;
+    }
+
+    /**
+     * Sets the container.
+     *
+     * @param ContainerInterface|null $container A ContainerInterface instance or null
+     */
+    public function setContainer(ContainerInterface $container = null)
+    {
+        $this->container = $container;
     }
 
     public function isAccepted()
@@ -41,17 +74,20 @@ public function isRejected()
 
     public function process()
     {
-        $this->form->setData(new Authorize(
-            $this->request->request->has('accepted'),
-            $this->request->query->all()
-        ));
+        $request = $this->getCurrentRequest();
+        if (null !== $request) {
+            $this->form->setData(new Authorize(
+                $request->request->has('accepted'),
+                $request->query->all()
+            ));
 
-        if ('POST' === $this->request->getMethod()) {
-            $this->form->bind($this->request);
-            if ($this->form->isValid()) {
-                $this->onSuccess();
+            if ('POST' === $request->getMethod()) {
+                $this->form->handleRequest($request);
+                if ($this->form->isValid()) {
+                    $this->onSuccess();
 
-                return true;
+                    return true;
+                }
             }
         }
 
@@ -63,6 +99,15 @@ public function getScope()
         return $this->form->getData()->scope;
     }
 
+    public function __get($name)
+    {
+        if ($name === 'request') {
+            @trigger_error(sprintf('%s::$request is deprecated since 1.4 and will be removed in 2.0.', __CLASS__), E_USER_DEPRECATED);
+
+            return $this->getCurrentRequest();
+        }
+    }
+
     /**
      * Put form data in $_GET so that OAuth2 library will call Request::createFromGlobals()
      *
@@ -79,4 +124,17 @@ protected function onSuccess()
             'scope'         => $this->form->getData()->scope,
         );
     }
+
+    private function getCurrentRequest()
+    {
+        if (null !== $this->requestStack) {
+            if ($this->requestStack instanceof Request) {
+                return $this->requestStack;
+            } else {
+                return $this->requestStack->getCurrentRequest();
+            }
+        }
+
+        return $this->container->get('request');
+    }
 }