/ - Diff - M2U UPASS Project - Penril Support System

     	public int addUser(String appAccessId, String hashedSecretKey, MinimalUserBean user, Session txSession) {
     		return addUser(appAccessId, hashedSecretKey, user, txSession, true);
+    	}
     	public int addUser(String appAccessId, String hashedSecretKey, MinimalUserBean user, Session txSession, boolean checkPassword) {
     	public int addUser(String appAccessId, String hashedSecretKey, MinimalUserBean user, Session txSession,
     			boolean checkPassword) {
     		final String userAlias = user.getUserAlias();
     		final String doubleHashedPassword = user.getPcipherText();
-...
     		Integer appId = appAccessMgtService.getAppIdForAdmin(appAccessId, txSession);
     		return appId;
+    	}
     	public UserProfile findProfile(String appAccessId, String hashedSecretKey, String username, Session txSession)
     			throws UPassException {
     		try {
     			Integer invokingAppId = checkAppAccess(appAccessId, hashedSecretKey, txSession);
     			if (invokingAppId == null)
     				throw new UPassException(MinimalConstants.ERR_APP_SERV_NOT_PERMITTED);
     			else {
     				List profiles = modifyUserService.listProfiles(username, txSession);
     				for (Iterator profileIter = profiles.iterator(); profileIter.hasNext();) {
     					UserProfile profile = (UserProfile) profileIter.next();
     					final Integer appIdForProfile = (Integer) AppAccessMgtService
     							.profileToAppMap.get(profile.getClass());
     					if (invokingAppId.equals(appIdForProfile)) {
     						return profile;
+    					}
+    				}
     				return null;
+    			}
     		} catch (MultipleAppAccessesFound e) {
     			throw new UPassException(MinimalConstants.ERR_APP_SERV_NOT_PERMITTED);
+    		}
+    	}
+    }

src/main/java/my/com/upass/dao/UserDAO.java
74	74	boolean updateProfileShallowly(UserProfile profile, final Session txSession) throws Exception;
75	75
76	76	boolean updateUserToStore(MinimalUserBean MinimalUserBean, final Session txSession) throws Exception;
	77
	78	List/<UserProfile>/ listProfilesFor(String username, final Session txSession) throws Exception;
77	79	}

     package my.com.upass.dao.hibernate;
     import java.util.ArrayList;
     import java.util.List;
     import my.com.upass.MinimalConstants;
-...
     import my.com.upass.pojo.UserAppAccess;
     import net.penril.generic.hibernate.GenericDAOHibernate;
     import org.apache.commons.collections.CollectionUtils;
     import org.apache.commons.collections.PredicateUtils;
     import org.apache.log4j.Logger;
     import org.hibernate.Criteria;
     import org.hibernate.FetchMode;
-...
+    		}
     		return successful;
