Enables the well-known smart-configuration even if OAuth is not enabed

elimuinformatics · May 7, 2024 · 9bc3af6 · 9bc3af6
1 parent b9fad53
commit 9bc3af6
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/main/java/ca/uhn/fhir/jpa/starter/common/StarterJpaConfig.java b/src/main/java/ca/uhn/fhir/jpa/starter/common/StarterJpaConfig.java
@@ -453,19 +453,21 @@ public RestfulServer restfulServer(
 			fhirServer.registerProviders(partitionManagementProvider);
 		}
 
-		// Support for OAuth2 and API_KEY authentication
+		// Support for OAuth 2.0 authentication
 		if (appProperties.getOauth().getEnabled()) {
 			fhirServer.registerInterceptor(new CapabilityStatementCustomizer(appProperties));
 			fhirServer.registerInterceptor(new CustomAuthorizationInterceptor(appProperties));
 			fhirServer.registerInterceptor(new CustomSearchNarrowingInterceptor(appProperties));
-			fhirServer.registerInterceptor(new SmartWellKnownInterceptor(appProperties));
 			FhirVersionEnum fhirVersion = fhirServer.getFhirContext().getVersion().getVersion();
 			if (fhirVersion != FhirVersionEnum.R5) {
 				// Utilize the consent interceptor to simulate a patient compartment for the Task resource
 				fhirServer.registerInterceptor(new ConsentInterceptor(new CustomConsentService(daoRegistry, appProperties)));
 			}
 		}
 
+		// Support for SMART on FHIR launchers
+		fhirServer.registerInterceptor(new SmartWellKnownInterceptor(appProperties));
+
 		repositoryValidatingInterceptor.ifPresent(fhirServer::registerInterceptor);
 
 		// register custom interceptors