Author: prabath
Date: Mon Feb 11 07:20:24 2008
New Revision: 13590

Log:

removed additional attributes which are optional, being added, during 
self-issued infocard registration + formatting

Modified:
   
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/InfoCardUserRegistrationSubmitAction.java

Modified: 
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/InfoCardUserRegistrationSubmitAction.java
==============================================================================
--- 
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/InfoCardUserRegistrationSubmitAction.java
 (original)
+++ 
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/InfoCardUserRegistrationSubmitAction.java
 Mon Feb 11 07:20:24 2008
@@ -43,53 +43,59 @@
         ActionContext context = ActionContext.getContext();
         HttpServletRequest request = (HttpServletRequest) context
                 .get(StrutsStatics.HTTP_REQUEST);
-        String ppid = 
(String)request.getAttribute(IdentityConstants.CLAIM_PPID);
-        if(ppid == null) {
+        String ppid = (String) request
+                .getAttribute(IdentityConstants.CLAIM_PPID);
+        if (ppid == null) {
             this.addErrorMessage(getText("no_selector"));
             return ERROR;
         }
-        
+
         RegisteredInfoCardInfoAdmin admin = new RegisteredInfoCardInfoAdmin();
-        if(admin.isRegistedInformationCard(ppid)) {
+        if (admin.isRegistedInformationCard(ppid)) {
             this.addErrorMessage(getText("card_alredy_registered",
-                    new String[] { IdentityUtil
-                            .getPPIDDisplayValue(ppid) }));
+                    new String[] { IdentityUtil.getPPIDDisplayValue(ppid) }));
             return ERROR;
         }
-        
+
         try {
             UserStore store = UserStore.getInstance();
-            
+
             String userName = IdentityUtil.getPPIDDisplayValue(ppid);
-            store.getRealm().getUserStoreAdmin().addUser(userName, 
UUIDGenerator.getUUID());
+            store.getRealm().getUserStoreAdmin().addUser(userName,
+                    UUIDGenerator.getUUID());
 
             ClaimsAdmin ClaimsAdmin = new ClaimsAdmin();
             ClaimDO[] claimDOs = ClaimsAdmin.getAllMappedEnabledClaims();
             HashMap props = new HashMap();
 
             for (int i = 0; i < claimDOs.length; i++) {
-                props.put(claimDOs[i].getUri(), (String) 
request.getAttribute(claimDOs[i].getUri()));
+                if (!claimDOs[i].isOptional())
+                    props.put(claimDOs[i].getUri(), (String) request
+                            .getAttribute(claimDOs[i].getUri()));
             }
-            
+
             // We create an OpenID for all registering users
             String openid = OpenIDProvider.generateOpenID(userName);
             props.put(IdentityConstants.CLAIM_OPENID, openid);
-            
-            store.getRealm().getUserStoreAdmin().setUserProperties(userName, 
props);
 
-            String issuerInfo = (String) 
request.getAttribute(TokenVerifierConstants.ISSUER_INFO);
+            store.getRealm().getUserStoreAdmin().setUserProperties(userName,
+                    props);
+
+            String issuerInfo = (String) request
+                    .getAttribute(TokenVerifierConstants.ISSUER_INFO);
             admin.registerNewInfoCardInformation(ppid, userName, issuerInfo);
-            
-            ReportAdmin.record(userName, ActionDO.ACTION_USER_INFOCARD_SUBMIT, 
"PPID="+ppid);
+
+            ReportAdmin.record(userName, ActionDO.ACTION_USER_INFOCARD_SUBMIT,
+                    "PPID=" + ppid);
             this.addInfoMessage(getText("user_successfully_added",
                     new String[] { userName }));
             this.addInfoMessage("Your OpenID is " + openid);
-            
+
         } catch (RuntimeException e) {
             this.addActionError(e.getMessage());
             return ERROR;
         }
-        
+
         return SUCCESS;
     }
 

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

Reply via email to