Revision 76:aa63439cd1c0

View differences:

src/main/java/my/com/upass/MinimalUPassControllerV2.java
660 660
		}
661 661
		return null;
662 662
	}
663

  
663
	
664 664
	public List/* <UserProfile> */listProfilesByExamples(
665 665
			String appAccessId, String hashedSecretKey,
666 666
			List/* <UserProfile> */exampleProfiles, Session txSession)
src/main/java/my/com/upass/dao/UserDAO.java
13 13

  
14 14
import java.util.Date;
15 15
import java.util.List;
16
import java.util.Map;
16 17

  
17 18
import my.com.upass.generic.hibernate.GenericDAO;
18 19
import my.com.upass.maybank.entities.UserProfile;
......
43 44

  
44 45
	boolean deleteUser(MinimalUserBean userBean, final Session txSession) throws Exception;
45 46

  
46
	boolean deleteProfile(String username, Class/* <UserProfile> */profileClass, final Session txSession) throws Exception;
47
	boolean deleteProfile(String username, Class/* <UserProfile> */profileClass, final Session txSession)
48
			throws Exception;
47 49

  
48 50
	MinimalUserBean getTbAmUserByUserAlias(String userAlias, final Session txSession) throws Exception;
49 51

  
......
88 90

  
89 91
	boolean updateUserToStore(MinimalUserBean MinimalUserBean, final Session txSession) throws Exception;
90 92

  
93
	Map/* <MinimalUserBean, UserAppAccess> */listApplicationAdmins(final Session txSession) throws Exception;
94

  
91 95
	List/* <UserProfile> */listProfilesFor(
92 96
			String username, final Session txSession) throws Exception;
93 97

  
......
103 107
			String invokerUsername, String invokerHashedPassword,
104 108
			String targetUsername, String targetHashedPassword, final Session txSession)
105 109
			throws Exception;
110

  
106 111
}
src/main/java/my/com/upass/dao/hibernate/UserDAOHibernate.java
15 15
import java.util.Calendar;
16 16
import java.util.Date;
17 17
import java.util.GregorianCalendar;
18
import java.util.HashMap;
18 19
import java.util.Iterator;
19 20
import java.util.LinkedList;
20 21
import java.util.List;
22
import java.util.Map;
21 23

  
22 24
import my.com.upass.MinimalConstants;
23 25
import my.com.upass.dao.UserDAO;
......
359 361
		return accesses;
360 362
	}
361 363

  
364
	public Map/* <MinimalUserBean, UserAppAccess> */listApplicationAdmins(Session txSession)
365
			throws Exception {
366

  
367
		Map map = null;
368
		Session session = null;
369
		try {
370
			session = txSession != null ? txSession : getSession();
371

  
372
			final Character adminAccessType = new Character(UserAppAccess.TYPE_ADMIN);
373
			List adminsAccessList = session.createCriteria(UserAppAccess.class)
374
					.add(Restrictions.eq("accessType", adminAccessType)).list();
375

  
376
			map = new HashMap(adminsAccessList.size(), 1.0f);
377
			for (Iterator iterator = adminsAccessList.iterator(); iterator.hasNext();) {
378
				final UserAppAccess adminAccess = (UserAppAccess) iterator.next();
379
				final MinimalUserBean adminUser = adminAccess.getUser();
380
				map.put(adminUser, adminAccess);
381
				if (txSession == null) {
382
					Hibernate.initialize(adminAccess);
383
					Hibernate.initialize(adminUser);
384
				}
385
			}
386
		} finally {
387
			if (txSession == null)
388
				closeSessionIfAny(session);
389
		}
390
		return map;
391
	}
392

  
362 393
	/**
363 394
	 * @see my.com.upass.dao.UserDAO#listAllClientApps(Session)
364 395
	 */
src/main/java/my/com/upass/pojo/MinimalUserBean.java
36 36
	// private Integer applicationId;
37 37

  
38 38
	private transient String hashedPassword;
39
	private transient int hashCode;
39 40

  
40 41
	//
41 42

  
......
53 54

  
54 55
	public void setUserAlias(String userAlias) {
55 56
		this.userAlias = userAlias;
57
		hashCode = userAlias != null ?
58
				userAlias.hashCode() : 0;
59
	}
60

  
61
	public int hashCode() {
62
		return hashCode;
56 63
	}
57 64

  
58 65
	public int getUserType() {
......
264 271
	public String getHashedPassword() {
265 272
		return hashedPassword;
266 273
	}
267

  
268 274
}
src/main/java/my/com/upass/services/AppAccessMgtService.java
74 74
	}
75 75

  
76 76
	public static Integer getAppIdForProfile(UserProfile profile) {
77
	
77

  
78 78
		Integer appId = (Integer) PROFILE_TO_APP_ID_MAP.get(profile);
79 79
		if (appId != null)
80 80
			return appId;
......
177 177
		return removed;
178 178
	}
179 179

  
180
	public Map/* <MinimalUserBean, UserAppAccess> */listApplicationAdmins(Session txSession) {
181

  
182
		Map map = null;
183
		try {
184
			UserDAO userDao = MinimalDAOFactory.minimalInstance().getUserDAO();
185
			map = userDao.listApplicationAdmins(txSession);
186

  
187
		} catch (Exception e) {
188
			e.printStackTrace();
189
		}
190
		return map;
191
	}
192

  
180 193
	//
181 194

  
182 195
	public class MultipleAppAccessesFound extends UPassException {
183
		
196

  
184 197
		private static final long serialVersionUID = 1L;
185 198

  
186 199
		public MultipleAppAccessesFound() {

Also available in: Unified diff