From a77ef9ecf4d99d40b7160aa2665fa1a4db871c10 Mon Sep 17 00:00:00 2001
From: Josh Cummings <josh.cummings@gmail.com>
Date: Wed, 12 Jul 2023 14:24:26 -0600
Subject: [PATCH] Add ClientAuthenticationMethod#toString

Closes gh-13497
---
 ...ractWebClientReactiveOAuth2AccessTokenResponseClient.java | 3 +--
 ...AuthenticationMethodValidatingRequestEntityConverter.java | 2 +-
 .../security/oauth2/core/ClientAuthenticationMethod.java     | 5 +++++
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/endpoint/AbstractWebClientReactiveOAuth2AccessTokenResponseClient.java b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/endpoint/AbstractWebClientReactiveOAuth2AccessTokenResponseClient.java
index 0b2403e897..fff6222bb6 100644
--- a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/endpoint/AbstractWebClientReactiveOAuth2AccessTokenResponseClient.java
+++ b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/endpoint/AbstractWebClientReactiveOAuth2AccessTokenResponseClient.java
@@ -115,8 +115,7 @@ public abstract class AbstractWebClientReactiveOAuth2AccessTokenResponseClient<T
 		if (!supportedClientAuthenticationMethod) {
 			throw new IllegalArgumentException(String.format(
 					"This class supports `client_secret_basic`, `client_secret_post`, and `none` by default. Client [%s] is using [%s] instead. Please use a supported client authentication method, or use `set/addParametersConverter` or `set/addHeadersConverter` to supply an instance that supports [%s].",
-					clientRegistration.getRegistrationId(), clientAuthenticationMethod.getValue(),
-					clientAuthenticationMethod.getValue()));
+					clientRegistration.getRegistrationId(), clientAuthenticationMethod, clientAuthenticationMethod));
 		}
 	}
 
diff --git a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/endpoint/ClientAuthenticationMethodValidatingRequestEntityConverter.java b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/endpoint/ClientAuthenticationMethodValidatingRequestEntityConverter.java
index 0c2537d896..1c6068b08b 100644
--- a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/endpoint/ClientAuthenticationMethodValidatingRequestEntityConverter.java
+++ b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/endpoint/ClientAuthenticationMethodValidatingRequestEntityConverter.java
@@ -41,7 +41,7 @@ class ClientAuthenticationMethodValidatingRequestEntityConverter<T extends Abstr
 				|| clientAuthenticationMethod.equals(ClientAuthenticationMethod.CLIENT_SECRET_POST);
 		Assert.isTrue(supportedClientAuthenticationMethod, () -> String.format(
 				"This class supports `client_secret_basic`, `client_secret_post`, and `none` by default. Client [%s] is using [%s] instead. Please use a supported client authentication method, or use `setRequestEntityConverter` to supply an instance that supports [%s].",
-				registrationId, clientAuthenticationMethod.getValue(), clientAuthenticationMethod.getValue()));
+				registrationId, clientAuthenticationMethod, clientAuthenticationMethod));
 		return this.delegate.convert(grantRequest);
 	}
 
diff --git a/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/ClientAuthenticationMethod.java b/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/ClientAuthenticationMethod.java
index fdb843a1ab..0b986dcc55 100644
--- a/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/ClientAuthenticationMethod.java
+++ b/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/ClientAuthenticationMethod.java
@@ -98,4 +98,9 @@ public final class ClientAuthenticationMethod implements Serializable {
 		return getValue().hashCode();
 	}
 
+	@Override
+	public String toString() {
+		return this.value;
+	}
+
 }