Browse Source

ProviderSettings @Bean is required

Issue gh-373
pull/497/head
Joe Grandja 4 years ago
parent
commit
8defe2eb3a
  1. 2
      oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2AuthorizationCodeAuthenticationProvider.java
  2. 2
      oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2ClientCredentialsAuthenticationProvider.java
  3. 2
      oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2RefreshTokenAuthenticationProvider.java
  4. 2
      oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/authentication/OidcClientRegistrationAuthenticationProvider.java
  5. 8
      oauth2-authorization-server/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/authorization/OidcUserInfoTests.java

2
oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2AuthorizationCodeAuthenticationProvider.java

@ -124,7 +124,7 @@ public final class OAuth2AuthorizationCodeAuthenticationProvider implements Auth
this.refreshTokenGenerator = refreshTokenGenerator; this.refreshTokenGenerator = refreshTokenGenerator;
} }
@Autowired(required = false) @Autowired
protected void setProviderSettings(ProviderSettings providerSettings) { protected void setProviderSettings(ProviderSettings providerSettings) {
this.providerSettings = providerSettings; this.providerSettings = providerSettings;
} }

2
oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2ClientCredentialsAuthenticationProvider.java

@ -90,7 +90,7 @@ public final class OAuth2ClientCredentialsAuthenticationProvider implements Auth
this.jwtCustomizer = jwtCustomizer; this.jwtCustomizer = jwtCustomizer;
} }
@Autowired(required = false) @Autowired
protected void setProviderSettings(ProviderSettings providerSettings) { protected void setProviderSettings(ProviderSettings providerSettings) {
this.providerSettings = providerSettings; this.providerSettings = providerSettings;
} }

2
oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2RefreshTokenAuthenticationProvider.java

@ -118,7 +118,7 @@ public final class OAuth2RefreshTokenAuthenticationProvider implements Authentic
this.refreshTokenGenerator = refreshTokenGenerator; this.refreshTokenGenerator = refreshTokenGenerator;
} }
@Autowired(required = false) @Autowired
protected void setProviderSettings(ProviderSettings providerSettings) { protected void setProviderSettings(ProviderSettings providerSettings) {
this.providerSettings = providerSettings; this.providerSettings = providerSettings;
} }

2
oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/authentication/OidcClientRegistrationAuthenticationProvider.java

@ -120,7 +120,7 @@ public final class OidcClientRegistrationAuthenticationProvider implements Authe
this.jwtEncoder = jwtEncoder; this.jwtEncoder = jwtEncoder;
} }
@Autowired(required = false) @Autowired
protected void setProviderSettings(ProviderSettings providerSettings) { protected void setProviderSettings(ProviderSettings providerSettings) {
this.providerSettings = providerSettings; this.providerSettings = providerSettings;
} }

8
oauth2-authorization-server/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/authorization/OidcUserInfoTests.java

@ -58,6 +58,7 @@ import org.springframework.security.oauth2.server.authorization.client.InMemoryR
import org.springframework.security.oauth2.server.authorization.client.RegisteredClient; import org.springframework.security.oauth2.server.authorization.client.RegisteredClient;
import org.springframework.security.oauth2.server.authorization.client.RegisteredClientRepository; import org.springframework.security.oauth2.server.authorization.client.RegisteredClientRepository;
import org.springframework.security.oauth2.server.authorization.client.TestRegisteredClients; import org.springframework.security.oauth2.server.authorization.client.TestRegisteredClients;
import org.springframework.security.oauth2.server.authorization.config.ProviderSettings;
import org.springframework.security.oauth2.server.authorization.oidc.authentication.OidcUserInfoAuthenticationToken; import org.springframework.security.oauth2.server.authorization.oidc.authentication.OidcUserInfoAuthenticationToken;
import org.springframework.security.oauth2.server.resource.authentication.JwtAuthenticationToken; import org.springframework.security.oauth2.server.resource.authentication.JwtAuthenticationToken;
import org.springframework.security.web.SecurityFilterChain; import org.springframework.security.web.SecurityFilterChain;
@ -306,6 +307,13 @@ public class OidcUserInfoTests {
return new NimbusJwsEncoder(jwkSource); return new NimbusJwsEncoder(jwkSource);
} }
@Bean
ProviderSettings providerSettings() {
return ProviderSettings.builder()
.issuer("https://auth-server:9000")
.build();
}
} }
} }

Loading…
Cancel
Save