From b0bf668a0472d050916160d4b06c013a46db6997 Mon Sep 17 00:00:00 2001 From: Simon Bear Date: Thu, 1 Jun 2023 14:07:29 +1000 Subject: [PATCH 1/3] Increment version for next development iteration --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 65509926..d31329fb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -projectVersion=6.0.2 +projectVersion=6.1.0-SNAPSHOT org.gradle.daemon=true org.gradle.parallel=true From f941df0009b006e20b1ad1b6d493a9a8169da6b0 Mon Sep 17 00:00:00 2001 From: adam-collins Date: Mon, 5 Jun 2023 13:32:31 +1000 Subject: [PATCH 2/3] Fix getAlaApiKeyClient bean initialization (#26) Co-authored-by: Adam Collins --- .../au/org/ala/ws/security/AlaWsSecurityConfiguration.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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); } From 1f0b1ec812c68c5de6b791634c2b97cf3f3b4d8e Mon Sep 17 00:00:00 2001 From: Simon Bear Date: Mon, 5 Jun 2023 13:38:10 +1000 Subject: [PATCH 3/3] Release 6.0.3 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index d31329fb..f0f2dceb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -projectVersion=6.1.0-SNAPSHOT +projectVersion=6.0.3 org.gradle.daemon=true org.gradle.parallel=true