Automatically set the domain or prefix on version groups if it's not provided.

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

Author: jasonlewis

src/Provider/ApiServiceProvider.php

@@ -174,7 +174,9 @@ protected function registerRouter()
                 $app['api.router.adapter'],
                 new Http\Parser\Accept($config['vendor'], $config['version'], $config['defaultFormat']),
                 $app['api.exception'],
-                $app
+                $app,
+                $config['domain'],
+                $config['prefix']
             );
         });
 

src/Routing/Router.php

@@ -91,22 +91,40 @@ class Router
      */
     protected $routesDispatched = 0;
 
+    /**
+     * The API domain.
+     *
+     * @var string
+     */
+    protected $domain;
+
+    /**
+     * The API prefix.
+     *
+     * @var string
+     */
+    protected $prefix;
+
     /**
      * Create a new router instance.
      *
      * @param \Dingo\Api\Routing\Adapter\Adapter  $adapter
      * @param \Dingo\Api\Http\Parser\AcceptParser $accept
      * @param \Dingo\Api\Exception\Handler        $exception
      * @param \Illuminate\Container\Container     $container
+     * @param string                              $domain
+     * @param string                              $prefix
      *
      * @return void
      */
-    public function __construct(Adapter $adapter, AcceptParser $accept, Handler $exception, Container $container)
+    public function __construct(Adapter $adapter, AcceptParser $accept, Handler $exception, Container $container, $domain, $prefix)
     {
         $this->adapter = $adapter;
         $this->accept = $accept;
         $this->exception = $exception;
         $this->container = $container;
+        $this->domain = $domain;
+        $this->prefix = $prefix;
     }
 
     /**
@@ -158,6 +176,14 @@ public function group(array $attributes, $callback)
             $attributes['version'] = (array) $attributes['version'];
         }
 
+        if ((! isset($attributes['prefix']) || empty($attributes['prefix'])) && isset($this->prefix)) {
+            $attributes['prefix'] = $this->prefix;
+        }
+
+        if ((! isset($attributes['domain']) || empty($attributes['domain'])) && isset($this->domain)) {
+            $attributes['domain'] = $this->domain;
+        }
+
         $this->groupStack[] = $attributes;
 
         call_user_func($callback, $this);

tests/DispatcherTest.php

@@ -28,7 +28,7 @@ public function setUp()
 
         $this->adapter = new RoutingAdapterStub;
         $this->exception = m::mock('Dingo\Api\Exception\Handler');
-        $this->router = new Router($this->adapter, new Http\Parser\Accept('api', 'v1', 'json'), $this->exception, $this->container);
+        $this->router = new Router($this->adapter, new Http\Parser\Accept('api', 'v1', 'json'), $this->exception, $this->container, null, null);
 
         $this->auth = new Auth($this->router, $this->container, []);
         $this->dispatcher = new Dispatcher($this->container, new Filesystem, $this->router, $this->auth);

tests/Routing/Adapter/BaseAdapterTest.php

@@ -24,7 +24,7 @@ public function setUp()
 
         $this->adapter = new $class(new IlluminateRouter(new Dispatcher($this->container), $this->container));
         $this->exception = m::mock('Dingo\Api\Exception\Handler');
-        $this->router = new Router($this->adapter, new Http\Parser\Accept('api', 'v1', 'json'), $this->exception, $this->container);
+        $this->router = new Router($this->adapter, new Http\Parser\Accept('api', 'v1', 'json'), $this->exception, $this->container, null, null);
 
         Http\Response::setFormatters(['json' => new Http\Response\Format\Json]);
     }