+    	}
     	public List/* <UserProfile> */listProfilesFor(String username, Session txSession) throws Exception {
     		List profiles = new ArrayList(5);
     		Session session = null;
     		try {
     			session = txSession != null ? txSession : getSession();
     			// Retrieving IbccUser
     			Query ibccQuery = session.createQuery(
     					"FROM IbccUser u WHERE u.minUser.userAlias = :userAlias ");
     			profiles.add(ibccQuery.setString("userAlias", username).uniqueResult());
     			// Retrieving Im2uUser
     			Query im2uQuery = session.createQuery(
     					"FROM Im2uUser u WHERE u.m2uUser.minUser.userAlias = :userAlias ");
     			profiles.add(im2uQuery.setString("userAlias", username).uniqueResult());
     			// Retrieving M2uUser
     			Query m2uQuery = session.createQuery(
     					"FROM M2uUser u WHERE u.minUser.userAlias = :userAlias ");
     			profiles.add(m2uQuery.setString("userAlias", username).uniqueResult());
     			// Retrieving StockUser
     			Query stockQuery = session.createQuery(
     					"FROM StockUser u WHERE u.m2uUser.minUser.userAlias = :userAlias ");
     			profiles.add(stockQuery.setString("userAlias", username).uniqueResult());
     			// Retrieving TicketingUser
     			Query ticketingQuery = session.createQuery(
     					"FROM TicketingUser u WHERE u.minUser.userAlias = :userAlias ");
     			profiles.add(ticketingQuery.setString("userAlias", username).uniqueResult());
     			CollectionUtils.filter(profiles, PredicateUtils.notNullPredicate());
     		} finally {
     			if (txSession == null)
     				closeSessionIfAny(session);
+    		}
     		return profiles;
+    	}
+    }

     public interface MinimalMaybankFacade {
     	int authenticateUser(
     			String appAccessId, String hashedSecretKey,
     			String appAccessId, String hashedSecretKey,
     			String username, String hashedPassword);
     	int newUser(
     			String appAccessId, String hashedSecretKey,
     			String username, String hashedPassword,
     			String appAccessId, String hashedSecretKey,
     			String username, String hashedPassword,
     			String pan1, String pan2);
     	int changePassword(
-...
     			String username, String oldHashedPassword, String newHashedPassword);
     	int resetPassword(
     			String appAccessId, String hashedSecretKey,
     			String appAccessId, String hashedSecretKey,
     			String username, String newHashedPassword);
     	int changePan1(
     			String appAccessId, String hashedSecretKey,
     			String username, String pan1);
     	int changePan2(
     			String appAccessId, String hashedSecretKey,
     			String username, String pan2);
     	Response lookupUsername_internal(
     			String appAccessId, String hashedSecretKey,
     			String username);
+    }

     package my.com.upass.maybank;
     import java.util.Map;
     import my.com.upass.MinimalConstants;
     import my.com.upass.MinimalUPassControllerV2;
     import my.com.upass.UPassException;
     import my.com.upass.maybank.entities.M2uUser;
     import my.com.upass.maybank.entities.UserProfile;
     import my.com.upass.pojo.MinimalUserBean;
     import net.penril.generic.hibernate.GenericDAOHibernate;
     import net.penril.generic.hibernate.HibernateUtils;
     import org.apache.commons.lang.NotImplementedException;
     import org.apache.log4j.Logger;
     import org.hibernate.Session;
-...
     				appAccessId, hashedSecretKey, username, newHashedPassword);
