Revision 17:45ecfdecdff4

View differences:

WebContent/jsp/ss112_user/ibssRetailUserResetPass.jsp
89 89
				</c:choose> </strong></td>
90 90
		<td>&nbsp;</td>
91 91
	</tr>
92
	 <tr>
93
    <td>&nbsp;</td>
94
    <td><bean:message key="user.new.password"/>:</td>
95
    <td colspan="2"><htmlEL:password autocomplete="off" property="pass" name="ibssUserForm" maxlength="12"/></td>
96
    <td>&nbsp;</td>
97
  </tr>
98
  <tr>
99
    <td>&nbsp;</td>
100
    <td><bean:message key="user.confirm.password"/>:</td>
101
    <td colspan="2"><htmlEL:password autocomplete="off" property="confirmPass" name="ibssUserForm" maxlength="12"/></td>
102
    <td>&nbsp;</td>
103
  </tr>
92 104
  <tr>
93 105
    <td>&nbsp;</td>
94 106
    <td>&nbsp;</td>
src/com/ib/ibss/controller/actions/ss112_user/IBSSRetailUserEnquiryResetPassAction.java
70 70
		}
71 71
		else
72 72
		{
73
			try
73
			ActionErrors m_oError = p_oForm.validate(createNewActionMapping(p_oMapping, JSPValidator.RESET_PASS_VALIDATION), p_oRequest);
74
			
75
			if(!m_oError.isEmpty ())
74 76
			{
75
				checkToken (p_oRequest, p_oMapping, false);
76
				checkCredential(p_oRequest, FunctionCodeEnum.RIB_USER_ENQUIRY);
77
				errorHandling(p_oRequest, p_oMapping, m_oError);
78
			}
79
			else
80
			{
81
				try
82
				{
83
					checkToken (p_oRequest, p_oMapping, false);
84
					checkCredential(p_oRequest, FunctionCodeEnum.RIB_USER_ENQUIRY);
85
					
86
					IBSSSessionObjects m_oSessionObjects = new IBSSSessionObjects(p_oRequest);
87
					IBSSNavigationUtil m_oTree = new IBSSNavigationUtil(m_oSessionObjects);
88
					m_oTree.buildNavigation ();
89
					
90
					//Check User Permission Access
91
					Long actionId = RIBPermission.RESET_RIB_USER_PASSWORD.getActionId();
92
					SessionUserPermissionVerificationService access = new SessionUserPermissionVerificationService(m_oSessionObjects);
93
					access.validateUser(actionId);
77 94
				
78
				IBSSSessionObjects m_oSessionObjects = new IBSSSessionObjects(p_oRequest);
79
				IBSSNavigationUtil m_oTree = new IBSSNavigationUtil(m_oSessionObjects);
80
				m_oTree.buildNavigation ();
81
				
82
				//Check User Permission Access
83
				Long actionId = RIBPermission.RESET_RIB_USER_PASSWORD.getActionId();
84
				SessionUserPermissionVerificationService access = new SessionUserPermissionVerificationService(m_oSessionObjects);
85
				access.validateUser(actionId);
86
			
87
				String m_sPassword 			= p_oRequest.getParameter(IBSSUserConstants.PASS);
88
				String m_sConfirmPassword 	= p_oRequest.getParameter(IBSSUserConstants.CONFIRM_PASS);
89
				
90
				m_oIBDynaBean.set(IBSSUserConstants.PASS, m_sPassword);
91
				m_oIBDynaBean.set(IBSSUserConstants.CONFIRM_PASS, m_sConfirmPassword);
92
				
93
				IBSSRetailUserEnquiryResetPassServices m_oServices = new IBSSRetailUserEnquiryResetPassServices(m_oSessionObjects);
94
				m_oServices.setIBSSDynaBean (m_oIBDynaBean);
95
				m_oServices.userResetPassword();
96
			}
97
			catch (IBSSGenericException e)
98
			{
99
				errorHandling(p_oRequest, p_oMapping, e);
95
					String m_sPassword 			= p_oRequest.getParameter(IBSSUserConstants.PASS);
96
					String m_sConfirmPassword 	= p_oRequest.getParameter(IBSSUserConstants.CONFIRM_PASS);
97
					
98
					m_oIBDynaBean.set(IBSSUserConstants.PASS, m_sPassword);
99
					m_oIBDynaBean.set(IBSSUserConstants.CONFIRM_PASS, m_sConfirmPassword);
100
					
101
					IBSSRetailUserEnquiryResetPassServices m_oServices = new IBSSRetailUserEnquiryResetPassServices(m_oSessionObjects);
102
					m_oServices.setIBSSDynaBean (m_oIBDynaBean);
103
					m_oServices.userResetPassword();
104
				}
105
				catch (IBSSGenericException e)
106
				{
107
					errorHandling(p_oRequest, p_oMapping, e);
108
				}
100 109
			}
101 110
		}
