Fix to latest master

zf-fr · Jan 14, 2014 · 4ea4ab8 · 4ea4ab8
1 parent a937844
commit 4ea4ab8
Show file tree

Hide file tree

Showing 12 changed files with 73 additions and 58 deletions.
diff --git a/README.md b/README.md
@@ -86,3 +86,5 @@ return [
     ]
 ];
 ```
+
+You can also pass a service key, that will be pulled from the service manager, if you need to inject dependencies.
diff --git a/config/module.config.php b/config/module.config.php
@@ -25,6 +25,7 @@
             'ZfrOAuth2\Server\AuthorizationServer'                             => 'ZfrOAuth2Module\Server\Factory\AuthorizationServerFactory',
             'ZfrOAuth2\Server\ResourceServer'                                  => 'ZfrOAuth2Module\Server\Factory\ResourceServerFactory',
             'ZfrOAuth2\Server\Service\ClientService'                           => 'ZfrOAuth2Module\Server\Factory\ClientServiceFactory',
+            'ZfrOAuth2\Server\Service\ScopeService'                            => 'ZfrOAuth2Module\Server\Factory\ScopeServiceFactory',
             'ZfrOAuth2Module\Server\Authentication\Adapter\AccessTokenAdapter' => 'ZfrOAuth2Module\Server\Factory\AccessTokenAdapterFactory',
             'ZfrOAuth2Module\Server\Options\ModuleOptions'                     => 'ZfrOAuth2Module\Server\Factory\ModuleOptionsFactory',
             'ZfrOAuth2Module\Server\Grant\GrantPluginManager'                  => 'ZfrOAuth2Module\Server\Factory\GrantPluginManagerFactory',

diff --git a/config/zfr_oauth2_server.global.php.dist b/config/zfr_oauth2_server.global.php.dist
@@ -67,11 +67,6 @@ return [
         // 'access_token_ttl'       => 3600,
         // 'refresh_token_ttl'      => 86400,
 
-        /**
-         * Default scopes to use when a token is generated, if none is specified
-         */
-        'default_scopes' => [],
-
         /**
          * Registered grants for this server
          */

diff --git a/src/ZfrOAuth2Module/Server/Factory/AccessTokenServiceFactory.php b/src/ZfrOAuth2Module/Server/Factory/AccessTokenServiceFactory.php
@@ -39,11 +39,12 @@ public function createService(ServiceLocatorInterface $serviceLocator)
         /* @var \Doctrine\Common\Persistence\ObjectManager $objectManager */
         $objectManager   = $serviceLocator->get($options->getObjectManager());
         $tokenRepository = $objectManager->getRepository('ZfrOAuth2\Server\Entity\AccessToken');
-        $scopeRepository = $objectManager->getRepository('ZfrOAuth2\Server\Entity\Scope');
 
-        $accessTokenService = new TokenService($objectManager, $tokenRepository, $scopeRepository);
+        /* @var \ZfrOAuth2Module\Server\Service\ScopeService $scopeService */
+        $scopeService = $serviceLocator->get('ZfrOAuth2\Server\Service\ScopeService');
+
+        $accessTokenService = new TokenService($objectManager, $tokenRepository, $scopeService);
         $accessTokenService->setTokenTTL($options->getAccessTokenTtl());
-        $accessTokenService->setDefaultScopes($options->getDefaultScopes());
 
         return $accessTokenService;
     }

diff --git a/src/ZfrOAuth2Module/Server/Factory/AuthorizationCodeServiceFactory.php b/src/ZfrOAuth2Module/Server/Factory/AuthorizationCodeServiceFactory.php
@@ -39,11 +39,12 @@ public function createService(ServiceLocatorInterface $serviceLocator)
         /* @var \Doctrine\Common\Persistence\ObjectManager $objectManager */
         $objectManager   = $serviceLocator->get($options->getObjectManager());
         $tokenRepository = $objectManager->getRepository('ZfrOAuth2\Server\Entity\AuthorizationCode');
-        $scopeRepository = $objectManager->getRepository('ZfrOAuth2\Server\Entity\Scope');
 
-        $authorizationCodeService = new TokenService($objectManager, $tokenRepository, $scopeRepository);
+        /* @var \ZfrOAuth2Module\Server\Service\ScopeService $scopeService */
+        $scopeService = $serviceLocator->get('ZfrOAuth2\Server\Service\ScopeService');
+
+        $authorizationCodeService = new TokenService($objectManager, $tokenRepository, $scopeService);
         $authorizationCodeService->setTokenTTL($options->getAuthorizationCodeTtl());
-        $authorizationCodeService->setDefaultScopes($options->getDefaultScopes());
 
         return $authorizationCodeService;
     }

diff --git a/src/ZfrOAuth2Module/Server/Factory/RefreshTokenServiceFactory.php b/src/ZfrOAuth2Module/Server/Factory/RefreshTokenServiceFactory.php
@@ -39,11 +39,12 @@ public function createService(ServiceLocatorInterface $serviceLocator)
         /* @var \Doctrine\Common\Persistence\ObjectManager $objectManager */
         $objectManager   = $serviceLocator->get($options->getObjectManager());
         $tokenRepository = $objectManager->getRepository('ZfrOAuth2\Server\Entity\RefreshToken');
-        $scopeRepository = $objectManager->getRepository('ZfrOAuth2\Server\Entity\Scope');
 
-        $refreshTokenService = new TokenService($objectManager, $tokenRepository, $scopeRepository);
+        /* @var \ZfrOAuth2Module\Server\Service\ScopeService $scopeService */
+        $scopeService = $serviceLocator->get('ZfrOAuth2\Server\Service\ScopeService');
+
+        $refreshTokenService = new TokenService($objectManager, $tokenRepository, $scopeService);
         $refreshTokenService->setTokenTTL($options->getRefreshTokenTtl());
-        $refreshTokenService->setDefaultScopes($options->getDefaultScopes());
 
         return $refreshTokenService;
     }

diff --git a/src/ZfrOAuth2Module/Server/Factory/ScopeServiceFactory.php b/src/ZfrOAuth2Module/Server/Factory/ScopeServiceFactory.php
@@ -0,0 +1,45 @@
+<?php
+/*
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the MIT license.
+ */
+
+namespace ZfrOAuth2Module\Server\Factory;
+
+use Zend\ServiceManager\FactoryInterface;
+use Zend\ServiceManager\ServiceLocatorInterface;
+use ZfrOAuth2\Server\Service\ScopeService;
+
+/**
+ * @author  Michaël Gallego <mic.gallego@gmail.com>
+ * @licence MIT
+ */
+class ScopeServiceFactory implements FactoryInterface
+{
+    /**
+     * {@inheritDoc}
+     */
+    public function createService(ServiceLocatorInterface $serviceLocator)
+    {
+        /* @var \ZfrOAuth2Module\Server\Options\ModuleOptions $options */
+        $options = $serviceLocator->get('ZfrOAuth2Module\Server\Options\ModuleOptions');
+
+        /* @var \Doctrine\Common\Persistence\ObjectManager $objectManager */
+        $objectManager   = $serviceLocator->get($options->getObjectManager());
+        $scopeRepository = $objectManager->getRepository('ZfrOAuth2\Server\Entity\Scope');
+
+        return new ScopeService($objectManager, $scopeRepository);
+    }
+}
diff --git a/src/ZfrOAuth2Module/Server/Options/ModuleOptions.php b/src/ZfrOAuth2Module/Server/Options/ModuleOptions.php
@@ -56,13 +56,6 @@ class ModuleOptions extends AbstractOptions
      */
     protected $refreshTokenTtl = 86400;
 
-    /**
-     * Default scopes to use when a token is generated
-     *
-     * @var array
-     */
-    protected $defaultScopes = [];
-
     /**
      * Set the owner callable
      *
@@ -166,26 +159,6 @@ public function getRefreshTokenTtl()
         return $this->refreshTokenTtl;
     }
 
-    /**
-     * Set the default scopes to use when generating a token
-     *
-     * @param array $defaultScopes
-     */
-    public function setDefaultScopes(array $defaultScopes)
-    {
-        $this->defaultScopes = $defaultScopes;
-    }
-
-    /**
-     * Get the default scopes to use when generating a token
-     *
-     * @return array
-     */
-    public function getDefaultScopes()
-    {
-        return $this->defaultScopes;
-    }
-
     /**
      * Set the callable used to validate a user (or service name)
      *

diff --git a/tests/ZfrOAuth2ModuleTest/Server/Factory/AccessTokenServiceFactoryTest.php b/tests/ZfrOAuth2ModuleTest/Server/Factory/AccessTokenServiceFactoryTest.php
@@ -47,10 +47,10 @@ public function testCanCreateFromFactory()
                       ->with('ZfrOAuth2\Server\Entity\AccessToken')
                       ->will($this->returnValue($this->getMock('Doctrine\Common\Persistence\ObjectRepository')));
 
-        $objectManager->expects($this->at(1))
-                      ->method('getRepository')
-                      ->with('ZfrOAuth2\Server\Entity\Scope')
-                      ->will($this->returnValue($this->getMock('Doctrine\Common\Persistence\ObjectRepository')));
+        $serviceManager->setService(
+            'ZfrOAuth2\Server\Service\ScopeService',
+            $this->getMock('ZfrOAuth2\Server\Service\ScopeService', [], [], '', false)
+        );
 
         $factory = new AccessTokenServiceFactory();
         $service = $factory->createService($serviceManager);

diff --git a/tests/ZfrOAuth2ModuleTest/Server/Factory/AuthorizationCodeServiceFactoryTest.php b/tests/ZfrOAuth2ModuleTest/Server/Factory/AuthorizationCodeServiceFactoryTest.php
@@ -47,10 +47,10 @@ public function testCanCreateFromFactory()
                       ->with('ZfrOAuth2\Server\Entity\AuthorizationCode')
                       ->will($this->returnValue($this->getMock('Doctrine\Common\Persistence\ObjectRepository')));
 
-        $objectManager->expects($this->at(1))
-                      ->method('getRepository')
-                      ->with('ZfrOAuth2\Server\Entity\Scope')
-                      ->will($this->returnValue($this->getMock('Doctrine\Common\Persistence\ObjectRepository')));
+        $serviceManager->setService(
+            'ZfrOAuth2\Server\Service\ScopeService',
+            $this->getMock('ZfrOAuth2\Server\Service\ScopeService', [], [], '', false)
+        );
 
         $factory = new AuthorizationCodeServiceFactory();
         $service = $factory->createService($serviceManager);

diff --git a/tests/ZfrOAuth2ModuleTest/Server/Factory/RefreshTokenServiceFactoryTest.php b/tests/ZfrOAuth2ModuleTest/Server/Factory/RefreshTokenServiceFactoryTest.php
@@ -47,10 +47,10 @@ public function testCanCreateFromFactory()
                       ->with('ZfrOAuth2\Server\Entity\RefreshToken')
                       ->will($this->returnValue($this->getMock('Doctrine\Common\Persistence\ObjectRepository')));
 
-        $objectManager->expects($this->at(1))
-                      ->method('getRepository')
-                      ->with('ZfrOAuth2\Server\Entity\Scope')
-                      ->will($this->returnValue($this->getMock('Doctrine\Common\Persistence\ObjectRepository')));
+        $serviceManager->setService(
+            'ZfrOAuth2\Server\Service\ScopeService',
+            $this->getMock('ZfrOAuth2\Server\Service\ScopeService', [], [], '', false)
+        );
 
         $factory = new RefreshTokenServiceFactory();
         $service = $factory->createService($serviceManager);

diff --git a/tests/ZfrOAuth2ModuleTest/Server/Options/ModuleOptionsTest.php b/tests/ZfrOAuth2ModuleTest/Server/Options/ModuleOptionsTest.php
@@ -37,18 +37,14 @@ public function testSettersAndGetters()
             'authorization_code_ttl' => 300,
             'access_token_ttl'       => 3000,
             'refresh_token_ttl'      => 30000,
-            'default_scopes'         => ['read'],
             'owner_callable'         => $callable,
-            'grants'                 => [
-                'ZfrOAuth2\Server\Grant\ClientCredentialsGrant'
-            ]
+            'grants'                 => ['ZfrOAuth2\Server\Grant\ClientCredentialsGrant']
         ]);
 
         $this->assertEquals('my_object_manager', $options->getObjectManager());
         $this->assertEquals(300, $options->getAuthorizationCodeTtl());
         $this->assertEquals(3000, $options->getAccessTokenTtl());
         $this->assertEquals(30000, $options->getRefreshTokenTtl());
-        $this->assertEquals(['read'], $options->getDefaultScopes());
         $this->assertSame($callable, $options->getOwnerCallable());
         $this->assertEquals(['ZfrOAuth2\Server\Grant\ClientCredentialsGrant'], $options->getGrants());
     }