Update :servlet:spring-boot:java:oauth2:login to 7

servlet/spring-boot/java/oauth2/login/gradle.properties

@@ -1,4 +1,4 @@
 version=6.1.1
-spring-security.version=6.5.0-SNAPSHOT
+spring-security.version=7.0.0-SNAPSHOT
 org.gradle.jvmargs=-Xmx6g -XX:+HeapDumpOnOutOfMemoryError
 org.gradle.caching=true

servlet/spring-boot/java/oauth2/login/src/integTest/java/example/OAuth2LoginApplicationTests.java

@@ -194,7 +194,7 @@ public class OAuth2LoginApplicationTests {
 		String state = URLDecoder.decode(params.get(OAuth2ParameterNames.STATE), "UTF-8");
 		String redirectUri = URLDecoder.decode(params.get(OAuth2ParameterNames.REDIRECT_URI), "UTF-8");
 
-		String authorizationResponseUri = UriComponentsBuilder.fromHttpUrl(redirectUri)
+		String authorizationResponseUri = UriComponentsBuilder.fromUriString(redirectUri)
 			.queryParam(OAuth2ParameterNames.CODE, code)
 			.queryParam(OAuth2ParameterNames.STATE, state)
 			.build()
@@ -218,7 +218,7 @@ public class OAuth2LoginApplicationTests {
 		String state = "state";
 		String redirectUri = AUTHORIZE_BASE_URL + "/" + clientRegistration.getRegistrationId();
 
-		String authorizationResponseUri = UriComponentsBuilder.fromHttpUrl(redirectUri)
+		String authorizationResponseUri = UriComponentsBuilder.fromUriString(redirectUri)
 			.queryParam(OAuth2ParameterNames.CODE, code)
 			.queryParam(OAuth2ParameterNames.STATE, state)
 			.build()
@@ -253,7 +253,7 @@ public class OAuth2LoginApplicationTests {
 		String state = "invalid-state";
 		String redirectUri = AUTHORIZE_BASE_URL + "/" + clientRegistration.getRegistrationId();
 
-		String authorizationResponseUri = UriComponentsBuilder.fromHttpUrl(redirectUri)
+		String authorizationResponseUri = UriComponentsBuilder.fromUriString(redirectUri)
 			.queryParam(OAuth2ParameterNames.CODE, code)
 			.queryParam(OAuth2ParameterNames.STATE, state)
 			.build()

servlet/spring-boot/java/oauth2/login/src/main/java/example/filter/LoopbackIpRedirectFilter.java

@@ -57,7 +57,7 @@ public class LoopbackIpRedirectFilter extends OncePerRequestFilter {
 	protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain)
 			throws ServletException, IOException {
 		if (request.getServerName().equals("localhost") && request.getHeader("host") != null) {
-			UriComponents uri = UriComponentsBuilder.fromHttpRequest(new ServletServerHttpRequest(request))
+			UriComponents uri = UriComponentsBuilder.fromUriString(request.getRequestURL().toString())
 				.host("127.0.0.1")
 				.build();
 			response.sendRedirect(uri.toUriString());

servlet/spring-boot/java/oauth2/login/src/test/java/example/web/OAuth2LoginControllerTests.java

@@ -23,10 +23,8 @@ import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
 import org.springframework.boot.test.context.TestConfiguration;
-import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.security.oauth2.client.registration.ClientRegistration;
-import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository;
 import org.springframework.security.oauth2.client.web.HttpSessionOAuth2AuthorizedClientRepository;
 import org.springframework.security.oauth2.client.web.OAuth2AuthorizedClientRepository;
 import org.springframework.security.oauth2.core.AuthorizationGrantType;
@@ -47,9 +45,6 @@ public class OAuth2LoginControllerTests {
 	@Autowired
 	MockMvc mvc;
 
-	@MockBean
-	ClientRegistrationRepository clientRegistrationRepository;
-
 	@Test
 	void rootWhenAuthenticatedReturnsUserAndClient() throws Exception {
 		// @formatter:off
@@ -64,9 +59,11 @@ public class OAuth2LoginControllerTests {
 	void rootWhenOverridingClientRegistrationReturnsAccordingly() throws Exception {
 		// @formatter:off
 		ClientRegistration clientRegistration = ClientRegistration.withRegistrationId("test")
-			.authorizationGrantType(AuthorizationGrantType.PASSWORD)
+			.authorizationGrantType(AuthorizationGrantType.AUTHORIZATION_CODE)
+			.authorizationUri("https://authorization-uri.example.org")
 			.clientId("my-client-id")
 			.clientName("my-client-name")
+			.redirectUri("{baseUrl}/login/oauth2/code/test")
 			.tokenUri("https://token-uri.example.org")
 			.build();