Fix theme store connection

app/Config/Cors.php

@@ -68,7 +68,7 @@ class Cors extends BaseConfig
          *
          * @see https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Access-Control-Allow-Headers
          */
-        'allowedHeaders' => ['Content-Type', 'Authorization', 'X-API-Key'],
+        'allowedHeaders' => ['Content-Type', 'Authorization', 'X-API-Key', 'Accept', 'Fetch'],
 
         /**
          * Set headers to expose.
@@ -93,7 +93,7 @@ class Cors extends BaseConfig
          *
          * @see https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Access-Control-Allow-Methods
          */
-        'allowedMethods' => ['GET', 'POST', 'PUT', 'DELETE', 'OPTIONS'],
+        'allowedMethods' => ['GET', 'POST', 'PUT', 'DELETE', 'OPTIONS', 'FETCH'],
 
         /**
          * Set how many seconds the results of a preflight request can be cached.

app/Config/Routes.php

@@ -5,7 +5,9 @@ use CodeIgniter\Router\RouteCollection;
 /**
  * @var RouteCollection $routes
  */
-$routes->get('/', 'Home::index');
+$routes->get('/', static function () {
+    return redirect()->to('/themes');
+});
 $routes->get('/themes', 'ThemeStore::index');
 $routes->post('/themes/upload', 'ThemeStore::upload');
 $routes->get('/themes/preview/(:segment)', 'ThemeStore::preview/$1');
@@ -96,18 +98,20 @@ $routes->group('api/v1', ['namespace' => 'App\Controllers\Api\V1', 'filter' => [
 });
 $routes->get('/themes', 'ThemeStore::index');
 $routes->options('/themes', static function () {
-    header('Access-Control-Allow-Origin: http://localhost:5173');
+    $origin = service('request')->getHeaderLine('Origin') ?: '*';
+    header('Access-Control-Allow-Origin: ' . $origin);
     header('Access-Control-Allow-Methods: GET, OPTIONS');
-    header('Access-Control-Allow-Headers: Content-Type, Accept, Fetch');
+    header('Access-Control-Allow-Headers: Content-Type, Accept');
-    header('Access-Control-Allow-Credentials: true');
+    header('Vary: Origin');
     return response()->setStatusCode(204);
 });
 $routes->post('/themes/upload', 'ThemeStore::upload');
 $routes->options('/themes/upload', static function () {
-    header('Access-Control-Allow-Origin: http://localhost:5173');
+    $origin = service('request')->getHeaderLine('Origin') ?: '*';
+    header('Access-Control-Allow-Origin: ' . $origin);
     header('Access-Control-Allow-Methods: POST, OPTIONS');
-    header('Access-Control-Allow-Headers: Content-Type, Accept, Fetch');
+    header('Access-Control-Allow-Headers: Content-Type, Accept');
-    header('Access-Control-Allow-Credentials: true');
+    header('Vary: Origin');
     return response()->setStatusCode(204);
 });
 $routes->get('/themes/preview/(:segment)', 'ThemeStore::preview/$1');

app/Controllers/ThemeStore.php

@@ -24,8 +24,9 @@ class ThemeStore extends BaseController
         }
 
         if ($this->request->isAJAX() || $this->request->hasHeader('Fetch') || str_contains($this->request->getHeaderLine('Accept'), 'application/json')) {
-            header('Access-Control-Allow-Origin: http://localhost:5173');
+            $origin = $this->request->getHeaderLine('Origin') ?: '*';
-            header('Access-Control-Allow-Credentials: true');
+            header('Access-Control-Allow-Origin: ' . $origin);
+            header('Vary: Origin');
             return $this->response->setJSON($themes);
         }
 
@@ -38,8 +39,9 @@ class ThemeStore extends BaseController
 
     public function upload(): Response
     {
-        header('Access-Control-Allow-Origin: http://localhost:5173');
+        $origin = $this->request->getHeaderLine('Origin') ?: '*';
-        header('Access-Control-Allow-Credentials: true');
+        header('Access-Control-Allow-Origin: ' . $origin);
+        header('Vary: Origin');
 
         $file        = $this->request->getFile('theme_css');
         $displayName = trim($this->request->getPost('display_name') ?? '');