Skip to content

Commit bd13b7e

Browse files
committed
[Prod] Implement SessionController zone path tests
1 parent 17fc08b commit bd13b7e

File tree

3 files changed

+9
-7
lines changed

3 files changed

+9
-7
lines changed

docs/path-based-zones-endpoints-without-z-support.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ This document lists endpoints that do **not** yet have a dual path mapping for `
1717
4.[Force password change (UI)](#4-force-password-change-ui)
1818
5.[Logged out (UI)](#5-logged-out-ui)
1919
6.[Home and error pages (UI)](#6-home-and-error-pages-ui)
20-
7. [Session (UI)](#7-session-ui)
20+
7. [Session (UI)](#7-session-ui)
2121
8.[Invitations (UI + API)](#8-invitations-ui--api)
2222
9.[Profile (UI)](#9-profile-ui)
2323
10.[Passcode (API / UI)](#10-passcode-api--ui)

server/src/main/java/org/cloudfoundry/identity/uaa/SpringServletXmlSecurityConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ public class SpringServletXmlSecurityConfiguration {
6464
"/saml_error",
6565
"/favicon.ico",
6666
"/oauth_error",
67-
"/session",
68-
"/session_management",
67+
"/session", "/z/*/session",
68+
"/session_management", "/z/*/session_management",
6969
"/oauth/token/.well-known/openid-configuration", "/z/*/oauth/token/.well-known/openid-configuration",
7070
"/.well-known/openid-configuration", "/z/*/.well-known/openid-configuration",
7171
"/logged_out", "/z/*/logged_out"

server/src/main/java/org/cloudfoundry/identity/uaa/login/SessionController.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,19 @@
2121
@Controller
2222
public class SessionController {
2323

24-
@RequestMapping("/session")
25-
public String session(Model model, @RequestParam String clientId, @RequestParam String messageOrigin) {
24+
@RequestMapping({"/session", "/z/{subdomain}/session"})
25+
public String session(Model model,
26+
@RequestParam String clientId, @RequestParam String messageOrigin) {
2627
// We need to maintain this version of the session page to continue compatibility with the
2728
// original version of uaa-singular.
2829
model.addAttribute("clientId", clientId);
2930
model.addAttribute("messageOrigin", messageOrigin);
3031
return "session";
3132
}
3233

33-
@RequestMapping("/session_management")
34-
public String sessionManagement(Model model, @RequestParam String clientId, @RequestParam String messageOrigin) {
34+
@RequestMapping({"/session_management", "/z/{subdomain}/session_management"})
35+
public String sessionManagement(Model model,
36+
@RequestParam String clientId, @RequestParam String messageOrigin) {
3537
model.addAttribute("clientId", clientId);
3638
model.addAttribute("messageOrigin", messageOrigin);
3739
return "session_management";

0 commit comments

Comments
 (0)