Merge pull request #153 from hans-thomas/151-urls-for-try-it-feature

Fix incorrect URLs generated for "Try it" feature
RonasIT · Jan 22, 2025 · ea0c5b5 · ea0c5b5
2 parents 5add876 + 4bc635f
commit ea0c5b5
Showing 11 changed files with 12 additions and 18 deletions.
diff --git a/src/Services/SwaggerService.php b/src/Services/SwaggerService.php
@@ -6,6 +6,7 @@
 use Illuminate\Http\Request;
 use Illuminate\Http\Testing\File;
 use Illuminate\Support\Arr;
+use Illuminate\Support\Facades\URL;
 use Illuminate\Support\Str;
 use ReflectionClass;
 use RonasIT\AutoDoc\Exceptions\DocFileNotExistsException;
@@ -140,7 +141,7 @@ protected function generateEmptyData(): array
         $data = [
             'openapi' => self::OPEN_API_VERSION,
             'servers' => [
-                ['url' => $this->getAppUrl() . $this->config['basePath']],
+                ['url' => URL::query($this->config['basePath'])],
             ],
             'paths' => [],
             'components' => [
@@ -158,13 +159,6 @@ protected function generateEmptyData(): array
         return $data;
     }
 
-    protected function getAppUrl(): string
-    {
-        $url = config('app.url');
-
-        return str_replace(['http://', 'https://', '/'], '', $url);
-    }
-
     protected function generateSecurityDefinition(): ?array
     {
         if (empty($this->security)) {

diff --git a/tests/fixtures/SwaggerServiceTest/tmp_data_get_route_parameters_description.json b/tests/fixtures/SwaggerServiceTest/tmp_data_get_route_parameters_description.json
@@ -2,7 +2,7 @@
     "openapi": "3.1.0",
     "servers": [
         {
-            "url": "localhost/"
+            "url": "http://localhost"
         }
     ],
     "paths": {

diff --git a/tests/fixtures/SwaggerServiceTest/tmp_data_request_with_empty_data_and_info.json b/tests/fixtures/SwaggerServiceTest/tmp_data_request_with_empty_data_and_info.json
@@ -2,7 +2,7 @@
     "openapi": "3.1.0",
     "servers": [
         {
-            "url": "localhost/"
+            "url": "http://localhost"
         }
     ],
     "paths": [],

diff --git a/tests/fixtures/SwaggerServiceTest/tmp_data_request_with_empty_data_jwt.json b/tests/fixtures/SwaggerServiceTest/tmp_data_request_with_empty_data_jwt.json
@@ -2,7 +2,7 @@
     "openapi": "3.1.0",
     "servers": [
         {
-            "url": "localhost/"
+            "url": "http://localhost"
         }
     ],
     "paths": [],

diff --git a/tests/fixtures/SwaggerServiceTest/tmp_data_request_with_empty_data_laravel.json b/tests/fixtures/SwaggerServiceTest/tmp_data_request_with_empty_data_laravel.json
@@ -2,7 +2,7 @@
     "openapi": "3.1.0",
     "servers": [
         {
-            "url": "localhost/"
+            "url": "http://localhost"
         }
     ],
     "paths": [],

diff --git a/tests/fixtures/SwaggerServiceTest/tmp_data_request_with_empty_data_query.json b/tests/fixtures/SwaggerServiceTest/tmp_data_request_with_empty_data_query.json
@@ -2,7 +2,7 @@
     "openapi": "3.1.0",
     "servers": [
         {
-            "url": "localhost/"
+            "url": "http://localhost"
         }
     ],
     "paths": [],

diff --git a/tests/fixtures/SwaggerServiceTest/tmp_data_search_roles_closure_request.json b/tests/fixtures/SwaggerServiceTest/tmp_data_search_roles_closure_request.json
@@ -2,7 +2,7 @@
     "openapi": "3.1.0",
     "servers": [
         {
-            "url": "localhost/"
+            "url": "http://localhost"
         }
     ],
     "paths": {

diff --git a/tests/fixtures/SwaggerServiceTest/tmp_data_search_roles_request.json b/tests/fixtures/SwaggerServiceTest/tmp_data_search_roles_request.json
@@ -2,7 +2,7 @@
     "openapi": "3.1.0",
     "servers": [
         {
-            "url": "localhost/"
+            "url": "http://localhost"
         }
     ],
     "paths": {

diff --git a/tests/fixtures/SwaggerServiceTest/tmp_data_search_roles_request_jwt_security.json b/tests/fixtures/SwaggerServiceTest/tmp_data_search_roles_request_jwt_security.json
@@ -2,7 +2,7 @@
     "openapi": "3.1.0",
     "servers": [
         {
-            "url": "localhost/"
+            "url": "http://localhost"
         }
     ],
     "paths": {

diff --git a/tests/fixtures/SwaggerServiceTest/tmp_data_search_roles_request_laravel_security.json b/tests/fixtures/SwaggerServiceTest/tmp_data_search_roles_request_laravel_security.json
@@ -2,7 +2,7 @@
     "openapi": "3.1.0",
     "servers": [
         {
-            "url": "localhost/"
+            "url": "http://localhost"
         }
     ],
     "paths": {

diff --git a/tests/fixtures/SwaggerServiceTest/tmp_data_search_roles_request_query_security.json b/tests/fixtures/SwaggerServiceTest/tmp_data_search_roles_request_query_security.json
@@ -2,7 +2,7 @@
     "openapi": "3.1.0",
     "servers": [
         {
-            "url": "localhost/"
+            "url": "http://localhost"
         }
     ],
     "paths": {