Author: prabath
Date: Thu Feb 28 03:09:57 2008
New Revision: 14312

Log:

ax support for OpenID Information Cards

Modified:
   
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/sts/OpenIDTokenIssuer.java
   
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/OpenIDAuthVerificationAction.java
   
trunk/solutions/identity/modules/user-ui/src/main/webapp/jsp/openidauthentication.jsp

Modified: 
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/sts/OpenIDTokenIssuer.java
==============================================================================
--- 
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/sts/OpenIDTokenIssuer.java
     (original)
+++ 
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/sts/OpenIDTokenIssuer.java
     Thu Feb 28 03:09:57 2008
@@ -164,7 +164,7 @@
         params = header.buildHeader(claimID, OpenIDProvider.getOpAddress(),
                 appliesTo);
 
-        setSimpleAttributeParams(params);
+        setAttributeExchangeParams(params);
 
         try {
             message = Message.createMessage(params);
@@ -203,10 +203,6 @@
                 IdentityConstants.OpenId.ExchangeAttributes.MODE,
                 IdentityConstants.OpenId.ExchangeAttributes.FETCH_RESPONSE));
 
-        params.set(new Parameter(
-                IdentityConstants.OpenId.SimpleRegAttributes.OP_SREG,
-                IdentityConstants.OpenId.SimpleRegAttributes.NS_SREG));
-
         iterator = ipData.requestedClaims.keySet().iterator();
 
         while (iterator.hasNext()) {

Modified: 
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/OpenIDAuthVerificationAction.java
==============================================================================
--- 
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/OpenIDAuthVerificationAction.java
 (original)
+++ 
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/OpenIDAuthVerificationAction.java
 Thu Feb 28 03:09:57 2008
@@ -79,6 +79,9 @@
 
             rpUrl = requestParam.getParameter(
                     IdentityConstants.OpenId.ATTR_RETURN_TO).getValue();
+            if (rpUrl != null && rpUrl.indexOf("?") > 0) {
+                rpUrl = rpUrl.substring(0, rpUrl.indexOf("?"));
+            }
         } else {
             addErrorMessage(getText("returnTo_required"));
             return ERROR;
@@ -255,6 +258,10 @@
         String rpUrl = requestParam
                 .getParameterValue(IdentityConstants.OpenId.ATTR_RETURN_TO);
 
+        if (rpUrl != null && rpUrl.indexOf("?") > 0) {
+            rpUrl = rpUrl.substring(0, rpUrl.indexOf("?"));
+        }
+
         try {
             db = IPPersistenceManager.getPersistanceManager();
         } catch (IdentityProviderException e) {

Modified: 
trunk/solutions/identity/modules/user-ui/src/main/webapp/jsp/openidauthentication.jsp
==============================================================================
--- 
trunk/solutions/identity/modules/user-ui/src/main/webapp/jsp/openidauthentication.jsp
       (original)
+++ 
trunk/solutions/identity/modules/user-ui/src/main/webapp/jsp/openidauthentication.jsp
       Thu Feb 28 03:09:57 2008
@@ -45,6 +45,11 @@
                        : null;
        String site = (String) (openidrealm == null ? openidreturnto
                        : openidrealm);
+
+       if (openidreturnto != null && openidreturnto.indexOf("?") > 0) {
+               openidreturnto = openidreturnto.substring(0, openidreturnto
+               .indexOf("?"));
+       }
  %>
 
 <table cellpadding="0" cellspacing="0" border="0" style="width: 100%;">

_______________________________________________
Identity-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/identity-dev

Reply via email to