Author: prabath
Date: Tue Feb 19 21:16:22 2008
New Revision: 13906
Log:
code review fixes + code formatting
Modified:
trunk/solutions/identity/modules/admin-ui/src/main/java/org/wso2/solutions/identity/admin/ui/action/AddNewClaimAction.java
trunk/solutions/identity/modules/admin-ui/src/main/resources/org/wso2/solutions/identity/package.properties
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/UIConstants.java
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/AddUserProfileAction.java
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/AddUserProfileSubmitAction.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/java/org/wso2/solutions/identity/user/ui/action/OpenIDAuthenticationAction.java
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/OpenIDInfoCardSubmitAction.java
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/OpenIDUserApprovalAction.java
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/UpdateOpenIDUserRPAction.java
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/interceptor/SessionInterceptor.java
trunk/solutions/identity/modules/user-ui/src/main/resources/struts.xml
trunk/solutions/identity/modules/user-ui/src/main/webapp/jsp/openidauthentication.jsp
Modified:
trunk/solutions/identity/modules/admin-ui/src/main/java/org/wso2/solutions/identity/admin/ui/action/AddNewClaimAction.java
==============================================================================
---
trunk/solutions/identity/modules/admin-ui/src/main/java/org/wso2/solutions/identity/admin/ui/action/AddNewClaimAction.java
(original)
+++
trunk/solutions/identity/modules/admin-ui/src/main/java/org/wso2/solutions/identity/admin/ui/action/AddNewClaimAction.java
Tue Feb 19 21:16:22 2008
@@ -18,8 +18,6 @@
import org.wso2.solutions.identity.admin.ClaimsAdmin;
-import java.net.URI;
-
public class AddNewClaimAction extends ManagedAction {
private static final long serialVersionUID = 4547175925687868897L;
Modified:
trunk/solutions/identity/modules/admin-ui/src/main/resources/org/wso2/solutions/identity/package.properties
==============================================================================
---
trunk/solutions/identity/modules/admin-ui/src/main/resources/org/wso2/solutions/identity/package.properties
(original)
+++
trunk/solutions/identity/modules/admin-ui/src/main/resources/org/wso2/solutions/identity/package.properties
Tue Feb 19 21:16:22 2008
@@ -45,3 +45,6 @@
email_verification = Email verification sent for {0}
cannot_edit_default_realm = Cannot edit DefaultRealm!
+user_profile_exists=Please enter a unique profile name
+invalid_user_login=Please login with your user credentials
+openid_required=OpenID is missing in your request
Modified:
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/UIConstants.java
==============================================================================
---
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/UIConstants.java
(original)
+++
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/UIConstants.java
Tue Feb 19 21:16:22 2008
@@ -51,8 +51,6 @@
public final static String OPENID_SUBMIT_ACTION = "OpenIDSubmit.action";
- public final static String USER_REGISTRATION_OPENDID_ACTION =
"OpenIDUserRegistration.action";
-
public final static String OPENDID_CALLBACK_ACTION =
"OpenIDCallback.action";
public final static String OPENID_SERVER_PAGE = "/server";
Modified:
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/AddUserProfileAction.java
==============================================================================
---
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/AddUserProfileAction.java
(original)
+++
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/AddUserProfileAction.java
Tue Feb 19 21:16:22 2008
@@ -1,15 +1,18 @@
package org.wso2.solutions.identity.user.ui.action;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.List;
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.struts2.StrutsStatics;
import org.wso2.solutions.identity.admin.ClaimsAdmin;
import org.wso2.solutions.identity.persistence.dataobject.ClaimDO;
+import org.wso2.solutions.identity.user.ui.UIConstants;
-import com.opensymphony.xwork2.ActionSupport;
+import com.opensymphony.xwork2.ActionContext;
-public class AddUserProfileAction extends ActionSupport {
+public class AddUserProfileAction extends ManagedAction {
/**
*
@@ -18,16 +21,44 @@
private List claims;
+ /**
+ * This will get executed while adding a new user profile to an existing
+ * user and will load all the supported claims where the user can use in
his
+ * profile.
+ */
public String execute() throws Exception {
- ClaimsAdmin ClaimsAdmin = new ClaimsAdmin();
- ClaimDO[] claimDOs = ClaimsAdmin.getAllMappedEnabledClaims();
- claims = new ArrayList<ClaimDO>();
- for (int i = 0; i < claimDOs.length; i++) {
- if(claimDOs[i].isUserEditable()) {
- claims.add(claimDOs[i]);
+ String userName = null;
+ HttpServletRequest request = null;
+ ClaimsAdmin claimsAdmin = null;
+ ClaimDO[] claimDOs = null;
+
+ try {
+ request = (HttpServletRequest) ActionContext.getContext().get(
+ StrutsStatics.HTTP_REQUEST);
+
+ userName = (String) request.getSession().getAttribute(
+ UIConstants.USER);
+
+ if (userName == null) {
+ this.addErrorMessage(getText("invalid_user_login"));
+ return ERROR;
+ }
+
+ claimsAdmin = new ClaimsAdmin();
+ claimDOs = claimsAdmin.getAllMappedEnabledClaims();
+
+ claims = new ArrayList<ClaimDO>();
+ for (int i = 0; i < claimDOs.length; i++) {
+ if (claimDOs[i].isUserEditable()) {
+ claims.add(claimDOs[i]);
+ }
}
+ } catch (Exception e) {
+ return ERROR;
}
+
+ this.loadMessages();
return SUCCESS;
}
Modified:
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/AddUserProfileSubmitAction.java
==============================================================================
---
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/AddUserProfileSubmitAction.java
(original)
+++
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/AddUserProfileSubmitAction.java
Tue Feb 19 21:16:22 2008
@@ -26,27 +26,29 @@
private String profileName;
- public String getProfileName() {
- return profileName;
- }
-
- public void setProfileName(String profileName) {
- this.profileName = profileName;
- }
-
+ /**
+ * This will get executed while adding a new user profile to an existing
+ * user.
+ */
public String execute() throws Exception {
String userName = null;
- HttpServletRequest request = (HttpServletRequest) ActionContext
- .getContext().get(StrutsStatics.HTTP_REQUEST);
+ HttpServletRequest request = null;
+ ClaimsAdmin claimsAdmin = null;
+ ClaimDO[] claimDOs = null;
+
+ request = (HttpServletRequest) ActionContext.getContext().get(
+ StrutsStatics.HTTP_REQUEST);
userName = (String)
request.getSession().getAttribute(UIConstants.USER);
- if (userName == null)
+ if (userName == null) {
+ this.addErrorMessage(getText("invalid_user_login"));
return ERROR;
+ }
- ClaimsAdmin ClaimsAdmin = new ClaimsAdmin();
- ClaimDO[] claimDOs = ClaimsAdmin.getAllMappedEnabledClaims();
+ claimsAdmin = new ClaimsAdmin();
+ claimDOs = claimsAdmin.getAllMappedEnabledClaims();
HashMap<String, String> props = new HashMap<String, String>();
for (int i = 0; i < claimDOs.length; i++) {
@@ -69,8 +71,7 @@
reader = realm.getIdentityUserStoreReader();
if (reader.isExistingUserProfile(userName, profileName)) {
- this.addErrorMessage(getText("sign_in_user_exist",
- new String[] { profileName }));
+ this.addErrorMessage(getText("user_profile_exists"));
loadMessages();
return ERROR;
} else {
@@ -87,4 +88,12 @@
return SUCCESS;
}
+ public String getProfileName() {
+ return profileName;
+ }
+
+ public void setProfileName(String profileName) {
+ this.profileName = profileName;
+ }
+
}
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
Tue Feb 19 21:16:22 2008
@@ -62,7 +62,14 @@
infoCardSignin = request.getParameter("InfoCardSignin");
requestParam = (ParameterList) session.getAttribute("parameterlist");
- openID = requestParam.getParameter("openid.identity").getValue();
+
+ if (requestParam != null &&
requestParam.hasParameter(IdentityConstants.OpenId.ATTR_IDENTITY)) {
+ openID = requestParam.getParameter(
+ IdentityConstants.OpenId.ATTR_IDENTITY).getValue();
+ } else {
+ addErrorMessage(getText("openid_required"));
+ return ERROR;
+ }
user = UserUtil.getUserName(openID);
Modified:
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/OpenIDAuthenticationAction.java
==============================================================================
---
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/OpenIDAuthenticationAction.java
(original)
+++
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/OpenIDAuthenticationAction.java
Tue Feb 19 21:16:22 2008
@@ -7,6 +7,7 @@
import org.apache.struts2.StrutsStatics;
import org.openid4java.message.ParameterList;
+import org.wso2.solutions.identity.IdentityConstants;
import com.opensymphony.xwork2.ActionContext;
@@ -33,7 +34,15 @@
.get(StrutsStatics.HTTP_RESPONSE);
session = request.getSession();
requestParam = (ParameterList) session.getAttribute("parameterlist");
- openID = requestParam.getParameter("openid.identity").getValue();
+
+ if (requestParam != null &&
requestParam.hasParameter(IdentityConstants.OpenId.ATTR_IDENTITY)) {
+ openID = requestParam.getParameter(
+ IdentityConstants.OpenId.ATTR_IDENTITY).getValue();
+ } else {
+ addErrorMessage(getText("openid_required"));
+ loadMessages();
+ return ERROR;
+ }
loadMessages();
Modified:
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/OpenIDInfoCardSubmitAction.java
==============================================================================
---
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/OpenIDInfoCardSubmitAction.java
(original)
+++
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/OpenIDInfoCardSubmitAction.java
Tue Feb 19 21:16:22 2008
@@ -12,7 +12,7 @@
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ActionSupport;
-public class OpenIDInfoCardSubmitAction extends ActionSupport {
+public class OpenIDInfoCardSubmitAction extends ManagedAction {
private static final long serialVersionUID = 264026108621800214L;
@@ -36,8 +36,10 @@
openID = (String) request
.getAttribute(IdentityConstants.OpenId.OPENID_IDENTIFIER);
- if (openID == null)
+ if (openID == null) {
+ addErrorMessage(getText("openid_required"));
return ERROR;
+ }
userID = UserUtil.getUserName(openID);
Modified:
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/OpenIDUserApprovalAction.java
==============================================================================
---
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/OpenIDUserApprovalAction.java
(original)
+++
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/OpenIDUserApprovalAction.java
Tue Feb 19 21:16:22 2008
@@ -17,9 +17,8 @@
import org.wso2.solutions.identity.users.IdentityUserStoreReader;
import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.ActionSupport;
-public class OpenIDUserApprovalAction extends ActionSupport {
+public class OpenIDUserApprovalAction extends ManagedAction {
/**
*
@@ -56,18 +55,25 @@
if (submitAction.equals("Only Once")) {
action = IdentityConstants.OpenId.COMPLETE;
- authenticatedAndApproved="once";
+ authenticatedAndApproved = "once";
} else if (submitAction.equals("Always")) {
action = IdentityConstants.OpenId.COMPLETE;
- authenticatedAndApproved="always";
+ authenticatedAndApproved = "always";
} else if (submitAction.equals("Denyy")) {
action = IdentityConstants.OpenId.CANCEL;
- authenticatedAndApproved="false";
+ authenticatedAndApproved = "false";
}
- String rpUrl = requestp.getParameterValue("openid.return_to");
+ String rpUrl = requestp
+
.getParameterValue(IdentityConstants.OpenId.ATTR_RETURN_TO);
String openididentity = requestp
- .getParameterValue("openid.identity");
+ .getParameterValue(IdentityConstants.OpenId.ATTR_IDENTITY);
+
+ if (openididentity == null || rpUrl == null) {
+ addErrorMessage(getText("openid_required"));
+ return ERROR;
+ }
+
String userName = UserUtil.getUserName(openididentity);
realm = (IdentityDefaultRealm) UserStore.getInstance().getRealm();
Modified:
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/UpdateOpenIDUserRPAction.java
==============================================================================
---
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/UpdateOpenIDUserRPAction.java
(original)
+++
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/UpdateOpenIDUserRPAction.java
Tue Feb 19 21:16:22 2008
@@ -7,9 +7,8 @@
import org.wso2.solutions.identity.user.ui.UIConstants;
import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.ActionSupport;
-public class UpdateOpenIDUserRPAction extends ActionSupport {
+public class UpdateOpenIDUserRPAction extends ManagedAction {
/**
*
@@ -24,12 +23,18 @@
* This will get executed while updating user visited relying Parties
*/
public String execute() throws Exception {
+
if (rpUrl != null && operation != null && rpUrl.length() > 0
&& operation.length() > 0) {
Map session = ActionContext.getContext().getSession();
String user = (String) session.get(UIConstants.USER);
+ if (user == null) {
+ this.addErrorMessage(getText("invalid_user_login"));
+ return ERROR;
+ }
+
IPPersistenceManager db = IPPersistenceManager
.getPersistanceManager();
OpenIDUserRPDO[] rpdos = null;
Modified:
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/interceptor/SessionInterceptor.java
==============================================================================
---
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/interceptor/SessionInterceptor.java
(original)
+++
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/interceptor/SessionInterceptor.java
Tue Feb 19 21:16:22 2008
@@ -57,10 +57,6 @@
&& requestURL.toString().indexOf(
UIConstants.OPENID_INFO_CARD__SUBMIT_ACTION) < 0
&& requestURL.toString().indexOf(
- UIConstants.OPENID_INFO_CARD__ACTION) < 0
- && requestURL.toString().indexOf(
- UIConstants.OPENID_INFO_CARD__DOWNLOAD_ACTION) < 0
- && requestURL.toString().indexOf(
UIConstants.ADD_USER_PROFILE_ACTION) < 0
&& requestURL.toString().indexOf(
UIConstants.ADD_USER_PROFILE_SUBMIT_ACTION) < 0
Modified: trunk/solutions/identity/modules/user-ui/src/main/resources/struts.xml
==============================================================================
--- trunk/solutions/identity/modules/user-ui/src/main/resources/struts.xml
(original)
+++ trunk/solutions/identity/modules/user-ui/src/main/resources/struts.xml
Tue Feb 19 21:16:22 2008
@@ -152,6 +152,7 @@
<action name="OpenIDAuthentication"
class="org.wso2.solutions.identity.user.ui.action.OpenIDAuthenticationAction">
<result
name="success">/jsp/openidauthentication.jsp</result>
+ <result name="error"
type="redirect">Login.action</result>
</action>
<action name="OpenIDSubmit"
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
Tue Feb 19 21:16:22 2008
@@ -73,12 +73,18 @@
theme="simple" method="POST">
<input type="hidden" id="remember"
name="remember" value="false" />
<div class="errors"><s:actionerror />
<s:fielderror /></div>
+ <%
+ if (openidreturnto != null &&
openididentity != null) {
+ %>
<table>
<tr>
<td><strong>Please sign
in to authenticate to <%=openidreturnto%>
as
<%=openididentity%>.</strong></td>
</tr>
</table>
+ <%
+ }
+ %>
<table>
<tr>
<td width="40%">
@@ -97,8 +103,9 @@
id="chkRemember" onclick="setRememberMe();">Remember
me on
this computer</td>
</tr>
- <tr>
- <td
colspan="2"><s:submit value="Login" align="left" cssClass="button" /></td>
+ <tr>
+ <td
colspan="2"><s:submit value="Login" align="left"
+
cssClass="button" /></td>
</tr>
</table>
_______________________________________________
Identity-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/identity-dev
