#271 make cors configurable, default not activated

ahdis · Sep 12, 2024 · 1604f77 · 1604f77
1 parent 263c7a7
commit 1604f77
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/docs/changelog.md b/docs/changelog.md
@@ -1,3 +1,6 @@
+2024/09/ Release 3.9.x
+- Make CORS configurable, default not activated make cors configurable (now activated) [#271](https://github.com/ahdis/matchbox/issues/271)
+
 2024/09/10 Release 3.9.0
 
 - initial support for FML transforms between different FHIR versions (R4, R4B, R5) [#265](https://github.com/ahdis/matchbox/issues/265), set flag xVersion

diff --git a/matchbox-server/src/main/java/ca/uhn/fhir/jpa/starter/common/StarterJpaConfig.java b/matchbox-server/src/main/java/ca/uhn/fhir/jpa/starter/common/StarterJpaConfig.java
@@ -26,6 +26,7 @@
 import ca.uhn.fhir.validation.IValidatorModule;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Primary;
 import org.springframework.core.env.ConfigurableEnvironment;
@@ -218,7 +219,7 @@ IMdmLinkDao mdmLinkDao() {
 
 
 	@Bean
-//	@ConditionalOnProperty(prefix = "hapi.fhir", name = "cors")
+	@ConditionalOnProperty(prefix = "hapi.fhir", name = "cors")
 	public CorsInterceptor corsInterceptor(AppProperties appProperties) {
 		// Define your CORS configuration. This is an example
 		// showing a typical setup. You should customize this