From bd0c31dacf45d534c7507a7dc527f7f38c3ec889 Mon Sep 17 00:00:00 2001 From: David Kral Date: Thu, 12 Jan 2023 13:07:20 +0100 Subject: [PATCH 1/2] Accidentally ramoved updateRequest method returned Signed-off-by: David Kral --- .../providers/oidc/common/OidcConfig.java | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/security/providers/oidc-common/src/main/java/io/helidon/security/providers/oidc/common/OidcConfig.java b/security/providers/oidc-common/src/main/java/io/helidon/security/providers/oidc/common/OidcConfig.java index bf212e11fb5..47ae905d433 100644 --- a/security/providers/oidc-common/src/main/java/io/helidon/security/providers/oidc/common/OidcConfig.java +++ b/security/providers/oidc-common/src/main/java/io/helidon/security/providers/oidc/common/OidcConfig.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, 2022 Oracle and/or its affiliates. + * Copyright (c) 2018, 2023 Oracle and/or its affiliates. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -35,6 +35,7 @@ import io.helidon.common.Errors; import io.helidon.common.LazyValue; import io.helidon.common.configurable.Resource; +import io.helidon.common.http.FormParams; import io.helidon.common.http.Http; import io.helidon.common.http.SetCookie; import io.helidon.common.reactive.Single; @@ -882,6 +883,21 @@ public URI introspectUri() { return defaultTenant.get().introspectUri(); } + /** + * Update request that uses form params with authentication. + * + * @param type type of the request + * @param request request builder + * @param form form params builder + * @deprecated this will be removed without replacement + */ + @Deprecated(since = "2.5.5", forRemoval = true) + public void updateRequest(RequestType type, WebClientRequestBuilder request, FormParams.Builder form) { + if (type == RequestType.CODE_TO_TOKEN && tokenEndpointAuthentication() == ClientAuthentication.CLIENT_SECRET_POST) { + form.add("client_id", clientId()); + form.add("client_secret", clientSecret()); + } + } Supplier webClientBuilderSupplier() { return webClientBuilderSupplier; } From 1721f1cdcd4184191ddda2b4784412167510413f Mon Sep 17 00:00:00 2001 From: David Kral Date: Thu, 12 Jan 2023 13:11:43 +0100 Subject: [PATCH 2/2] space added Signed-off-by: David Kral --- .../io/helidon/security/providers/oidc/common/OidcConfig.java | 1 + 1 file changed, 1 insertion(+) diff --git a/security/providers/oidc-common/src/main/java/io/helidon/security/providers/oidc/common/OidcConfig.java b/security/providers/oidc-common/src/main/java/io/helidon/security/providers/oidc/common/OidcConfig.java index 47ae905d433..7dff62b84f4 100644 --- a/security/providers/oidc-common/src/main/java/io/helidon/security/providers/oidc/common/OidcConfig.java +++ b/security/providers/oidc-common/src/main/java/io/helidon/security/providers/oidc/common/OidcConfig.java @@ -898,6 +898,7 @@ public void updateRequest(RequestType type, WebClientRequestBuilder request, For form.add("client_secret", clientSecret()); } } + Supplier webClientBuilderSupplier() { return webClientBuilderSupplier; }