102 111
		return super.execute (p_oMapping, p_oForm, p_oRequest, p_oResponse);
src/com/ib/ibss/enterprise/services/ss112_user/IBSSRetailUserEnquiryDetailsServices.java
119 119
					}
120 120
					case 2:{//Maybank Online Stock
121 121
						StockUser user = getStockUser(userId);
122
						detailMap.put(ResourcesUtils.getApplicationResourceMessage("user.active.attribute"), user.getActiveAttr());
123
						detailMap.put(ResourcesUtils.getApplicationResourceMessage("user.high.net.worth.attribute"), user.getHighNetWorthAttr());
124 122
						detailMap.put(ResourcesUtils.getApplicationResourceMessage("user.id.no"), user.getIdNo());
125
						detailMap.put(ResourcesUtils.getApplicationResourceMessage("user.pal.account.no"), user.getPalAccountNo());
126
						detailMap.put(ResourcesUtils.getApplicationResourceMessage("user.st.account.no"), user.getStAccountNo());
127
						detailMap.put(ResourcesUtils.getApplicationResourceMessage("user.customer.type"), String.valueOf(user.getCustType()));
128 123
						break;
129 124
					}
130 125
					case 3:{//Maybank Online Ticketing
......
211 206
	public StockUser getStockUser (long userId){
212 207
		StockUser user = new StockUser();
213 208
		user.setUserId(userId);
214
		user.setActiveAttr("active");
215
		user.setCustType(0);
216
		user.setHighNetWorthAttr("highNetWorthAttr");
217 209
		user.setIdNo("123456789");
218
		user.setPalAccountNo("palAccountNo");
219
		user.setStAccountNo("stAccountNo");
220 210
		
221 211
		return user;
222 212
	}
src/com/ib/ibss/enterprise/services/ss112_user/IBSSRetailUserEnquiryResetPassServices.java
13 13

  
14 14
import java.util.Date;
15 15

  
16
import my.com.upass.UPassControllerV2;
16 17
import net.penril.ibss.audit.log.AuditLogConstants;
17 18
import net.penril.ibss.core.hibernate.IbCustProfile;
18 19

  
20
import com.ib.common.utils.constant.UPassConstants;
19 21
import com.ib.ibss.common.constant.AdminPermissionModeType.RIBPermission;
20 22
import com.ib.ibss.common.constant.ExceptionErrors;
21 23
import com.ib.ibss.common.utils.IBSSLogger;
......
85 87
		try
86 88
		{
87 89
			/* Match password and re-type password */
88
//			checkPasswordMatching();
90
			checkPasswordMatching();
89 91
			
90 92
			RetailUserSharedServices m_oSharedServices = new RetailUserSharedServices();
91 93
			//Determine maker checker
......
93 95
			boolean isMakerChecker = m_oSharedServices.determineMakerChecker (actionId, getAdminActionDAO(), getIBSSessionObjects());	
94 96
			
95 97
			/* Reset password */
96
//				resetPassword();
98
				resetPassword();
97 99
				/* Log successful */
98 100
				m_oLogStatus = AuditLogConstants.SUCCESSFUL;
99 101
				
......
131 133
	{
132 134
		IBSSLogger.debug (c_oClass, "Entering resetPassword");
133 135
		
136
		UPassControllerV2 upass = new UPassControllerV2();
134 137
		int m_iRC = getUPassService ().resetUserPassword (c_sUserAlias, c_sPassword);
135 138
		
136 139
		switch(m_iRC)
......
156 159
		
157 160
		if (!c_sPassword.equals(c_sConfirmPassword))
158 161
		{
159
			throw IBSSErrorHandler.createBusinessException (IBSSBusinessException.LOGIN, ExceptionErrors.LOGIN_PASSWORD_NOT_MATCH);
162
			String[] params = new String[1];
163
			params[0] = ResourcesUtils.getApplicationResourceMessage("user.new.password");
164
			throw IBSSErrorHandler.createBusinessException (IBSSBusinessException.LOGIN, ExceptionErrors.LOGIN_PASSWORD_NOT_MATCH, params);
160 165
		}
161 166
		
162 167
		IBSSLogger.debug (c_oClass, "Exiting checkPasswordMatching");

Also available in: Unified diff