Author: prabath Date: Fri Mar 28 02:42:01 2008 New Revision: 15290 Log:
added two new claims to the dialect http://schemas.xmlsoap.org/ws/2005/05/identity and mapped those to the OpenID by default Modified: trunk/solutions/identity/modules/admin-ui/src/main/webapp/jsp/claims.jsp trunk/solutions/identity/modules/base/src/main/java/org/wso2/solutions/identity/IdentityConstants.java trunk/solutions/identity/modules/identity-provider/conf/initial-claims.xml trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/openid/OpenIDProvider.java Modified: trunk/solutions/identity/modules/admin-ui/src/main/webapp/jsp/claims.jsp ============================================================================== --- trunk/solutions/identity/modules/admin-ui/src/main/webapp/jsp/claims.jsp (original) +++ trunk/solutions/identity/modules/admin-ui/src/main/webapp/jsp/claims.jsp Fri Mar 28 02:42:01 2008 @@ -100,7 +100,8 @@ </div> <div id="<s:property value="#stat.index" />-content" style="display:block;"> <table cellpadding="0" cellspacing="0" border="0" class="data-table"> - <s:iterator value="dialectClaims"> + <s:iterator value="dialectClaims"> + <s:if test="%{userEditable}"> <tr> <td width="300" <s:if test="supported">class="selected-row"</s:if>> <div style="font-weight:bold;line-height:18px;"><s:property value="displayTag" /></div> @@ -119,7 +120,8 @@ </s:else> </ul> </td> - </tr> + </tr> + </s:if> </s:iterator> </table> </div> Modified: trunk/solutions/identity/modules/base/src/main/java/org/wso2/solutions/identity/IdentityConstants.java ============================================================================== --- trunk/solutions/identity/modules/base/src/main/java/org/wso2/solutions/identity/IdentityConstants.java (original) +++ trunk/solutions/identity/modules/base/src/main/java/org/wso2/solutions/identity/IdentityConstants.java Fri Mar 28 02:42:01 2008 @@ -67,9 +67,9 @@ public final static String CLAIM_OPENID = OPENID_NS + "/claims/identifier"; - public final static String CLAIM_GENDER = OPENID_NS + "/claims/gender"; + public final static String CLAIM_GENDER = NS + "/claims/gender"; - public final static String CLAIM_DOB = OPENID_NS + "/claims/dob"; + public final static String CLAIM_DOB = NS + "/claims/dateofbirth"; public final static String CLAIM_TIME_ZONE = OPENID_NS + "/claims/timezone"; Modified: trunk/solutions/identity/modules/identity-provider/conf/initial-claims.xml ============================================================================== --- trunk/solutions/identity/modules/identity-provider/conf/initial-claims.xml (original) +++ trunk/solutions/identity/modules/identity-provider/conf/initial-claims.xml Fri Mar 28 02:42:01 2008 @@ -55,7 +55,17 @@ <DisplayTag>Nickname</DisplayTag> <Description>Nickname</Description> <OpenIDTag>nickname</OpenIDTag> - </ClaimType> + </ClaimType> + <ClaimType Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/dateofbirth";> + <DisplayTag>Date of Birth</DisplayTag> + <Description>Date of Birth</Description> + <OpenIDTag>dob</OpenIDTag> + </ClaimType> + <ClaimType Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/gender";> + <DisplayTag>Gender</DisplayTag> + <Description>Gender</Description> + <OpenIDTag>gender</OpenIDTag> + </ClaimType> </Claims> <Claims Dialect="http://identity.wso2.org/claims"; DialectInfo="WSO2 Claims"> <ClaimType Uri="http://identity.wso2.org/claims/givenname";> @@ -97,6 +107,26 @@ <Description>Full Name</Description> <OpenIDTag>fullname</OpenIDTag> </ClaimType> + <ClaimType Uri="http://schema.openid.net/2007/05/claims/nickname";> + <DisplayTag>Nickname</DisplayTag> + <Description>Nickname</Description> + <OpenIDTag>nickname</OpenIDTag> + </ClaimType> + <ClaimType Uri="http://schema.openid.net/2007/05/claims/country";> + <DisplayTag>Country</DisplayTag> + <Description>Country</Description> + <OpenIDTag>country</OpenIDTag> + </ClaimType> + <ClaimType Uri="http://schema.openid.net/2007/05/claims/postcode";> + <DisplayTag>Postal code</DisplayTag> + <Description>Postal code</Description> + <OpenIDTag>postcode</OpenIDTag> + </ClaimType> + <ClaimType Uri="http://schema.openid.net/2007/05/claims/email";> + <DisplayTag>Email address</DisplayTag> + <Description>Email address</Description> + <OpenIDTag>email</OpenIDTag> + </ClaimType> </Claims> <Claims Dialect="http://axschema.org"; DialectInfo="OpenID Attribute Exchange Claims"> <ClaimType Uri="http://axschema.org/namePerson/friendly";> @@ -143,7 +173,6 @@ <DisplayTag>Time Zone</DisplayTag> <Description>Time Zone</Description> <OpenIDTag>timezone</OpenIDTag> - </ClaimType> - + </ClaimType> </Claims> </InitialClaims> Modified: trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/openid/OpenIDProvider.java ============================================================================== --- trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/openid/OpenIDProvider.java (original) +++ trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/openid/OpenIDProvider.java Fri Mar 28 02:42:01 2008 @@ -14,7 +14,6 @@ * limitations under the License. */ - package org.wso2.solutions.identity.openid; import java.io.IOException; @@ -279,6 +278,8 @@ req.setAuthRequest(authReq); + boolean hasExtension = false; + for (Object alias : authReq.getExtensions()) { if (log.isDebugEnabled()) log.info("Found extension in the OpenID request: " + alias); @@ -293,11 +294,16 @@ message.addExtension(messageExtension); AuthSuccess authSuccess = (AuthSuccess) message; authSuccess.setSignExtension((String) alias); + hasExtension = true; manager.sign(authSuccess); } } } + if (!hasExtension) { + return message.getDestinationUrl(true); + } + sendData(httpReq, httpResp, message); return null; } _______________________________________________ Identity-dev mailing list [email protected] http://wso2.org/cgi-bin/mailman/listinfo/identity-dev
