refactored cf-secure-worker-token logic

dilmaheu · Jan 16, 2024 · 0b47f66 · 0b47f66
1 parent f135bd1
commit 0b47f66
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 9 deletions.
diff --git a/src/workers/dilmahtea-me-email/src/index.ts b/src/workers/dilmahtea-me-email/src/index.ts
@@ -9,7 +9,10 @@ declare interface Body {
 }
 
 async function handlePOST(request: Request, env: ENV) {
-  if (request.headers.get("x-secret") !== env.EMAIL_WORKER_SECRET) {
+  if (
+    request.headers.get("x-cf-secure-worker-token") !==
+    env.CF_SECURE_WORKER_TOKEN
+  ) {
     return reply({ success: false, error: "Unauthorized" }, 401);
   }
 

diff --git a/src/workers/dilmahtea-me-email/src/types/env.ts b/src/workers/dilmahtea-me-email/src/types/env.ts
@@ -8,5 +8,5 @@ export interface ENV {
   MAILS: KVNamespace;
 
   // SECRETS
-  EMAIL_WORKER_SECRET: string;
+  CF_SECURE_WORKER_TOKEN: string;
 }
diff --git a/src/workers/dilmahtea-me-email/wrangler.toml b/src/workers/dilmahtea-me-email/wrangler.toml
@@ -13,4 +13,4 @@ services = [{ binding = "RETRY_WORKERS", service = "dilmahtea-me-retry-workers"
 
 # secrets
 # DKIM_PRIVATE_KEY
-# EMAIL_WORKER_SECRET
+# CF_SECURE_WORKER_TOKEN
diff --git a/src/workers/dilmahtea-me-exact-account/src/index.ts b/src/workers/dilmahtea-me-exact-account/src/index.ts
@@ -25,7 +25,10 @@ declare interface Body {
 }
 
 async function handlePOST(request: Request, env: ENV) {
-  if (request.headers.get("x-secret") !== env.EXACT_ACCOUNT_WORKER_SECRET) {
+  if (
+    request.headers.get("x-cf-secure-worker-token") !==
+    env.CF_SECURE_WORKER_TOKEN
+  ) {
     return reply({ success: false, error: "Unauthorized" }, 401);
   }
 

diff --git a/src/workers/dilmahtea-me-exact-account/src/types/env.ts b/src/workers/dilmahtea-me-exact-account/src/types/env.ts
@@ -13,5 +13,5 @@ export interface ENV {
   EXACT_API_ENDPOINT: string;
 
   // EXACT ACCOUNT WORKER
-  EXACT_ACCOUNT_WORKER_SECRET: string;
+  CF_SECURE_WORKER_TOKEN: string;
 }
diff --git a/src/workers/dilmahtea-me-exact-account/wrangler.toml b/src/workers/dilmahtea-me-exact-account/wrangler.toml
@@ -34,4 +34,4 @@ services = [{ binding = "RETRY_WORKERS", service = "dilmahtea-me-retry-workers"
 # secrets
 # DKIM_PRIVATE_KEY
 # EXACT_API_ENDPOINT
-# EXACT_ACCOUNT_WORKER_SECRET
+# CF_SECURE_WORKER_TOKEN
diff --git a/src/workers/dilmahtea-me-stripe-webhook/src/types/env.ts b/src/workers/dilmahtea-me-stripe-webhook/src/types/env.ts
@@ -42,5 +42,5 @@ export interface ENV {
   EXACT_API_ENDPOINT: string;
 
   // EXACT ACCOUNT WORKER
-  EXACT_ACCOUNT_WORKER_SECRET: string;
+  CF_SECURE_WORKER_TOKEN: string;
 }
diff --git a/src/workers/dilmahtea-me-stripe-webhook/src/utils/createExactOrder.ts b/src/workers/dilmahtea-me-stripe-webhook/src/utils/createExactOrder.ts
@@ -53,7 +53,7 @@ export default async function createExactOrder(
       method: "POST",
       headers: {
         "content-type": "application/json",
-        "x-secret": env.EXACT_ACCOUNT_WORKER_SECRET,
+        "x-cf-secure-worker-token": env.CF_SECURE_WORKER_TOKEN,
       },
       body: JSON.stringify(CustomerData),
     },

diff --git a/src/workers/dilmahtea-me-stripe-webhook/wrangler.toml b/src/workers/dilmahtea-me-stripe-webhook/wrangler.toml
@@ -56,4 +56,4 @@ services = [
 # STRIPE_SECRET_KEY
 # STRIPE_SIGNING_SECRET_KEY
 # EXACT_API_ENDPOINT
-# EXACT_ACCOUNT_WORKER_SECRET
+# CF_SECURE_WORKER_TOKEN