Skip to content

Commit 8a066a8

Browse files
authored
fix: CORS errors when sending tracked headers other than Flagsmith-SDK-User-Agent (#6017)
1 parent b07d231 commit 8a066a8

1 file changed

Lines changed: 15 additions & 8 deletions

File tree

api/app/settings/common.py

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828

2929
from app.routers import ReplicaReadStrategy
3030
from app.utils import get_numbered_env_vars_with_prefix
31+
from app_analytics.constants import TRACK_HEADERS
3132
from environments.enums import EnvironmentDocumentCacheMode
3233

3334
django_stubs_ext.monkeypatch()
@@ -1189,20 +1190,26 @@
11891190
CORS_ORIGIN_ALLOW_ALL = env.bool("CORS_ORIGIN_ALLOW_ALL", not COOKIE_AUTH_ENABLED)
11901191
CORS_ALLOW_CREDENTIALS = env.bool("CORS_ALLOW_CREDENTIALS", COOKIE_AUTH_ENABLED)
11911192
FLAGSMITH_CORS_EXTRA_ALLOW_HEADERS = env.list(
1192-
"FLAGSMITH_CORS_EXTRA_ALLOW_HEADERS", default=["sentry-trace"]
1193+
"FLAGSMITH_CORS_EXTRA_ALLOW_HEADERS",
1194+
default=["sentry-trace"],
11931195
)
11941196
CORS_ALLOWED_ORIGINS = env.list(
11951197
"CORS_ALLOWED_ORIGINS",
11961198
subcast=str,
11971199
default=[],
11981200
)
1199-
CORS_ALLOW_HEADERS = [
1200-
*default_headers,
1201-
*FLAGSMITH_CORS_EXTRA_ALLOW_HEADERS,
1202-
"X-Environment-Key",
1203-
"X-E2E-Test-Auth-Token",
1204-
"Flagsmith-SDK-User-Agent",
1205-
]
1201+
CORS_ALLOW_HEADERS = list(
1202+
set(
1203+
header.casefold()
1204+
for header in (
1205+
*default_headers,
1206+
*FLAGSMITH_CORS_EXTRA_ALLOW_HEADERS,
1207+
"X-Environment-Key",
1208+
"X-E2E-Test-Auth-Token",
1209+
*TRACK_HEADERS,
1210+
)
1211+
)
1212+
)
12061213

12071214
# Hubspot settings
12081215
HUBSPOT_ACCESS_TOKEN = env.str("HUBSPOT_ACCESS_TOKEN", None)

0 commit comments

Comments
 (0)