Author: prabath Date: Thu Jan 10 02:57:20 2008 New Revision: 12110 Log:
OpenID integration Modified: trunk/solutions/identity/modules/user-ui/src/main/webapp/jsp/login.jsp trunk/solutions/identity/modules/user-ui/src/main/webapp/jsp/main.jsp trunk/solutions/identity/modules/user-ui/src/main/webapp/jsp/openidauthorization.jsp Modified: trunk/solutions/identity/modules/user-ui/src/main/webapp/jsp/login.jsp ============================================================================== --- trunk/solutions/identity/modules/user-ui/src/main/webapp/jsp/login.jsp (original) +++ trunk/solutions/identity/modules/user-ui/src/main/webapp/jsp/login.jsp Thu Jan 10 02:57:20 2008 @@ -1,81 +1,105 @@ -<%@ taglib prefix="s" uri="/struts-tags" %> +<%@ taglib prefix="s" uri="/struts-tags"%> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" -"http://www.w3.org/TR/html4/strict.dtd";> -<html> -<head> -<title>WSO2 Identity Solution</title> -<link type="text/css" rel="stylesheet" href="css/styles.css" /> -</head> -<body> -<!-- Include the header --> -<s:include value="header.jsp" /> - -<table cellpadding="0" cellspacing="0" border="0" style="width:100%;"> - <tr> - <td class="right-back"> - </td> - <td class="content" valign="top"> - <table cellpadding="0" cellspacing="0" border="0" style="width:100%;"> - <tr> - <td><h1>WSO2 Identity Provider</h1></td> - <td align="right" valign="top"><img src="images/wso2-identity-content-rounded.jpg" align="top" /></td> - </tr> - </table> - - <br> - - <s:iterator value="errorMessages"> - <div class="error-message"><s:property /></div> - </s:iterator> - - <s:iterator value="infoMessages"> - <div class="info-message"><s:property /></div> - </s:iterator> - <table cellpadding="0" cellspacing="10" border="0" class="login-header"> - <tr> - <td valign="top" width="30%"> - <strong>Login with Username and Password</strong> - - <s:form action="Login.action" theme="simple" method="POST"> - <div class="errors"> - <s:actionerror /> - <s:fielderror /> - </div> - <table cellpadding="0" cellspacing="10" border="0"> - <tr><td>Username</td><td><s:textfield name="username" label="Login name" cssClass="text-box-normal" /></td></tr> - <tr><td>Password</td><td><s:password name="password" label="Password" cssClass="text-box-normal" /></td></tr> - <tr><td></td><td><s:submit value="Login" align="left" cssClass="button" /></td></tr> - </table> - </s:form> - - </td> - <td><img src="images/line-sep.png" height="150" width="2" /></td> - <td valign="top"> - <strong>Login with your Information Card</strong> - <div> - <a href="/InfoCardLogin.action" title="Login with your Information Card"><img src="images/infocard_114x80.png" align="left" style="margin-right:10px;" border="0" /></a> - you can only login with a personal information card that you have already registered. - If you have not registered a personal information card please first login with your username and password and - register a card. - </div> - </td> - </tr> - - </table> - <s:if test="%{allowUserRegistration}"> - <div> - <strong>Don't have a Login?</strong><br/><br/> - Sign up is easy. - <a href="ShowUserRegistration.action">Sign Up</a> - </div> - </s:if> - </td> - </tr> -</table> - -<!-- Include footer --> -<s:include value="footer.jsp" /> - -</body> - -</html> +"http://www.w3.org/TR/html4/strict.dtd";> +<html> +<head> +<title>WSO2 Identity Solution</title> +<link type="text/css" rel="stylesheet" href="css/styles.css" /> +</head> +<body> +<!-- Include the header --> +<s:include value="header.jsp" /> + +<table cellpadding="0" cellspacing="0" border="0" style="width: 100%;"> + <tr> + <td class="right-back"></td> + <td class="content" valign="top"> + <table cellpadding="0" cellspacing="0" border="0" style="width: 100%;"> + <tr> + <td> + <h1>WSO2 Identity Provider</h1> + </td> + <td align="right" valign="top"><img + src="images/wso2-identity-content-rounded.jpg" align="top" /></td> + </tr> + </table> + + <br> + + <s:iterator value="errorMessages"> + <div class="error-message"><s:property /></div> + </s:iterator> <s:iterator value="infoMessages"> + <div class="info-message"><s:property /></div> + </s:iterator> + <table cellpadding="0" cellspacing="10" border="0" + class="login-header"> + <tr> + <td valign="top" width="30%"><strong>Login with + Username and Password</strong> <s:form action="Login.action" theme="simple" + method="POST"> + <div class="errors"><s:actionerror /> <s:fielderror /></div> + <table cellpadding="0" cellspacing="10" border="0"> + <tr> + <td>Username</td> + <td><s:textfield name="username" label="Login name" + cssClass="text-box-normal" /></td> + </tr> + <tr> + <td>Password</td> + <td><s:password name="password" label="Password" + cssClass="text-box-normal" /></td> + </tr> + <tr> + <td></td> + <td><s:submit value="Login" align="left" cssClass="button" /></td> + </tr> + </table> + </s:form></td> + <td><img src="images/line-sep.png" height="150" width="2" /></td> + <td valign="top"> + <table> + <tr> + <td><strong>Login with your Information Card</strong> + <div><a href="/InfoCardLogin.action" + title="Login with your Information Card"><img + src="images/infocard_114x80.png" align="left" + style="margin-right: 10px;" border="0" /></a> you can only login + with a personal information card that you have already registered. + If you have not registered a personal information card please + first login with your username and password and register a card.</div> + </td> + </tr> + + <tr> + <td valign="top"><br /> + <br /> + <strong>Login with your OpenID</strong> + <div>you can login with your OpenID which you obtained by + any trusted OpenID provider</div> + <div><a href="/OpenIDLogin.action" + title="Login with your OpenId"><img + src="images/openid-logo.gif" align="left" + style="margin-right: 10px" border="0" /></a></div> + </td> + </tr> + + </table> + + </td> + </tr> + + </table> + <s:if test="%{allowUserRegistration}"> + <div><strong>Don't have a Login?</strong><br /> + <br /> + Sign up is easy. <a href="ShowUserRegistration.action">Sign Up</a></div> + </s:if></td> + </tr> +</table> + +<!-- Include footer --> +<s:include value="footer.jsp" /> + +</body> + +</html> Modified: trunk/solutions/identity/modules/user-ui/src/main/webapp/jsp/main.jsp ============================================================================== --- trunk/solutions/identity/modules/user-ui/src/main/webapp/jsp/main.jsp (original) +++ trunk/solutions/identity/modules/user-ui/src/main/webapp/jsp/main.jsp Thu Jan 10 02:57:20 2008 @@ -1,11 +1,11 @@ -<%@ taglib prefix="s" uri="/struts-tags" %> +<%@ taglib prefix="s" uri="/struts-tags"%> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" -"http://www.w3.org/TR/html4/strict.dtd";> -<html> -<head> -<title>WSO2 Identity Provider</title> -<link type="text/css" rel="stylesheet" href="css/styles.css" /> - +"http://www.w3.org/TR/html4/strict.dtd";> +<html> +<head> +<title>WSO2 Identity Provider</title> +<link type="text/css" rel="stylesheet" href="css/styles.css" /> + <script language="JavaScript" type="text/JavaScript"> function showHide(){ @@ -13,151 +13,183 @@ if(top_div.style.display=='block') top_div.style.display='none'; else top_div.style.display='block'; } -</script> - -</head> -<body> -<!-- Include the header --> -<s:include value="header.jsp" /> - - -<table cellpadding="0" cellspacing="0" border="0" style="width:100%;"> - <tr> - <td class="right-back"> - </td> - <td class="content" valign="top"> - <table cellpadding="0" cellspacing="0" border="0" style="width:100%;"> - <tr> - <td><h1>Welcome to the Identity Provider of the WSO2 Identity Solution</h1></td> - <td align="right" valign="top"><img src="images/wso2-identity-content-rounded.jpg" align="top" /></td> - </tr> - </table> - <div class="info-message">IMPORTANT : The identity provider will be reset periodically.</div> - - <s:iterator value="errorMessages"> - <div class="error-message"><s:property /></div> - </s:iterator> - - <s:iterator value="infoMessages"> - <div class="info-message"><s:property /></div> - </s:iterator> - - <br> - <!-- New STARTS Here --> - <div class="information"> - <table cellpadding="0" cellspacing="0" border="0" style="width:100%;margin-bottom:10px;"> - <tr> - - <td valign="top" style="line-height:20px;"> - <a href="DownloadInfoCard.action" class="heading-link">Download Information Card</a> - <br>This card can be used with any identity selector that supports Microsoft CardSpace specifications and will allow you to login to web applications that supports information card logins. - - </td> - <td valign="top"> - <div id="claim-title" onclick="showHide()"><img src="images/arrow-down.gif" align="top" style="margin-top:5px;margin-left:3px;margin-right:3px;" />Click here to see the claims supported by the identity provider<img src="images/arrow-down.gif" align="top" style="margin-top:5px;margin-left:3px;margin-right:3px;" /></div> - <div id="claim-content"> - - <a href="#" onClick="showHide();" class="close-link">Close [ x ]</a> - - - <table cellpadding="0" cellspacing="0" border="0" class="data-table" style="clear:both;" > - <s:iterator value="claims"> - <tr> - <td> - <div style="font-weight:bold;line-height:18px;"><s:property value="displayTag" /></div> - <div style="line-height:18px;"><s:property value="uri" /></div> - <div style="line-height:18px;"><s:property value="description" /></div> - </td> - </tr> - </s:iterator> - </table> - - - </div> - </td> - </tr> - <tr> - <td colspan="3"><a href="DownloadInfoCard.action" class="download-link"></a></td> - </tr> - </table> - - <table cellpadding="0" cellspacing="0" border="0" class="manage-table"> - <tr> - <td> - <p class="heading-link">Managed Information Cards for Self Issued Information Cards</p> - - - <a href="RequestRegisterInfoCard.action" class="register-link">Register Self Issued Card</a> - - - <table cellpadding="0" cellspacing="0" border="0" style="margin-bottom:10px;" class="data-table"> - <tr> - <th colspan="3">List of registered self issued information cards</th> - </tr> - <s:iterator value="registeredInformationCards"> - <s:url id="downloadCardForPPIDUrl" namespace="/" action="DownloadInfoCard"> - <s:param name="selfIssuedPpid" value="ppid" /> - </s:url> - <s:url id="removeRegisteredCard" namespace="/" action="RemoveRegisteredInfoCard"> - <s:param name="ppid" value="ppid" /> - </s:url> - - <tr> - <td><s:property value="ppid"/></td> - <td><s:a href="%{downloadCardForPPIDUrl}" >Download Information Card</s:a></td> - <td><s:a href="%{removeRegisteredCard}">Remove</s:a></td> - </tr> - </s:iterator> - </table> - - </td> - </tr> - </table> - - - - - - - - <table cellpadding="0" cellspacing="0" border="0" class="manage-table"> - <tr> - <td valign="top" style="padding-right:10px;"><a class="manage-info-cards" src="#" /></td> - <td valign="top"> - <a href="#" class="heading-link">Add Trusted Relying Party</a> - <br>You will be able to use the managed cards issued by this identity provider to log into and relying party that this identity provider trusts. - </td> - </tr> - <tr> - <td colspan="2"> - <s:form action="UploadRelyingPartyCertificate" method="POST" enctype="multipart/form-data" theme="simple"> - <div style="padding:5px;"><s:file name="certificateFile" label="Certificate"/></div> - <div style="padding:5px;"><s:submit type="button" cssClass="button" label="Upload"/></div> - </s:form> - </td> - </tr> - </table> - - <div class="relying-parties-title">Personal Trusted Relying Parties</div> - <table cellpadding="0" cellspacing="0" border="0" class="data-table"> - <s:iterator value="personalRPs"> - <s:url id="removeRP" namespace="/" action="RemoveRelyingParty"> - <s:param name="hostName" value="identifier.hostName" /> - </s:url> - <tr><td><s:property value="identifier.hostName"/></td><td><s:a href="%{removeRP}">Remove</s:a></td></tr> - </s:iterator> - </table> - - </div> - <!-- New Ends Here --> - - - </td> - </tr> -</table> - -<!-- Include footer --> -<s:include value="footer.jsp" /> - -</body> +</script> + +</head> +<body> +<!-- Include the header --> +<s:include value="header.jsp" /> + + +<table cellpadding="0" cellspacing="0" border="0" style="width: 100%;"> + <tr> + <td class="right-back"></td> + <td class="content" valign="top"> + <table cellpadding="0" cellspacing="0" border="0" style="width: 100%;"> + <tr> + <td> + <h1>Welcome to the Identity Provider of the WSO2 Identity + Solution</h1> + </td> + <td align="right" valign="top"><img + src="images/wso2-identity-content-rounded.jpg" align="top" /></td> + </tr> + </table> + <div class="info-message">IMPORTANT : The identity provider will + be reset periodically.</div> + + <s:iterator value="errorMessages"> + <div class="error-message"><s:property /></div> + </s:iterator> <s:iterator value="infoMessages"> + <div class="info-message"><s:property /></div> + </s:iterator> <br> + <!-- New STARTS Here --> + <div class="information"> + <table cellpadding="0" cellspacing="0" border="0" + style="width: 100%; margin-bottom: 10px;"> + <tr> + + <td valign="top" style="line-height: 20px;"><a + href="DownloadInfoCard.action" class="heading-link">Download + Information Card</a> <br> + This card can be used with any identity selector that supports + Microsoft CardSpace specifications and will allow you to login to + web applications that supports information card logins.</td> + <td valign="top"> + <div id="claim-title" onclick="showHide()"><img + src="images/arrow-down.gif" align="top" + style="margin-top: 5px; margin-left: 3px; margin-right: 3px;" />Click + here to see the claims supported by the identity provider<img + src="images/arrow-down.gif" align="top" + style="margin-top: 5px; margin-left: 3px; margin-right: 3px;" /></div> + <div id="claim-content"><a href="#" onClick="showHide();" + class="close-link">Close [ x ]</a> + + + <table cellpadding="0" cellspacing="0" border="0" class="data-table" + style="clear: both;"> + <s:iterator value="claims"> + <tr> + <td> + <div style="font-weight: bold; line-height: 18px;"><s:property + value="displayTag" /></div> + <div style="line-height: 18px;"><s:property value="uri" /></div> + <div style="line-height: 18px;"><s:property + value="description" /></div> + </td> + </tr> + </s:iterator> + </table> + + + </div> + </td> + </tr> + <tr> + <td colspan="3"><a href="DownloadInfoCard.action" + class="download-link"></a></td> + </tr> + </table> + + <table cellpadding="0" cellspacing="0" border="0" + style="width: 100%; margin-bottom: 10px;"> + <tr> + <td valign="top" style="line-height: 20px;"><a + href="OpenIDDownloadInfoCard.action" class="heading-link">Download + OpenID Information Card</a> <br> + This card can be used with any OpenID Provider which supports + Microsoft CardSpace specifications.</td> + <td><img src="images/openid_infocard.png" align="left" + style="margin-right: 10px" border="0" /></td> + </tr> + <tr> + <td colspan="3"><a href="OpenIDDownloadInfoCard.action" + class="download-link"></a></td> + </tr> + </table> + + <table cellpadding="0" cellspacing="0" border="0" class="manage-table"> + <tr> + <td> + <p class="heading-link">Managed Information Cards for Self + Issued Information Cards</p> + + + <a href="RequestRegisterInfoCard.action" class="register-link">Register + Self Issued Card</a> + + + <table cellpadding="0" cellspacing="0" border="0" + style="margin-bottom: 10px;" class="data-table"> + <tr> + <th colspan="3">List of registered self issued information + cards</th> + </tr> + <s:iterator value="registeredInformationCards"> + <s:url id="downloadCardForPPIDUrl" namespace="/" + action="DownloadInfoCard"> + <s:param name="selfIssuedPpid" value="ppid" /> + </s:url> + <s:url id="removeRegisteredCard" namespace="/" + action="RemoveRegisteredInfoCard"> + <s:param name="ppid" value="ppid" /> + </s:url> + + <tr> + <td><s:property value="ppid" /></td> + <td><s:a href="%{downloadCardForPPIDUrl}">Download Information Card</s:a></td> + <td><s:a href="%{removeRegisteredCard}">Remove</s:a></td> + </tr> + </s:iterator> + </table> + + </td> + </tr> + </table> + + + <table cellpadding="0" cellspacing="0" border="0" class="manage-table"> + <tr> + <td valign="top" style="padding-right: 10px;"><a + class="manage-info-cards" src="#" /></td> + <td valign="top"><a href="#" class="heading-link">Add + Trusted Relying Party</a> <br> + You will be able to use the managed cards issued by this identity + provider to log into and relying party that this identity provider + trusts.</td> + </tr> + <tr> + <td colspan="2"><s:form action="UploadRelyingPartyCertificate" + method="POST" enctype="multipart/form-data" theme="simple"> + <div style="padding: 5px;"><s:file name="certificateFile" + label="Certificate" /></div> + <div style="padding: 5px;"><s:submit type="button" + cssClass="button" label="Upload" /></div> + </s:form></td> + </tr> + </table> + + <div class="relying-parties-title">Personal Trusted Relying + Parties</div> + <table cellpadding="0" cellspacing="0" border="0" class="data-table"> + <s:iterator value="personalRPs"> + <s:url id="removeRP" namespace="/" action="RemoveRelyingParty"> + <s:param name="hostName" value="identifier.hostName" /> + </s:url> + <tr> + <td><s:property value="identifier.hostName" /></td> + <td><s:a href="%{removeRP}">Remove</s:a></td> + </tr> + </s:iterator> + </table> + + </div> + <!-- New Ends Here --></td> + </tr> +</table> + +<!-- Include footer --> +<s:include value="footer.jsp" /> + +</body> </html> \ No newline at end of file Modified: trunk/solutions/identity/modules/user-ui/src/main/webapp/jsp/openidauthorization.jsp ============================================================================== --- trunk/solutions/identity/modules/user-ui/src/main/webapp/jsp/openidauthorization.jsp (original) +++ trunk/solutions/identity/modules/user-ui/src/main/webapp/jsp/openidauthorization.jsp Thu Jan 10 02:57:20 2008 @@ -11,13 +11,9 @@ </head> <body> -<div class="page"> -<!-- START Header --> -<s:include value="header.jsp" /> -<!-- END Header --> -<% - - ParameterList requestp = (ParameterList) session +<div class="page"><!-- START Header --> <s:include + value="header.jsp" /> <!-- END Header --> <% + ParameterList requestp = (ParameterList) session .getAttribute("parameterlist"); String openidrealm = requestp.hasParameter("openid.realm") ? requestp .getParameterValue("openid.realm") @@ -31,9 +27,7 @@ String openididentity = requestp.hasParameter("openid.identity") ? requestp .getParameterValue("openid.identity") : null; - %> - <!-- START Content --> - <% + %> <!-- START Content --> <% if (request.getParameter("action") == null) { String site = (String) (openidrealm == null ? openidreturnto : openidrealm); @@ -53,33 +47,71 @@ </tr> </table> - <table cellpadding="0" cellspacing="10" border="0" class="login-header"> + <table cellpadding="0" cellspacing="10" border="0" + class="login-header"> <tr> - <td> - - <s:form action="/server?_action=complete" theme="simple" method="POST"> + <td><s:form action="/server?_action=complete" theme="simple" + method="POST"> <div class="errors"><s:actionerror /> <s:fielderror /></div> + <table> + <tr> + <td><strong>Please sign in to authenticate to <%=openidreturnto.substring(0, openidreturnto + .indexOf("?"))%> as <%=openididentity%>.</strong></td> + </tr> + </table> + <table> + <tr> + <td width="40%"> + <table cellpadding="0" cellspacing="10" border="0" + class="form-table"> + <tr> + <td colspan="2"><strong>Login with your OpenID password</strong></td> + </tr> + <tr> + <td width="10%">Password</td> + <td><input type="password" name="password"></td> + </tr> + <tr> + <td></td> + <td><s:submit value="Login" align="left" cssClass="button" /></td> + </tr> + + </table> + </td> + + <td><img src="images/line-sep.png" height="150" width="2" /></td> - <table cellpadding="0" cellspacing="10" border="0" class="form-table"> - <tr> - <td colspan="2"><strong>Please sign in to authenticate to <%=openidreturnto.substring(0,openidreturnto.indexOf("?"))%> as <%=openididentity%>.</strong></td> - </tr> - <tr> - <td width="10%">Password </td> - <td><input type="password" name="password"></td> - </tr> - <tr> - <td></td> - <td><s:submit value="Login" align="left" cssClass="button" /></td> + <td valign="middle" align="center" width="5%"><strong>OR</strong></td> + + <td><img src="images/line-sep.png" height="150" width="2" /></td> + + <td> + <table cellpadding="40"> + <tr> + <td><strong>Login with your self-issued + Information Card</strong> + <div><a href="/InfoCardLogin.action" + title="Login with your Information Card"><img + src="images/infocard_114x80.png" align="left" + style="margin-right: 10px;" border="0" /></a> you can only login + with a personal information card that you have already + registered. If you have not registered a personal information + card please first login with your username and password and + register a card.</div> + </td> + </tr> + </table> + </td> </tr> - - </table> - </s:form> - </td> + </table> + </s:form></td> </table> - - - <br/><br/><br/><br/> + + + <br /> + <br /> + <br /> + <br /> </td> </tr> </table> _______________________________________________ Identity-dev mailing list [email protected] http://wso2.org/cgi-bin/mailman/listinfo/identity-dev
