Revision 57:1ba6caba8f3a

View differences:

src/main/java/my/com/upass/maybank/MinimalMaybankFacadeImpl.java
1 1
package my.com.upass.maybank;
2 2

  
3
import java.util.HashMap;
3 4
import java.util.LinkedList;
4 5
import java.util.List;
5 6
import java.util.Map;
......
15 16
import my.com.upass.pojo.ClientApp;
16 17
import my.com.upass.pojo.MinimalUserBean;
17 18
import my.com.upass.pojo.UserAppAccess;
19
import my.com.upass.spring.ldap.MaybankLdapConstant;
18 20

  
19 21
import org.apache.log4j.Logger;
20 22
import org.hibernate.Session;
......
241 243
				int rc = minUpcV2.updateProfileShallowly(
242 244
						appAccessId, hashedSecretKey, m2uUser, session);
243 245

  
244
				if (rc == MinimalConstants.ERR_SUCCESS)
246
				if (rc == MinimalConstants.ERR_SUCCESS){
247
					if(minUpcV2.isInMigrationPeriod()){
248
						Map attrMap = new HashMap();
249
						if (pan1 != null)
250
							attrMap.put(MaybankLdapConstant.ATTR_PAN_1, pan1);
251

  
252
						if (pan2 != null)
253
							attrMap.put(MaybankLdapConstant.ATTR_PAN_2, pan2);
254
						
255
						if(!attrMap.isEmpty())
256
							MinimalUPassControllerV2.getMaybankLdapDAO().updateUser(username, attrMap);
257
					}
258
					
245 259
					session.getTransaction().commit();
246
				else
260
				}else{
261
					LOGGER.warn("Unable to update user profile.");
247 262
					GenericDAOHibernate.rollbackTransactionIfAny(session);
263
				}
248 264

  
249 265
				return rc;
250 266

  
src/main/java/my/com/upass/services/ChangeStaticPasswordService.java
97 97

  
98 98
				// update database
99 99
				boolean lrc = userDao.updateUserToStore(userBean, session);
100
				if (!lrc) {
100
				// update ldap
101
				if (lrc) {
102
					if(upc.isInMigrationPeriod()){
103
						Map attrMap = new HashMap();
104
						attrMap.put(MaybankLdapConstant.ATTR_PASSWORD, newPlainPassword);
105
						MinimalUPassControllerV2.getMaybankLdapDAO().updateUser(userBean.getUserAlias(), attrMap);
106
					}
107
					
108
					session.getTransaction().commit();
109
				}else{
101 110
					rc = MinimalConstants.ERR_SYSTEM_NOT_READY;
111
					GenericDAOHibernate.rollbackTransactionIfAny(session);
102 112
				}
103
				// update ldap
104
				if (upc.isInMigrationPeriod()) {
105
					Map attrMap = new HashMap();
106
					attrMap.put(MaybankLdapConstant.ATTR_PASSWORD, newPlainPassword);
107
					MinimalUPassControllerV2.getMaybankLdapDAO().updateUser(userBean.getUserAlias(), attrMap);
108
				}
109
				session.getTransaction().commit();
110 113

  
111 114
			} catch (UPassException e) {
112 115
				rc = e.getErrorCode();
src/main/java/my/com/upass/services/ModifyUserService.java
111 111

  
112 112
			if (userDao.updateUserToStore(ub, session)) {
113 113
				rc = MinimalConstants.ERR_SUCCESS;
114
				// update ldap
115
				if (updateLdap && plainPassword != null) {
116
					Map attrMap = new HashMap();
117
					attrMap.put(MaybankLdapConstant.ATTR_PASSWORD, plainPassword);
118
					MinimalUPassControllerV2.getMaybankLdapDAO().updateUser(userAlias, attrMap);
119
				}
120
				
121
				session.getTransaction().commit();
122
				
114 123
			} else {
115 124
				rc = MinimalConstants.ERR_UNKNOWN;
125
				GenericDAOHibernate.rollbackTransactionIfAny(session);
116 126
			}
117 127

  
118
			// update ldap
119
			if (updateLdap && plainPassword != null) {
120
				Map attrMap = new HashMap();
121
				attrMap.put(MaybankLdapConstant.ATTR_PASSWORD, plainPassword);
122
				MinimalUPassControllerV2.getMaybankLdapDAO().updateUser(userAlias, attrMap);
123
			}
124
			session.getTransaction().commit();
125 128

  
126 129
		} catch (UPassException e) {
127 130
			e.printStackTrace();

Also available in: Unified diff