Revision 70:2d8ed17e0fed

View differences:

WebContent/WEB-INF/config/ss102_user_admin/validation.xml
58 58 
   <field depends="required" property="userGroup">
59 59 
    <arg0 key="user.group"/>
60 60 
   </field>
61 
   <field depends="required, minlength, password" property="pass">
61 
   <field depends="required" property="pass">
62 62 
    <arg0 key="user.password"/>
63 63 
    <arg1 key="${var:minlength}" name="minlength" resource="false"/>
64 64 
    <var>
......
71 71 
     <var-value>12</var-value>
72 72 
    </var>
73 73 
   </field>
74 
   <field depends="required, minlength, password" property="confirmPass">
74 
   <field depends="required" property="confirmPass">
75 75 
    <arg0 key="user.confirm.password"/>
76 76 
    <arg1 key="${var:minlength}" name="minlength" resource="false"/>
77 77 
    <var>
......
345 345 
     <var-value>12</var-value>
346 346 
    </var>
347 347 
   </field>
348 
   <field depends="required, minlength, password" property="userNewPassword">
348 
   <field depends="required" property="userNewPassword">
349 349 
    <arg0 key="user.new.password"/>
350 350 
    <arg1 key="${var:minlength}" name="minlength" resource="false"/>
351 351 
    <var>
......
358 358 
     <var-value>12</var-value>
359 359 
    </var>
360 360 
   </field>
361 
   <field depends="required, minlength, password" property="userConfirmPassword">
361 
   <field depends="required" property="userConfirmPassword">
362 362 
    <arg0 key="user.confirm.password"/>
363 363 
    <arg1 key="${var:minlength}" name="minlength" resource="false"/>
364 364 
    <var>
......
469 469 
   <field depends="required" property="userGroup">
470 470 
    <arg0 key="user.group"/>
471 471 
   </field>
472 
   <field depends="required, minlength, password" property="pass">
472 
   <field depends="required" property="pass">
473 473 
    <arg0 key="user.password"/>
474 474 
    <arg1 key="${var:minlength}" name="minlength" resource="false"/>
475 475 
    <var>
......
482 482 
     <var-value>12</var-value>
483 483 
    </var>
484 484 
   </field>
485 
   <field depends="required, minlength, password" property="confirmPass">
485 
   <field depends="required" property="confirmPass">
486 486 
    <arg0 key="user.confirm.password"/>
487 487 
    <arg1 key="${var:minlength}" name="minlength" resource="false"/>
488 488 
    <var>
WebContent/WEB-INF/config/ss223_application/validation.xml
17 17 
     <var-value>16</var-value>
18 18 
    </var>
19 19 
   </field>
20 
   <field depends="required, minlength, maxlength, password" property="password">
20 
   <field depends="required" property="password">
21 21 
    <arg0 key="appuser.user.password"/>
22 22 
	<arg1 key="${var:minlength}" name="minlength" resource="false"/>
23 23 
	<var>
......
30 30 
     <var-value>12</var-value>
31 31 
    </var>
32 32 
   </field>
33 
    <field depends="required, minlength, maxlength, password" property="confirmPassword">
33 
    <field depends="required" property="confirmPassword">
34 34 
    <arg0 key="appuser.user.confirmPassword"/>
35 35 
    <arg1 key="${var:minlength}" name="minlength" resource="false"/>
36 36 
	<var>
......
99 99 
  </form>
100 100
101 101 
  <form name="appUserResetPassValidation">
102 
	<field depends="required, minlength, password" property="password">
102 
	<field depends="required" property="password">
103 103 
	<msg key="errors.minlength" name="minlength"/>
104 104 
	 <arg0 key="appuser.user.password"/>
105 105 
	 <arg1 key="${var:minlength}" name="minlength" resource="false"/>
......
108 108 
			<var-value>8</var-value>
109 109 
		 </var>
110 110 
	</field>
111 
	<field depends="required, minlength, password" property="confirmPassword">
111 
	<field depends="required" property="confirmPassword">
112 112 
	<msg key="errors.minlength" name="minlength"/>
113 113 
	<arg0 key="appuser.user.confirmPassword"/>
114 114 
	<arg1 key="${var:minlength}" name="minlength" resource="false"/>
src/com/ib/ibss/enterprise/services/ss102_user_admin/AdminSharedServices.java
375 375 
			throw IBSSErrorHandler.createBusinessException (IBSSBusinessException.LOGIN, ExceptionErrors.ERR_SYSTEM_NOT_READY);
376 376 
		}
