Revision 80:682320950f46

View differences:

WebContent/WEB-INF/config/ss102_user_admin/validation.xml
5 5
 <formset>
6 6
  <form name="adminValidation">
7 7
   <field
8
    depends="required, maxlength, minlength, alphaNumeric, noAlphabet" property="userId">
8
    depends="required" property="userId">
9 9
    <arg0 key="user.id"/>
10 10
    <arg1 key="${var:maxlength}" name="maxlength" resource="false"/>
11 11
    <var>
......
178 178
   </field>
179 179
  </form>
180 180
  <form name="userValidation">
181
   <field depends="required, minlength, maxlength, specialCharacters3, noAlphabet" property="userId">
181
   <field depends="required" property="userId">
182 182
    <arg0 key="user.id"/>
183 183
    <arg1 key="${var:minlength}" name="minlength" resource="false"/>
184 184
    <var>
......
416 416
  <!-- Create User with Role -->
417 417
  <form name="adminValidationWithRole">
418 418
   <field
419
    depends="required, maxlength, minlength, alphaNumeric, noAlphabet" property="userId">
419
    depends="required" property="userId">
420 420
    <arg0 key="user.id"/>
421 421
    <arg1 key="${var:maxlength}" name="maxlength" resource="false"/>
422 422
    <var>
......
560 560
  <!-- Create System Admin -->
561 561
  <form name="systemAdminValidation">
562 562
   <field
563
    depends="required, maxlength, minlength, alphaNumeric, noAlphabet" property="userId">
563
    depends="required" property="userId">
564 564
    <arg0 key="user.id"/>
565 565
    <arg1 key="${var:maxlength}" name="maxlength" resource="false"/>
566 566
    <var>
WebContent/WEB-INF/config/ss223_application/validation.xml
4 4
<form-validation>
5 5
 <formset>
6 6
  <form name="appUserCreateConfirmValidation">
7
   <field depends="alphaNumeric, maxlength, minlength, required" property="userAlias">
7
   <field depends="required" property="userAlias">
8 8
    <arg0 key="appuser.user.id"/>
9 9
    <arg1 key="${var:minlength}" name="minlength" resource="false"/>
10 10
	<var>
......
75 75
  </form>
76 76
  
77 77
  <form name="appUserEditConfirmValidation">
78
   <field depends="alphaNumeric, maxlength, minlength, required" property="userAlias">
79
    <arg0 key="appuser.user.id"/>
80
    <arg1 key="${var:minlength}" name="minlength" resource="false"/>
81
	<var>
82
	 <var-name>minlength</var-name>
83
	 <var-value>5</var-value>
84
	 </var>
85
    <arg1 key="${var:maxlength}" name="maxlength" resource="false"/>
86
    <var>
87
     <var-name>maxlength</var-name>
88
     <var-value>16</var-value>
89
    </var>
90
   </field>
91 78
   <field depends="maxlength" property="userDescription">
92 79
    <arg0 key="appuser.user.description"/>
93 80
    <arg1 key="${var:maxlength}" name="maxlength" resource="false"/>
resource/AppConfig.properties
14 14
#Application check for maximum days before dormant
15 15
application.max.dormant.day=30
16 16

  
17
application.upass.admin.id=UpassAdmin
18
application.upass.admin.password=password
17
application.root.admin.id=root
18
application.root.admin.password=P@ssw0rd
19 19

  
20 20
#Reports directory
21 21
#reports.root.dir=/opt/rib_reports
resource/com/ib/ibss/resources/message/IBSSApplicationResources.properties
573 573
error.service.currently.unavailable=Service is currently unavailable.
574 574
error.system.currently.unavailable=System is currently unavailable.
575 575
error.password.cannot.be.useralias=Password Cannot be as Similar as User ID
576
error.user.alias.weak=User ID is not meet complexity configuration.
576 577

  
577 578
error.password.change.interval=You have changed your password within {0} minutes, please try again later.
578 579
# s1s02_user_admin category (Login Details, Personal Details, etc)
src/com/ib/ibss/enterprise/services/StatusConstants.java
89 89
	public static final String APPLICATION_ID							= "application.id";
90 90
	public static final String APPLICATION_ADMIN_GROUP_ID				= "application.admin.group.id";
91 91
	public static final String APPLICATION_MAX_DORMANT_DAY				= "application.max.dormant.day";
92
	public static final String APPLICATION_ADMIN_ID						= "application.upass.admin.id";
93
	public static final String APPLICATION_ADMIN_PASS					= "application.upass.admin.password";
92
	public static final String APPLICATION_ADMIN_ID						= "application.root.admin.id";
93
	public static final String APPLICATION_ADMIN_PASS					= "application.root.admin.password";
94 94
	
95 95
}
src/com/ib/ibss/enterprise/services/ss102_user_admin/AdminSharedServices.java
39 39
			{
40 40
		String logReason = "";
41 41

  
42
		int m_iRC = upass.addUser (adminProfile.getMainProfile ().getUserAlias (), "iBAM User", userPassword, Integer.parseInt(ResourcesUtils.getAppConfigValue(StatusConstants.APPLICATION_ID)));
42
		int m_iRC = upass.addUser (adminProfile.getMainProfile ().getUserAlias (), "iBAM User", userPassword);
43
		
44
		System.out.println("m_iRC = "+m_iRC);
43 45

  
44 46
		switch(m_iRC)
45 47
		{
......
53 55
			logReason = "Weak Password Combination: " + adminProfile.getMainProfile ().getUserAlias ();
54 56
			throw IBSSErrorHandler.createBusinessException (IBSSBusinessException.LOGIN, ExceptionErrors.LOGIN_PASSWORD_WEAK);
55 57
		case StatusConstants.ERR_SUSPEND_STATE:
56
			logReason = "Weak Username Combination: " + adminProfile.getMainProfile ().getUserAlias ();
58
			logReason = "Weak User ID Combination: " + adminProfile.getMainProfile ().getUserAlias ();
57 59
			throw IBSSErrorHandler.createBusinessException (IBSSBusinessException.LOGIN, ExceptionErrors.LOGIN_USER_ALIAS_WEAK);
58 60
		default:
59 61
			logReason = "Unhandled Response: " + adminProfile.getMainProfile ().getUserAlias () + " " + m_iRC;
src/com/ib/ibss/enterprise/services/ss112_user/IBSSRetailUserEnquiryDeleteServices.java
71 71
	String appId;
72 72
	Long c_oAdminID;
73 73
	Long c_oUserID;
74
	String upassAdmin		= ResourcesUtils.getAppConfigValue("application.upass.admin.id");
75
	String upassAdminPass	= ResourcesUtils.getAppConfigValue("application.upass.admin.password");
76 74
	
77 75
	IBSSDynaBean c_oDetailBean;
78 76
	
......
106 104
			UPassControllerV2 upass = new UPassControllerV2();
107 105
			session = HibernateUtils.currentSession();
108 106
			session.beginTransaction();
109
			int response = upass.deleteUserWithTheProfile(upassAdmin, upassAdminPass, c_sUserAlias, Integer.valueOf(appId), session);
107
			int response = upass.deleteUserWithTheProfile(getIBSSessionObjects().getSessionUserAlias(), getIBSSessionObjects().getSessionUserPassword(), c_sUserAlias, Integer.valueOf(appId), session);
110 108
			
111 109
			switch(response)
112 110
			{
src/com/ib/ibss/enterprise/services/ss112_user/IBSSRetailUserEnquiryDetailsServices.java
85 85
		IBSSDynaBean m_oDetailBean;
86 86
		IBSSDynaBean m_oUserBean;
87 87
		
88
		String upassAdmin		= ResourcesUtils.getAppConfigValue("application.upass.admin.id");
89
		String upassAdminPass	= ResourcesUtils.getAppConfigValue("application.upass.admin.password");
90
		
91 88
		Map<String, IBSSDynaBean> userMap 	= new HashMap<String, IBSSDynaBean> ();
92 89
		LinkedHashMap<String, String> detailMap = new LinkedHashMap<String, String> ();
93 90
		
......
125 122
				session = HibernateUtils.currentSession();
126 123
				session.beginTransaction();
127 124
				
128
				UserProfile userProfile = upass.findProfile(upassAdmin, upassAdminPass, (String)m_oUserBean.get(IBSSUserConstants.USER_ALIAS), userType, session);
125
				UserProfile userProfile = upass.findProfile(getIBSSessionObjects().getSessionUserAlias(), getIBSSessionObjects().getSessionUserPassword(), (String)m_oUserBean.get(IBSSUserConstants.USER_ALIAS), userType, session);
129 126
				
130 127
				switch (userType){
131 128
					case 1:{//M2U Retail Internet Banking
src/com/ib/ibss/enterprise/services/ss112_user/IBSSRetailUserEnquiryMainServices.java
97 97
		int m_iStartIndex 					= 0;
98 98
		int m_iEndIndex 					= 0;
99 99
		List<Integer> m_lPaginationList 	= new ArrayList<Integer> ();
100
		String upassAdmin					= ResourcesUtils.getAppConfigValue("application.upass.admin.id");
101
		String upassAdminPass				= ResourcesUtils.getAppConfigValue("application.upass.admin.password");
102 100
		Date creationDateFrom 				= null;
103 101
		Date creationDateTo 				= null;
104 102
		
......
195 193
				
196 194
				
197 195
			@SuppressWarnings("unchecked")
198
			List<UserProfile> userList = upass.listProfilesByExamples(upassAdmin, upassAdminPass, uList, creationDateFrom, creationDateTo, session);
196
			List<UserProfile> userList = upass.listProfilesByExamples(getIBSSessionObjects().getSessionUserAlias(), getIBSSessionObjects().getSessionUserPassword(), uList, creationDateFrom, creationDateTo, session);
199 197
			
200 198
			int m_iIndexNo 	= 0;
201 199
			m_iUserListSize = userList.size();
src/com/ib/ibss/enterprise/services/ss112_user/IBSSRetailUserEnquiryResetPassServices.java
68 68
	String c_sLogReason;
69 69
	Long c_oAdminID;
70 70
	Long c_oUserID;
71
	String upassAdmin		= ResourcesUtils.getAppConfigValue("application.upass.admin.id");
72
	String upassAdminPass	= ResourcesUtils.getAppConfigValue("application.upass.admin.password");
73 71
	
74 72
	IBSSDynaBean c_oDetailBean;
75 73
	
......
109 107
			MinimalUPassControllerV2 upass = new MinimalUPassControllerV2();
110 108
			session = HibernateUtils.currentSession();
111 109
			session.beginTransaction();
112
			int m_iRC = upass.resetPassword_withAppChecked(upassAdmin, upassAdminPass, c_sUserAlias, c_sPassword);
113
			System.out.println("m_iRC:"+m_iRC);
110
			int m_iRC = upass.resetPassword_withAppChecked(getIBSSessionObjects().getSessionUserAlias(), getIBSSessionObjects().getSessionUserPassword(), c_sUserAlias, c_sPassword);
111
			
114 112
			switch(m_iRC)
115 113
			{
116 114
				case StatusConstants.ERR_SUCCESS:
src/com/ib/ibss/enterprise/services/ss223_application/IBSSApplicationUserCreateResultServices.java
61 61
			String password 		= getBeanMessage (IBSSApplicationUserConstants.PASSWORD);
62 62
			String confirmPassword 	= getBeanMessage (IBSSApplicationUserConstants.CONFIRM_PASSWORD);
63 63
			String userDesc			= getBeanMessage (IBSSApplicationUserConstants.USER_DESCRIPTION);
64
			String upassAdmin		= ResourcesUtils.getAppConfigValue("application.upass.admin.id");
65
			String upassAdminPass	= ResourcesUtils.getAppConfigValue("application.upass.admin.password");
66 64
			
67 65
			/* This service to be shared among admin features and MK features */
68 66
			AdminSharedServices service = new AdminSharedServices ();
......
81 79
			user.setDescription(userDesc);
82 80
			user.setUserType(MinimalConstants.UTYPE_STATE_USER);
83 81
			
84
			int rc = upass.addUser(upassAdmin, upassAdminPass, user, UserAppAccess.TYPE_ADMIN, Integer.valueOf(selectedAppId), session, true);
82
			int rc = upass.addUser(getIBSSessionObjects().getSessionUserAlias(), getIBSSessionObjects().getSessionUserPassword(), user, UserAppAccess.TYPE_ADMIN, Integer.valueOf(selectedAppId), session, true);
85 83
			
86 84
			if(rc != MinimalConstants.ERR_SUCCESS && rc != MinimalConstants.ERR_USERALIAS_NOT_FOUND)
87 85
			{
......
91 89
					logReason = "Creation Successful: " + userAlias;
92 90
					status 	  = AuditLogConstants.SUCCESSFUL;
93 91
					break;
92
				case MinimalConstants.ERR_PASSWD_WEAK:
93
					logReason = String.valueOf(rc) + ResourcesUtils.getApplicationResourceMessage("error.password.weak");
94
					throw IBSSErrorHandler.createBusinessException (IBSSBusinessException.LOGIN, ExceptionErrors.LOGIN_PASSWORD_WEAK);
95
				case MinimalConstants.ERR_INVALID_USERALIAS:
96
					logReason = "Weak User ID Combination: " + userAlias;
97
					throw IBSSErrorHandler.createBusinessException (IBSSBusinessException.LOGIN, ExceptionErrors.LOGIN_USER_ALIAS_WEAK);
94 98
				case MinimalConstants.ERR_ALREADY_EXIST:
95 99
					logReason = AuditLogConstants.CREATE_ADMIN_R_ALREADY_EXIST + userAlias;
96 100
					throw IBSSErrorHandler.createBusinessException (IBSSBusinessException.LOGIN, StatusConstants.UPASS_ERR_USER_ALREADY_EXIST);
src/com/ib/ibss/enterprise/services/ss223_application/IBSSApplicationUserDeleteResultServices.java
64 64
			IBSSDynaBean userDetailBean = (IBSSDynaBean) getIBSSDynaBean().get(IBSSApplicationUserConstants.APPLICATION_USER_DETAILS_BEAN);
65 65
			String userAlias			= (String) userDetailBean.get (IBSSApplicationUserConstants.USER_ALIAS);
66 66
			Integer appId				= (Integer) userDetailBean.get (IBSSApplicationUserConstants.APPLICATION_ID);
67
			String upassAdmin			= ResourcesUtils.getAppConfigValue("application.upass.admin.id");
68
			String upassAdminPass		= ResourcesUtils.getAppConfigValue("application.upass.admin.password");
69 67
			
70 68
			UPassControllerV2 upass = new UPassControllerV2();
71 69
			
72 70
			session = HibernateUtils.currentSession();
73 71
			session.beginTransaction();
74 72
			
75
			int rc = upass.deleteUserWithTheProfile(upassAdmin, upassAdminPass, userAlias, appId, session);
73
			int rc = upass.deleteUserWithTheProfile(getIBSSessionObjects().getSessionUserAlias(), getIBSSessionObjects().getSessionUserPassword(), userAlias, appId, session);
76 74
			
77 75
			if(rc != MinimalConstants.ERR_SUCCESS)
78 76
			{
src/com/ib/ibss/enterprise/services/ss223_application/IBSSApplicationUserEditResultServices.java
69 69
			userAlias		= (String)getIBSSDynaBean().get (IBSSApplicationUserConstants.USER_ALIAS);
70 70
			userDescription = (String)getIBSSDynaBean().get (IBSSApplicationUserConstants.USER_DESCRIPTION);
71 71
			
72
			String upassAdmin		= ResourcesUtils.getAppConfigValue("application.upass.admin.id");
73
			String upassAdminPass	= ResourcesUtils.getAppConfigValue("application.upass.admin.password");
74
			
75 72
			/*Update user*/
76 73
			MinimalUPassControllerV2 upass = new MinimalUPassControllerV2();
77 74
			
......
82 79
			session = HibernateUtils.currentSession();
83 80
			session.beginTransaction();
84 81
			
85
			int rc = upass.UA_ModifyUser(upassAdmin, upassAdminPass, userAlias, userDescription, null);
82
			int rc = upass.UA_ModifyUser(getIBSSessionObjects().getSessionUserAlias(), getIBSSessionObjects().getSessionUserPassword(), userAlias, userDescription, null);
86 83
			
87 84
			if(rc != MinimalConstants.ERR_SUCCESS)
88 85
			{
src/com/ib/ibss/enterprise/services/ss223_application/IBSSApplicationUserMainServices.java
87 87
		
88 88
		try
89 89
		{
90
			String upassAdmin		= ResourcesUtils.getAppConfigValue("application.upass.admin.id");
91
			String upassAdminPass	= ResourcesUtils.getAppConfigValue("application.upass.admin.password");
92
			
93 90
			session = HibernateUtils.currentSession();
94 91
			session.beginTransaction();
95 92
			
96
			Map <MinimalUserBean, UserAppAccess> appAdminMap = controller.listApplicationAdmins(upassAdmin, upassAdminPass, session);
93
			Map <MinimalUserBean, UserAppAccess> appAdminMap = controller.listApplicationAdmins(getIBSSessionObjects().getSessionUserAlias(), getIBSSessionObjects().getSessionUserPassword(), session);
97 94
			
98 95
			if(appAdminMap == null)
99 96
			{
src/com/ib/ibss/enterprise/services/ss223_application/IBSSApplicationUserResetPassResultServices.java
11 11

  
12 12
package com.ib.ibss.enterprise.services.ss223_application;
13 13

  
14
import my.com.upass.MinimalConstants;
14 15
import my.com.upass.MinimalUPassControllerV2;
15 16
import net.penril.ibss.audit.log.AuditLogConstants;
16 17
import net.penril.ibss.audit.log.USER_ACTIVITY_TYTPE;
......
51 52
		IBSSLogger.debug (c_oClass, "Entering userResetPassword");
52 53
		
53 54
		Long logStatus 			= AuditLogConstants.UNSUCCESSFUL;
54
		String upassAdmin		= ResourcesUtils.getAppConfigValue("application.upass.admin.id");
55
		String upassAdminPass	= ResourcesUtils.getAppConfigValue("application.upass.admin.password");
56 55
		String password 		= getBeanMessage (IBSSApplicationUserConstants.PASSWORD);
57 56
		String confirmPassword 	= getBeanMessage (IBSSApplicationUserConstants.CONFIRM_PASSWORD);
58 57
		IBSSDynaBean detailBean = (IBSSDynaBean) getIBSSDynaBean().get(IBSSApplicationUserConstants.APPLICATION_USER_DETAILS_BEAN);
......
68 67
			
69 68
			/* Reset password */
70 69
			MinimalUPassControllerV2 upass = new MinimalUPassControllerV2();
71
			int rc = upass.resetPassword_withAppChecked(upassAdmin, upassAdminPass, userAlias, password);
72
			System.out.println("rc:"+rc);
70
			int rc = upass.resetPassword_withAppChecked(getIBSSessionObjects().getSessionUserAlias(), getIBSSessionObjects().getSessionUserPassword(), userAlias, password);
73 71
			
74 72
			switch(rc)
75 73
			{
......
79 77
					getIBSSDynaBean().set (IBSSApplicationUserConstants.USER_ID, String.valueOf (userID));
80 78
					logReason = "Update Successful";
81 79
					break;
80
				case MinimalConstants.ERR_PASSWD_WEAK:
81
					logReason = String.valueOf(rc) + ResourcesUtils.getApplicationResourceMessage("error.password.weak");
82
					throw IBSSErrorHandler.createBusinessException (IBSSBusinessException.LOGIN, ExceptionErrors.LOGIN_PASSWORD_WEAK);	
82 83
				default:
83 84
					logReason = "Unhandled response: " + rc;
84 85
					throw IBSSErrorHandler.createBusinessException (IBSSBusinessException.LOGIN, ExceptionErrors.ERR_SYSTEM_NOT_READY);
src/com/ib/ibss/upass/service/UPassService.java
43 43
	
44 44
	int addUser(String p_sUserAlias, String p_sDescription, String p_sPassword, int applicationId) throws Exception;
45 45
	
46
	int addUser(String p_sUserAlias, String p_sDescription, String p_sPassword) throws Exception;
47
	
46 48
	int resetTAC (String userAlias) throws Exception;
47 49
	
48 50
//	String generateSMSPin (String userAlias) throws Exception;
......
52 54
	String getTokenVendorName () throws Exception;
53 55

  
54 56
	int verifyPasswordComplexity(String password, int appID);
57

  
55 58
}
src/com/ib/ibss/upass/service/UPassServiceImpl.java
95 95
	public int lockUser(String userAlias) throws Exception {
96 96
		int m_iResponse = 0;
97 97
		try {
98
			upassController.UA_LockUser(adminUserAlias, adminUserPassword, userAlias);
98
			upassController.AD_LockUser(adminUserAlias, adminUserPassword, userAlias);
99 99

  
100 100
		} catch (Exception e) {
101 101
			IBSSLogger.error(c_oClass, IBSSErrorHandler.generateErrorMessage(e));
......
103 103
		}
104 104
		return m_iResponse;
105 105
	}
106

  
106
	
107 107
	/**
108 108
	 * Delete user from System
109 109
	 * 
......
157 157
		int m_iResponse;
158 158

  
159 159
		// m_oProfile = getUserData (userAlias);
160
		m_iResponse = upassController.UA_ModifyUser(
160
		m_iResponse = upassController.AD_ModifyUser(
161 161
				adminUserAlias, adminUserPassword,
162 162
				userAlias, "Desciption", newPassword);
163 163

  
......
224 224
				adminUserAlias, adminUserPassword,
225 225
				userAlias, description, password, applicationId);
226 226
	}
227
	
228
	public int addUser(String userAlias, String description, String password)
229
			throws Exception {
230

  
231
		// return upassController.UA_AddUser (adminUserAlias, adminUserPassword, userAlias, description, password, "",
232
		// "00");
233
		return upassController.AD_AddUser(adminUserAlias, adminUserPassword, userAlias, description, password);
234
	}
227 235

  
228 236
	/**
229 237
	 * Activate user back to normal status
......
236 244
	 * @see com.ib.ibss.upass.service.UPassService#activateUser(java.lang.String)
237 245
	 */
238 246
	public int activateUser(String userAlias) throws Exception {
239
		return upassController.UA_ActivateUser(adminUserAlias, adminUserPassword, userAlias);
247
		return upassController.AD_ActivateUser(adminUserAlias, adminUserPassword, userAlias);
240 248
	}
241

  
249
	
242 250
	// @Override
243 251
	// public String generateSMSPin(String userAlias) throws Exception {
244 252
	// // TODO Auto-generated method stub
src/com/ib/ibss/upass/service/UPassServiceMockUpImpl.java
218 218
		return 0;
219 219
	}
220 220

  
221
	@Override
222
	public int addUser(String p_sUserAlias, String p_sDescription,
223
			String p_sPassword) throws Exception {
224
		// TODO Auto-generated method stub
225
		return 0;
226
	}
227

  
221 228
}

Also available in: Unified diff