Merge branch '3.5.x' into 4.0.x

Closes gh-49327
This commit is contained in:
Andy Wilkinson
2026-02-26 09:38:10 +00:00
2 changed files with 41 additions and 8 deletions
@@ -78,9 +78,11 @@ public class OAuth2ClientProperties implements InitializingBean {
public static class Registration {
/**
* Reference to the OAuth 2.0 provider to use. May reference an element from the
* 'provider' property or used one of the commonly used providers (google, github,
* facebook, okta).
* Reference to the OAuth 2.0 provider to use. May reference one of the common
* providers (google, github, facebook, okta) or the ID of a custom provider
* configured using 'spring.security.oauth2.client.provider.<id>.*'
* properties. When not set, the ID of this registration is used to identify the
* provider.
*/
private @Nullable String provider;