+    	}
     	public int changePan1(
     			String appAccessId, String hashedSecretKey,
     			String username, String pan1) {
     		throw new NotImplementedException();
     		// return minUpcV2.updateProfileShallowly(
     		// appAccessId, hashedSecretKey, "", null);
+    	}
     	public int changePan2(
     			String appAccessId, String hashedSecretKey,
     			String username, String pan2) {
     		// TODO Auto-generated method stub
     		throw new NotImplementedException();
+    	}
     	public Response lookupUsername_internal(
     			String appAccessId, String hashedSecretKey,
     			String username) {
     		Response res = new Response();
     		Session session = null;
     		try {
     			session = HibernateUtils.currentSession();
     			UserProfile profile = minUpcV2.findProfile(
     					appAccessId, hashedSecretKey, username, session);
     			final Map map = profile.propertiesToMap();
     			res.setMap(map);
     			res.setCode(MinimalConstants.ERR_SUCCESS);
     		} catch (UPassException e) {
     			LOGGER.info(e, e);
     			res.setCode(e.getErrorCode());
     		} catch (Exception e) {
     			LOGGER.error(e, e);
     			res.setCode(MinimalConstants.ERR_UNKNOWN);
     		} finally {
     			GenericDAOHibernate.closeSessionIfAny(session);
+    		}
     		return res;
+    	}
     	// protected methods
     	protected int newUser(

     package my.com.upass.maybank;
     import java.util.Map;
     public class Response {
     	private int code;
     	private Map/*<String, String>*/ map;
     	//
     	public int getCode() {
     		return code;
+    	}
     	public void setCode(int code) {
     		this.code = code;
+    	}
     	public Map getMap() {
     		return map;
+    	}
     	public void setMap(Map map) {
     		this.map = map;
+    	}
+    }

     package my.com.upass.maybank.entities;
     import java.util.HashMap;
     import java.util.Map;
     import my.com.upass.pojo.MinimalUserBean;
     public class IbccUser implements UserProfile {
-...
     	public void setUserId(Long userId) {
     		this.userId = userId;
+    	}
     	public Map propertiesToMap() {
     		Map map = new HashMap(2, 1.0f);
     		map.put("username", minUser.getUsername());
     		map.put("panCc", panCc);
     		return map;
+    	}
+    }

     package my.com.upass.maybank.entities;
     import java.util.Date;
     import java.util.HashMap;
     import java.util.Map;
     import my.com.upass.pojo.MinimalUserBean;
-...
     	private static final long serialVersionUID = 1L;
     	private Long userId;
     	private M2uUser m2uUser;
     	private String wsFlag;
     	private String wsIdentCode;
     	private String wsMySgId;
     	private Date wsRegTimeStamp;
     	private M2uUser m2uUser;
     	//
     	public String getWsFlag() {
-...
     		if (minUser != null)
     			this.userId = m2uUser.getUserId();
+    	}
     	public M2uUser getM2uUser() {
     		return m2uUser;
+    	}
-...
     		if (m2uUser != null)
     			this.userId = m2uUser.getUserId();
+    	}
     	public Map propertiesToMap() {
     		Map map = new HashMap(2, 1.0f);
     		map.put("wsFlag", wsFlag);
     		map.put("wsIdentCode", wsIdentCode);
     		map.put("wsMySgId", wsMySgId);
     		map.put("wsRegTimeStamp", wsRegTimeStamp);
     		map.putAll(m2uUser.propertiesToMap());
     		return map;
+    	}
+    }

     package my.com.upass.maybank.entities;
     import java.util.HashMap;
     import java.util.Map;
     import my.com.upass.pojo.MinimalUserBean;
     public class M2uUser implements UserProfile {
-...
+    	}
     	public Map propertiesToMap() {
     		Map map = new HashMap(2, 1.0f);
     		map.put("pan1", pan1);
     		map.put("pan2", pan2);
     		map.put("username", minUser.getUsername());
     		return map;
+    	}
+    }

     package my.com.upass.maybank.entities;
     import java.util.HashMap;
     import java.util.Map;
     import my.com.upass.pojo.MinimalUserBean;
     public class StockUser implements UserProfile {
-...
     	private Long userId;
     	private M2uUser m2uUser;
     	private String palAccountNo;
     	private String stAccountNo;
     	private String idNo;
     	private String highNetWorthAttr;
     	private Integer custType;
     	private String activeAttr;
     	//
     	public String getPalAccountNo() {
     		return palAccountNo;
+    	}
     	public void setPalAccountNo(String palAccountNo) {
     		this.palAccountNo = palAccountNo;
+    	}
     	public String getStAccountNo() {
     		return stAccountNo;
+    	}
     	public void setStAccountNo(String stAccountNo) {
     		this.stAccountNo = stAccountNo;
+    	}
     	public String getIdNo() {
     		return idNo;
+    	}
-...
     		this.idNo = idNo;
+    	}
     	public String getHighNetWorthAttr() {
     		return highNetWorthAttr;
+    	}
     	public void setHighNetWorthAttr(String highNetWorthAttr) {
     		this.highNetWorthAttr = highNetWorthAttr;
+    	}
     	public Integer getCustType() {
     		return custType;
+    	}
     	public void setCustType(Integer custType) {
     		this.custType = custType;
+    	}
     	public M2uUser getM2uUser() {
     		return m2uUser;
+    	}
-...
     		this.userId = userId;
+    	}
     	public String getActiveAttr() {
     		return activeAttr;
+    	}
     	public void setActiveAttr(String activeAttr) {
     		this.activeAttr = activeAttr;
+    	}
     	public MinimalUserBean getMinUser() {
     		return m2uUser.getMinUser();
+    	}
-...
     		if (minUser != null)
     			this.userId = m2uUser.getUserId();
+    	}
     	public Map propertiesToMap() {
     		Map map = new HashMap(2, 1.0f);
     		map.put("idNo", idNo);
     		map.putAll(m2uUser.propertiesToMap());
     		return map;
+    	}
+    }

     package my.com.upass.maybank.entities;
     import java.util.HashMap;
     import java.util.Map;
     import my.com.upass.pojo.MinimalUserBean;
     public class TicketingUser implements UserProfile {
     	private static final long serialVersionUID = 1L;
     	private Long userId;
     	private MinimalUserBean minUser;
     	private String fullName;
-...
     	public void setUserId(Long userId) {
     		this.userId = userId;
+    	}
     	public Map propertiesToMap() {
     		Map map = new HashMap(2, 1.0f);
     		map.put("fullName", fullName);
     		map.put("firstName", firstName);
     		map.put("lastName", lastName);
     		map.put("payeeCode", payeeCode);
     		map.put("username", minUser.getUsername());
     		return map;
+    	}
+    }

     package my.com.upass.maybank.entities;
     import java.io.Serializable;
     import java.util.Map;
     import my.com.upass.pojo.ClientApp;
     import my.com.upass.pojo.MinimalUserBean;
     public interface UserProfile extends Serializable {
-...
     	MinimalUserBean getMinUser();
     	void setMinUser(MinimalUserBean maybankUser);
     	Map propertiesToMap();
+    }

     import java.util.ArrayList;
     import java.util.HashMap;
     import java.util.Iterator;
     import java.util.LinkedList;
     import java.util.List;
     import java.util.Map;
