From 9e2e22f168d3f773e3f811f9604acba607430179 Mon Sep 17 00:00:00 2001
From: Will Freeman <hohosanta@me.com>
Date: Mon, 2 Feb 2026 11:21:06 -0700
Subject: [PATCH] fix cors

---
 .github/workflows/deflock-api-deploy.yml |  2 +-
 api/server.ts                            | 22 +++++++++++++++-------
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/deflock-api-deploy.yml b/.github/workflows/deflock-api-deploy.yml
index 99f6d73..5d6a321 100644
--- a/.github/workflows/deflock-api-deploy.yml
+++ b/.github/workflows/deflock-api-deploy.yml
@@ -2,7 +2,7 @@ name: DeFlock API Deploy
 
 on:
   push:
-    branches: [master]
+    branches: [ts-backend]
 
 jobs:
   deploy:
diff --git a/api/server.ts b/api/server.ts
index c4df6f4..dc142de 100644
--- a/api/server.ts
+++ b/api/server.ts
@@ -36,13 +36,21 @@ const start = async () => {
 
   // Coors Light Config
   await server.register(cors, {
-    origin: [
-      'http://localhost:5173', // vite dev server
-      'https://deflock.me',
-      'https://www.deflock.me',
-      'https://deflock.org', // will migrate
-      'https://www.deflock.org', // will migrate
-    ],
+    origin: (origin, cb) => {
+      const allowedOrigins = [
+        'http://localhost:5173', // vite dev server
+        'https://deflock.me',
+        'https://www.deflock.me',
+        'https://deflock.org', // will migrate
+        'https://www.deflock.org', // will migrate
+      ];
+      
+      if (!origin || allowedOrigins.includes(origin) || /^https:\/\/.*\.deflock\.pages\.dev$/.test(origin)) {
+        cb(null, true);
+      } else {
+        cb(null, false);
+      }
+    },
     methods: ['GET', 'HEAD'],
   });