Add config support for frontend origin

sigpwny · Jun 18, 2024 · 508cc18 · 508cc18
1 parent ab5b166
commit 508cc18
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/server/app.js b/server/app.js
@@ -50,9 +50,11 @@ app.register(helmet, {
   }
 })
 
-app.register(cors, {
-  origin: "https://uiuctf-2024-rctf-frontend.pages.dev"
-})
+if (config.originFrontend) {
+  app.register(cors, {
+    origin: config.originFrontend
+  })
+}
 
 uploadProviderInit(app)
 

diff --git a/server/config/server.ts b/server/config/server.ts
@@ -39,6 +39,7 @@ export type ServerConfig = {
   instanceType: string;
   tokenKey: string;
   origin: string;
+  originFrontend?: string;
 
   // TODO: enforce `trust` is false when `cloudflare` is true
   proxy: {

diff --git a/server/email/index.ts b/server/email/index.ts
@@ -30,7 +30,7 @@ if (emailConfig) {
     const emailView = {
       ctf_name: config.ctfName,
       logo_url: config.logoUrl,
-      origin: config.origin,
+      origin: config.originFrontend ?? config.origin,
       token: encodeURIComponent(token),
       register: kind === 'register',
       recover: kind === 'recover',