-...
     public class AppAccessMgtService {
     	/* Class<Integer, Class<UserProfile>> */
     	public static final Map appToProfileMap = createAppToProfileMap();
     	/* Map<Class<UserProfile>, Integer> */
     	public static final Map profileToAppMap = createProfileToAppMap();
     	//

     package my.com.upass.services;
     import java.util.List;
     import my.com.upass.MinimalConstants;
     import my.com.upass.MinimalUPassControllerV2;
     import my.com.upass.UPassException;
     import my.com.upass.dao.MinimalDAOFactory;
     import my.com.upass.dao.UserDAO;
     import my.com.upass.factory.MinimalUPassFactory;
-...
     			String userPassword, int userState) {
     		int rc = MinimalConstants.ERR_SYSTEM_NOT_READY;
     		if (userAlias == null) {
     			return MinimalConstants.ERR_INVALID_INPUT;
+    		}
     		UserDAO userDao;
     		try {
     			userDao = MinimalDAOFactory.minimalInstance().getUserDAO();
     			UserDAO userDao = MinimalDAOFactory.minimalInstance().getUserDAO();
     			MinimalUserBean ub = userDao.getUserFromStore(userAlias, null);
     			if (ub == null) {
     				return MinimalConstants.ERR_USERALIAS_NOT_FOUND;
+    			}
     			if (userPassword != null) {
     				// Generate new paswword
     				PasswordController pc = MinimalUPassFactory.getPasswordController(ub,
-...
+    				}
     				ub = (MinimalUserBean) pc.getUpdatedObject();
+    			}
     			if (userDesc != null) {
     				ub.setDescription(userDesc);
+    			}
     			ub.setUserType(userType);
     			ub.setUstate(userState);
-...
+    		}
     		return rc;
+    	}
     	public List/* <UserProfile> */listProfiles(String username, Session txSession) throws UPassException {
     		// int rc = MinimalConstants.ERR_SYSTEM_NOT_READY;
     		if (username == null) {
     			throw new UPassException(MinimalConstants.ERR_INVALID_INPUT);
+    		}
     		try {
     			UserDAO userDao = MinimalDAOFactory.minimalInstance().getUserDAO();
     			return userDao.listProfilesFor(username, txSession);
     		} catch (Exception e) {
     			if (e instanceof UPassException) {
     				UPassException upassEx = (UPassException) e;
     				throw upassEx;
     			} else
     				e.printStackTrace();
+    		}
     		return null;
+    	}
+    }

     		<property name="activeAttr" type="string">
     			<column name="ACTIVE_ATTR" length="1" />
     		</property>
     		 -->
     		<property name="highNetWorthAttr" type="string">
     			<column name="HIGH_NET_WORTH_ATTR" length="1" />
     		</property>
     		<property name="custType" type="integer">
     			<column name="CUST_TYPE" />
     		</property>
     		 -->
     		<property name="idNo" type="string">
     			<column name="ID_NO" length="20" />
     		</property>
     		<property name="stAccountNo" type="string">
     			<column name="ST_ACCOUNT_NO" length="20" />
     		<!--
     		<column name="ST_ACCOUNT_NO" length="20" />
     		</property>
     		<property name="palAccountNo" type="string">
     			<column name="PAL_ACCOUNT_NO" length="20" />
     		</property>
      		<property name="stAccountNo" type="string">
     		 -->
     		<one-to-one name="m2uUser" class="my.com.upass.maybank.entities.M2uUser" constrained="true"></one-to-one>
     	</class>
     </hibernate-mapping>

Z-Archive » Maybank Projects » M2U UPASS Project

Revision 37:ba861318d360