Use setCookieCustomizer

Issue gh-14132

Author: jzheaux

web/src/test/java/org/springframework/security/web/server/csrf/CookieServerCsrfTokenRepositoryTests.java

@@ -131,13 +131,19 @@ void saveTokenWhenSameSiteThenCookieSameSite() {
 
 	@Test
 	void saveTokenWhenCustomPropertiesThenCustomProperties() {
-		setExpectedDomain("spring.io");
 		setExpectedCookieName("csrfCookie");
-		setExpectedPath("/some/path");
 		setExpectedHeaderName("headerName");
 		setExpectedParameterName("paramName");
-		setExpectedSameSitePolicy("Strict");
-		setExpectedCookieMaxAge(3600);
+		this.csrfTokenRepository.setCookieCustomizer((cookie) -> {
+			this.expectedPath = "/some/path";
+			cookie.path(this.expectedPath);
+			this.expectedDomain = "spring.io";
+			cookie.domain(this.expectedDomain);
+			this.expectedMaxAge = Duration.ofSeconds(3600);
+			cookie.maxAge(this.expectedMaxAge);
+			this.expectedSameSitePolicy = "Strict";
+			cookie.sameSite(this.expectedSameSitePolicy);
+		});
 		saveAndAssertExpectedValues(createToken());
 	}
 
@@ -195,16 +201,6 @@ void saveTokenWhenSslInfoNullThenNotSecure() {
 		assertThat(cookie.isSecure()).isFalse();
 	}
 
-	@Test
-	void saveTokenWhenSecureFlagTrueThenSecure() {
-		MockServerWebExchange exchange = MockServerWebExchange.from(this.request);
-		this.csrfTokenRepository.setSecure(true);
-		this.csrfTokenRepository.saveToken(exchange, createToken()).block();
-		ResponseCookie cookie = exchange.getResponse().getCookies().getFirst(this.expectedCookieName);
-		assertThat(cookie).isNotNull();
-		assertThat(cookie.isSecure()).isTrue();
-	}
-
 	@Test
 	void saveTokenWhenSecureFlagTrueThenSecureUsingCustomizer() {
 		MockServerWebExchange exchange = MockServerWebExchange.from(this.request);
@@ -215,16 +211,6 @@ void saveTokenWhenSecureFlagTrueThenSecureUsingCustomizer() {
 		assertThat(cookie.isSecure()).isTrue();
 	}
 
-	@Test
-	void saveTokenWhenSecureFlagFalseThenNotSecure() {
-		MockServerWebExchange exchange = MockServerWebExchange.from(this.request);
-		this.csrfTokenRepository.setSecure(false);
-		this.csrfTokenRepository.saveToken(exchange, createToken()).block();
-		ResponseCookie cookie = exchange.getResponse().getCookies().getFirst(this.expectedCookieName);
-		assertThat(cookie).isNotNull();
-		assertThat(cookie.isSecure()).isFalse();
-	}
-
 	@Test
 	void saveTokenWhenSecureFlagFalseThenNotSecureUsingCustomizer() {
 		MockServerWebExchange exchange = MockServerWebExchange.from(this.request);
@@ -235,17 +221,6 @@ void saveTokenWhenSecureFlagFalseThenNotSecureUsingCustomizer() {
 		assertThat(cookie.isSecure()).isFalse();
 	}
 
-	@Test
-	void saveTokenWhenSecureFlagFalseAndSslInfoThenNotSecure() {
-		MockServerWebExchange exchange = MockServerWebExchange.from(this.request);
-		this.request.sslInfo(SslInfo.from("sessionId"));
-		this.csrfTokenRepository.setSecure(false);
-		this.csrfTokenRepository.saveToken(exchange, createToken()).block();
-		ResponseCookie cookie = exchange.getResponse().getCookies().getFirst(this.expectedCookieName);
-		assertThat(cookie).isNotNull();
-		assertThat(cookie.isSecure()).isFalse();
-	}
-
 	@Test
 	void saveTokenWhenSecureFlagFalseAndSslInfoThenNotSecureUsingCustomizer() {
 		MockServerWebExchange exchange = MockServerWebExchange.from(this.request);
@@ -314,19 +289,14 @@ private void setExpectedParameterName(String expectedParameterName) {
 		this.expectedParameterName = expectedParameterName;
 	}
 
-	private void setExpectedDomain(String expectedDomain) {
-		this.csrfTokenRepository.setCookieDomain(expectedDomain);
-		this.expectedDomain = expectedDomain;
-	}
-
 	private void setExpectedPath(String expectedPath) {
 		this.csrfTokenRepository.setCookiePath(expectedPath);
 		this.expectedPath = expectedPath;
 	}
 
 	private void setExpectedHttpOnly(boolean expectedHttpOnly) {
 		this.expectedHttpOnly = expectedHttpOnly;
-		this.csrfTokenRepository.setCookieHttpOnly(expectedHttpOnly);
+		this.csrfTokenRepository.setCookieCustomizer((cookie) -> cookie.httpOnly(expectedHttpOnly));
 	}
 
 	private void setExpectedCookieName(String expectedCookieName) {
@@ -335,7 +305,8 @@ private void setExpectedCookieName(String expectedCookieName) {
 	}
 
 	private void setExpectedCookieMaxAge(int expectedCookieMaxAge) {
-		this.csrfTokenRepository.setCookieMaxAge(expectedCookieMaxAge);
+		Duration duration = Duration.ofSeconds(expectedCookieMaxAge);
+		this.csrfTokenRepository.setCookieCustomizer((cookie) -> cookie.maxAge(duration));
 		this.expectedMaxAge = Duration.ofSeconds(expectedCookieMaxAge);
 	}