Remove deprecated code and add new implementation for Symfony 3.0

ghostika · GuilhemN · commit 1111a0fb5ae9 · 2016-01-13T14:35:30.000+01:00
diff --git a/Controller/AuthorizeController.php b/Controller/AuthorizeController.php
@@ -58,14 +58,14 @@ 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')
                 ->finishClientAuthorization(true, $user, $request, $scope);
         }
 
-        if (true === $formHandler->process()) {
+        if (true === $formHandler->process($request)) {
             return $this->processSuccess($user, $formHandler, $request);
         }
 
@@ -79,8 +79,9 @@ public function authorizeAction(Request $request)
     }
 
     /**
-     * @param UserInterface        $user
+     * @param UserInterface $user
      * @param AuthorizeFormHandler $formHandler
+     * @param Request $request
      *
      * @return Response
      */
@@ -126,11 +127,11 @@ protected function getRedirectionUrl(UserInterface $user)
      */
     protected function getClient()
     {
+        $request = $this->container->get('request_stack')->getMasterRequest();
         if (null === $this->client) {
-            if (null === $clientId = $this->container->get('request')->get('client_id')) {
+            if (null === $clientId = $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);
+                $clientId = $request->get(sprintf('%s[client_id]', $form->getName()), null, true);
             }
 
             $client = $this->container
diff --git a/DependencyInjection/Compiler/TokenStorageCompilerPass.php b/DependencyInjection/Compiler/TokenStorageCompilerPass.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace FOS\OAuthServerBundle\DependencyInjection\Compiler;
+
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+/**
+ * @author Andras Ratz <ratz.andras86@gmail.com>
+ */
+class TokenStorageCompilerPass implements CompilerPassInterface
+{
+
+    /**
+     * {@inheritdoc}
+     */
+    public function process(ContainerBuilder $container)
+    {
+        $definition = $container->getDefinition('fos_oauth_server.security.authentication.listener');
+
+        if (interface_exists('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface')) {
+            $tokenStorageReference = new Reference('security.token_storage');
+        } else {
+            $tokenStorageReference = new Reference('security.context');
+        }
+        $definition->replaceArgument(0, $tokenStorageReference);
+    }
+
+}
diff --git a/FOSOAuthServerBundle.php b/FOSOAuthServerBundle.php
@@ -11,6 +11,7 @@
 
 namespace FOS\OAuthServerBundle;
 
+use FOS\OAuthServerBundle\DependencyInjection\Compiler\TokenStorageCompilerPass;
 use FOS\OAuthServerBundle\DependencyInjection\FOSOAuthServerExtension;
 use FOS\OAuthServerBundle\DependencyInjection\Security\Factory\OAuthFactory;
 use FOS\OAuthServerBundle\DependencyInjection\Compiler\GrantExtensionsCompilerPass;
@@ -35,5 +36,6 @@ public function build(ContainerBuilder $container)
         }
 
         $container->addCompilerPass(new GrantExtensionsCompilerPass());
+        $container->addCompilerPass(new TokenStorageCompilerPass());
     }
 }
diff --git a/Form/Handler/AuthorizeFormHandler.php b/Form/Handler/AuthorizeFormHandler.php
@@ -14,6 +14,7 @@
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\HttpFoundation\Request;
 use FOS\OAuthServerBundle\Form\Model\Authorize;
+use Symfony\Component\HttpFoundation\RequestStack;
 
 /**
  * @author Chris Jones <leeked@gmail.com>
@@ -23,10 +24,10 @@ class AuthorizeFormHandler
     protected $request;
     protected $form;
 
-    public function __construct(FormInterface $form, Request $request)
+    public function __construct(FormInterface $form, RequestStack $requestStack)
     {
         $this->form = $form;
-        $this->request = $request;
+        $this->request = $requestStack->getMasterRequest();
     }
 
     public function isAccepted()
@@ -47,7 +48,7 @@ public function process()
         ));
 
         if ('POST' === $this->request->getMethod()) {
-            $this->form->bind($this->request);
+            $this->form->submit($this->request);
             if ($this->form->isValid()) {
                 $this->onSuccess();
 
diff --git a/Resources/config/authorize.xml b/Resources/config/authorize.xml
@@ -18,9 +18,9 @@
             <tag name="form.type" alias="fos_oauth_server_authorize" />
         </service>
 
-        <service id="fos_oauth_server.authorize.form.handler.default" class="FOS\OAuthServerBundle\Form\Handler\AuthorizeFormHandler" scope="request">
+        <service id="fos_oauth_server.authorize.form.handler.default" class="FOS\OAuthServerBundle\Form\Handler\AuthorizeFormHandler">
             <argument type="service" id="fos_oauth_server.authorize.form" />
-            <argument type="service" id="request" />
+            <argument type="service" id="request_stack" />
         </service>
     </services>
 
diff --git a/Resources/config/security.xml b/Resources/config/security.xml
@@ -18,7 +18,7 @@
         </service>
 
         <service id="fos_oauth_server.security.authentication.listener" class="%fos_oauth_server.security.authentication.listener.class%" public="false">
-            <argument type="service" id="security.context"/>
+            <argument /> <!-- security.token_storage or security.context for Symfony < 2.6 -->
             <argument type="service" id="security.authentication.manager" />
             <argument type="service" id="fos_oauth_server.server" />
         </service>
diff --git a/Security/Firewall/OAuthListener.php b/Security/Firewall/OAuthListener.php
@@ -17,6 +17,7 @@
 use Symfony\Component\HttpKernel\Event\GetResponseEvent;
 use Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
+use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Symfony\Component\Security\Core\Exception\AuthenticationException;
 use Symfony\Component\Security\Core\SecurityContextInterface;
 use Symfony\Component\Security\Http\Firewall\ListenerInterface;
@@ -29,7 +30,7 @@
 class OAuthListener implements ListenerInterface
 {
     /**
-     * @var \Symfony\Component\Security\Core\SecurityContextInterface
+     * @var \Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface|\Symfony\Component\Security\Core\SecurityContextInterface
      */
     protected $securityContext;
 
