Merge pull request #22 from voidreamer/staging

feat: add custom domain support for CORS

Author: voidreamer

.github/workflows/ci-cd.yml

@@ -160,6 +160,7 @@ jobs:
           TF_VAR_ses_email: ${{ secrets.SES_EMAIL }}
           TF_VAR_supabase_url: ${{ secrets.SUPABASE_URL }}
           TF_VAR_supabase_jwt_secret: ${{ secrets.SUPABASE_JWT_SECRET }}
+          TF_VAR_domain_name: ${{ secrets.DOMAIN_NAME }}
           TF_VAR_environment: staging
         run: terraform plan -out=tfplan
 
@@ -169,6 +170,7 @@ jobs:
           TF_VAR_ses_email: ${{ secrets.SES_EMAIL }}
           TF_VAR_supabase_url: ${{ secrets.SUPABASE_URL }}
           TF_VAR_supabase_jwt_secret: ${{ secrets.SUPABASE_JWT_SECRET }}
+          TF_VAR_domain_name: ${{ secrets.DOMAIN_NAME }}
           TF_VAR_environment: staging
         run: terraform apply -auto-approve tfplan
 
@@ -277,6 +279,7 @@ jobs:
           TF_VAR_ses_email: ${{ secrets.SES_EMAIL }}
           TF_VAR_supabase_url: ${{ secrets.SUPABASE_URL }}
           TF_VAR_supabase_jwt_secret: ${{ secrets.SUPABASE_JWT_SECRET }}
+          TF_VAR_domain_name: ${{ secrets.DOMAIN_NAME }}
           TF_VAR_environment: prod
         run: terraform plan -out=tfplan
 
@@ -286,6 +289,7 @@ jobs:
           TF_VAR_ses_email: ${{ secrets.SES_EMAIL }}
           TF_VAR_supabase_url: ${{ secrets.SUPABASE_URL }}
           TF_VAR_supabase_jwt_secret: ${{ secrets.SUPABASE_JWT_SECRET }}
+          TF_VAR_domain_name: ${{ secrets.DOMAIN_NAME }}
           TF_VAR_environment: prod
         run: terraform apply -auto-approve tfplan
 

backend/app/main.py

@@ -46,6 +46,10 @@ async def lifespan(app: FastAPI):
 if settings.FRONTEND_URL:
     origins.append(settings.FRONTEND_URL)
 
+# Add CloudFront URL if using custom domain (both need to work)
+if settings.CLOUDFRONT_URL and settings.CLOUDFRONT_URL not in origins:
+    origins.append(settings.CLOUDFRONT_URL)
+
 app.add_middleware(
     CORSMiddleware,
     allow_origins=origins,

backend/app/utils/config.py

@@ -34,6 +34,7 @@ class Settings(BaseSettings):
 
     # Frontend
     FRONTEND_URL: str = "http://localhost:5173"
+    CLOUDFRONT_URL: str = ""  # CloudFront URL when using custom domain
 
     class Config:
         env_file = ".env"

terraform/lambda.tf

@@ -134,7 +134,8 @@ resource "aws_lambda_function" "api" {
       SUPABASE_URL         = var.supabase_url
       SUPABASE_JWT_SECRET  = var.supabase_jwt_secret
       SES_EMAIL            = var.ses_email
-      FRONTEND_URL         = "https://${aws_cloudfront_distribution.frontend.domain_name}"
+      FRONTEND_URL         = var.domain_name != "" ? "https://${var.domain_name}" : "https://${aws_cloudfront_distribution.frontend.domain_name}"
+      CLOUDFRONT_URL       = "https://${aws_cloudfront_distribution.frontend.domain_name}"
     }
   }
 
@@ -168,11 +169,14 @@ resource "aws_apigatewayv2_api" "main" {
     allow_credentials = true
     allow_headers     = ["Content-Type", "Authorization", "X-Amz-Date", "X-Api-Key"]
     allow_methods     = ["GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS"]
-    allow_origins     = [
-      "http://localhost:3000",
-      "http://localhost:5173",
-      "https://${aws_cloudfront_distribution.frontend.domain_name}"
-    ]
+    allow_origins     = concat(
+      [
+        "http://localhost:3000",
+        "http://localhost:5173",
+        "https://${aws_cloudfront_distribution.frontend.domain_name}"
+      ],
+      var.domain_name != "" ? ["https://${var.domain_name}"] : []
+    )
     expose_headers    = ["*"]
     max_age           = 3600
   }

terraform/main.tf

@@ -224,11 +224,14 @@ resource "aws_s3_bucket_cors_configuration" "attachments" {
   cors_rule {
     allowed_headers = ["*"]
     allowed_methods = ["GET", "PUT", "POST", "DELETE"]
-    allowed_origins = [
-      "http://localhost:3000",
-      "http://localhost:5173",
-      "https://${aws_cloudfront_distribution.frontend.domain_name}"
-    ]
+    allowed_origins = concat(
+      [
+        "http://localhost:3000",
+        "http://localhost:5173",
+        "https://${aws_cloudfront_distribution.frontend.domain_name}"
+      ],
+      var.domain_name != "" ? ["https://${var.domain_name}"] : []
+    )
     expose_headers  = ["ETag"]
     max_age_seconds = 3000
   }