Merge pull request #39 from TomHAnderson/feature/oauth2server-validate

Validate OAuth2 server from Query resources

README.md

@@ -94,6 +94,13 @@ An example to match ZfcUser `auth_identity_fields` configuration:
         'auth_identity_fields' => array('username', 'email'), // defaults to array('username')
 ```
 
+
+Validate zf-apigility-doctrine resources
+----------------------------------------
+
+To validate the OAuth2 session with Query Create Filters and Query Providers implement `ZF\OAuth2\Doctrine\OAuth2ServerInterface` and use `ZF\OAuth2\Doctrine\OAuth2ServerTrait`.  Then call `$result = $this->validateOAuth2($scope);` in the filter function.
+
+
 Extensions
 ----------
 

config/module.config.php

@@ -10,4 +10,14 @@
                 'ZF\OAuth2\Doctrine\Factory\DoctrineAdapterFactory',
         ),
     ),
+    'zf-apigility-doctrine-query-create-filter' => array(
+        'initializers' => array(
+            'ZF\OAuth2\Doctrine\Query\OAuth2ServerInitializer',
+        ),
+    ),
+    'zf-apigility-doctrine-query-provider' => array(
+        'initializers' => array(
+            'ZF\OAuth2\Doctrine\Query\OAuth2ServerInitializer',
+        ),
+    ),
 );

src/Query/OAuth2ServerInitializer.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace ZF\OAuth2\Doctrine\Query;
+
+use Zend\ServiceManager\InitializerInterface;
+use Zend\ServiceManager\ServiceLocatorInterface;
+use ZF\OAuth2\Doctrine\Query\OAuth2ServerInterface;
+
+class OAuth2ServerInitializer implements InitializerInterface
+{
+    public function initialize($instance, ServiceLocatorInterface $serviceLocator)
+    {
+        if ($instance instanceof OAuth2ServerInterface) {
+            $oAuth2ServerFactory = $serviceLocator->getServiceLocator()->get('ZF\OAuth2\Service\OAuth2Server');
+            $oAuth2Server = $oAuth2ServerFactory();
+            $instance->setOAuth2Server($oAuth2Server);
+        }
+    }
+}

src/Query/OAuth2ServerInterface.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace ZF\OAuth2\Doctrine\Query;
+
+use OAuth2\Server as OAuth2Server;
+
+interface OAuth2ServerInterface
+{
+    public function setOAuth2Server(OAuth2Server $server);
+    public function getOAuth2Server();
+    public function validateOAuth2($scope = null);
+}

src/Query/OAuth2ServerTrait.php

@@ -0,0 +1,42 @@
+<?php
+
+namespace ZF\OAuth2\Doctrine\Query;
+
+use OAuth2\Server as OAuth2Server;
+use OAuth2\Request as OAuth2Request;
+use ZF\ApiProblem\ApiProblem;
+
+trait OAuth2ServerTrait
+{
+    protected $oAuth2Server;
+
+    public function setOAuth2Server(OAuth2Server $server)
+    {
+        $this->oAuth2Server = $server;
+
+        return $this;
+    }
+
+    public function getOAuth2Server()
+    {
+        return $this->oAuth2Server;
+    }
+
+    public function validateOAuth2($scope = null)
+    {
+        if (! $this->getOAuth2Server()->verifyResourceRequest(
+            OAuth2Request::createFromGlobals(),
+            $response = null,
+            $scope
+        )) {
+            $error = $this->getOAuth2Server()->getResponse();
+            $parameters = $error->getParameters();
+            $detail = isset($parameters['error_description']) ?
+                $parameters['error_description']: $error->getStatusText();
+
+            return new ApiProblem($error->getStatusCode(), $detail);
+        }
+
+        return true;
+    }
+}