Remove Google provider's override of exchangeExternalImpl to allow ex… #38450
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rmartinc
suggested changes
Mar 26, 2025
There was a problem hiding this comment.
@sguilhen I needed to do more changes to can exchange a ID token issued by google. I have this in a stash:
diff --git a/services/src/main/java/org/keycloak/broker/oidc/OIDCIdentityProvider.java b/services/src/main/java/org/keycloak/broker/oidc/OIDCIdentityProvider.java
index 9509bf54fd..b1dce686e2 100755
--- a/services/src/main/java/org/keycloak/broker/oidc/OIDCIdentityProvider.java
+++ b/services/src/main/java/org/keycloak/broker/oidc/OIDCIdentityProvider.java
@@ -894,11 +894,13 @@ public class OIDCIdentityProvider extends AbstractOAuth2IdentityProvider<OIDCIde
}
protected boolean isTokenTypeSupported(JsonWebToken parsedToken) {
- return SUPPORTED_TOKEN_TYPES.contains(parsedToken.getType());
+ return true; //SUPPORTED_TOKEN_TYPES.contains(parsedToken.getType());
}
diff --git a/services/src/main/java/org/keycloak/social/google/GoogleIdentityProvider.java b/services/src/main/java/org/keycloak/social/google/GoogleIdentityProvider.java
index 9ef583b696..4342e7d506 100755
--- a/services/src/main/java/org/keycloak/social/google/GoogleIdentityProvider.java
+++ b/services/src/main/java/org/keycloak/social/google/GoogleIdentityProvider.java
@@ -41,6 +41,7 @@ public class GoogleIdentityProvider extends OIDCIdentityProvider implements Soci
public static final String AUTH_URL = "https://accounts.google.com/o/oauth2/v2/auth";
public static final String TOKEN_URL = "https://oauth2.googleapis.com/token";
public static final String PROFILE_URL = "https://openidconnect.googleapis.com/v1/userinfo";
+ public static final String JWKS_URL = "https://www.googleapis.com/oauth2/v3/certs";
public static final String DEFAULT_SCOPE = "openid profile email";
private static final String OIDC_PARAMETER_HOSTED_DOMAINS = "hd";
@@ -52,6 +53,7 @@ public class GoogleIdentityProvider extends OIDCIdentityProvider implements Soci
config.setAuthorizationUrl(AUTH_URL);
config.setTokenUrl(TOKEN_URL);
config.setUserInfoUrl(PROFILE_URL);
+ config.setJwksUrl(JWKS_URL);
}
@Override
@@ -86,10 +88,10 @@ public class GoogleIdentityProvider extends OIDCIdentityProvider implements Soci
}
- @Override
- protected BrokeredIdentityContext exchangeExternalImpl(EventBuilder event, MultivaluedMap<String, String> params) {
- return exchangeExternalUserInfoValidationOnly(event, params);
- }
+ //@Override
+ //protected BrokeredIdentityContext exchangeExternalImpl(EventBuilder event, MultivaluedMap<String, String> params) {
+ // return exchangeExternalUserInfoValidationOnly(event, params);
+ //}
@Override
protected UriBuilder createAuthorizationUrl(AuthenticationRequest request) {You can try to make a test although socials are a pain. 😄
…change of ID tokens Signed-off-by: Stefan Guilhen <sguilhen@redhat.com> Closes keycloak#38147
016472f to
1277898
Compare
|
@rmartinc is the change to |
No, it's not necessary. I just did it to pass the other issue #33332 quickly 😄. But probably they need the option set now to be able to validate the google ID token. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
…change of ID tokens
Signed-off-by: Stefan Guilhen sguilhen@redhat.com
Closes #38147