Skip to content

Commit

Permalink
Support SameSite cookie attribute in MockMvcHttpConnector
Browse files Browse the repository at this point in the history
Closes gh-30264
  • Loading branch information
justin-tay authored and sbrannen committed Apr 4, 2023
1 parent 90b0f45 commit dd97ee4
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2002-2022 the original author or authors.
* Copyright 2002-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -197,6 +197,7 @@ private MockClientHttpResponse adaptResponse(MvcResult mvcResult) {
.path(cookie.getPath())
.secure(cookie.getSecure())
.httpOnly(cookie.isHttpOnly())
.sameSite(cookie.getAttribute("samesite"))
.build();
clientResponse.getCookies().add(httpCookie.getName(), httpCookie);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2002-2020 the original author or authors.
* Copyright 2002-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -50,6 +50,7 @@ public void setup() {
CookieLocaleResolver localeResolver = new CookieLocaleResolver();
localeResolver.setCookieDomain("domain");
localeResolver.setCookieHttpOnly(true);
localeResolver.setCookieSameSite("Strict");

client = MockMvcWebTestClient.bindToController(new SimpleController())
.interceptors(new LocaleChangeInterceptor())
Expand Down Expand Up @@ -107,6 +108,10 @@ public void testHttpOnly() {
client.get().uri("/").exchange().expectCookie().httpOnly(COOKIE_NAME, true);
}

@Test
public void testSameSite() {
client.get().uri("/").exchange().expectCookie().sameSite(COOKIE_NAME, "Strict");
}

@Controller
private static class SimpleController {
Expand Down

0 comments on commit dd97ee4

Please sign in to comment.