From 3994646309a8354459e443cc2430a996907b85f3 Mon Sep 17 00:00:00 2001
From: Ian <ianwallen@hotmail.com>
Date: Tue, 29 Mar 2022 08:07:15 -0300
Subject: [PATCH 1/2] use toString() instead of cast String or it will fail
 when using Spring configtree

Fix for #10979
---
 .../authentication/ClientIdAndSecretCredentialsProvider.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/adapters/oidc/adapter-core/src/main/java/org/keycloak/adapters/authentication/ClientIdAndSecretCredentialsProvider.java b/adapters/oidc/adapter-core/src/main/java/org/keycloak/adapters/authentication/ClientIdAndSecretCredentialsProvider.java
index 186597c2afde..13ea456618f5 100644
--- a/adapters/oidc/adapter-core/src/main/java/org/keycloak/adapters/authentication/ClientIdAndSecretCredentialsProvider.java
+++ b/adapters/oidc/adapter-core/src/main/java/org/keycloak/adapters/authentication/ClientIdAndSecretCredentialsProvider.java
@@ -45,7 +45,7 @@ public String getId() {
 
     @Override
     public void init(KeycloakDeployment deployment, Object config) {
-        clientSecret = (String) config;
+        clientSecret = config.toString();
     }
 
     @Override

From 85216c1e1d89378833e1e92aa940c7b9b866e943 Mon Sep 17 00:00:00 2001
From: Ian <ianwallen@hotmail.com>
Date: Sun, 15 May 2022 08:01:58 -0300
Subject: [PATCH 2/2] Update ClientIdAndSecretCredentialsProvider.java

Fix potential NPE issue if config was null.
---
 .../authentication/ClientIdAndSecretCredentialsProvider.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/adapters/oidc/adapter-core/src/main/java/org/keycloak/adapters/authentication/ClientIdAndSecretCredentialsProvider.java b/adapters/oidc/adapter-core/src/main/java/org/keycloak/adapters/authentication/ClientIdAndSecretCredentialsProvider.java
index 13ea456618f5..fb78d0c0cb2f 100644
--- a/adapters/oidc/adapter-core/src/main/java/org/keycloak/adapters/authentication/ClientIdAndSecretCredentialsProvider.java
+++ b/adapters/oidc/adapter-core/src/main/java/org/keycloak/adapters/authentication/ClientIdAndSecretCredentialsProvider.java
@@ -45,7 +45,7 @@ public String getId() {
 
     @Override
     public void init(KeycloakDeployment deployment, Object config) {
-        clientSecret = config.toString();
+        clientSecret = (config == null ? null : config.toString());
     }
 
     @Override