support cops_full_url in rest api - see #74

mikespub-org · Feb 26, 2024 · c117955 · c117955
1 parent 7a113bf
commit c117955
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/lib/Output/RestApi.php b/lib/Output/RestApi.php
@@ -131,7 +131,7 @@ public function getOutput($result = null)
             $path = $this->getPathInfo();
             $params = $this->matchPathInfo($path);
             if (!isset($params)) {
-                header('Location: ' . $this->request->script() . '/index');
+                header('Location: ' . Route::url(static::$endpoint) . '/index');
                 exit;
             }
             if ($this->isExtra) {
@@ -281,7 +281,7 @@ public static function getTable($database, $name, $request)
     public static function getOpenApi($request)
     {
         $result = ["openapi" => "3.0.3", "info" => ["title" => "COPS REST API", "version" => Config::VERSION]];
-        $result["servers"] = [["url" => $request->script(), "description" => "COPS REST API Endpoint"]];
+        $result["servers"] = [["url" => Route::url(static::$endpoint), "description" => "COPS REST API Endpoint"]];
         $result["components"] = ["securitySchemes" => ["ApiKeyAuth" => ["type" => "apiKey", "in" => "header", "name" => "X-API-KEY"]]];
         $result["paths"] = [];
         foreach (Route::getRoutes() as $route => $queryParams) {

diff --git a/restapi.php b/restapi.php
@@ -10,6 +10,7 @@
 
 use SebLucas\Cops\Input\Config;
 use SebLucas\Cops\Input\Request;
+use SebLucas\Cops\Input\Route;
 use SebLucas\Cops\Output\Format;
 use SebLucas\Cops\Output\RestApi;
 
@@ -28,7 +29,7 @@
 if (empty($path)) {
     header('Content-Type:text/html;charset=utf-8');
 
-    $data = ['link' => $request->script() . '/openapi'];
+    $data = ['link' => Route::url(Config::ENDPOINT["restapi"]) . '/openapi'];
     $template = __DIR__ . '/templates/restapi.html';
     echo Format::template($data, $template);
     return;