Revision 90:a033e3985176
src/com/ib/ibss/enterprise/services/ss101_access/IBSSForceChangePasswordServices.java | ||
---|---|---|
29 | 29 |
import com.ib.ibss.enterprise.services.IBSSEnterpriseServicesWorkspace; |
30 | 30 |
import com.ib.ibss.enterprise.services.StatusConstants; |
31 | 31 |
import com.ib.ibss.enterprise.services.ss102_user_admin.AdminSharedServices; |
32 |
import com.ib.ibss.enterprise.services.ss221_settings.IBSSSettingConstants; |
|
32 | 33 |
import com.ib.ibss.error.exception.IBSSBusinessException; |
33 | 34 |
import com.ib.ibss.error.exception.IBSSGenericException; |
34 | 35 |
import com.ib.ibss.error.handler.IBSSErrorHandler; |
... | ... | |
78 | 79 |
|
79 | 80 |
AdminSharedServices m_oAdminService = new AdminSharedServices (); |
80 | 81 |
|
81 |
c_sLogReason = m_oAdminService.checkPasswordPattern (m_sNewPassword,getUPassService ()); |
|
82 |
c_sLogReason = m_oAdminService.checkPasswordPattern (m_sNewPassword,getUPassService (), IBSSSettingConstants.UPASS_ADMIN_APP_ID);
|
|
82 | 83 |
|
83 | 84 |
if(m_sNewPassword.equals(m_sConfirmPassword)) |
84 | 85 |
{ |
src/com/ib/ibss/enterprise/services/ss102_user_admin/AdminSharedServices.java | ||
---|---|---|
359 | 359 |
|
360 | 360 |
} |
361 | 361 |
|
362 |
public String checkPasswordPattern(String password, UPassService upass) throws IBSSGenericException |
|
362 |
public String checkPasswordPattern(String password, UPassService upass, int appID) throws IBSSGenericException
|
|
363 | 363 |
{ |
364 | 364 |
String logReason = ""; |
365 | 365 |
|
366 |
int m_iRC = upass.verifyPasswordComplexity(password, 1);
|
|
366 |
int m_iRC = upass.verifyPasswordComplexity(password, appID);
|
|
367 | 367 |
|
368 | 368 |
switch(m_iRC) |
369 | 369 |
{ |
src/com/ib/ibss/enterprise/services/ss102_user_admin/IBSSChgPassResultsServices.java | ||
---|---|---|
26 | 26 |
import com.ib.ibss.enterprise.services.IBSSEnterpriseServicesWorkspace; |
27 | 27 |
import com.ib.ibss.enterprise.services.StatusConstants; |
28 | 28 |
import com.ib.ibss.enterprise.services.ss102_user_admin.constants.IBSSUserConstants; |
29 |
import com.ib.ibss.enterprise.services.ss221_settings.IBSSSettingConstants; |
|
29 | 30 |
import com.ib.ibss.error.exception.IBSSBusinessException; |
30 | 31 |
import com.ib.ibss.error.exception.IBSSGenericException; |
31 | 32 |
import com.ib.ibss.error.handler.IBSSErrorHandler; |
... | ... | |
68 | 69 |
getIBSSessionObjects ().getSessionUserAlias (), |
69 | 70 |
"New Password"); |
70 | 71 |
|
71 |
c_sLogReason = m_oAdminService.checkPasswordPattern (getBeanMessage (IBSSUserConstants.NEW_PASS) ,getUPassService ()); |
|
72 |
c_sLogReason = m_oAdminService.checkPasswordPattern (getBeanMessage (IBSSUserConstants.NEW_PASS) ,getUPassService (), IBSSSettingConstants.UPASS_ADMIN_APP_ID);
|
|
72 | 73 |
|
73 | 74 |
if (getBeanMessage (IBSSUserConstants.NEW_PASS).equals ( |
74 | 75 |
getBeanMessage (IBSSUserConstants.CONF_PASS))) |
src/com/ib/ibss/enterprise/services/ss102_user_admin/IBSSUserCreateConfirmServices.java | ||
---|---|---|
16 | 16 |
import com.ib.ibss.enterprise.services.IBSSEnterpriseServicesWorkspace; |
17 | 17 |
import com.ib.ibss.enterprise.services.StatusConstants; |
18 | 18 |
import com.ib.ibss.enterprise.services.ss102_user_admin.constants.IBSSUserConstants; |
19 |
import com.ib.ibss.enterprise.services.ss221_settings.IBSSSettingConstants; |
|
19 | 20 |
import com.ib.ibss.error.exception.IBSSBusinessException; |
20 | 21 |
import com.ib.ibss.error.exception.IBSSGenericException; |
21 | 22 |
import com.ib.ibss.error.handler.IBSSErrorHandler; |
... | ... | |
58 | 59 |
getBeanMessage (IBSSUserConstants.LOGIN_ID), |
59 | 60 |
"Password"); |
60 | 61 |
|
61 |
m_sLogReason = m_oAdminService.checkPasswordPattern (getBeanMessage (IBSSUserConstants.PASS),getUPassService ()); |
|
62 |
m_sLogReason = m_oAdminService.checkPasswordPattern (getBeanMessage (IBSSUserConstants.PASS),getUPassService (), IBSSSettingConstants.UPASS_ADMIN_APP_ID);
|
|
62 | 63 |
|
63 | 64 |
if(getAdminUserProfileDAO().getUndeletedUserProfile( |
64 | 65 |
(String) getIBSSDynaBean().get(IBSSUserConstants.LOGIN_ID)) != null) |
src/com/ib/ibss/enterprise/services/ss102_user_admin/IBSSUserEnquiryResetPassServices.java | ||
---|---|---|
22 | 22 |
import com.ib.ibss.common.utils.ResourcesUtils; |
23 | 23 |
import com.ib.ibss.enterprise.services.IBSSEnterpriseServicesWorkspace; |
24 | 24 |
import com.ib.ibss.enterprise.services.ss102_user_admin.constants.IBSSUserConstants; |
25 |
import com.ib.ibss.enterprise.services.ss221_settings.IBSSSettingConstants; |
|
25 | 26 |
import com.ib.ibss.error.exception.IBSSBusinessException; |
26 | 27 |
import com.ib.ibss.error.exception.IBSSGenericException; |
27 | 28 |
import com.ib.ibss.error.handler.IBSSErrorHandler; |
... | ... | |
76 | 77 |
(String) c_oDetailBean.get (IBSSUserConstants.USER_ALIAS), |
77 | 78 |
"New Password"); |
78 | 79 |
|
79 |
m_sLogReason = m_oAdminService.checkPasswordPattern (getBeanMessage (IBSSUserConstants.PASS),getUPassService ()); |
|
80 |
m_sLogReason = m_oAdminService.checkPasswordPattern (getBeanMessage (IBSSUserConstants.PASS),getUPassService (), IBSSSettingConstants.UPASS_ADMIN_APP_ID);
|
|
80 | 81 |
/* Password cannot be the same as the username */ |
81 | 82 |
checkPasswordMatchUserName (getBeanMessage (IBSSUserConstants.PASS), |
82 | 83 |
(String) c_oDetailBean.get (IBSSUserConstants.USER_ALIAS)); |
src/com/ib/ibss/enterprise/services/ss112_user/IBSSRetailUserEnquiryResetPassServices.java | ||
---|---|---|
16 | 16 |
import org.hibernate.Session; |
17 | 17 |
|
18 | 18 |
import my.com.upass.MinimalUPassControllerV2; |
19 |
import my.com.upass.pojo.ClientApp; |
|
19 | 20 |
import net.penril.generic.hibernate.HibernateUtils; |
20 | 21 |
import net.penril.ibss.audit.log.AuditLogConstants; |
21 | 22 |
import net.penril.ibss.audit.log.USER_ACTIVITY_TYTPE; |
... | ... | |
86 | 87 |
c_oUserID = (Long) c_oDetailBean.get (IBSSUserConstants.USER_ID); |
87 | 88 |
c_sUserAlias = (String) c_oDetailBean.get (IBSSUserConstants.USER_ALIAS); |
88 | 89 |
|
90 |
String appId = (String) c_oDetailBean.get (IBSSUserConstants.USER_APPLICATION_KEY); |
|
91 |
|
|
89 | 92 |
Session session = null; |
90 | 93 |
|
91 | 94 |
try |
... | ... | |
97 | 100 |
|
98 | 101 |
AdminSharedServices m_oAdminService = new AdminSharedServices (); |
99 | 102 |
|
100 |
c_sLogReason = m_oAdminService.checkPasswordPattern (c_sPassword,getUPassService ()); |
|
103 |
/* Validate Password */ |
|
104 |
if(Integer.valueOf(appId).equals(ClientApp.APP_ID_ONLINE_STOCK) || Integer.valueOf(appId).equals(ClientApp.APP_ID_IM2U)) |
|
105 |
{ |
|
106 |
c_sLogReason = m_oAdminService.checkPasswordPattern (c_sPassword ,getUPassService (), ClientApp.APP_ID_M2U); |
|
107 |
} |
|
108 |
else |
|
109 |
{ |
|
110 |
c_sLogReason = m_oAdminService.checkPasswordPattern (c_sPassword ,getUPassService (), Integer.valueOf(appId)); |
|
111 |
} |
|
101 | 112 |
|
102 | 113 |
//Determine maker checker |
103 | 114 |
Long actionId = RIBPermission.RESET_RIB_USER_PASSWORD.getActionId(); |
src/com/ib/ibss/enterprise/services/ss221_settings/IBSSSettingConstants.java | ||
---|---|---|
77 | 77 |
public static final String HAS_EDIT_ACCESS ="hasEditAccess"; |
78 | 78 |
|
79 | 79 |
//upass application id |
80 |
public static final String UPASS_ADMIN_APP_ID ="0";
|
|
80 |
public static final Integer UPASS_ADMIN_APP_ID = 0;
|
|
81 | 81 |
} |
src/com/ib/ibss/enterprise/services/ss221_settings/IBSSUpassMaintenanceResultServices.java | ||
---|---|---|
84 | 84 |
updateTbAmConfig = getTbAmConfigDAO().getTbAmConfigByConfigNameAppId(each.toString(),Integer.parseInt(applicationId)); |
85 | 85 |
configValue = (String) getIBSSDynaBean().get(each.toString()); |
86 | 86 |
|
87 |
|
|
88 | 87 |
if (!DataValidator.isEmptyString(configValue)) |
89 | 88 |
{ |
90 | 89 |
updateTbAmConfig.setConfigValue(configValue); |
src/com/ib/ibss/enterprise/services/ss223_application/IBSSApplicationUserCreateConfirmServices.java | ||
---|---|---|
24 | 24 |
import com.ib.ibss.common.utils.IBSSLogger; |
25 | 25 |
import com.ib.ibss.enterprise.services.IBSSEnterpriseServicesWorkspace; |
26 | 26 |
import com.ib.ibss.enterprise.services.ss102_user_admin.AdminSharedServices; |
27 |
import com.ib.ibss.enterprise.services.ss221_settings.IBSSSettingConstants; |
|
27 | 28 |
import com.ib.ibss.enterprise.services.ss222_application.constants.IBSSApplicationUserConstants; |
28 | 29 |
import com.ib.ibss.error.exception.IBSSGenericException; |
29 | 30 |
import com.ib.ibss.error.handler.IBSSErrorHandler; |
... | ... | |
87 | 88 |
getBeanMessage (IBSSApplicationUserConstants.USER_ALIAS), |
88 | 89 |
"Password"); |
89 | 90 |
|
90 |
logReason = service.checkPasswordPattern (getBeanMessage (IBSSApplicationUserConstants.PASSWORD),getUPassService ()); |
|
91 |
logReason = service.checkPasswordPattern (getBeanMessage (IBSSApplicationUserConstants.PASSWORD),getUPassService (), IBSSSettingConstants.UPASS_ADMIN_APP_ID);
|
|
91 | 92 |
} |
92 | 93 |
catch (Exception e) |
93 | 94 |
{ |
src/com/ib/ibss/enterprise/services/ss223_application/IBSSApplicationUserCreateResultServices.java | ||
---|---|---|
14 | 14 |
import my.com.upass.MinimalConstants; |
15 | 15 |
import my.com.upass.MinimalUPassControllerV2; |
16 | 16 |
import my.com.upass.generic.hibernate.HibernateUtils; |
17 |
import my.com.upass.pojo.ClientApp; |
|
17 | 18 |
import my.com.upass.pojo.MinimalUserBean; |
18 | 19 |
import my.com.upass.pojo.UserAppAccess; |
19 | 20 |
import net.penril.ibss.audit.log.AuditLogConstants; |
... | ... | |
66 | 67 |
AdminSharedServices service = new AdminSharedServices (); |
67 | 68 |
|
68 | 69 |
/* Validate Password */ |
69 |
logReason = service.checkPasswordPattern (password ,getUPassService ()); |
|
70 |
if(Integer.valueOf(selectedAppId).equals(ClientApp.APP_ID_ONLINE_STOCK) || Integer.valueOf(selectedAppId).equals(ClientApp.APP_ID_IM2U)) |
|
71 |
{ |
|
72 |
logReason = service.checkPasswordPattern (password ,getUPassService (), ClientApp.APP_ID_M2U); |
|
73 |
} |
|
74 |
else |
|
75 |
{ |
|
76 |
logReason = service.checkPasswordPattern (password ,getUPassService (), Integer.valueOf(selectedAppId)); |
|
77 |
} |
|
70 | 78 |
|
71 | 79 |
/*verify and create user*/ |
72 | 80 |
MinimalUPassControllerV2 upass = new MinimalUPassControllerV2(); |
src/com/ib/ibss/enterprise/services/ss223_application/IBSSApplicationUserResetPassResultServices.java | ||
---|---|---|
13 | 13 |
|
14 | 14 |
import my.com.upass.MinimalConstants; |
15 | 15 |
import my.com.upass.MinimalUPassControllerV2; |
16 |
import my.com.upass.pojo.ClientApp; |
|
16 | 17 |
import net.penril.ibss.audit.log.AuditLogConstants; |
17 | 18 |
import net.penril.ibss.audit.log.USER_ACTIVITY_TYTPE; |
18 | 19 |
|
... | ... | |
57 | 58 |
IBSSDynaBean detailBean = (IBSSDynaBean) getIBSSDynaBean().get(IBSSApplicationUserConstants.APPLICATION_USER_DETAILS_BEAN); |
58 | 59 |
Long userID = (Long) detailBean.get (IBSSApplicationUserConstants.USER_ID); |
59 | 60 |
String userAlias = (String) detailBean.get (IBSSApplicationUserConstants.USER_ALIAS); |
61 |
String appId = (String) detailBean.get (IBSSApplicationUserConstants.APPLICATION_ID); |
|
62 |
|
|
60 | 63 |
String logReason = null; |
61 | 64 |
|
62 | 65 |
try |
63 | 66 |
{ |
64 | 67 |
/* Validate password*/ |
65 | 68 |
AdminSharedServices adminService = new AdminSharedServices (); |
66 |
logReason = adminService.checkPasswordPattern (password ,getUPassService ()); |
|
69 |
|
|
70 |
if(Integer.valueOf(appId).equals(ClientApp.APP_ID_ONLINE_STOCK) || Integer.valueOf(appId).equals(ClientApp.APP_ID_IM2U)) |
|
71 |
{ |
|
72 |
logReason = adminService.checkPasswordPattern (password ,getUPassService (), ClientApp.APP_ID_M2U); |
|
73 |
} |
|
74 |
else |
|
75 |
{ |
|
76 |
logReason = adminService.checkPasswordPattern (password ,getUPassService (), Integer.valueOf(appId)); |
|
77 |
} |
|
67 | 78 |
|
68 | 79 |
/* Reset password */ |
69 | 80 |
MinimalUPassControllerV2 upass = new MinimalUPassControllerV2(); |
Also available in: Unified diff