Revision 78:4550585d34a5
| src/main/java/my/com/upass/maybank/MinimalMaybankFacadeImpl.java | ||
|---|---|---|
| 11 | 11 |
import my.com.upass.generic.hibernate.HibernateUtils; |
| 12 | 12 |
import my.com.upass.maybank.entities.IbccUser; |
| 13 | 13 |
import my.com.upass.maybank.entities.M2uUser; |
| 14 |
import my.com.upass.maybank.entities.M2uUserContainer; |
|
| 14 | 15 |
import my.com.upass.maybank.entities.UserProfile; |
| 15 | 16 |
import my.com.upass.pojo.ClientApp; |
| 16 | 17 |
import my.com.upass.pojo.MinimalUserBean; |
| ... | ... | |
| 254 | 255 |
session = HibernateUtils.currentSession(); |
| 255 | 256 |
session.beginTransaction(); |
| 256 | 257 |
|
| 257 |
rc = minUpcV2.addUser( |
|
| 258 |
appAccessId, hashedSecretKey, profile.getMinUser(), UserAppAccess.TYPE_USER, session); |
|
| 259 |
|
|
| 258 |
rc = (profile instanceof M2uUserContainer) ? |
|
| 259 |
MinimalConstants.ERR_SUCCESS |
|
| 260 |
: minUpcV2.addUser( |
|
| 261 |
appAccessId, hashedSecretKey, profile.getMinUser(), UserAppAccess.TYPE_USER, session); |
|
| 262 |
|
|
| 260 | 263 |
if (rc == MinimalConstants.ERR_SUCCESS) {
|
| 261 | 264 |
rc = minUpcV2.updateProfileShallowly(appAccessId, hashedSecretKey, profile, session); |
| 262 |
|
|
| 265 |
|
|
| 263 | 266 |
if (rc == MinimalConstants.ERR_SUCCESS) {
|
| 264 | 267 |
session.getTransaction().commit(); |
| 265 | 268 |
} else {
|
| ... | ... | |
| 268 | 271 |
} else {
|
| 269 | 272 |
GenericDAOHibernate.rollbackTransactionIfAny(session); |
| 270 | 273 |
} |
| 271 |
|
|
| 272 | 274 |
} catch (UPassException e) {
|
| 273 | 275 |
rc = e.getErrorCode(); |
| 274 | 276 |
LOGGER.error(e, e); |
| src/main/java/my/com/upass/services/ChangeStaticPasswordService.java | ||
|---|---|---|
| 63 | 63 |
return MinimalConstants.ERR_USERALIAS_NOT_FOUND; |
| 64 | 64 |
} |
| 65 | 65 |
userBean.getPdateCreated(); |
| 66 |
|
|
| 66 |
|
|
| 67 | 67 |
String newPlainPassword = null; |
| 68 | 68 |
|
| 69 | 69 |
// verify user |
| ... | ... | |
| 99 | 99 |
boolean lrc = userDao.updateUserToStore(userBean, session); |
| 100 | 100 |
// update ldap |
| 101 | 101 |
if (lrc) {
|
| 102 |
if(upc.isInMigrationPeriod()){
|
|
| 102 |
if (upc.isInMigrationPeriod() |
|
| 103 |
&& userBean.getUserType() == MinimalConstants.UTYPE_STATE_USER) {
|
|
| 104 |
|
|
| 103 | 105 |
Map attrMap = new HashMap(); |
| 104 | 106 |
attrMap.put(MaybankLdapConstant.ATTR_PASSWORD, newPlainPassword); |
| 105 | 107 |
MinimalUPassControllerV2.getMaybankLdapDAO().updateUser(userBean.getUserAlias(), attrMap); |
| 106 | 108 |
} |
| 109 |
session.getTransaction().commit(); |
|
| 107 | 110 |
|
| 108 |
session.getTransaction().commit(); |
|
| 109 |
}else{
|
|
| 111 |
} else {
|
|
| 110 | 112 |
rc = MinimalConstants.ERR_SYSTEM_NOT_READY; |
| 111 | 113 |
GenericDAOHibernate.rollbackTransactionIfAny(session); |
| 112 | 114 |
} |
| src/main/java/my/com/upass/services/ModifyUserService.java | ||
|---|---|---|
| 78 | 78 |
if (ub == null) {
|
| 79 | 79 |
return MinimalConstants.ERR_USERALIAS_NOT_FOUND; |
| 80 | 80 |
} |
| 81 |
|
|
| 82 | 81 |
PasswordController pc = null; |
| 83 | 82 |
String plainPassword = null; |
| 84 | 83 |
|
| ... | ... | |
| 112 | 111 |
if (userDao.updateUserToStore(ub, session)) {
|
| 113 | 112 |
rc = MinimalConstants.ERR_SUCCESS; |
| 114 | 113 |
// update ldap |
| 115 |
if (updateLdap && plainPassword != null) {
|
|
| 114 |
if (ub.getUserType() == MinimalConstants.UTYPE_STATE_USER |
|
| 115 |
&& updateLdap && plainPassword != null) {
|
|
| 116 |
|
|
| 116 | 117 |
Map attrMap = new HashMap(); |
| 117 | 118 |
attrMap.put(MaybankLdapConstant.ATTR_PASSWORD, plainPassword); |
| 118 | 119 |
MinimalUPassControllerV2.getMaybankLdapDAO().updateUser(userAlias, attrMap); |
| 119 | 120 |
} |
| 120 |
|
|
| 121 | 121 |
session.getTransaction().commit(); |
| 122 |
|
|
| 122 |
|
|
| 123 | 123 |
} else {
|
| 124 | 124 |
rc = MinimalConstants.ERR_UNKNOWN; |
| 125 | 125 |
GenericDAOHibernate.rollbackTransactionIfAny(session); |
| 126 | 126 |
} |
| 127 |
|
|
| 128 |
|
|
| 129 | 127 |
} catch (UPassException e) {
|
| 130 | 128 |
e.printStackTrace(); |
| 131 | 129 |
rc = e.getErrorCode(); |
| src/main/java/my/com/upass/services/VerifyStaticPasswordService.java | ||
|---|---|---|
| 146 | 146 |
final String plainPassword = hashedPassword; |
| 147 | 147 |
hashedPassword = PasswordController.sha256(plainPassword); |
| 148 | 148 |
|
| 149 |
if (ret.user.getDoubleHashedPassword() == null) { // password null, so the user haven't get migrated.
|
|
| 149 |
if (ret.user.getUserType() == MinimalConstants.UTYPE_STATE_USER |
|
| 150 |
&& ret.user.getDoubleHashedPassword() == null) {
|
|
| 151 |
|
|
| 152 |
// password is null, so the user haven't got migrated. |
|
| 150 | 153 |
|
| 151 | 154 |
// authenticate to ldap |
| 152 | 155 |
if (!MinimalUPassControllerV2.getMaybankLdapDAO().authenticate(userAlias, plainPassword)) {
|
Also available in: Unified diff