Author: ruchith
Date: Thu Dec 6 04:00:07 2007
New Revision: 10634
Log:
Fixed IDENTITY-151
Modified:
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/action/InfoCardSubmitAction.java
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
Thu Dec 6 04:00:07 2007
@@ -19,6 +19,7 @@
successful_verification = You are successfully verified. You may login now!!
no_user_store_config = No configuration properties available for this user
store
no_token_types_selected = Please select at least one token type
+invalid_card_login = Invalid login : Information card used is not registered
with the identity provider
add_claim_duplicate_claim = Duplicate claim : {0}
add_claim_uri_null = Claim URI missing
Modified:
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/InfoCardSubmitAction.java
==============================================================================
---
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/InfoCardSubmitAction.java
(original)
+++
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/InfoCardSubmitAction.java
Thu Dec 6 04:00:07 2007
@@ -16,8 +16,6 @@
package org.wso2.solutions.identity.user.ui.action;
-import javax.servlet.http.HttpServletRequest;
-
import org.apache.struts2.StrutsStatics;
import org.wso2.solutions.identity.IdentityConstants;
import org.wso2.solutions.identity.admin.RegisteredInfoCardInfoAdmin;
@@ -25,15 +23,17 @@
import org.wso2.solutions.identity.persistence.dataobject.ActionDO;
import
org.wso2.solutions.identity.persistence.dataobject.RegisteredInfoCardInfoDO;
import org.wso2.solutions.identity.relyingparty.TokenVerifierConstants;
+import org.wso2.solutions.identity.sts.IdentityProviderUtil;
import org.wso2.solutions.identity.user.ui.UIConstants;
+import javax.servlet.http.HttpServletRequest;
+
import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.ActionSupport;
/**
* Process an info card login
*/
-public class InfoCardSubmitAction extends ActionSupport {
+public class InfoCardSubmitAction extends ManagedAction {
private static final long serialVersionUID = 264026108621800214L;
@@ -58,8 +58,13 @@
if (info != null && info.getIssuerInfo().equals(issuerInfo)) {
context.getSession().put(UIConstants.USER, info.getUserId());
context.getSession().put(UIConstants.PPID, ppid);
- ReportAdmin.record(info.getUserId(),
ActionDO.ACTION_USER_LOG_IN_CARD, "PPID="+ppid);
+ ReportAdmin.record(info.getUserId(),
+ ActionDO.ACTION_USER_LOG_IN_CARD, "PPID=" + ppid);
+ this.addInfoMessage(getText("login_successful",
+ new String[] { IdentityProviderUtil
+ .getPPIDDisplayValue(ppid) }));
} else {
+ this.addErrorMessage(getText("invalid_card_login"));
return ERROR;
}
return SUCCESS;
_______________________________________________
Identity-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/identity-dev
