fix: CORS errors with additional headers in local dev (#3379)

Fixes #3378
TBD54566975 · Nov 13, 2024 · 86b4cf0 · 86b4cf0
1 parent b66fe24
commit 86b4cf0
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/backend/controller/timeline/events_ingress.go b/backend/controller/timeline/events_ingress.go
@@ -126,7 +126,7 @@ func (s *Service) insertHTTPIngress(ctx context.Context, querier sql.Querier, in
 		return fmt.Errorf("failed to encrypt ingress payload: %w", err)
 	}
 
-	log.FromContext(ctx).Warnf("Inserting ingress event for %s %s", ingress.RequestKey, ingress.Path)
+	log.FromContext(ctx).Debugf("Inserting ingress event for %s %s", ingress.RequestKey, ingress.Path)
 
 	err = libdal.TranslatePGError(querier.InsertTimelineIngressEvent(ctx, sql.InsertTimelineIngressEventParams{
 		DeploymentKey: ingress.DeploymentKey,

diff --git a/frontend/cli/cmd_serve.go b/frontend/cli/cmd_serve.go
@@ -149,6 +149,11 @@ func (s *serveCmd) run(
 		s.CommonConfig.AllowOrigins = append(s.CommonConfig.AllowOrigins, addr)
 	}
 
+	if devMode && len(s.CommonConfig.AllowHeaders) == 0 {
+		// Default to allowing all headers for console requests in local dev mode.
+		s.CommonConfig.AllowHeaders = []string{"*"}
+	}
+
 	provisionerAddresses := make([]*url.URL, 0, s.Provisioners)
 	for range s.Provisioners {
 		bind, err := bindAllocator.Next()

diff --git a/frontend/console/src/features/verbs/VerbRequestForm.tsx b/frontend/console/src/features/verbs/VerbRequestForm.tsx
@@ -166,7 +166,7 @@ export const VerbRequestForm = ({ module, verb }: { module?: Module; verb?: Verb
     }
   }, [verb, bodyTextKey])
 
-  const bottomText = response ?? error ?? ''
+  const bottomText = response || error || ''
   const schemaString = verb ? JSON.stringify(simpleJsonSchema(verb)) : ''
 
   return (