Cleanup

Author: ghostika

Controller/AuthorizeController.php

@@ -79,7 +79,7 @@ public function authorizeAction(Request $request)
     }
 
     /**
-     * @param UserInterface $user
+     * @param UserInterface        $user
      * @param AuthorizeFormHandler $formHandler
      * @param Request $request
      *
@@ -127,7 +127,7 @@ protected function getRedirectionUrl(UserInterface $user)
      */
     protected function getClient()
     {
-        $request = $this->container->get('request_stack')->getMasterRequest();
+        $request = $this->container->get('request_stack')->getCurrentRequest();
         if (null === $this->client) {
             if (null === $clientId = $request->get('client_id')) {
                 $form = $this->container->get('fos_oauth_server.authorize.form');

DependencyInjection/Compiler/TokenStorageCompilerPass.php

@@ -1,5 +1,14 @@
 <?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;
@@ -18,7 +27,7 @@ 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')) {
+        if ($container->hasDefinition('security.token_storage')) {
             $tokenStorageReference = new Reference('security.token_storage');
         } else {
             $tokenStorageReference = new Reference('security.context');

Form/Handler/AuthorizeFormHandler.php

@@ -24,10 +24,15 @@ class AuthorizeFormHandler
     protected $request;
     protected $form;
 
+    /**
+     * @var RequestStack
+     */
+    private $requestStack;
+
     public function __construct(FormInterface $form, RequestStack $requestStack)
     {
         $this->form = $form;
-        $this->request = $requestStack->getMasterRequest();
+        $this->requestStack = $requestStack;
     }
 
     public function isAccepted()
@@ -42,6 +47,8 @@ public function isRejected()
 
     public function process()
     {
+        $this->request = $this->requestStack->getCurrentRequest();
+
         $this->form->setData(new Authorize(
             $this->request->request->has('accepted'),
             $this->request->query->all()

Security/Firewall/OAuthListener.php

@@ -51,6 +51,9 @@ class OAuthListener implements ListenerInterface
      */
     public function __construct($securityContext, AuthenticationManagerInterface $authenticationManager, OAuth2 $serverService)
     {
+        if (!$securityContext instanceof  TokenStorageInterface && !$securityContext instanceof SecurityContextInterface) {
+            throw new \InvalidArgumentException('Wrong type for OAuthListener, it has to implement TokenStorageInterface or SecurityContextInterface');
+        }
         $this->securityContext = $securityContext;
         $this->authenticationManager = $authenticationManager;
         $this->serverService = $serverService;

Tests/Security/Firewall/OAuthListenerTest.php

@@ -103,4 +103,10 @@ public function testHandleResponse()
         $this->assertEquals($response, $ret);
     }
 
+    public function testWrongTypeForOAuthListener()
+    {
+        $this->setExpectedException('InvalidArgumentException');
+        $listener = new OAuthListener($this->event, $this->authManager, $this->serverService);
+    }
+
 }