Moved CORS config to env variable

Author: ujjavaldesai07

.env-sample

@@ -11,9 +11,11 @@ DB_PASS=mypass
 REACT_APP_STRIPE_PUBLISH_KEY=pk_test_51H805Oa3n3j3JVXUotWOsdf223PXI2ZehJ0s4QSQK0WjEJer78w87wer8h2u3bo32sTVcxyh5bDuulBildNrp
 REACT_APP_GOOGLE_AUTH_CLIENT_ID=23432543654-m4s23i3dsf72938gubrj32n8932ro9knqudv.apps.googleusercontent.com
 REACT_APP_PORT=3000
-REACT_APP_ENVIRONMENT=<prod/dev>
 
+REACT_CLIENT_URL=http://localhost:3000
+REACT_APP_ENVIRONMENT=<prod/dev>
 ACTIVE_PROFILE=<dev/prod>
+
 REDIS_PASSWORD=mypass
 REDIS_PORT=6379
 

client/.env-sample

@@ -1,12 +1,18 @@
 REACT_APP_STRIPE_PUBLISH_KEY=pk_test_5dsf4534jkmn4nm345QSQK0WjEJKx1PNH3mJxeUkA45345345Vcxyh5bDuulBildNrp3MWn005xEkAdJ4
-REACT_APP_COMMON_DATA_SERVICE_IP=localhost
 REACT_APP_GOOGLE_AUTH_CLIENT_ID=357808142500-sdfsndln4oh5345435.apps.googleusercontent.com
+
+# Add below ports if you are running on your machine
 REACT_APP_AUTHENTICATION_SERVICE_PORT=7000
 REACT_APP_PAYMENT_SERVICE_PORT=9050
 REACT_APP_COMMON_DATA_SERVICE_PORT=9000
 REACT_APP_SEARCH_SUGGESTION_SERVICE_PORT=10000
+REACT_APP_COMMON_DATA_SERVICE_IP=localhost
+
+# Add URL if you dont want to use port.
+# Higher priority is given to URL over PORTs.
 REACT_APP_AUTHENTICATION_SERVICE_URL=<URL of Auth Service>
 REACT_APP_COMMON_DATA_SERVICE_URL=<URL of Common Data Service>
 REACT_APP_PAYMENT_SERVICE_URL=<URL of Payment Service>
 REACT_APP_SEARCH_SUGGESTION_SERVICE_URL=<URL of Search Suggestion Service>
+
 REACT_APP_ENVIRONMENT=<prod/dev>

docker-compose.yml

@@ -17,7 +17,7 @@ services:
       - spring-cloud-microservices
 
   redis-cache:
-    image: redis:latest
+    image: redis:alpine
     container_name: redis-cache-container
     command: redis-server --requirepass ${REDIS_PASSWORD}
     ports:
@@ -73,6 +73,7 @@ services:
       - REDIS_PASSWORD=${REDIS_PASSWORD}
       - REDIS_HOST=redis-cache
       - REDIS_PORT=${REDIS_PORT}
+      - REACT_CLIENT_URL=${REACT_CLIENT_URL}
     links:
       - mysql-db:mysql
     expose:

server/common-data-service/src/main/java/com/ujjaval/ecommerce/commondataservice/CommonDataServiceApplication.java

@@ -12,6 +12,6 @@ public class CommonDataServiceApplication {
 
     public static void main(final String[] args) {
         ConfigurableApplicationContext context = SpringApplication.run(CommonDataServiceApplication.class, args);
-//        context.getBean(CommonDataController.class).fillWithTestData();
+        context.getBean(CommonDataController.class).fillWithTestData();
     }
 }

server/common-data-service/src/main/java/com/ujjaval/ecommerce/commondataservice/config/CorsConfig.java

@@ -11,7 +11,7 @@ public class CorsConfig implements WebMvcConfigurer
 {
     @Override
     public void addCorsMappings(CorsRegistry registry) {
-        registry.addMapping("/**").allowedOrigins("https://shoppers-ecom-app.herokuapp.com")
+        registry.addMapping("/**").allowedOrigins(System.getenv("REACT_CLIENT_URL"))
                 .allowedMethods("GET", "POST");
     }
 }