Automatically prefix internal requests and properly set the default domain, version and format in the provider.

Signed-off-by: Jason Lewis <[email protected]>

Author: jasonlewis

src/Dispatcher.php

@@ -131,6 +131,13 @@ class Dispatcher
      */
     protected $vendor;
 
+    /**
+     * API prefix.
+     *
+     * @var string
+     */
+    protected $prefix;
+
     /**
      * Default version.
      *
@@ -438,6 +445,8 @@ protected function createRequest($verb, $uri, $parameters)
     {
         $parameters = array_merge($this->parameters, (array) $parameters);
 
+        $uri = $this->addPrefixToUri($uri);
+
         $request = InternalRequest::create($uri, $verb, $parameters, $this->cookies, $this->uploads, [], $this->content);
 
         $request->headers->set('host', $this->getDomain());
@@ -451,6 +460,28 @@ protected function createRequest($verb, $uri, $parameters)
         return $request;
     }
 
+    /**
+     * Add the prefix to the URI.
+     *
+     * @param string $uri
+     *
+     * @return string
+     */
+    protected function addPrefixToUri($uri)
+    {
+        if (! isset($this->prefix)) {
+            return $uri;
+        }
+
+        $uri = trim($uri, '/');
+
+        if (starts_with($uri, $this->prefix)) {
+            return $uri;
+        }
+
+        return '/'.trim($this->prefix, '/').'/'.$uri;
+    }
+
     /**
      * Build the "Accept" header.
      *
@@ -606,6 +637,18 @@ public function setVendor($vendor)
         $this->vendor = $vendor;
     }
 
+    /**
+     * Set the prefix.
+     *
+     * @param string $prefix
+     *
+     * @return void
+     */
+    public function setPrefix($prefix)
+    {
+        $this->prefix = $prefix;
+    }
+
     /**
      * Set the default version.
      *

src/Provider/ApiServiceProvider.php

@@ -128,7 +128,17 @@ protected function registerExceptionHandler()
     public function registerDispatcher()
     {
         $this->app->singleton('api.dispatcher', function ($app) {
-            return new Dispatcher($app, $app['files'], $app['api.router'], $app['api.auth']);
+            $dispatcher = new Dispatcher($app, $app['files'], $app['api.router'], $app['api.auth']);
+
+            $config = $app['config']['api'];
+
+            $dispatcher->setVendor($config['vendor']);
+            $dispatcher->setPrefix($config['prefix']);
+            $dispatcher->setDefaultVersion($config['version']);
+            $dispatcher->setDefaultDomain($config['domain']);
+            $dispatcher->setDefaultFormat($config['defaultFormat']);
+
+            return $dispatcher;
         });
     }
 

tests/DispatcherTest.php

@@ -94,6 +94,10 @@ public function testInternalRequestWithPrefix()
         });
 
         $this->assertEquals('test', $this->dispatcher->get('baz/test'));
+
+        $this->dispatcher->setPrefix('baz');
+
+        $this->assertEquals('test', $this->dispatcher->get('test'));
     }
 
     public function testInternalRequestWithDomain()
@@ -105,6 +109,10 @@ public function testInternalRequestWithDomain()
         });
 
         $this->assertEquals('test', $this->dispatcher->get('http://foo.bar/test'));
+
+        $this->dispatcher->setDefaultDomain('foo.bar');
+
+        $this->assertEquals('test', $this->dispatcher->get('test'));
     }
 
     /**