Merge branch 'release/6.0.3'

AtlasOfLivingAustralia · Jun 5, 2023 · 463d3bc · 463d3bc
2 parents 6c95e2c + 1f0b1ec
commit 463d3bc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/ala-ws-security/src/main/java/au/org/ala/ws/security/AlaWsSecurityConfiguration.java b/ala-ws-security/src/main/java/au/org/ala/ws/security/AlaWsSecurityConfiguration.java
@@ -1,5 +1,6 @@
 package au.org.ala.ws.security;
 
+import au.org.ala.userdetails.UserDetailsClient;
 import au.org.ala.ws.security.authenticator.AlaApiKeyAuthenticator;
 import au.org.ala.ws.security.authenticator.AlaIpWhitelistAuthenticator;
 import au.org.ala.ws.security.authenticator.AlaOidcAuthenticator;
@@ -167,14 +168,15 @@ public AlaOidcClient getAlaOidcClient(OidcConfiguration oidcConfiguration, JWKSo
     @Bean
     @ConditionalOnMissingBean
     @ConditionalOnProperty(prefix = "security.apikey", name = "enabled")
-    public AlaApiKeyClient getAlaApiKeyClient(ApiKeyClient apiKeyClient) {
+    public AlaApiKeyClient getAlaApiKeyClient(ApiKeyClient apiKeyClient, UserDetailsClient userDetailsClient) {
 
         AlaApiKeyCredentialsExtractor credentialsExtractor = new AlaApiKeyCredentialsExtractor();
         credentialsExtractor.setHeaderName(apiKeyProperties.getHeader().getOverride());
         credentialsExtractor.setAlternativeHeaderNames(apiKeyProperties.getHeader().getAlternatives());
 
         AlaApiKeyAuthenticator authenticator = new AlaApiKeyAuthenticator();
         authenticator.setApiKeyClient(apiKeyClient);
+        authenticator.setUserDetailsClient(userDetailsClient);
 
         return new AlaApiKeyClient(credentialsExtractor, authenticator);
     }

diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-projectVersion=6.0.2
+projectVersion=6.0.3
 
 org.gradle.daemon=true
 org.gradle.parallel=true