Merge pull request #121 from medizininformatik-initiative/120-using-o…

…auth-authentication-without-oauth-proxy-leads-to-npe-at-plugin-startup FIx NPE on empty OAuth proxy settings
medizininformatik-initiative · Aug 12, 2024 · 9760926 · 9760926
2 parents 7ea6545 + c3a91f3
commit 9760926
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/...edizininformatik_initiative/process/feasibility/client/store/StoreClientSpringConfig.java b/...edizininformatik_initiative/process/feasibility/client/store/StoreClientSpringConfig.java
@@ -57,7 +57,7 @@ public class StoreClientSpringConfig {
     @Value("${de.medizininformatik_initiative.feasibility_dsf_process.client.store.base_url:}")
     private String storeBaseUrl;
 
-    @Value("${de.medizininformatik_initiative.feasibility_dsf_process.client.store.auth.oauth.client.secret:#{null}}")
+    @Value("${de.medizininformatik_initiative.feasibility_dsf_process.client.store.auth.oauth.client.password:#{null}}")
     private String oauthClientSecret;
 
     @Value("${de.medizininformatik_initiative.feasibility_dsf_process.client.store.auth.oauth.client.id:#{null}}")
@@ -101,8 +101,8 @@ IGenericClient client(@Qualifier("store-client") FhirContext fhirContext,
         } else if (!isNullOrEmpty(oauthClientId) && !isNullOrEmpty(oauthClientSecret)
                 && !isNullOrEmpty(oauthTokenUrl)) {
             client.registerInterceptor(new OAuthInterceptor(oauthClientId, oauthClientSecret, oauthTokenUrl,
-                    Optional.of(oauthProxyHost), Optional.of(oauthProxyPort), Optional.of(oauthProxyUsername),
-                    Optional.of(oauthProxyPassword)));
+                    Optional.ofNullable(oauthProxyHost), Optional.ofNullable(oauthProxyPort),
+                    Optional.ofNullable(oauthProxyUsername), Optional.ofNullable(oauthProxyPassword)));
         }
 
         if (basicAuthUsername != null || basicAuthPassword != null) {

diff --git a/pom.xml b/pom.xml
@@ -16,7 +16,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <compileSource>17</compileSource>
         <compileTarget>17</compileTarget>
-        <dsf.version>1.3.1</dsf.version>
+        <dsf.version>1.5.1</dsf.version>
         <hapi.fhir.version>5.1.0</hapi.fhir.version>
         <testcontainers.version>1.19.8</testcontainers.version>
     </properties>