mindol1004/spring-authorization-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove deprecated API usage

Browse Source
This commit is contained in:
Joe Grandja
2022-08-01 11:47:29 -04:00
parent 4934088593
commit 6284e1dc1e
5 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OAuth2AuthorizationServerConfigurer.java
View File

@@ -38,7 +38,7 @@ import org.springframework.security.oauth2.server.authorization.web.OAuth2Author
import org.springframework.security.oauth2.server.authorization.web.ProviderContextFilter;
import org.springframework.security.web.authentication.HttpStatusEntryPoint;
import org.springframework.security.web.authentication.preauth.AbstractPreAuthenticatedProcessingFilter;
import org.springframework.security.web.context.SecurityContextPersistenceFilter;
import org.springframework.security.web.context.SecurityContextHolderFilter;
import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
import org.springframework.security.web.util.matcher.OrRequestMatcher;
import org.springframework.security.web.util.matcher.RequestMatcher;
@@ -246,7 +246,7 @@ public final class OAuth2AuthorizationServerConfigurer
ProviderSettings providerSettings = OAuth2ConfigurerUtils.getProviderSettings(httpSecurity);
ProviderContextFilter providerContextFilter = new ProviderContextFilter(providerSettings);
httpSecurity.addFilterAfter(postProcess(providerContextFilter), SecurityContextPersistenceFilter.class);
httpSecurity.addFilterAfter(postProcess(providerContextFilter), SecurityContextHolderFilter.class);
JWKSource<com.nimbusds.jose.proc.SecurityContext> jwkSource = OAuth2ConfigurerUtils.getJwkSource(httpSecurity);
if (jwkSource != null) {

4
oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/OAuth2AuthorizationServerMetadataTests.java
View File

@@ -562,7 +562,7 @@ public class OAuth2AuthorizationServerMetadataTests {
.claim("claim-name", "claim-value")
.claims((claims) -> claims.remove("claim-name"))
.build();
assertThat(authorizationServerMetadata.containsClaim("claim-name")).isFalse();
assertThat(authorizationServerMetadata.hasClaim("claim-name")).isFalse();
}
@Test
@@ -571,7 +571,7 @@ public class OAuth2AuthorizationServerMetadataTests {
this.minimalBuilder
.claim("claim-name", "claim-value")
.build();
assertThat(authorizationServerMetadata.containsClaim("claim-name")).isTrue();
assertThat(authorizationServerMetadata.hasClaim("claim-name")).isTrue();
}
private static URL url(String urlString) {

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

@@ -75,7 +75,6 @@ import org.springframework.test.web.servlet.ResultMatcher;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.reset;
import static org.mockito.Mockito.spy;
import static org.springframework.test.web.servlet.ResultMatcher.matchAll;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
@@ -124,7 +123,7 @@ public class OidcUserInfoTests {
this.mvc.perform(get(DEFAULT_OIDC_USER_INFO_ENDPOINT_URI)
.header(HttpHeaders.AUTHORIZATION, "Bearer " + accessToken.getTokenValue()))
.andExpect(status().is2xxSuccessful())
.andExpect(userInfoResponse());
.andExpectAll(userInfoResponse());
// @formatter:on
}
@@ -140,7 +139,7 @@ public class OidcUserInfoTests {
this.mvc.perform(post(DEFAULT_OIDC_USER_INFO_ENDPOINT_URI)
.header(HttpHeaders.AUTHORIZATION, "Bearer " + accessToken.getTokenValue()))
.andExpect(status().is2xxSuccessful())
.andExpect(userInfoResponse());
.andExpectAll(userInfoResponse());
// @formatter:on
}
@@ -156,7 +155,7 @@ public class OidcUserInfoTests {
this.mvc.perform(get(DEFAULT_OIDC_USER_INFO_ENDPOINT_URI)
.header(HttpHeaders.AUTHORIZATION, "Bearer " + accessToken.getTokenValue()))
.andExpect(status().is2xxSuccessful())
.andExpect(userInfoResponse());
.andExpectAll(userInfoResponse());
// @formatter:on
}
@@ -173,7 +172,7 @@ public class OidcUserInfoTests {
MvcResult mvcResult = this.mvc.perform(get(DEFAULT_OIDC_USER_INFO_ENDPOINT_URI)
.header(HttpHeaders.AUTHORIZATION, "Bearer " + accessToken.getTokenValue()))
.andExpect(status().is2xxSuccessful())
.andExpect(userInfoResponse())
.andExpectAll(userInfoResponse())
.andReturn();
// @formatter:on
@@ -182,9 +181,9 @@ public class OidcUserInfoTests {
assertThat(securityContext.getAuthentication()).isNull();
}
private static ResultMatcher userInfoResponse() {
private static ResultMatcher[] userInfoResponse() {
// @formatter:off
return matchAll(
return new ResultMatcher[] {
jsonPath("sub").value("user1"),
jsonPath("name").value("First Last"),
jsonPath("given_name").value("First"),
@@ -205,7 +204,7 @@ public class OidcUserInfoTests {
jsonPath("phone_number_verified").value("false"),
jsonPath("address.formatted").value("Champ de Mars\n5 Av. Anatole France\n75007 Paris\nFrance"),
jsonPath("updated_at").value("1970-01-01T00:00:00Z")
);
};
// @formatter:on
}

4
oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/oidc/OidcClientRegistrationTests.java
View File

@@ -399,7 +399,7 @@ public class OidcClientRegistrationTests {
.build();
// @formatter:on
assertThat(clientRegistration.containsClaim("claim-name")).isFalse();
assertThat(clientRegistration.hasClaim("claim-name")).isFalse();
}
@Test
@@ -410,7 +410,7 @@ public class OidcClientRegistrationTests {
.build();
// @formatter:on
assertThat(clientRegistration.containsClaim("claim-name")).isTrue();
assertThat(clientRegistration.hasClaim("claim-name")).isTrue();
}
}

2
oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/oidc/OidcProviderConfigurationTests.java
View File

@@ -514,7 +514,7 @@ public class OidcProviderConfigurationTests {
this.minimalConfigurationBuilder
.claim("claim-name", "claim-value")
.build();
assertThat(configuration.containsClaim("claim-name")).isTrue();
assertThat(configuration.hasClaim("claim-name")).isTrue();
}
private static URL url(String urlString) {