@@ -44,11 +45,11 @@ class OAuthListener implements ListenerInterface
     protected $serverService;
 
     /**
-     * @param \Symfony\Component\Security\Core\SecurityContextInterface                      $securityContext       The security context.
-     * @param \Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface $authenticationManager The authentication manager.
-     * @param \OAuth2\OAuth2                                                                 $serverService
+     * @param \Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface|\Symfony\Component\Security\Core\SecurityContextInterface   $tokenStorage          The token storage.
+     * @param \Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface        $authenticationManager The authentication manager.
+     * @param \OAuth2\OAuth2                                                                        $serverService
      */
-    public function __construct(SecurityContextInterface $securityContext, AuthenticationManagerInterface $authenticationManager, OAuth2 $serverService)
+    public function __construct($securityContext, AuthenticationManagerInterface $authenticationManager, OAuth2 $serverService)
     {
         $this->securityContext = $securityContext;
         $this->authenticationManager = $authenticationManager;
diff --git a/Tests/Security/Firewall/OAuthListenerTest.php b/Tests/Security/Firewall/OAuthListenerTest.php
@@ -20,7 +20,7 @@ class OAuthListenerTest extends TestCase
 
     protected $authManager;
 
-    protected $securityContext;
+    protected $tokenStorage;
 
     protected $event;
 
@@ -34,8 +34,13 @@ public function setUp()
         $this->authManager = $this
             ->getMock('Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface');
 
-        $this->securityContext = $this
-            ->getMock('Symfony\Component\Security\Core\SecurityContextInterface');
+        if (interface_exists('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface')) {
+            $this->tokenStorage = $this
+                ->getMock('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface');
+        } else {
+            $this->tokenStorage = $this
+                ->getMock('Symfony\Component\Security\Core\SecurityContextInterface');
+        }
 
         $this->event = $this
             ->getMockBuilder('Symfony\Component\HttpKernel\Event\GetResponseEvent')
@@ -45,7 +50,7 @@ public function setUp()
 
     public function testHandle()
     {
-        $listener = new OAuthListener($this->securityContext, $this->authManager, $this->serverService);
+        $listener = new OAuthListener($this->tokenStorage, $this->authManager, $this->serverService);
 
         $this->serverService
             ->expects($this->once())
@@ -57,7 +62,7 @@ public function testHandle()
             ->method('authenticate')
             ->will($this->returnArgument(0));
 
-        $this->securityContext
+        $this->tokenStorage
             ->expects($this->once())
             ->method('setToken')
             ->will($this->returnArgument(0));
@@ -70,7 +75,7 @@ public function testHandle()
 
     public function testHandleResponse()
     {
-        $listener = new OAuthListener($this->securityContext, $this->authManager, $this->serverService);
+        $listener = new OAuthListener($this->tokenStorage, $this->authManager, $this->serverService);
 
         $this->serverService
             ->expects($this->once())
@@ -84,7 +89,7 @@ public function testHandleResponse()
             ->method('authenticate')
             ->will($this->returnValue($response));
 
-        $this->securityContext
+        $this->tokenStorage
             ->expects($this->never())
             ->method('setToken');
 

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`
`12`	`12`	`namespace FOS\OAuthServerBundle;`
`13`	`13`
	`14`	`+use FOS\OAuthServerBundle\DependencyInjection\Compiler\TokenStorageCompilerPass;`
`14`	`15`	`use FOS\OAuthServerBundle\DependencyInjection\FOSOAuthServerExtension;`
`15`	`16`	`use FOS\OAuthServerBundle\DependencyInjection\Security\Factory\OAuthFactory;`
`16`	`17`	`use FOS\OAuthServerBundle\DependencyInjection\Compiler\GrantExtensionsCompilerPass;`
`@@ -35,5 +36,6 @@ public function build(ContainerBuilder $container)`
`35`	`36`	`}`
`36`	`37`
`37`	`38`	`$container->addCompilerPass(new GrantExtensionsCompilerPass());`
	`39`	`+ $container->addCompilerPass(new TokenStorageCompilerPass());`
`38`	`40`	`}`
`39`	`41`	`}`