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

[svn]

Author: prabath
Date: Fri Jan 25 00:52:17 2008
New Revision: 12880

Log:

code refactoring

Modified:
   
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/sts/OpenIDTokenIssuer.java

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
     Fri Jan 25 00:52:17 2008
@@ -18,8 +18,6 @@
 import org.apache.rahas.TrustUtil;
 import org.apache.ws.security.message.WSSecEncryptedKey;
 import org.apache.ws.security.util.XmlSchemaDateFormat;
-import org.openid4java.association.Association;
-import org.openid4java.association.AssociationException;
 import org.openid4java.message.Message;
 import org.openid4java.message.MessageException;
 import org.openid4java.message.Parameter;
@@ -32,6 +30,7 @@
 import org.wso2.solutions.identity.IdentityConstants;
 import org.wso2.solutions.identity.IdentityProviderException;
 import org.wso2.solutions.identity.openid.OpenIDProvider;
+import org.wso2.solutions.identity.openid.infocard.OpenIDInfoCardHeader;
 import org.wso2.solutions.identity.openid.infocard.OpenIDInfoCardProviderData;
 import org.wso2.solutions.identity.openid.infocard.OpenIDInfoCardToken;
 import 
org.wso2.solutions.identity.openid.infocard.OpenIDInfoCardProviderData.OpenIDRequestedClaimData;
@@ -111,11 +110,8 @@
         OMElement reqSecTokenElem = TrustUtil
                 .createRequestedSecurityTokenElement(wstVersion, rstrElem);
 
-        try {
-            createOpenIdToken(reqSecTokenElem);
-        } catch (MessageException e) {
-            throw new IdentityProviderException(e.getMessage());
-        }
+        createOpenIdToken(reqSecTokenElem);
+
         createAttachedRef(rstrElem, assertion.getId());
         createUnattachedRef(rstrElem, assertion.getId());
 
@@ -140,7 +136,7 @@
      * @throws MessageException
      */
     protected OMElement createOpenIdToken(OMElement rstrElem)
-            throws MessageException {
+            throws IdentityProviderException {
         OMElement rdt = IdentityProviderUtil
                 .createOpenIdToken(rstrElem, ipData);
 
@@ -148,60 +144,25 @@
         Message message = null;
         ParameterList params = null;
         String claimID = null;
-        Association assoc = null;
-        String nonce = null;
+        OpenIDInfoCardHeader header = null;
+
+        header = new OpenIDInfoCardHeader(OpenIDProvider.getManager());
 
         claimID = ((RequestedClaimData) ipData.requestedClaims
                 .get(IdentityConstants.CLAIM_OPENID)).value;
-        nonce = OpenIDProvider.getNonce();
-
-        params = new ParameterList();
-
-        params.set(new Parameter(IdentityConstants.OpenId.ATTR_NS,
-                IdentityConstants.OpenId.OPENID_URL));
-
-        params.set(new Parameter(IdentityConstants.OpenId.ATTR_OP_ENDPOINT,
-                OpenIDProvider.getOpAddress()));
-
-        params.set(new Parameter(IdentityConstants.OpenId.ATTR_CLAIM_ID,
-                claimID));
-
-        params.set(new Parameter(IdentityConstants.OpenId.ATTR_RESPONSE_NONCE,
-                nonce));
 
-        params.set(new Parameter(IdentityConstants.OpenId.ATTR_MODE, 
"id_res"));
+        params = header.buildHeader(claimID, OpenIDProvider.getOpAddress(),
+                appliesTo);
 
-        params.set(new Parameter(IdentityConstants.OpenId.ATTR_IDENTITY,
-                claimID));
-
-        params.set(new Parameter(IdentityConstants.OpenId.ATTR_RETURN_TO,
-                appliesTo));
+        setSimpleAttributeParams(params);
 
         try {
-            assoc = OpenIDProvider.getAssocHandle();
-            params.set(new Parameter(
-                    IdentityConstants.OpenId.ATTR_ASSOC_HANDLE, assoc
-                            .getHandle()));
-        } catch (AssociationException e) {
-            throw new MessageException(e.getMessage());
-        }
-
-        params
-                .set(new Parameter(IdentityConstants.OpenId.ATTR_SIGNED,
-                        
"op_endpoint,claimed_id,identity,return_to,response_nonce,assoc_handle"));
+            message = Message.createMessage(params);
+        } catch (MessageException e) {
+            throw new IdentityProviderException(e.getMessage());
 
-        try {
-            params.set(new Parameter(IdentityConstants.OpenId.ATTR_SIG,
-                    OpenIDProvider.getSignature(OpenIDProvider.getOpAddress(),
-                            claimID, false, appliesTo, nonce, assoc)));
-        } catch (AssociationException e) {
-            throw new MessageException(e.getMessage());
         }
 
-        setSimpleAttributeParams(params);
-
-        message = Message.createMessage(params);
-
         token = new OpenIDInfoCardToken(message);
 
         rdt.setText(token.getToken());

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