377 377 

  		




  
  378
  
    
		logReason = String.valueOf(m_iRC);


  		




  
  379
  
    
		


  		




  378
  380
  
    
		return logReason;			


  		




  379
  381
  
    
	}


  		




  380
  382
  
    

  		












  

    
      src/com/ib/ibss/enterprise/services/ss102_user_admin/IBSSChgPassResultsServices.java
    
  





  62
  62
  
    
		{


  		




  63
  63
  
    
			/* Match password and re-type password */


  		




  64
  64
  
    
			AdminSharedServices m_oAdminService = new AdminSharedServices ();


  		




  65
  
  
    
			m_oAdminService.checkPasswordMatching (


  		




  
  65
  
    
			c_sLogReason = m_oAdminService.checkPasswordMatching (


  		




  66
  66
  
    
					getBeanMessage (IBSSUserConstants.NEW_PASS),


  		




  67
  67
  
    
					getBeanMessage (IBSSUserConstants.CONF_PASS),


  		




  68
  68
  
    
					getIBSSessionObjects ().getSessionUserAlias (),


  		




  69
  69
  
    
					"New Password");


  		




  70
  70
  
    
			


  		




  
  71
  
    
			c_sLogReason = m_oAdminService.checkPasswordPattern (getBeanMessage (IBSSUserConstants.NEW_PASS) ,getUPassService ());


  		




  
  72
  
    
			


  		




  71
  73
  
    
			if (getBeanMessage (IBSSUserConstants.NEW_PASS).equals (


  		




  72
  74
  
    
					getBeanMessage (IBSSUserConstants.CONF_PASS)))


  		




  73
  75
  
    
			{


  		












  

    
      src/com/ib/ibss/enterprise/services/ss102_user_admin/IBSSUserCreateConfirmServices.java
    
  





  58
  58
  
    
					getBeanMessage (IBSSUserConstants.LOGIN_ID),


  		




  59
  59
  
    
					"Password");


  		




  60
  60
  
    
			


  		




  61
  
  
    
//			m_sLogReason = m_oAdminService.checkPasswordPattern (getBeanMessage (IBSSUserConstants.PASS),getUPassService ());


  		




  
  61
  
    
			m_sLogReason = m_oAdminService.checkPasswordPattern (getBeanMessage (IBSSUserConstants.PASS),getUPassService ());


  		




  62
  62
  
    
			


  		




  63
  63
  
    
			if(getAdminUserProfileDAO().getUndeletedUserProfile(


  		




  64
  64
  
    
					(String) getIBSSDynaBean().get(IBSSUserConstants.LOGIN_ID)) != null)


  		












  

    
      src/com/ib/ibss/enterprise/services/ss102_user_admin/IBSSUserEnquiryResetPassServices.java
    
  





  70
  70
  
    
			/* This service to be shared among admin features and MK features */


  		




  71
  71
  
    
			AdminSharedServices m_oAdminService = new AdminSharedServices ();


  		




  72
  72
  
    
			/* Match password and re-type password */


  		




  73
  
  
    
			m_oAdminService.checkPasswordMatching (


  		




  
  73
  
    
			m_sLogReason = m_oAdminService.checkPasswordMatching (


  		




  74
  74
  
    
					getBeanMessage (IBSSUserConstants.PASS),


  		




  75
  75
  
    
					getBeanMessage (IBSSUserConstants.CONFIRM_PASS),


  		




  76
  76
  
    
					(String) c_oDetailBean.get (IBSSUserConstants.USER_ALIAS),


  		




  77
  77
  
    
					"New Password");


  		




  78
  78
  
    
			


  		




  79
  
  
    
			m_oAdminService.checkPasswordPattern (getBeanMessage (IBSSUserConstants.PASS),getUPassService ());


  		




  
  79
  
    
			m_sLogReason = m_oAdminService.checkPasswordPattern (getBeanMessage (IBSSUserConstants.PASS),getUPassService ());


  		




  80
  80
  
    
			/* Password cannot be the same as the username */


  		




  81
  81
  
    
			checkPasswordMatchUserName (getBeanMessage (IBSSUserConstants.PASS),


  		




  82
  82
  
    
					(String) c_oDetailBean.get (IBSSUserConstants.USER_ALIAS));


  		












  

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





  67
  67
  
    
			/* This service to be shared among admin features and MK features */


  		




  68
  68
  
    
			AdminSharedServices service = new AdminSharedServices ();


  		




  69
  69
  
    
			


  		




  70
  
  
    
			/* Match password and re-type password */


  		




  71
  
  
    
			logReason = service.checkPasswordMatching (password, confirmPassword, userAlias, "Password");


  		




  
  70
  
    
			/* Validate Password */


  		




  
  71
  
    
			logReason = service.checkPasswordPattern (password ,getUPassService ());


  		




  72
  72
  
    
			


  		




  73
  73
  
    
			/*verify and create user*/


  		




  74
  74
  
    
			MinimalUPassControllerV2 upass = new MinimalUPassControllerV2();


  		












  

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





  62
  62
  
    
		


  		




  63
  63
  
    
		try


  		




  64
  64
  
    
		{


  		




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


  		




  
  65
  
    
			/* Validate password*/


  		




  66
  66
  
    
			AdminSharedServices adminService = new AdminSharedServices ();


  		




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


  		




  
  67
  
    
			logReason = adminService.checkPasswordPattern (password ,getUPassService ());


  		




  68
  68
  
    
			


  		




  69
  69
  
    
			/* Reset password */


  		




  70
  70
  
    
			MinimalUPassControllerV2 upass = new MinimalUPassControllerV2();


  		












Also available in:  Unified diff