fix: various fixes

Author: maxakuru

src/index.js

@@ -23,13 +23,20 @@ async function parseData(req) {
   }
   if (['POST', 'PUT', 'PATCH'].includes(req.method)) {
     const text = await req.text();
-    try {
-      return JSON.parse(text);
-    } catch {
-      return text;
+    if (text.trim().length) {
+      try {
+        return JSON.parse(text);
+      } catch {
+        return text;
+      }
+    }
+
+    const params = new URL(req.url).searchParams;
+    if (params.size) {
+      return Object.fromEntries(params.entries());
     }
   }
-  return null;
+  return {};
 }
 
 /**

src/routes/config/handler.js

@@ -13,6 +13,7 @@
 import { errorResponse } from '../../utils/http.js';
 import { assertAuthorization } from '../../utils/auth.js';
 import { validate } from '../../utils/validation.js';
+import { updateToken } from '../auth/update.js';
 import ConfigSchema from '../../schemas/Config.js';
 
 /**
@@ -46,7 +47,14 @@ export default async function configHandler(ctx) {
   }
 
   // valid, persist it
+  const exists = (await ctx.env.CONFIGS.list({ prefix: ctx.config.siteKey })).keys.length > 0;
   await ctx.env.CONFIGS.put(ctx.config.siteKey, JSON.stringify(json));
+
+  // add key
+  if (!exists) {
+    await updateToken(ctx);
+  }
+
   return new Response(JSON.stringify(json), {
     status: 200,
     headers: {

src/routes/index.js

@@ -13,7 +13,7 @@
 import content from './content/handler.js';
 import catalog from './catalog/handler.js';
 import config from './config/handler.js';
-import { errorResponse } from '../utils/http.js';
+import auth from './auth/handler.js';
 
 /**
  * @type {Record<string, (ctx: Context, request: Request) => Promise<Response>>}
@@ -22,6 +22,5 @@ export default {
   content,
   catalog,
   config,
-  // eslint-disable-next-line no-unused-vars
-  graphql: async (ctx) => errorResponse(501, 'not implemented'),
+  auth,
 };

src/schemas/Config.js

@@ -44,6 +44,7 @@ const ConfigEntry = {
     offerVariantURLTemplate: { type: 'string' },
     liveSearchEnabled: { type: 'boolean' },
     attributeOverrides: AttributeOverrides,
+    catalogSource: { type: 'string', enum: ['helix', 'magento'] },
     imageRoleOrder: {
       type: 'array',
       items: { type: 'string' },

src/types.d.ts

@@ -34,7 +34,7 @@ declare global {
     /**
      * Override "escape hatch" for json-ld
      */
-    jsonld?: any;
+    jsonld?: string;
 
     /**
      * Additional data that can be retrieved via .json API

src/utils/auth.js

@@ -21,15 +21,14 @@ export async function assertAuthorization(ctx) {
     ctx.attributes.key = ctx.info.headers.authorization?.slice('Bearer '.length);
     actual = ctx.attributes.key;
   }
-  if (!actual) {
-    throw errorWithResponse(403, 'invalid key');
-  }
-
   if (actual === ctx.env.SUPERUSER_KEY) {
     ctx.log.info('acting as superuser');
     return;
   }
 
+  if (!actual) {
+    throw errorWithResponse(403, 'invalid key');
+  }
   const expected = await ctx.env.KEYS.get(ctx.config.siteKey);
   if (!expected) {
     throw errorWithResponse(403, 'no key found for site');

src/utils/http.js

@@ -48,7 +48,7 @@ export class ResponseError extends Error {
 
 /**
  * @param {number} status - The HTTP status code.
- * @param {string} xError - The error message.
+ * @param {string} [xError] - The error message.
  * @param {string|Record<string,unknown>} [body=''] - The response body.
  * @returns {Response} - A response object.
  */