Merge branch 'hotfix/2.2.3'

authbucket · Sep 4, 2014 · 011d65b · 011d65b
2 parents b23b6d7 + 9aeec0f
commit 011d65b
Show file tree

Hide file tree

Showing 10 changed files with 37 additions and 31 deletions.
diff --git a/README.md b/README.md
@@ -202,18 +202,6 @@ endpoint:
         ),
     );
 
-> NOTE: As we are using [Guzzle](http://guzzle3.readthedocs.org/) for
-> sending HTTP request, this style will NOT works if you are:
->
-> -   Setting `debug_endpoint` to current instance (in whatever absolute
->     nor relative URL style), AND
-> -   The current instance is running with PHP build-in web server (in
->     single thread style).
->
-> The build-in web server will deadlocked, and your browser will just
-> keep on waiting for timeout with
-> [WSOD](http://en.wikipedia.org/wiki/Screen_of_death).
-
 Demo
 ----
 

diff --git a/app/config/security.php b/app/config/security.php
@@ -71,7 +71,7 @@
             'resource_type' => 'debug_endpoint',
             'scope' => array('demoscope1'),
             'options' => array(
-                'debug_endpoint' => 'http://oauth2-php.authbucket.com/api/v1.0/oauth2/debug',
+                'debug_endpoint' => '/api/v1.0/oauth2/debug',
                 'cache' => false,
             ),
         ),
@@ -82,7 +82,7 @@
             'resource_type' => 'debug_endpoint',
             'scope' => array('demoscope1'),
             'options' => array(
-                'debug_endpoint' => 'http://oauth2-php.authbucket.com/api/v1.0/oauth2/debug',
+                'debug_endpoint' => '/api/v1.0/oauth2/debug',
                 'cache' => true,
             ),
         ),

diff --git a/src/AuthBucket/OAuth2/Provider/AuthBucketOAuth2ServiceProvider.php b/src/AuthBucket/OAuth2/Provider/AuthBucketOAuth2ServiceProvider.php
@@ -122,6 +122,7 @@ public function register(Application $app)
 
         $app['authbucket_oauth2.resource_handler.factory'] = $app->share(function ($app) {
             return new ResourceTypeHandlerFactory(
+                $app,
                 $app['authbucket_oauth2.model_manager.factory'],
                 $app['authbucket_oauth2.resource_handler']
             );

diff --git a/src/AuthBucket/OAuth2/ResourceType/AbstractResourceTypeHandler.php b/src/AuthBucket/OAuth2/ResourceType/AbstractResourceTypeHandler.php
@@ -12,6 +12,7 @@
 namespace AuthBucket\OAuth2\ResourceType;
 
 use AuthBucket\OAuth2\Model\ModelManagerFactoryInterface;
+use Symfony\Component\HttpKernel\HttpKernelInterface;
 
 /**
  * Shared resource type implementation.
@@ -20,12 +21,15 @@
  */
 abstract class AbstractResourceTypeHandler implements ResourceTypeHandlerInterface
 {
+    protected $httpKernel;
     protected $modelManagerFactory;
 
     public function __construct(
+        HttpKernelInterface $httpKernel,
         ModelManagerFactoryInterface $modelManagerFactory
     )
     {
+        $this->httpKernel = $httpKernel;
         $this->modelManagerFactory = $modelManagerFactory;
     }
 }
diff --git a/src/AuthBucket/OAuth2/ResourceType/DebugEndpointResourceTypeHandler.php b/src/AuthBucket/OAuth2/ResourceType/DebugEndpointResourceTypeHandler.php
@@ -52,13 +52,25 @@ public function handle(
             }
         }
 
-        // Fetch meta data of supplied access token by query remote debug endpoint.
-        $client = new \Guzzle\Http\Client();
-        $crawler = $client->get($options['debug_endpoint'], array(), array(
-            'headers' => array('Authorization' => implode(' ', array('Bearer', $accessToken))),
-            'exceptions' => false,
-        ));
-        $response = json_decode($crawler->send()->getBody(), true);
+        // Fetch meta data of supplied access token by query debug endpoint.
+        if (strpos($options['debug_endpoint'], '/') === 0) {
+            // For relative URL, use Symfony test client to simulates and
+            // HTTP client like a browser and makes requests.
+            $client = new \Symfony\Component\HttpKernel\Client($this->httpKernel);
+            $crawler = $client->request('GET', $options['debug_endpoint'], array(), array(), array(
+                'HTTP_Authorization' => implode(' ', array('Bearer', $accessToken)),
+            ));
+            $content = $client->getResponse()->getContent();
+        } else {
+            // For absolute URL, use Guzzle client to create request.
+            $client = new \Guzzle\Http\Client();
+            $crawler = $client->get($options['debug_endpoint'], array(), array(
+                'headers' => array('Authorization' => implode(' ', array('Bearer', $accessToken))),
+                'exceptions' => false,
+            ));
+            $content = $crawler->send()->getBody();
+        }
+        $response = json_decode($content, true);
 
         // Throw exception if error return.
         if (isset($response['error'])) {

diff --git a/src/AuthBucket/OAuth2/ResourceType/ResourceTypeHandlerFactory.php b/src/AuthBucket/OAuth2/ResourceType/ResourceTypeHandlerFactory.php
@@ -13,6 +13,7 @@
 
 use AuthBucket\OAuth2\Exception\ServerErrorException;
 use AuthBucket\OAuth2\Model\ModelManagerFactoryInterface;
+use Symfony\Component\HttpKernel\HttpKernelInterface;
 
 /**
  * OAuth2 resource type handler factory implemention.
@@ -21,14 +22,17 @@
  */
 class ResourceTypeHandlerFactory implements ResourceTypeHandlerFactoryInterface
 {
+    protected $httpKernel;
     protected $modelManagerFactory;
     protected $classes;
 
     public function __construct(
+        HttpKernelInterface $httpKernel,
         ModelManagerFactoryInterface $modelManagerFactory,
         array $classes = array()
     )
     {
+        $this->httpKernel = $httpKernel;
         $this->modelManagerFactory = $modelManagerFactory;
 
         foreach ($classes as $class) {
@@ -62,6 +66,7 @@ public function getResourceTypeHandler($type = null)
         $class = $this->classes[$type];
 
         return new $class(
+            $this->httpKernel,
             $this->modelManagerFactory
         );
     }

diff --git a/tests/AuthBucket/OAuth2/Tests/ResourceType/ResourceTypeHandlerFactoryTest.php b/tests/AuthBucket/OAuth2/Tests/ResourceType/ResourceTypeHandlerFactoryTest.php
@@ -22,6 +22,7 @@ class ResourceTypeHandlerFactoryTest extends WebTestCase
     public function testNonExistsResourceTypeHandler()
     {
         $resourceTypeHandlerFactory = new ResourceTypeHandlerFactory(
+            $this->app,
             $this->app['authbucket_oauth2.model_manager.factory'],
             array('foo' => 'AuthBucket\\OAuth2\\Tests\\ResourceType\\NonExistsResourceTypeHandler')
         );
@@ -34,6 +35,7 @@ public function testNonExistsResourceTypeHandler()
     public function testBadAddResourceTypeHandler()
     {
         $resourceTypeHandlerFactory = new ResourceTypeHandlerFactory(
+            $this->app,
             $this->app['authbucket_oauth2.model_manager.factory'],
             array('foo' => 'AuthBucket\\OAuth2\\Tests\\ResourceType\\FooResourceTypeHandler')
         );
@@ -46,6 +48,7 @@ public function testBadAddResourceTypeHandler()
     public function testBadGetResourceTypeHandler()
     {
         $resourceTypeHandlerFactory = new ResourceTypeHandlerFactory(
+            $this->app,
             $this->app['authbucket_oauth2.model_manager.factory'],
             array('bar' => 'AuthBucket\\OAuth2\\Tests\\ResourceType\\BarResourceTypeHandler')
         );
@@ -55,6 +58,7 @@ public function testBadGetResourceTypeHandler()
     public function testGoodGetResourceTypeHandler()
     {
         $resourceTypeHandlerFactory = new ResourceTypeHandlerFactory(
+            $this->app,
             $this->app['authbucket_oauth2.model_manager.factory'],
             array('bar' => 'AuthBucket\\OAuth2\\Tests\\ResourceType\\BarResourceTypeHandler')
         );

diff --git a/tests/AuthBucket/OAuth2/Tests/TestBundle/Resources/views/index.html.twig b/tests/AuthBucket/OAuth2/Tests/TestBundle/Resources/views/index.html.twig
@@ -134,14 +134,6 @@ $app[&#39;security.firewalls&#39;] = array(
         ),
     ),
 );</code></pre>
-                <blockquote>
-                    <p>NOTE: As we are using <a href="http://guzzle3.readthedocs.org/">Guzzle</a> for sending HTTP request, this style will NOT works if you are:</p>
-                    <ul>
-                        <li>Setting <code>debug_endpoint</code> to current instance (in whatever absolute nor relative URL style), AND</li>
-                        <li>The current instance is running with PHP build-in web server (in single thread style).</li>
-                    </ul>
-                    <p>The build-in web server will deadlocked, and your browser will just keep on waiting for timeout with <a href="http://en.wikipedia.org/wiki/Screen_of_death">WSOD</a>.</p>
-                </blockquote>
 
                 <h2 id="demo" class="page-header">Demo</h2>
                 <p class="lead">The demo is based on <a href="http://silex.sensiolabs.org/">Silex</a> and <a href="https://github.com/authbucket/oauth2-php/blob/master/src/AuthBucket/OAuth2/Provider/AuthBucketOAuth2ServiceProvider.php">AuthBucketOAuth2ServiceProvider</a>. Read though <a href="http://oauth2-php.authbucket.com/demo">Demo</a> for more information.</p>

diff --git a/tests/AuthBucket/OAuth2/Tests/TestBundle/Resources/views/page_bottom.html.twig b/tests/AuthBucket/OAuth2/Tests/TestBundle/Resources/views/page_bottom.html.twig
@@ -29,7 +29,7 @@
     window.twttr=(function(j,d,i){var h,k,l=j.getElementsByTagName(d)[0];
     if(j.getElementById(i)){return}k=j.createElement(d);
     k.id=i;k.async=1;k.src="https://platform.twitter.com/widgets.js";
-    l.parentNode.insertBefore(k,l);returnwindow.twttr||(h={_e:[],ready:function(a){h._e.push(a)
+    l.parentNode.insertBefore(k,l);return window.twttr||(h={_e:[],ready:function(a){h._e.push(a)
     }})}(document,"script","twitter-wjs"));
 </script>
 

diff --git a/tests/AuthBucket/OAuth2/Tests/TestBundle/Resources/views/scripts.html.twig b/tests/AuthBucket/OAuth2/Tests/TestBundle/Resources/views/scripts.html.twig
@@ -10,4 +10,4 @@
 <script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/8.2/languages/php.min.js"></script>
 <script>hljs.initHighlightingOnLoad();</script>
 <!-- holder.js -->
-<script src="//cdnjs.cloudflare.com/ajax/libs/holder/2.4.0/holder.min.js"></script>
+<script src="//cdnjs.cloudflare.com/ajax/libs/holder/2.3.2/holder.min.js"></script>