[Identity-dev] svn commit r15673 - trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/openid

[svn]

Author: prabath
Date: Tue Apr 15 03:39:04 2008
New Revision: 15673

Log:

merging changed from the 1.5 branch

Modified:
   
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/openid/OpenIDProvider.java

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
     Tue Apr 15 03:39:04 2008
@@ -37,6 +37,7 @@
 import org.openid4java.message.MessageException;
 import org.openid4java.message.MessageExtension;
 import org.openid4java.message.ParameterList;
+import org.openid4java.message.sreg.SRegMessage;
 import org.openid4java.server.ServerException;
 import org.openid4java.server.ServerManager;
 import org.wso2.solutions.identity.IdentityConstants;
@@ -287,6 +288,7 @@
             req.setAuthRequest(authReq);
 
             boolean hasExtension = false;
+            boolean hasSregExtension = false;
 
             for (Object alias : authReq.getExtensions()) {
                 if (log.isDebugEnabled())
@@ -302,13 +304,22 @@
                         message.addExtension(messageExtension);
                         AuthSuccess authSuccess = (AuthSuccess) message;
                         authSuccess.setSignExtension((String) alias);
-                        hasExtension = true;
+
+                        if ((messageExtension instanceof SRegMessage)
+                                && req
+                                        .getExtensionAlias()
+                                        .equals(
+                                                
IdentityConstants.OpenId.SimpleRegAttributes.NS_SREG)) {
+                            hasSregExtension = true;
+                        } else {
+                            hasExtension = true;
+                        }
                         manager.sign(authSuccess);
                     }
                 }
             }
 
-            if (!hasExtension) {
+            if (hasSregExtension && !hasExtension) {
                 return message.getDestinationUrl(true);
             }
 

_______________________________________________
Identity-dev mailing list
Identity-dev@wso2.org
http://wso2.org/cgi-bin/mailman/listinfo/identity-dev