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 index 21930762..0e3bc7e8 100644 --- 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,7 +168,7 @@ 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()); @@ -175,6 +176,7 @@ public AlaApiKeyClient getAlaApiKeyClient(ApiKeyClient apiKeyClient) { AlaApiKeyAuthenticator authenticator = new AlaApiKeyAuthenticator(); authenticator.setApiKeyClient(apiKeyClient); + authenticator.setUserDetailsClient(userDetailsClient); return new AlaApiKeyClient(credentialsExtractor, authenticator); } diff --git a/gradle.properties b/gradle.properties index 65509926..f0f2dceb 100644 --- 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