chore: fix conflicts

maxakuru · maxakuru · commit d47f04c7153d · 2025-02-20T16:23:10.000-08:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## [1.12.9](https://github.com/adobe-rnd/helix-commerce-api/compare/v1.12.8...v1.12.9) (2025-02-21)
+
+
+### Bug Fixes
+
+* refactor ([#79](https://github.com/adobe-rnd/helix-commerce-api/issues/79)) ([9128220](https://github.com/adobe-rnd/helix-commerce-api/commit/912822009b5574b78e366a1148a55bcb07b60bd0))
+
 ## [1.12.8](https://github.com/adobe-rnd/helix-commerce-api/compare/v1.12.7...v1.12.8) (2025-02-05)
 
 
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "helix-commerce-api",
-  "version": "1.12.8",
+  "version": "1.12.9",
   "private": true,
   "description": "API for markup content and a commerce graphql commerce proxy",
   "main": "src/index.js",
diff --git a/src/types.d.ts b/src/types.d.ts
@@ -204,6 +204,7 @@ declare global {
   export interface Env {
     VERSION: string;
     ENVIRONMENT: string;
+    SUPERUSER_KEY: string;
 
     // KV namespaces
     CONFIGS: KVNamespace<string>;
diff --git a/src/utils/auth.js b/src/utils/auth.js
@@ -29,6 +29,7 @@ export async function assertAuthorization(ctx) {
   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');

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "helix-commerce-api",`
`3`		`- "version": "1.12.8",`
	`3`	`+ "version": "1.12.9",`
`4`	`4`	`"private": true,`
`5`	`5`	`"description": "API for markup content and a commerce graphql commerce proxy",`
`6`	`6`	`"main": "src/index.js",`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@ export async function assertAuthorization(ctx) {`
`29`	`29`	`if (!actual) {`
`30`	`30`	`throw errorWithResponse(403, 'invalid key');`
`31`	`31`	`}`
	`32`	`+`
`32`	`33`	`const expected = await ctx.env.KEYS.get(ctx.config.siteKey);`
`33`	`34`	`if (!expected) {`
`34`	`35`	`throw errorWithResponse(403, 'no key found for site');`