From 392315281edbd56ea1793ea618bfeed6e4b0fea0 Mon Sep 17 00:00:00 2001
From: Aaron Louie <ajlouie@gmail.com>
Date: Mon, 25 May 2020 15:26:46 -0400
Subject: [PATCH] Adds CORS setting to backend and pb.

---
 .travis.yml               | 2 +-
 docker/docker-compose.yml | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 94f1375..1c52ec4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,7 +34,7 @@ env:
     - API_URL=http://localhost:5000/v1.0
     - BASE_HREF=/
     - HOME_ROUTE=home
-    - IRB_URL=http://localhost:5001
+    - IRB_URL=http://localhost:5001/
     - PORT0=4200
     - PRODUCTION=false
 script:
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index d74c6fd..370c1d2 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -27,6 +27,7 @@ services:
       - DB_NAME=pb_test
       - PORT0=5001
       - APPLICATION_ROOT=/
+      - CORS_ALLOW_ORIGINS=localhost:5000,backend:5000
     ports:
       - "5001:5001"
     command: ./wait-for-it.sh db:5432 -t 0 -- ./docker_run.sh
@@ -48,7 +49,7 @@ services:
       - UPGRADE_DB=true
       - RESET_DB=true
       - LDAP_URL=ldap
-      - PB_BASE_URL=http://pb:5001/v2.0/
+      - PB_BASE_URL=http://localhost:5001/v2.0/
       - DB_HOST=db
       - DB_PORT=5432
       - DB_PASSWORD=crc_pass
@@ -56,6 +57,7 @@ services:
       - DB_NAME=crc_test
       - PORT0=5000
       - APPLICATION_ROOT=/
+      - CORS_ALLOW_ORIGINS=localhost:5002,bpmn:5002,localhost:4200,frontend:4200
     ports:
       - "5000:5000"
     command: ./wait-for-it.sh pb:5001 -t 0 -- ./docker_run.sh
@@ -73,7 +75,7 @@ services:
 #      - API_URL=http://localhost:5000/v1.0
 #      - BASE_HREF=/bpmn
 #      - HOME_ROUTE=home
-#      - IRB_URL=http://localhost:5001
+#      - IRB_URL=http://localhost:5001/
 #      - PORT0=5002
 #      - PRODUCTION=false
 #    ports: