[java-identity-provider COMMIT] /trunk/idp-war/src/main/webapp/WEB-INF/jsp/login.jsp

Fri Aug 22 21:12:39 EDT 2014

Author: scantor
Date: Fri Aug 22 21:12:38 2014
New Revision: 6463

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6463&view=rev
Log:
Handle unverified SP case.

Modified:
    trunk/idp-war/src/main/webapp/WEB-INF/jsp/login.jsp

Modified: trunk/idp-war/src/main/webapp/WEB-INF/jsp/login.jsp
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-war/src/main/webapp/WEB-INF/jsp/login.jsp?rev=6463&r1=6462&r2=6463&view=diff
==============================================================================

--- trunk/idp-war/src/main/webapp/WEB-INF/jsp/login.jsp (original)
+++ trunk/idp-war/src/main/webapp/WEB-INF/jsp/login.jsp Fri Aug 22 21:12:38 2014
@@ -1,12 +1,12 @@
 <!DOCTYPE html>
 
 <%@ taglib uri="urn:mace:shibboleth:2.0:idp:ui" prefix="idpui" %>
-<%@ page import="net.shibboleth.idp.authn.context.*" %>
 <%@ page import="org.opensaml.profile.context.ProfileRequestContext" %>
 <%@ page import="net.shibboleth.utilities.java.support.codec.HTMLEncoder" %>
 <%@ page import="net.shibboleth.idp.authn.context.AuthenticationContext" %>
 <%@ page import="net.shibboleth.idp.authn.context.AuthenticationErrorContext" %>
 <%@ page import="net.shibboleth.idp.authn.context.UsernamePasswordContext" %>
+<%@ page import="net.shibboleth.idp.ui.context.RelyingPartyUIContext" %>
 <%@ page import="org.springframework.webflow.execution.RequestContext" %>
 
 <%
@@ -15,6 +15,8 @@
 if (username == null) {
 	username = "";
 }
+
+final boolean identifiedRP = ((RelyingPartyUIContext) request.getAttribute("rpUIContext")).getServiceName() != null;
 %>
 
 <html>
@@ -56,9 +58,11 @@
                 </section>
               <% }  %>
 
-              <legend>
-                Log in to <idpui:serviceName/>
-              </legend>
+              <% if (identifiedRP) { %>
+                <legend>
+                  Log in to <idpui:serviceName/>
+                </legend>
+              <% } %>
 
               <section>
                 <Label for="username">Username</label>
@@ -91,12 +95,13 @@
               //      https://wiki.shibboleth.net/confluence/display/SHIB2/IdPAuthUserPassLoginPage
               //
               //    Example:
-            %>
-                    <p>
-                      <idpui:serviceLogo>default</idpui:serviceLogo>
-                      <idpui:serviceDescription>SP description</idpui:serviceDescription>
-                    </p>
-              
+             %>
+             <% if (identifiedRP) { %>
+                 <p>
+                   <idpui:serviceLogo>default</idpui:serviceLogo>
+                   <idpui:serviceDescription>SP description</idpui:serviceDescription>
+                 </p>
+             <% } %>
 
           </div>
           <div class="column two">

