Merge pull request #162 from tanmaymishu/feature/dynamic-domain-resol…

…ution Allow host as a fallback domain when using variable domain
davidhsianturi · Jun 13, 2021 · fc027d1 · fc027d1
2 parents 8f3dee1 + 10e84db
commit fc027d1
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 1 deletion.
diff --git a/src/Storage/DatabaseRequestRepository.php b/src/Storage/DatabaseRequestRepository.php
@@ -108,7 +108,9 @@ protected function routeResult(?array $route, ?array $responses)
             $route['description'],
             $route['content'],
             [
-                'domain' => $route['domain'],
+                'domain' => $this->hasVariableFragment($route['domain'])
+                    ? request()->getHost()
+                    : $route['domain'],
                 'methods' => $route['methods'],
                 'uri' => $route['uri'],
                 'name' => $route['name'],
@@ -144,4 +146,17 @@ protected function table($table)
     {
         return DB::connection($this->connection)->table($table);
     }
+
+    /**
+     * Determines if a given domain has any dynamic fragment.
+     *
+     * @param  string|null  $domain
+     * @return bool
+     */
+    private function hasVariableFragment(?string $domain)
+    {
+        return collect(explode('.', $domain))->filter(function ($fragment) {
+            return Str::startsWith($fragment, '{') && Str::endsWith($fragment, '}');
+        })->count() > 0;
+    }
 }
diff --git a/tests/Http/RoutesRequestTest.php b/tests/Http/RoutesRequestTest.php
@@ -3,6 +3,7 @@
 namespace Davidhsianturi\Compass\Tests\Http;
 
 use Davidhsianturi\Compass\Compass;
+use Illuminate\Support\Facades\URL;
 use Davidhsianturi\Compass\Tests\TestCase;
 use Davidhsianturi\Compass\Storage\RouteModel;
 use Illuminate\Foundation\Testing\RefreshDatabase;
@@ -54,6 +55,19 @@ public function test_show_route_request_by_id()
             ->assertExactJson($route);
     }
 
+    public function test_show_route_request_fallbacks_to_host_for_variable_domain()
+    {
+        $host = 'test.tld.test';
+        URL::forceRootUrl('http://'.$host);
+        $this->registerVariableRoute();
+
+        $route = $this->repository->get()->first()->jsonSerialize();
+
+        $this->getJson(route('compass.request.show', $route['id']))
+            ->assertSuccessful()
+            ->assertJsonFragment(['domain' => $host]);
+    }
+
     public function test_store_the_route_request_to_storage()
     {
         $this->registerAppRoutes();

diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -93,4 +93,15 @@ protected function registerAppRoutes()
             });
         });
     }
+
+    protected function registerVariableRoute()
+    {
+        RouteFacade::prefix('api/v1')->group(function () {
+            RouteFacade::group(['domain' => '{account}.tld.test'], function () {
+                RouteFacade::get('/test', function () {
+                    return 'test';
+                })->name('vardomain');
+            });
+        });
+    }
 }