Skip to content

Avoid error in OAuth2ClientPropertiesMapper when CommonOAuth2Provider is not available #47549

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Avoid error in OAuth2ClientPropertiesMapper when CommonOAuth2Provider is not available #47549

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions ...ringframework/boot/security/oauth2/client/autoconfigure/OAuth2ClientPropertiesMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
import org.springframework.security.oauth2.core.AuthenticationMethod;
import org.springframework.security.oauth2.core.AuthorizationGrantType;
import org.springframework.security.oauth2.core.ClientAuthenticationMethod;
import org.springframework.util.ClassUtils;
import org.springframework.util.StringUtils;

/**
Expand All @@ -45,6 +46,12 @@
* @since 4.0.0
*/
public final class OAuth2ClientPropertiesMapper {
private static final boolean SPRING_SECURITY_CONFIG_PRESENT;

static {
ClassLoader loader = OAuth2ClientPropertiesMapper.class.getClassLoader();
SPRING_SECURITY_CONFIG_PRESENT = ClassUtils.isPresent("org.springframework.security.config.oauth2.client.CommonOAuth2Provider", loader);
}

private final OAuth2ClientProperties properties;

Expand Down Expand Up @@ -137,6 +144,10 @@ private static Builder getBuilder(Builder builder, Provider provider) {
}

private static @Nullable CommonOAuth2Provider getCommonProvider(String providerId) {
if (!SPRING_SECURITY_CONFIG_PRESENT) {
return null;
}

try {
return ApplicationConversionService.getSharedInstance().convert(providerId, CommonOAuth2Provider.class);
}
Expand Down