Revision 108:3963fd7e8d81

View differences:

src/com/ib/ibss/controller/actions/ss112_user/IBSSRetailUserEnquiryEditResultAction.java
87 87
			{
88 88
				error = form.validate(createNewActionMapping(mapping, JSPValidator.SS112_RETAIL_USER_M2U_EDIT_RESULT_VALIDATION), request);
89 89
			}
90
			else if(appId.equals(ClientApp.APP_ID_ONLINE_STOCK))
90
//			else if(appId.equals(ClientApp.APP_ID_ONLINE_STOCK))
91
//			{
92
//				error = form.validate(createNewActionMapping(mapping, JSPValidator.SS112_RETAIL_USER_ONLINE_STOCK_EDIT_RESULT_VALIDATION), request);
93
//			}
94
			else if(appId.equals(ClientApp.APP_ID_ONLINE_TICKETING))
91 95
			{
92
				error = form.validate(createNewActionMapping(mapping, JSPValidator.SS112_RETAIL_USER_ONLINE_STOCK_EDIT_RESULT_VALIDATION), request);
96
				error = form.validate(createNewActionMapping(mapping, JSPValidator.SS112_RETAIL_USER_TICKETING_EDIT_RESULT_VALIDATION), request);
93 97
			}
94
//			else if(appId.equals(ClientApp.APP_ID_ONLINE_TICKETING))
95
//			{
96
//				error = form.validate(createNewActionMapping(mapping, JSPValidator.SS112_RETAIL_USER_TICKETING_EDIT_RESULT_VALIDATION), request);
97
//			}
98 98
			else if(appId.equals(ClientApp.APP_ID_CCPP))
99 99
			{
100 100
				error = form.validate(createNewActionMapping(mapping, JSPValidator.SS112_RETAIL_USER_CCPP_EDIT_RESULT_VALIDATION), request);
src/com/ib/ibss/enterprise/services/ss102_user_admin/AdminSharedServices.java
6 6

  
7 7
import org.hibernate.exception.ConstraintViolationException;
8 8

  
9
import my.com.upass.UPassControllerV2;
9 10
import net.penril.ibss.audit.log.AuditLogConstants;
10 11
import net.penril.ibss.core.AdminGroupDAO;
11 12
import net.penril.ibss.core.AdminSecurityDAO;
......
17 18
import net.penril.ibss.core.hibernate.AdminSecurity;
18 19
import net.penril.ibss.core.hibernate.AdminUserProfile;
19 20
import net.penril.ibss.core.hibernate.IbUser;
20

  
21
import com.ib.common.utils.ResourcesUtils;
22 21
import com.ib.ibss.common.constant.ExceptionErrors;
23 22
import com.ib.ibss.common.constant.AdminNavigationModeType.ModeType;
24 23
import com.ib.ibss.enterprise.services.GenericMkSharedServices;
......
115 114
		String m_sLogReason = "";
116 115
		int m_iRC = upass.lockUser (m_sUserAlias);
117 116

  
118

  
119 117
		switch(m_iRC)
120 118
		{
121 119
		case StatusConstants.ERR_SUCCESS:
......
381 379
		
382 380
		return logReason;			
383 381
	}
382
	
383
	public String checkUserAliasPattern(String userAlias, int appID) throws IBSSGenericException
384
	{
385
		String logReason = "";
386
		
387
		UPassControllerV2 upass = new UPassControllerV2();
388
		
389
		int rc = upass.verifyUserAliasComplexity(userAlias, appID);
390
		
391
		switch(rc)
392
		{
393
		case StatusConstants.ERR_SUCCESS:
394
			logReason = String.valueOf(rc);
395
			break;
396
		case StatusConstants.ERR_PASSWD_WEAK:
397
			logReason = "Weak User ID Combination ";
398
			throw IBSSErrorHandler.createBusinessException (IBSSBusinessException.LOGIN, ExceptionErrors.LOGIN_USER_ALIAS_WEAK);
399
		default:
400
			logReason = "Unhandled Response";
401
			throw IBSSErrorHandler.createBusinessException (IBSSBusinessException.LOGIN, ExceptionErrors.ERR_SYSTEM_NOT_READY);
402
		}
403
		
404
		return logReason;
405
	}
384 406

  
385 407
}
src/com/ib/ibss/enterprise/services/ss102_user_admin/IBSSUserCreateConfirmServices.java
12 12
package com.ib.ibss.enterprise.services.ss102_user_admin;
13 13

  
14 14

  
15
import my.com.upass.UPassControllerV2;
16

  
15 17
import com.ib.ibss.common.utils.IBSSLogger;
16 18
import com.ib.ibss.enterprise.services.IBSSEnterpriseServicesWorkspace;
17 19
import com.ib.ibss.enterprise.services.StatusConstants;
......
52 54
			/* This service to be shared among admin features and MK features */
53 55
			AdminSharedServices m_oAdminService = new AdminSharedServices ();
54 56
			
57
			/* Validate Complexity Pattern of User ID*/
58
			m_sLogReason = m_oAdminService.checkUserAliasPattern(getBeanMessage (IBSSUserConstants.LOGIN_ID), IBSSSettingConstants.UPASS_ADMIN_APP_ID);
59
			
55 60
			/* Match password and re-type password */
56 61
			m_sLogReason = m_oAdminService.checkPasswordMatching (
57 62
					getBeanMessage (IBSSUserConstants.PASS),
src/com/ib/ibss/enterprise/services/ss102_user_admin/IBSSUserCreateResultServices.java
63 63
			/* This service to be shared among admin features and MK features */
64 64
			AdminSharedServices m_oAdminService = new AdminSharedServices ();
65 65
			
66
			/* Match password and re-type password */
66
			/* Match password and re-type password 
67 67
			m_sLogReason = m_oAdminService.checkPasswordMatching (
68 68
					getBeanMessage (IBSSUserConstants.PASS),
69 69
					getBeanMessage (IBSSUserConstants.CONFIRM_PASS),
70 70
					getBeanMessage (IBSSUserConstants.LOGIN_ID),
71
					"Password");
71
					"Password");*/
72 72
			
73 73
			/* Set admin permission */
74 74
			AdminGroup group = getAdminGroupDAO().getGroupByIdentifier(Long.valueOf (getBeanMessage (IBSSUserConstants.USER_GROUP)));

Also available in: Unified diff