diff --git a/login-server/src/main/java/org/cloudfoundry/identity/uaa/login/SamlRemoteUaaController.java b/login-server/src/main/java/org/cloudfoundry/identity/uaa/login/SamlRemoteUaaController.java index 4c1ee3ab..11af3191 100644 --- a/login-server/src/main/java/org/cloudfoundry/identity/uaa/login/SamlRemoteUaaController.java +++ b/login-server/src/main/java/org/cloudfoundry/identity/uaa/login/SamlRemoteUaaController.java @@ -56,6 +56,9 @@ public class SamlRemoteUaaController extends RemoteUaaController { @Value("${login.entityID}") public String entityID = ""; + + @Value("${login.autoRedirect:false}") + public boolean autoRedirect = false; @Override @RequestMapping(value = { "/info", "/login" }, method = RequestMethod.GET) @@ -63,7 +66,8 @@ public String prompts(HttpServletRequest request, @RequestHeader HttpHeaders headers, Map model, Principal principal) throws Exception { // Entity ID to start the discovery model.put("entityID", entityID); - model.put("saml",Boolean.TRUE); + model.put("saml", Boolean.TRUE); + model.put("autoRedirect", autoRedirect); return super.prompts(request, headers, model, principal); } diff --git a/login-server/src/main/webapp/WEB-INF/jsp/oss/login.jsp b/login-server/src/main/webapp/WEB-INF/jsp/oss/login.jsp index 125e50b3..71f20e8c 100644 --- a/login-server/src/main/webapp/WEB-INF/jsp/oss/login.jsp +++ b/login-server/src/main/webapp/WEB-INF/jsp/oss/login.jsp @@ -95,99 +95,108 @@ img.gsc-branding-img,img.gsc-branding-img-noclear,img.gcsc-branding-img,img.gcsc } })(); + + + - -
- -
-
-
" method="POST" novalidate> -
- -
-
Unable to verify, please try again:
-
- -

Log in to Pivotal CF:

- - - - - - -
- - Forgot password »Create an account » -
- -

Sign in with your organization's credentials.

- + + +
+ +
+
+
" method="POST" novalidate> +
+ +
+
Unable to verify, please try again:
+
+ +

Log in to Pivotal CF:

+ + + + + + +
+ + Forgot password »Create an account » +
+ +

Sign in with your organization's credentials.

+ +
+
+ © + + Pivotal Software, Inc. All rights reserved. +
+
-
- © - - Pivotal Software, Inc. All rights reserved. -
- -
- - <%-- Clear out session scoped attributes, don't leak info --%> - - - - - - - - - - - - - - - - + + <%-- Clear out session scoped attributes, don't leak info --%> + + + + + + + + + + + + + + + + + diff --git a/login-server/src/main/webapp/WEB-INF/jsp/pivotal/login.jsp b/login-server/src/main/webapp/WEB-INF/jsp/pivotal/login.jsp index c309e505..5b5cd6db 100644 --- a/login-server/src/main/webapp/WEB-INF/jsp/pivotal/login.jsp +++ b/login-server/src/main/webapp/WEB-INF/jsp/pivotal/login.jsp @@ -76,121 +76,130 @@ + + + - -
-
- - -
- Forgot Password -
-
- -
-
" method="POST" novalidate> -
hidden"> - Unable to verify, please try again: -
- - - -
- - -
- - - -
- -
-
- -
- -

Sign in with your organization's credentials.

- -
- -
- -
-
Not a member yet?
-

- Join Pivotal Network for enterprise,
- or Pivotal Web Services for hosted solutions. -

-
-
- -
-
- © - - Pivotal Software, Inc. - All rights reserved -
-
- Powered by - -
-
- - <%-- Clear out session scoped attributes, don't leak info --%> - - - - - - - - - - - - - - - - + + +
+
+ + +
+ Forgot Password +
+
+ +
+
" method="POST" novalidate> +
hidden"> + Unable to verify, please try again: +
+ + + +
+ + +
+ + + +
+ +
+
+ +
+ +

Sign in with your organization's credentials.

+ +
+ +
+ +
+
Not a member yet?
+

+ Join Pivotal Network for enterprise,
+ or Pivotal Web Services for hosted solutions. +

+
+
+ +
+
+ © + + Pivotal Software, Inc. - All rights reserved +
+
+ Powered by + +
+
+ + <%-- Clear out session scoped attributes, don't leak info --%> + + + + + + + + + + + + + + + + +