Merge pull request #174 from ProgrammingLab/gedorinku/hydra_cors

Fix hydra cors settings
ProgrammingLab · Nov 5, 2019 · 3a52846 · 3a52846
2 parents 6d3f05a + 5f95f3a
commit 3a52846
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/.env.ci b/.env.ci
@@ -5,6 +5,7 @@ HYDRA_SALT=youReallyNeedToChangeThis
 OAUTH2_ISSUER_URL=http://localhost:4444
 OAUTH2_CONSENT_URL=http://localhost:8080/oauth/consent
 OAUTH2_LOGIN_URL=http://localhost:8080/oauth/login
+CORS_ALLOWED_ORIGINS=http://127.0.0.1:*,http://localhost:*,https://*.prolab.club,https://prolab.club
 
 # for ridgepole
 DATABASE_URL_RIDGEPOLE=postgresql://postgres:@pg/accounts?sslmode=disable

diff --git a/.env.sample b/.env.sample
@@ -5,6 +5,7 @@ HYDRA_SALT=youReallyNeedToChangeThis
 OAUTH2_ISSUER_URL=http://localhost:4444
 OAUTH2_CONSENT_URL=http://localhost:8080/oauth/consent
 OAUTH2_LOGIN_URL=http://localhost:8080/oauth/login
+CORS_ALLOWED_ORIGINS=http://127.0.0.1:*,http://localhost:*,https://*.prolab.club,https://prolab.club
 
 # for ridgepole
 DATABASE_URL_RIDGEPOLE=postgresql://postgres:@pg/accounts?sslmode=disable

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -58,13 +58,8 @@ services:
       - OAUTH2_SHARE_ERROR_DEBUG=1
       - OIDC_SUBJECT_TYPES_SUPPORTED=public,pairwise
       - OIDC_SUBJECT_TYPE_PAIRWISE_SALT=${HYDRA_SALT}
-#     - OAUTH2_ACCESS_TOKEN_STRATEGY=jwt
-#     Uncomment the following lines when configuring tracing
-#      - TRACING_PROVIDER=jaeger
-#      - TRACING_PROVIDER_JAEGER_SAMPLING_SERVER_URL=http://jaeger:5778/sampling
-#      - TRACING_PROVIDER_JAEGER_LOCAL_AGENT_ADDRESS=jaeger:6831
-#      - TRACING_PROVIDER_JAEGER_SAMPLING_TYPE=const
-#      - TRACING_PROVIDER_JAEGER_SAMPLING_VALUE=1
+      - CORS_ENABLED=true
+      - CORS_ALLOWED_ORIGINS=${CORS_ALLOWED_ORIGINS}
     restart: unless-stopped
 
   pg: