Revision 63:9431991ebe9b

View differences:

WebContent/WEB-INF/config/ss102_user_admin/validation.xml
105 105 
  </form>
106 106
107 107 
  <form name="editAdminValidation">
108 
    <field depends="required, customerFullNameVal" property="userName">
108 
    <field depends="required, maxlength, customerFullNameVal" property="userName">
109 109 
    <arg0 key="user.name"/>
110 
    <arg1 key="${var:maxlength}" name="maxlength" resource="false"/>
111 
    <var>
112 
     <var-name>maxlength</var-name>
113 
     <var-value>64</var-value>
114 
    </var>
110 115 
   </field>
111 116 
   <field depends="required, email2" property="email">
112 117 
    <arg0 key="user.email"/>
......
173 178 
   </field>
174 179 
  </form>
175 180 
  <form name="userValidation">
176 
   <field depends="required, minlength, specialCharacters3, noAlphabet" property="userId">
181 
   <field depends="required, minlength, maxlength, specialCharacters3, noAlphabet" property="userId">
177 182 
    <arg0 key="user.id"/>
178 183 
    <arg1 key="${var:minlength}" name="minlength" resource="false"/>
179 184 
    <var>
180 185 
     <var-name>minlength</var-name>
181 186 
     <var-value>5</var-value>
182 187 
    </var>
188 
    <arg1 key="${var:maxlength}" name="maxlength" resource="false"/>
189 
    <var>
190 
     <var-name>maxlength</var-name>
191 
     <var-value>16</var-value>
192 
    </var>
183 193 
   </field>
184 
   <field depends="required, minlength" property="userName">
194 
   <field depends="required, maxlength, customerFullNameVal" property="userName">
185 195 
    <arg0 key="user.name"/>
186 
    <arg1 key="${var:minlength}" name="minlength" resource="false"/>
196 
    <arg1 key="${var:maxlength}" name="maxlength" resource="false"/>
187 197 
    <var>
188 
     <var-name>minlength</var-name>
189 
     <var-value>5</var-value>
198 
     <var-name>maxlength</var-name>
199 
     <var-value>64</var-value>
190 200 
    </var>
191 201 
   </field>
192 202 
   <field depends="required, email2" property="email">
......
250 260 
   </field>
251 261 
  </form>
252 262 
  <form name="userEnquiryEditValidation">
253 
   <field depends="required, minlength" property="userName">
263 
  <field depends="required, maxlength, customerFullNameVal" property="userName">
254 264 
    <arg0 key="user.name"/>
255 
    <arg1 key="${var:minlength}" name="minlength" resource="false"/>
265 
    <arg1 key="${var:maxlength}" name="maxlength" resource="false"/>
256 266 
    <var>
257 
     <var-name>minlength</var-name>
258 
     <var-value>5</var-value>
267 
     <var-name>maxlength</var-name>
268 
     <var-value>64</var-value>
259 269 
    </var>
260 270 
   </field>
261 271 
   <field depends="required, email2" property="email">
......
506 516 
  </form>
507 517 
  <!-- Edit user with Role -->
508 518 
  <form name="editAdminValidationWithRole">
509 
   <field depends="required, customerFullNameVal" property="userName">
519 
    <field depends="required, maxlength, customerFullNameVal" property="userName">
510 520 
    <arg0 key="user.name"/>
521 
    <arg1 key="${var:maxlength}" name="maxlength" resource="false"/>
522 
    <var>
523 
     <var-name>maxlength</var-name>
524 
     <var-value>64</var-value>
525 
    </var>
511 526 
   </field>
512 527 
   <field depends="required, email2" property="email">
513 528 
    <arg0 key="user.email"/>
WebContent/WEB-INF/config/ss223_application/validation.xml
4 4 
<form-validation>
5 5 
 <formset>
6 6 
  <form name="appUserCreateConfirmValidation">
7 
   <field depends="alphaNumericSpace, maxlength, minlength, required" property="userAlias">
7 
   <field depends="alphaNumeric, maxlength, minlength, required" property="userAlias">
8 8 
    <arg0 key="appuser.user.id"/>
9 9 
    <arg1 key="${var:minlength}" name="minlength" resource="false"/>
10 10 
	<var>
11 11 
	 <var-name>minlength</var-name>
12 
	 <var-value>6</var-value>
12 
	 <var-value>5</var-value>
13 13 
	 </var>
14 14 
    <arg1 key="${var:maxlength}" name="maxlength" resource="false"/>
15 15 
    <var>
16 16 
     <var-name>maxlength</var-name>
17 
     <var-value>30</var-value>
17 
     <var-value>16</var-value>
18 18 
    </var>
19 19 
   </field>
20 
   <field depends="alphaNumericSpace, maxlength, minlength, required" property="userName">
20 
   <field depends="alphaNumericSpace, maxlength, required" property="userName">
21 21 
    <arg0 key="appuser.user.name"/>
22 22 
    <arg1 key="${var:minlength}" name="minlength" resource="false"/>
23 
	<var>
24 
	 <var-name>minlength</var-name>
25 
	 <var-value>6</var-value>
26 
	 </var>
27 23 
    <arg1 key="${var:maxlength}" name="maxlength" resource="false"/>
28 24 
    <var>
29 25 
     <var-name>maxlength</var-name>
30 
     <var-value>30</var-value>
26 
     <var-value>64</var-value>
31 27 
    </var>
32 28 
   </field>
33 29 
   <field depends="required, minlength, maxlength, password" property="password">
......
56 52 
     <var-value>12</var-value>
57 53 
    </var>
58 54 
   </field>
59 
   <field depends="maxlength, required" property="userDescription">
55 
    <field depends="notMatch" property="password">
56 
    <arg0 key="appuser.user.password"/>
57 
    <arg1 key="appuser.user.id" name="notMatch"/>
58 
    <arg2 key="${var:notMatchField}" name="notMatch"/>
59 
    <var>
60 
     <var-name>notMatchField</var-name>
61 
     <var-value>userAlias</var-value>
62 
    </var>
63 
   </field>
64 
   <field depends="match" property="confirmPassword">
65 
    <arg0 key="appuser.user.confirmPassword"/>
66 
    <arg1 key="appuser.user.password" name="match"/>
67 
    <arg2 key="${var:matchField}" name="match"/>
68 
    <var>
69 
     <var-name>matchField</var-name>
70 
     <var-value>password</var-value>
71 
    </var>
72 
   </field>
73 
   <field depends="maxlength" property="userDescription">
60 74 
    <arg0 key="appuser.user.description"/>
61 75 
    <arg1 key="${var:maxlength}" name="maxlength" resource="false"/>
62 76 
    <var>
......
70 84 
  </form>
71 85
72 86 
  <form name="appUserEditConfirmValidation">
73 
   <field depends="alphaNumericSpace, maxlength, minlength, required" property="userAlias">
87 
   <field depends="alphaNumeric, maxlength, minlength, required" property="userAlias">
74 88 
    <arg0 key="appuser.user.id"/>
75 89 
    <arg1 key="${var:minlength}" name="minlength" resource="false"/>
76 90 
	<var>
77 91 
	 <var-name>minlength</var-name>
78 
	 <var-value>6</var-value>
92 
	 <var-value>5</var-value>
79 93 
	 </var>
80 94 
    <arg1 key="${var:maxlength}" name="maxlength" resource="false"/>
81 95 
    <var>
82 96 
     <var-name>maxlength</var-name>
83 
     <var-value>30</var-value>
97 
     <var-value>16</var-value>
84 98 
    </var>
85 99 
   </field>
86 
    <field depends="alphaNumericSpace, maxlength, minlength, required" property="userName">
100 
    <field depends="alphaNumericSpace, maxlength, required" property="userName">
87 101 
    <arg0 key="appuser.user.name"/>
88 102 
    <arg1 key="${var:minlength}" name="minlength" resource="false"/>
89 
	<var>
90 
	 <var-name>minlength</var-name>
91 
	 <var-value>6</var-value>
92 
	 </var>
93 103 
    <arg1 key="${var:maxlength}" name="maxlength" resource="false"/>
94 104 
    <var>
95 105 
     <var-name>maxlength</var-name>
96 
     <var-value>30</var-value>
106 
     <var-value>64</var-value>
97 107 
    </var>
98 108 
   </field>
99 
   <field depends="maxlength, , required" property="userDescription">
109 
   <field depends="maxlength" property="userDescription">
100 110 
    <arg0 key="appuser.user.description"/>
101 111 
    <arg1 key="${var:maxlength}" name="maxlength" resource="false"/>
102 112 
    <var>
......
125 135 
			 <var-value>8</var-value>
126 136 
		 </var>
127 137 
	</field>
138 
	<field depends="notMatch" property="password">
139 
    <arg0 key="appuser.user.password"/>
140 
    <arg1 key="appuser.user.id" name="notMatch"/>
141 
    <arg2 key="${var:notMatchField}" name="notMatch"/>
142 
    <var>
143 
     <var-name>notMatchField</var-name>
144 
     <var-value>userAlias</var-value>
145 
    </var>
146 
   </field>
147 
   <field depends="match" property="confirmPassword">
148 
    <arg0 key="appuser.user.confirmPassword"/>
149 
    <arg1 key="appuser.user.password" name="match"/>
150 
    <arg2 key="${var:matchField}" name="match"/>
151 
    <var>
152 
     <var-name>matchField</var-name>
153 
     <var-value>password</var-value>
154 
    </var>
155 
   </field>
128 156 
	</form>
129 157
130 158 
 </formset>
WebContent/jsp/ss223_application/ibssAppUserCreateDetails.jsp
60 60 
	<tr>
61 61 
		<td>&nbsp;</td>
62 62 
		<td><bean:message key="appuser.user.password"/>:</td>
63 
		<td><htmlEL:text property="password" name="appUserForm" maxlength="64" autocomplete="off"/></td>
63 
		<td><htmlEL:password property="password" name="appUserForm" maxlength="64" autocomplete="off"/></td>
64 64 
		<td>&nbsp;</td>
65 65 
	</tr>
66 66
67 67 
	<tr>
68 68 
		<td>&nbsp;</td>
69 69 
		<td><bean:message key="appuser.user.confirmPassword"/>:</td>
70 
		<td><htmlEL:text property="confirmPassword" name="appUserForm" maxlength="64" autocomplete="off"/></td>
70 
		<td><htmlEL:password property="confirmPassword" name="appUserForm" maxlength="64" autocomplete="off"/></td>
71 71 
		<td>&nbsp;</td>
72 72 
	</tr>
73 73
WebContent/jsp/ss223_application/ibssAppUserEditDetails.jsp
42 42 
  <tr>
43 43 
    <td width="69">&nbsp;</td>
44 44 
    <td><bean:message key="appuser.user.name"/>:</td>
45 
     <td colspan="2"><strong><c:out value="${detailBean.map.userName}"/></strong></td>
45 
     <td colspan="2"><strong><htmlEL:text name="appUserForm" property="userName" /></strong></td>
46 46 
    <td>&nbsp;</td>
47 47 
  </tr>
48 48 
  <tr>
WebContent/jsp/ss223_application/ibssAppUserResetPass.jsp
31 31 
  </tr>
32 32 
  <tr>
33 33 
    <td width="69">&nbsp;</td>
34 
    <td><bean:message key="appuser.user.id"/>:</td>
34 
    <td><bean:message key="general.id"/>:</td>
35 35 
    <td colspan="2"><strong><c:out value="${detailBean.map.userId}"/></strong></td>
36 36 
    <td>&nbsp;</td>
37 37 
    </tr>
38 38 
     <tr>
39 39 
    <td width="69">&nbsp;</td>
40 
    <td><bean:message key="appuser.user.alias"/>:</td>
40 
    <td><bean:message key="appuser.user.id"/>:</td>
41 41 
    <td colspan="2"><strong><c:out value="${detailBean.map.userAlias}"/></strong></td>
42 42 
    <td>&nbsp;</td>
43 43 
    </tr>
44 
    <tr>
45 
    <td width="69">&nbsp;</td>
46 
    <td><bean:message key="appuser.user.name"/>:</td>
47 
    <td colspan="2"><strong><c:out value="${detailBean.map.userName}"/></strong></td>
48 
    <td>&nbsp;</td>
49 
    </tr>
44 50 
  	<tr>
45 51 
		<td>&nbsp;</td>
46 52 
		<td><bean:message key="appuser.application.name" />:</td>
resource/com/ib/ibss/resources/message/IBSSApplicationResources.properties
150 150 
general.error.message.refresh.reload.not.allowed.header=Invalid browser action
151 151 
general.error.message.refresh.reload.not.allowed.message=You have either clicked on the browser's back/forward button or refreshed the page, which is not allowed. For security reasons, we have logged you out and apologise for any inconvenience caused.
152 152 
general.error.message.registration.completed.header=Registration complete
153 
general.error.message.registration.completed.message=Your registration has been successful. Please proceed to login using your username and password.
153 
general.error.message.registration.completed.message=Your registration has been successful. Please proceed to login using your User ID and password.
154 154 
general.error.message.wrong.password.entered.header=Wrong password entered
155 155 
general.error.message.wrong.password.entered.message=You have reached the maximum number of password attempts.<BR>For security reasons, your account has been locked.
156 156 
general.error.message.wrong.security.answer.entered.header=Wrong security answer entered
......
534 534 
login.oldpassword=Old Password
535 535 
login.newpassword=New Password
536 536 
login.confirmpassword=Confirm Password
537 
login.userid=User Name
537 
login.userid=User ID
538 538 
login.password=Password
539 539 
general.forcechangepass.result=Force Change Password Result
540 540 
general.changedpassword=Password has been successfully changed
......
559 559 
error.token.already.assigned=Token already been assigned.
560 560 
error.token.serial.does.not.exist=Token serial does not exist.
561 561 
error.application.service.not.assigned=Application service not assigned.
562 
error.already.exist=Username already exist.
562 
error.already.exist=User ID already exist.
563 563 
error.invalid.input=Invalid input.
564 564 
error.system.not.ready=System is not ready.
565 565 
error.unknown=Service is currently unavailable.
566 566 
error.invalid.password=Invalid password.
567 567 
error.wrong.password= Invalid old password.
568 568 
error.password.not.tally=Confirm Password must be the same as {0}.
569 
error.password.username.similar={0} Cannot be as Similar as Username
569 
error.password.username.similar={0} Cannot be as Similar as User ID
570 570 
error.token.serial.not.exist.msg=Security Token serial no. is not valid.
571 571 
error.token.serial.not.exist=Security Token serial no. is not valid.
572 572 
error.service.currently.unavailable=Service is currently unavailable.
573 573 
error.system.currently.unavailable=System is currently unavailable.
574 
error.password.cannot.be.useralias=Password Cannot be as Similar as Username
574 
error.password.cannot.be.useralias=Password Cannot be as Similar as User ID
575 575 

  		




  576
  576
  
    
error.password.change.interval=You have changed your password within {0} minutes, please try again later.


  		




  577
  577
  
    
# s1s02_user_admin category (Login Details, Personal Details, etc)


  		




  ......




  2774
  2774
  
    
approvalmatrix.management.approval.matrix.3e=Approval Matrix 3E


  		




  2775
  2775
  
    

  		




  2776
  2776
  
    

  		




  2777
  
  
    
user.not.exist=Invalid Username


  		




  
  2777
  
    
user.not.exist=Invalid User ID


  		




  2778
  2778
  
    
invalid.cif.no=Invalid CIF No


  		




  2779
  2779
  
    
invalid.mobile.no=Invalid Mobile No


  		




  2780
  2780
  
    
invalid.user.role=Invalid User Role


  		




  ......




  2970
  2970
  
    

  		




  2971
  2971
  
    
app.user.successful.msg=Application User {0} has been successfully


  		




  2972
  2972
  
    

  		




  2973
  
  
    
error.app.user.username.already.exist=Application User ID already exist. Please use another User ID.


  		




  
  2973
  
    
error.app.user.username.already.exist=Application Admin ID already exist. Please use another User ID.


  		












  

    
      src/com/ib/ibss/enterprise/services/ss223_application/IBSSApplicationUserResetPassResultServices.java
    
  





  20
  20
  
    
import com.ib.ibss.common.utils.ResourcesUtils;


  		




  21
  21
  
    
import com.ib.ibss.enterprise.services.IBSSEnterpriseServicesWorkspace;


  		




  22
  22
  
    
import com.ib.ibss.enterprise.services.StatusConstants;


  		




  
  23
  
    
import com.ib.ibss.enterprise.services.ss102_user_admin.AdminSharedServices;


  		




  23
  24
  
    
import com.ib.ibss.enterprise.services.ss102_user_admin.constants.IBSSUserConstants;


  		




  24
  25
  
    
import com.ib.ibss.enterprise.services.ss222_application.constants.IBSSApplicationUserConstants;


  		




  25
  26
  
    
import com.ib.ibss.error.exception.IBSSBusinessException;


  		




  ......




  62
  63
  
    
		try


  		




  63
  64
  
    
		{


  		




  64
  65
  
    
			/* Match password and re-type password */


  		




  65
  
  
    
			checkPasswordMatching(password, confirmPassword);


  		




  
  66
  
    
			AdminSharedServices adminService = new AdminSharedServices ();


  		




  
  67
  
    
			adminService.checkPasswordMatching (password, confirmPassword, userAlias, "New Password");


  		




  66
  68
  
    
			


  		




  67
  69
  
    
			/* Reset password */


  		




  68
  70
  
    
			MinimalUPassControllerV2 upass = new MinimalUPassControllerV2();


  		




  ......




  115
  117
  
    
		IBSSLogger.debug (c_oClass, "Exiting userResetPassword");


  		




  116
  118
  
    
	}


  		




  117
  119
  
    

  		




  118
  
  
    
	private void checkPasswordMatching (String password, String confirmPassword) throws IBSSGenericException


  		




  119
  
  
    
	{


  		




  120
  
  
    
		IBSSLogger.debug (c_oClass, "Entering checkPasswordMatching");


  		




  121
  
  
    
		


  		




  122
  
  
    
		if (!password.equals(confirmPassword))


  		




  123
  
  
    
		{


  		




  124
  
  
    
			String[] params = new String[1];


  		




  125
  
  
    
			params[0] = ResourcesUtils.getApplicationResourceMessage("appuser.user.password");


  		




  126
  
  
    
			throw IBSSErrorHandler.createBusinessException (IBSSBusinessException.LOGIN, ExceptionErrors.LOGIN_PASSWORD_NOT_MATCH, params);


  		




  127
  
  
    
		}


  		




  128
  
  
    
		


  		




  129
  
  
    
		IBSSLogger.debug (c_oClass, "Exiting checkPasswordMatching");


  		




  130
  
  
    
	}


  		




  131
  
  
    
	


  		




  132
  120
  
    
}


  		












Also available in:  Unified diff