Revize 59cbe6ba

re #33: modify backend app to load configuration from environment variables; locally loaded by docker-compose from .env file

.gitignore

@@ -1 +1 @@
 .idea
 *.iml
+.env

docker-compose.yml

@@ -15 +15 @@
     image: danekja/ymanager
     build: ./server/
     restart: always
+    environment:
+      - JDBC_URL
+      - JDBC_USERNAME
+      - JDBC_PASSWORD
+      - JDBC_DRIVER
+      - OAUTH2_GOOGLE_CLIENT_ID
+      - OAUTH2_GOOGLE_CLIENT_SECRET
+      - OAUTH2_GOOGLE_ALLOWED_DOMAINS
+      - CORS_ALLOWED_ORIGINS
     ports:
       - 9080:8080
       - 6005:5005

example.env

@@ +1 @@
+JDBC_URL=jdbc:mariadb://db:3306/yamanager
+JDBC_USERNAME=user
+JDBC_PASSWORD=passwd
+JDBC_DRIVER=org.mariadb.jdbc.Driver
+
+OAUTH2_GOOGLE_CLIENT_ID=
+OAUTH2_GOOGLE_CLIENT_SECRET=
+OAUTH2_GOOGLE_ALLOWED_DOMAINS=
+
+CORS_ALLOWED_ORIGINS=http://localhost

server/src/main/java/org/danekja/ymanager/RESTConfiguration.java

@@ -9 +9 @@
 import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
 import com.fasterxml.jackson.databind.module.SimpleModule;
 import com.fasterxml.jackson.databind.ser.std.StdSerializer;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.CorsRegistry;
@@ -22 +23 @@
 
 @Configuration
 public class RESTConfiguration implements WebMvcConfigurer {
+    @Value("${ymanager.cors.allowed-origins}")
+    private String corsAllowedOrigins;
 
     @Override
     public void addCorsMappings(CorsRegistry registry) {
         registry.addMapping("/**")
-                .allowedOrigins("http://localhost") //TODO replace with env variable
+                .allowedOrigins(corsAllowedOrigins)
                 .allowedMethods("GET", "POST", "PUT", "DELETE")
                 .allowCredentials(true);
     }

server/src/main/resources/application.properties

@@ -1 +1 @@
 server.servlet.context-path=/api
-spring.datasource.url=jdbc:mariadb://db:3306/yamanager
-spring.datasource.username=user
-spring.datasource.password=passwd
-spring.datasource.driver-class-name=org.mariadb.jdbc.Driver
+
+spring.datasource.url=${JDBC_URL}
+spring.datasource.username=${JDBC_USERNAME}
+spring.datasource.password=${JDBC_PASSWORD}
+spring.datasource.driver-class-name=${JDBC_DRIVER}
+
 #populate these from your google oauth2 setup
 #https://www.baeldung.com/spring-security-5-oauth2-login
-#spring.security.oauth2.client.registration.google.client-id=<client id value here>
-#spring.security.oauth2.client.registration.google.client-secret=<secret here>
+spring.security.oauth2.client.registration.google.client-id=${OAUTH2_GOOGLE_CLIENT_ID}
+spring.security.oauth2.client.registration.google.client-secret=${OAUTH2_GOOGLE_CLIENT_SECRET}
+
 #comma-separated list of allowed domains, leave empty for all
-#ymanager.oauth2.client.google.allowed-domains=domain.com,domain2.com
+ymanager.oauth2.client.google.allowed-domains=${OAUTH2_GOOGLE_ALLOWED_DOMAINS}
+
+#comma-separated list of allowed origins, use asterisk for all
+ymanager.cors.allowed-origins=${CORS_ALLOWED_ORIGINS}