Revision 61:7674de95da21

View differences:

WebContent/WEB-INF/config/ss223_application/form-beans.xml
15 15
			<form-property name="clientAppList" type="java.util.List" />
16 16
			<form-property name="userId" type="java.lang.String" />
17 17
			<form-property name="userAlias" type="java.lang.String" />
18
			<form-property name="userName" type="java.lang.String" />
18 19
			<form-property name="userDescription" type="java.lang.String" />
19 20
			<form-property name="selectedAppId" type="java.lang.Integer" />
20 21
			<form-property name="selectedAppName" type="java.lang.String" />
......
29 30
			<form-property name="userList" type="java.util.List" />
30 31
			<form-property name="userProfileList" type="java.util.List" />
31 32
			<form-property name="userProfile" type="java.lang.Object"/>
33
			<form-property name="userDetailsMap" type="java.util.Map" />
34
			<form-property name="userFromMapList" type="java.util.List" />
35
			<form-property name="appAccessFromMapList" type="java.util.List" />
32 36
			
33 37
			<form-property name="hasAppCreateAccess" type="java.lang.Boolean" />
34 38
			<form-property name="hasAppEditAccess" type="java.lang.Boolean" />
WebContent/WEB-INF/config/ss223_application/struts-config.xml
28 28
			validate="false">
29 29
			<forward name="success" path=".ibss.app.user.create.confirm" />
30 30
			<forward name="refresh" path=".ibss.app.user.create" />
31
			<forward name="back" path="/ss103/appUserEnquiryMain.do" />
31
			<forward name="back" path="/ss223/appUserEnquiryMain.do" />
32 32
			<forward name="failure" path=".ibss.app.user.create" />
33 33
		</action>
34 34
		<action name="appUserForm" path="/ss223/createAppUserResult"
......
37 37
			validate="false">
38 38
			<forward name="success" path=".ibss.app.user.create.result" />
39 39
			<forward name="refresh" path=".ibss.app.user.create" />
40
			<forward name="back" path="/ss223/appUserEnquiryMain.do" />
40 41
			<forward name="failure" path=".ibss.app.user.create" />
41 42
		</action>
42 43
		
......
71 72
			validate="false">
72 73
			<forward name="success" path=".ibss.app.user.edit" />
73 74
			<forward name="delete" path="/ss223/deleteAppUserConfirm.do" />
75
			<forward name="reset" path="/ss223/appUserResetPass.do" />
74 76
			<forward name="back" path=".ibss.app.user.enquiry.main" />
75 77
			<forward name="failure" path=".ibss.app.user.details" />
76 78
		</action>
......
86 88
			type="com.ib.ibss.controller.actions.ss223_application.IBSSApplicationUserEditResultAction"
87 89
			validate="false">
88 90
			<forward name="success" path=".ibss.app.user.edit.result" />
89
			<forward name="back" path=".ibss.app.user.edit" />
91
			<forward name="back" path=".ibss.app.user.details" />
90 92
			<forward name="failure" path=".ibss.app.user.edit" />
91 93
		</action>
92 94
		
WebContent/WEB-INF/config/ss223_application/validation.xml
4 4
<form-validation>
5 5
 <formset>
6 6
  <form name="appUserCreateConfirmValidation">
7
   <field depends="alphaNumericSpace, maxlength, required" property="userAlias">
8
    <arg0 key="appuser.user.alias"/>
7
   <field depends="alphaNumericSpace, maxlength, minlength, required" property="userAlias">
8
    <arg0 key="appuser.user.id"/>
9
    <arg1 key="${var:minlength}" name="minlength" resource="false"/>
10
	<var>
11
	 <var-name>minlength</var-name>
12
	 <var-value>6</var-value>
13
	 </var>
9 14
    <arg1 key="${var:maxlength}" name="maxlength" resource="false"/>
10 15
    <var>
11 16
     <var-name>maxlength</var-name>
12
     <var-value>64</var-value>
17
     <var-value>30</var-value>
18
    </var>
19
   </field>
20
   <field depends="alphaNumericSpace, maxlength, minlength, required" property="userName">
21
    <arg0 key="appuser.user.name"/>
22
    <arg1 key="${var:minlength}" name="minlength" resource="false"/>
23
	<var>
24
	 <var-name>minlength</var-name>
25
	 <var-value>6</var-value>
26
	 </var>
27
    <arg1 key="${var:maxlength}" name="maxlength" resource="false"/>
28
    <var>
29
     <var-name>maxlength</var-name>
30
     <var-value>30</var-value>
13 31
    </var>
14 32
   </field>
15 33
   <field depends="required, minlength, maxlength, password" property="password">
......
52 70
  </form>
53 71
  
54 72
  <form name="appUserEditConfirmValidation">
55
   <field depends="alphaNumericSpace, maxlength, required" property="userAlias">
56
    <arg0 key="appuser.user.alias"/>
73
   <field depends="alphaNumericSpace, maxlength, minlength, required" property="userAlias">
74
    <arg0 key="appuser.user.id"/>
75
    <arg1 key="${var:minlength}" name="minlength" resource="false"/>
76
	<var>
77
	 <var-name>minlength</var-name>
78
	 <var-value>6</var-value>
79
	 </var>
57 80
    <arg1 key="${var:maxlength}" name="maxlength" resource="false"/>
58 81
    <var>
59 82
     <var-name>maxlength</var-name>
60
     <var-value>64</var-value>
83
     <var-value>30</var-value>
84
    </var>
85
   </field>
86
    <field depends="alphaNumericSpace, maxlength, minlength, required" property="userName">
87
    <arg0 key="appuser.user.name"/>
88
    <arg1 key="${var:minlength}" name="minlength" resource="false"/>
89
	<var>
90
	 <var-name>minlength</var-name>
91
	 <var-value>6</var-value>
92
	 </var>
93
    <arg1 key="${var:maxlength}" name="maxlength" resource="false"/>
94
    <var>
95
     <var-name>maxlength</var-name>
96
     <var-value>30</var-value>
61 97
    </var>
62 98
   </field>
63 99
   <field depends="maxlength, , required" property="userDescription">
WebContent/WEB-INF/config/ss223_application/view-beans.xml
17 17

  
18 18
		<form-bean name="appUserBean" type="org.apache.struts.action.DynaActionForm">
19 19
			<form-property name="userId" type="java.lang.Long" />
20
			<form-property name="userName" type="java.lang.String" />
20 21
			<form-property name="userDescription" type="java.lang.String" />
21 22
			<form-property name="userAlias" type="java.lang.String" />
22 23
			<form-property name="userCreationDate" type="java.lang.String" />
......
28 29

  
29 30
		<form-bean name="appUserDetailsBean" type="org.apache.struts.action.DynaActionForm">
30 31
			<form-property name="userId" type="java.lang.Long" />
32
			<form-property name="userName" type="java.lang.String" />
31 33
			<form-property name="userDescription" type="java.lang.String" />
32 34
			<form-property name="userAlias" type="java.lang.String" />
33 35
			<form-property name="userCreationDate" type="java.lang.String" />
WebContent/jsp/ss223_application/ibssAppUserCreateDetails.jsp
36 36

  
37 37
	<tr>
38 38
		<td>&nbsp;</td>
39
		<td><bean:message key="appuser.user.alias"/>:</td>
39
		<td><bean:message key="appuser.user.id"/>:</td>
40 40
		<td><htmlEL:text property="userAlias" name="appUserForm" maxlength="64" autocomplete="off"/></td>
41 41
		<td>&nbsp;</td>
42 42
		<td>&nbsp;</td>
......
44 44
	
45 45
	<tr>
46 46
		<td>&nbsp;</td>
47
		<td><bean:message key="appuser.user.name"/>:</td>
48
		<td><htmlEL:text property="userName" name="appUserForm" maxlength="64" autocomplete="off"/></td>
49
		<td>&nbsp;</td>
50
		<td>&nbsp;</td>
51
	</tr>
52
	
53
	<tr>
54
		<td>&nbsp;</td>
47 55
		<td><bean:message key="appuser.user.description"/>:</td>
48 56
		<td class="valignTop" colspan="2"><htmlEL:textarea property="userDescription" name="appUserForm"/></td>
49 57
		<td>&nbsp;</td>
WebContent/jsp/ss223_application/ibssAppUserDeleteConfirm.jsp
5 5
<%@ taglib uri="/WEB-INF/tld/struts-logic-el" prefix="logicEL" %>
6 6
<%@ taglib uri="/WEB-INF/tld/c" prefix="c" %>
7 7

  
8
<bean:define id="detailBean" name="appUserForm" property="appUserDetailBean"/>
8
<bean:define id="detailBean" name="appUserForm" property="appUserDetailsBean"/>
9 9

  
10 10
<h3 class="title"><strong><c:out value="${sessionScope.displayDesc}"/> - <bean:message key="navigation.details.displayDesc.delete.confirm" /></strong></h3>
11 11
<table id="errorTable">
WebContent/jsp/ss223_application/ibssAppUserDetails.jsp
28 28
  <tr>
29 29
    <td>&nbsp;</td>
30 30
    <td><bean:message key="appuser.user.id"/>:</td>
31
    <td colspan="2"><strong><c:out value="${detailBean.map.userId}"/></strong></td>
31
    <td colspan="2"><strong><c:out value="${detailBean.map.userAlias}"/></strong></td>
32 32
    <td colspan="2">&nbsp;</td>
33 33
  </tr>
34 34
  <tr>
35 35
    <td>&nbsp;</td>
36
    <td><bean:message key="appuser.user.alias"/>:</td>
37
    <td colspan="2"><strong><c:out value="${detailBean.map.userAlias}"/></strong></td>
36
    <td><bean:message key="appuser.user.name"/>:</td>
37
    <td colspan="2"><strong><c:out value="${detailBean.map.userName}"/></strong></td>
38 38
    <td colspan="2">&nbsp;</td>
39 39
  </tr>
40 40
   <tr>
WebContent/jsp/ss223_application/ibssAppUserEditDetails.jsp
36 36
  <tr>
37 37
    <td width="69">&nbsp;</td>
38 38
    <td><bean:message key="appuser.user.id"/>:</td>
39
    <td colspan="2"><strong><c:out value="${detailBean.map.userId}"/></strong></td>
39
    <td colspan="2"><strong><c:out value="${detailBean.map.userAlias}"/></strong></td>
40 40
    <td>&nbsp;</td>
41 41
    </tr>
42 42
  <tr>
43 43
    <td width="69">&nbsp;</td>
44
    <td><bean:message key="appuser.user.alias"/>:</td>
45
     <td colspan="2"><strong><c:out value="${detailBean.map.userAlias}"/></strong></td>
44
    <td><bean:message key="appuser.user.name"/>:</td>
45
     <td colspan="2"><strong><c:out value="${detailBean.map.userName}"/></strong></td>
46 46
    <td>&nbsp;</td>
47 47
  </tr>
48 48
  <tr>
WebContent/jsp/ss223_application/ibssAppUserEditResult.jsp
31 31
  </tr>
32 32
</table>
33 33

  
34
<htmlEL:form action="/ss223/appUserDetails.do">
34
<htmlEL:form action="/ss223/appUserEnquiryMain.do">
35 35
	<div class="floatRight">
36 36
		<htmlEL:submit property="action"><bean:message key="general.button.back"/></htmlEL:submit>
37 37
	</div>
WebContent/jsp/ss223_application/ibssAppUserEnquiry.jsp
33 33
	<table class="tabularData" cellspacing="0">
34 34
  <thead>
35 35
    <tr>
36
      <th height="34"><bean:message key="appuser.user.id"/></th>
37
      <th><bean:message key="appuser.user.alias"/></th>
36
      <th height="34"><bean:message key="appuser.id"/></th>
37
      <th><bean:message key="appuser.user.id"/></th>
38
      <th><bean:message key="appuser.user.name"/></th>
38 39
      <th><bean:message key="appuser.application.name"/></th>
39 40
      <th><bean:message key="appuser.created.date"/></th>
40 41
      <th>&nbsp;</th>
......
70 71
				<c:out value="${userBean.map.userAlias}"/>
71 72
			</td>
72 73
			<td>
74
				<c:out value="${userBean.map.userName}"/>
75
			</td>
76
			<td>
73 77
				<c:out value="${userBean.map.appName}"/>
74 78
			</td>
75 79
			<td>
WebContent/jsp/ss223_application/ibssAppUserResetPass.jsp
43 43
    </tr>
44 44
  	<tr>
45 45
		<td>&nbsp;</td>
46
		<td><bean:message key="appuser.application.name"" />:</td>
46
		<td><bean:message key="appuser.application.name" />:</td>
47 47
		 <td colspan="2"><strong><c:out value="${detailBean.map.appName}"/></strong></td>
48 48
		<td>&nbsp;</td>
49 49
	</tr>
resource/com/ib/ibss/resources/message/IBSSApplicationResources.properties
2955 2955
error.individual.cif=CIF of this class code cannot be used to register company.
2956 2956

  
2957 2957
#ss223 application user maintenance
2958
appuser.id=ID
2958 2959
appuser.user.id=User ID
2959 2960
appuser.user.alias=User Alias
2961
appuser.user.name=User Name
2960 2962
appuser.user.description=User Description
2961 2963
appuser.user.password=New Password
2962 2964
appuser.user.confirmPassword=Confirm Password
src/com/ib/ibss/controller/actions/ss223_application/IBSSApplicationUserEditDetailsAction.java
62 62
		{
63 63
			setForwardPage("delete");
64 64
		}
65
		else if(ActionTag.isResetPassword(action))
66
		{
67
			setForwardPage("reset");
68
		}
65 69
		else if (ActionTag.isBack (action))
66 70
		{
67 71
			setForwardPage("back");
src/com/ib/ibss/enterprise/services/ss112_user/IBSSRetailUserEnquiryDeleteServices.java
148 148
			{
149 149
				IBSSErrorHandler.handleServiceError (e, c_oClass);
150 150
			}
151
			finally
152
			{
153
				if(session!=null)
154
				{
155
					session.clear();
156
					session.close();
157
				}
158
			}
159 151
		}
160 152
		IBSSLogger.debug (c_oClass, "Exiting userResetPassword");
161 153
	}
src/com/ib/ibss/enterprise/services/ss112_user/IBSSRetailUserEnquiryResetPassServices.java
147 147
			{
148 148
				IBSSErrorHandler.handleServiceError (e, c_oClass);
149 149
			}
150
			finally
151
			{
152
				if(session!=null)
153
				{
154
					session.clear();
155
					session.close();
156
				}
157
			}
158 150
		}
159 151
		IBSSLogger.debug (c_oClass, "Exiting userResetPassword");
160 152
	}
src/com/ib/ibss/enterprise/services/ss222_application/constants/IBSSApplicationUserConstants.java
25 25
	public static final String CLIENT_APP_LIST					= "clientAppList";
26 26
	public static final String USER_ID							= "userId";
27 27
	public static final String USER_ALIAS						= "userAlias";
28
	public static final String USER_NAME						= "userName";
28 29
	public static final String USER_DESCRIPTION					= "userDescription";
29 30
	public static final String SELECTED_APPLICATION_ID			= "selectedAppId";
30 31
	public static final String SELECTED_APPLICATION_NAME		= "selectedAppName";
......
39 40
	public static final String USER_LIST 						= "userList";
40 41
	public static final String USER_PROFILE 					= "userProfile";
41 42
	public static final String USER_PROFILE_LIST 				= "userProfileList";
43
	public static final String USER_DETAILS_MAP					= "userDetailsMap";
44
	public static final String USER_FRM_MAP_LIST				= "userFromMapList";
45
	public static final String APP_ACCESS_FRM_MAP_LIST			= "appAccessFromMapList";
42 46
	
43 47
	public static final String HAS_APP_CREATE_ACCESS			= "hasAppCreateAccess";
44 48
	public static final String HAS_APP_EDIT_ACCESS				= "hasAppEditAccess";
src/com/ib/ibss/enterprise/services/ss223_application/IBSSApplicationUserCreateResultServices.java
57 57
		try
58 58
		{
59 59
			String userAlias 		= getBeanMessage (IBSSApplicationUserConstants.USER_ALIAS);
60
			String userName			= getBeanMessage (IBSSApplicationUserConstants.USER_NAME);
60 61
			Integer selectedAppId 	= (Integer) getBeanMessageObj(IBSSApplicationUserConstants.SELECTED_APPLICATION_ID);
61 62
			String password 		= getBeanMessage (IBSSApplicationUserConstants.PASSWORD);
62 63
			String confirmPassword 	= getBeanMessage (IBSSApplicationUserConstants.CONFIRM_PASSWORD);
......
78 79
			MinimalUserBean user = new MinimalUserBean();
79 80
			user.setUserAlias(userAlias);
80 81
			user.setHashedPassword(password);
82
			user.setUsername(userName);
81 83
			user.setDescription(userDesc);
82 84
			user.setUserType(MinimalConstants.UTYPE_STATE_USER);
83 85
			
......
129 131
			{
130 132
				IBSSErrorHandler.handleServiceError (e, c_oClass);
131 133
			}
132
			finally
133
			{
134
				if(session!=null)
135
				{
136
					session.clear();
137
					session.close();
138
				}
139
			}
140 134
		}
141 135
	}
142 136
}
src/com/ib/ibss/enterprise/services/ss223_application/IBSSApplicationUserDeleteResultServices.java
124 124
				IBSSLogger.error (c_oClass, IBSSErrorHandler.generateErrorMessage (e));
125 125
				IBSSErrorHandler.handleServiceError (e, c_oClass);
126 126
			}
127
			finally
128
			{
129
				if(session!=null)
130
				{
131
					session.clear();
132
					session.close();
133
				}
134
			}
135 127
		}
136 128
		IBSSLogger.debug (c_oClass, "Exiting deleteAppUser");
137 129
	}
src/com/ib/ibss/enterprise/services/ss223_application/IBSSApplicationUserDetailsServices.java
14 14
import java.util.ArrayList;
15 15
import java.util.List;
16 16

  
17
import my.com.upass.maybank.entities.UserProfile;
17
import my.com.upass.pojo.MinimalUserBean;
18 18

  
19 19
import com.ib.ibss.common.utils.IBSSLogger;
20 20
import com.ib.ibss.enterprise.services.IBSSEnterpriseServicesWorkspace;
......
67 67
				{
68 68
					userDetailBean.set (IBSSApplicationUserConstants.USER_ID, (Long)detailsBean.get(IBSSApplicationUserConstants.USER_ID));
69 69
					userDetailBean.set (IBSSApplicationUserConstants.USER_ALIAS, (String)detailsBean.get(IBSSApplicationUserConstants.USER_ALIAS));
70
					userDetailBean.set (IBSSApplicationUserConstants.USER_NAME, (String)detailsBean.get(IBSSApplicationUserConstants.USER_NAME));
70 71
					userDetailBean.set (IBSSApplicationUserConstants.USER_DESCRIPTION, (String)detailsBean.get(IBSSApplicationUserConstants.USER_DESCRIPTION));
71 72
					userDetailBean.set (IBSSApplicationUserConstants.APPLICATION_NAME, (String)detailsBean.get(IBSSApplicationUserConstants.APPLICATION_NAME));
72 73
					userDetailBean.set (IBSSApplicationUserConstants.APPLICATION_ID, (Integer)detailsBean.get(IBSSApplicationUserConstants.APPLICATION_ID));
73 74
					userDetailBean.set (IBSSApplicationUserConstants.USER_CREATION_DATE, (String)detailsBean.get(IBSSApplicationUserConstants.USER_CREATION_DATE));
74 75
					
75
					getIBSSDynaBean ().set (IBSSApplicationUserConstants.USER_PROFILE, (UserProfile)detailsBean.get(IBSSApplicationUserConstants.USER_PROFILE));
76
					getIBSSDynaBean().set (IBSSApplicationUserConstants.USER_PROFILE, (MinimalUserBean)detailsBean.get(IBSSApplicationUserConstants.USER_PROFILE));
76 77
					break;
77 78
				}
78 79
			}
src/com/ib/ibss/enterprise/services/ss223_application/IBSSApplicationUserEditDetailsServices.java
47 47
			userDetailBean = (IBSSDynaBean) getIBSSDynaBean().get(IBSSApplicationUserConstants.APPLICATION_USER_DETAILS_BEAN);
48 48
			
49 49
			getIBSSDynaBean().set (IBSSApplicationUserConstants.USER_ALIAS, (String) userDetailBean.get (IBSSApplicationUserConstants.USER_ALIAS));
50
			getIBSSDynaBean().set (IBSSApplicationUserConstants.USER_NAME, (String) userDetailBean.get (IBSSApplicationUserConstants.USER_NAME));
50 51
			getIBSSDynaBean().set (IBSSApplicationUserConstants.SELECTED_APPLICATION_NAME, (String) userDetailBean.get (IBSSApplicationUserConstants.APPLICATION_NAME));
51 52
			getIBSSDynaBean().set (IBSSApplicationUserConstants.USER_DESCRIPTION, (String) userDetailBean.get (IBSSApplicationUserConstants.USER_DESCRIPTION));
52 53
		}
src/com/ib/ibss/enterprise/services/ss223_application/IBSSApplicationUserEditResultServices.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.maybank.entities.UserProfile;
18 17
import my.com.upass.pojo.MinimalUserBean;
19 18
import net.penril.ibss.audit.log.AuditLogConstants;
20 19
import net.penril.ibss.audit.log.USER_ACTIVITY_TYTPE;
......
31 30
import com.ib.ibss.error.exception.IBSSBusinessException;
32 31
import com.ib.ibss.error.exception.IBSSGenericException;
33 32
import com.ib.ibss.error.handler.IBSSErrorHandler;
34
import com.ib.ibss.struts.utils.IBSSDynaBean;
35 33
import com.ib.ibss.struts.utils.IBSSSessionObjects;
36 34

  
37 35
/**
......
54 52

  
55 53
	public void updateEditedAppUser () throws IBSSGenericException
56 54
	{
57
		Long userId = null;
58 55
		String userAlias = null;
56
		String userName	 = null;
59 57
		String userDescription = null;
60 58

  
61
		IBSSDynaBean userDetailBean;
62 59
		MinimalUserBean user1 = null;
63 60
		MinimalUserBean user2 = null;
64 61
		
......
70 67
		try
71 68
		{			
72 69
			/* Get inputs from form and view bean */
73
			userDetailBean 	= (IBSSDynaBean) getIBSSDynaBean ().get (IBSSApplicationUserConstants.APPLICATION_USER_DETAILS_BEAN);
74
			userId			= (Long) userDetailBean.get (IBSSApplicationUserConstants.USER_ID);	
75 70
			userAlias		= (String)getIBSSDynaBean().get (IBSSApplicationUserConstants.USER_ALIAS);
71
			userName		= (String)getIBSSDynaBean().get (IBSSApplicationUserConstants.USER_NAME);
76 72
			userDescription = (String)getIBSSDynaBean().get (IBSSApplicationUserConstants.USER_DESCRIPTION);
77 73
			
78 74
			String upassAdmin		= ResourcesUtils.getAppConfigValue("application.upass.admin.id");
......
81 77
			/*Update user*/
82 78
			MinimalUPassControllerV2 upass = new MinimalUPassControllerV2();
83 79
			
84
			UserProfile profile = (UserProfile) getIBSSDynaBean().get (IBSSApplicationUserConstants.USER_PROFILE);
85
			user1 = profile.getMinUser();//before value
86
			user1.setDescription(userDescription);
87
			profile.setMinUser(user1);
88
			
89
			user2 = profile.getMinUser();//after value
80
			user1 = (MinimalUserBean) getIBSSDynaBean().get (IBSSApplicationUserConstants.USER_PROFILE);
81
			user2 = user1 ;
82
			user2.setUsername(userName);
83
			user2.setDescription(userDescription);//after value
90 84
			
91 85
			session = HibernateUtils.currentSession();
92 86
			session.beginTransaction();
93 87
			
94
			int rc = upass.updateProfileShallowly(upassAdmin, upassAdminPass, profile, session);
88
			int rc = upass.UA_ModifyUser(upassAdmin, upassAdminPass, userAlias, userDescription, null);
95 89
			
96 90
			if(rc != MinimalConstants.ERR_SUCCESS)
97 91
			{
......
140 134
			{
141 135
				IBSSErrorHandler.handleServiceError (e, c_oClass);
142 136
			}
143
			finally
144
			{
145
				if(session!=null)
146
				{
147
					session.clear();
148
					session.close();
149
				}
150
			}
151 137
		}
152 138
	}
153 139

  
src/com/ib/ibss/enterprise/services/ss223_application/IBSSApplicationUserMainServices.java
18 18

  
19 19
import javax.servlet.http.HttpServletRequest;
20 20

  
21
import my.com.upass.UPassControllerV2;
22
import my.com.upass.generic.hibernate.HibernateUtils;
23
import my.com.upass.pojo.MinimalUserBean;
24
import my.com.upass.pojo.UserAppAccess;
25
import net.penril.ibss.core.hibernate.AdminNavigationGroup;
26

  
21 27
import org.hibernate.Session;
22 28

  
23
import net.penril.ibss.core.hibernate.AdminNavigationGroup;
24

  
25
import my.com.upass.MinimalUPassControllerV2;
26
import my.com.upass.MinimalUPassControllerV2.AccessCheckResult;
27
import my.com.upass.generic.hibernate.HibernateUtils;
28
import my.com.upass.maybank.entities.IbccUser;
29
import my.com.upass.maybank.entities.Im2uUser;
30
import my.com.upass.maybank.entities.M2uUser;
31
import my.com.upass.maybank.entities.StockUser;
32
import my.com.upass.maybank.entities.TicketingUser;
33
import my.com.upass.maybank.entities.UserProfile;
34
import my.com.upass.pojo.ClientApp;
35
import my.com.upass.pojo.MinimalUserBean;
36 29
import com.ib.ibss.common.constant.AdminPermissionModeType.ApplicationPermission;
37 30
import com.ib.ibss.common.constant.FunctionConstants.FunctionCodeEnum;
38 31
import com.ib.ibss.common.constant.IBSSCommonConstants;
......
62 55
		super(sessionObjects);
63 56
	}
64 57

  
65
	@SuppressWarnings({ "unchecked", "rawtypes" })
66 58
	public void execute (Map<String, String> inputsMap, HttpServletRequest p_oRequest) throws IBSSGenericException
67 59
	{
68 60
		IBSSLogger.debug (c_oClass, "Entering execute");
......
84 76
		
85 77
		SimpleDateFormat m_oDateFormat = new SimpleDateFormat(IBSSCommonConstants.STANDARD_DATE_FORMAT_DDMMYYYY);
86 78
		
87
		MinimalUPassControllerV2 upass = new MinimalUPassControllerV2();
79
		UPassControllerV2 controller = new UPassControllerV2();
88 80
		Session session = null;
89 81
		
82
		List<MinimalUserBean> userFromMapList = null;
83
		List<UserAppAccess> appAccessFromMapList = null;
84
		
90 85
		try
91 86
		{
92 87
			String upassAdmin		= ResourcesUtils.getAppConfigValue("application.upass.admin.id");
......
95 90
			session = HibernateUtils.currentSession();
96 91
			session.beginTransaction();
97 92
			
98
			List examples = new ArrayList(5);
99
			examples.add(new M2uUser());
100
			examples.add(new StockUser());
101
			examples.add(new TicketingUser());
102
			examples.add(new IbccUser());
103
			examples.add(new Im2uUser());
93
			Map <MinimalUserBean, UserAppAccess> appAdminMap = controller.listApplicationAdmins(upassAdmin, upassAdminPass, session);
104 94
			
105
			List <UserProfile> userProfileList = upass.listProfilesByExamples(upassAdmin, upassAdminPass, examples, null, session);
106
			
107
			if (userProfileList == null)
95
			if(appAdminMap == null)
108 96
			{
109 97
				throw IBSSErrorHandler.createDelegationException(IBSSApplicationUserConstants.NO_USER);
110 98
			}
......
112 100
			{
113 101
				applicationUserViewBean = IBSSDynaBeanManager.createIBSSDynaBean(IBSSApplicationUserConstants.APPLICATION_USER_VIEW_BEAN, getIBSSDynaBean().getActionMapping());
114 102
				
103
				userFromMapList = new ArrayList<MinimalUserBean>(appAdminMap.keySet());
104
				appAccessFromMapList = new ArrayList<UserAppAccess>(appAdminMap.values());
105
				
115 106
				int indexNo 	= 0;
116
				appUserListSize = userProfileList.size ();
117
				pagination 	= new Pagination(appUserListSize, userEnquiryRowPerPage);
107
				appUserListSize = appAdminMap.size ();
108
				pagination 		= new Pagination(appUserListSize, userEnquiryRowPerPage);
118 109
				
119 110
				if (null != inputsMap.get (IBSSApplicationUserConstants.ENQUIRY_SEGMENT))
120 111
				{
......
130 121
				startIndex 		= totalFixRow - userEnquiryRowPerPage;
131 122
				endIndex 		= Math.min(totalFixRow-1, appUserListSize-1);
132 123
				
133
				List <ClientApp> clientAppList = upass.listRecognizedClientApps(session);
134
				
135 124
				for(int i = startIndex; i <= endIndex; i++)
136 125
				{
137
					UserProfile userProfile = userProfileList.get (i);
126
					MinimalUserBean user = userFromMapList.get (i);
138 127
					appUserBean 	= IBSSDynaBeanManager.createIBSSDynaBean(IBSSApplicationUserConstants.APPLICATION_USER_BEAN, getIBSSDynaBean().getActionMapping());
139
					MinimalUserBean user = userProfile.getMinUser();
140 128
					
141 129
					appUserBean.set (IBSSApplicationUserConstants.USER_ID, user.getUserID());
142 130
					appUserBean.set (IBSSApplicationUserConstants.USER_DESCRIPTION, user.getDescription());
143 131
					appUserBean.set (IBSSApplicationUserConstants.USER_ALIAS, user.getUserAlias());
132
					appUserBean.set (IBSSApplicationUserConstants.USER_NAME, user.getUsername());
144 133
					
145
					AccessCheckResult result = upass.checkAppAccess(user.getUserAlias(), user.getDoubleHashedPassword(), session);
134
					UserAppAccess app = appAccessFromMapList.get(i);
135
					appUserBean.set (IBSSApplicationUserConstants.APPLICATION_NAME, app.getApp().getAppName());
136
					appUserBean.set (IBSSApplicationUserConstants.APPLICATION_ID, app.getAppId());
146 137
					
147
					for(ClientApp app : clientAppList)
148
					{
149
						if(app.getAppId() == result.getInvokerAppId())
150
						{
151
							appUserBean.set (IBSSApplicationUserConstants.APPLICATION_NAME, app.getAppName());
152
							appUserBean.set (IBSSApplicationUserConstants.APPLICATION_ID, app.getAppId());
153
						}
154
					}
155 138
					appUserBean.set (IBSSApplicationUserConstants.USER_CREATION_DATE, user.getUdateCreated() != null ? m_oDateFormat.format (user.getUdateCreated()) : "");
156 139
					
157 140
					indexNo++;
158 141
					
159
					appUserBean.set(IBSSApplicationUserConstants.USER_PROFILE, userProfile);
142
					appUserBean.set(IBSSApplicationUserConstants.USER_PROFILE, user);
160 143
					appUserBean.set(IBSSApplicationUserConstants.INDEX_NO, String.valueOf(indexNo-1));
161 144
					userList.add(appUserBean);
162 145
				}
163 146
			}
164
			
165 147
			paginationList = pagination.getFixedPagesNavigation();
166 148
			
167 149
			applicationUserViewBean.set(IBSSApplicationUserConstants.PAGINATION_LIST, paginationList);
......
171 153
			applicationUserViewBean.set(IBSSApplicationUserConstants.ENQUIRY_CURRENT_PAGE_NO, String.valueOf(currentPageNo));
172 154
			applicationUserViewBean.set(IBSSApplicationUserConstants.ENQUIRY_TOTAL_PAGE_NO, String.valueOf(totalPageNo));
173 155
			
174
			getIBSSDynaBean().set(IBSSApplicationUserConstants.USER_PROFILE_LIST, userProfileList);
156
			getIBSSDynaBean().set(IBSSApplicationUserConstants.USER_DETAILS_MAP, appAdminMap);
157
			getIBSSDynaBean().set(IBSSApplicationUserConstants.USER_FRM_MAP_LIST, userFromMapList);
158
			getIBSSDynaBean().set(IBSSApplicationUserConstants.APP_ACCESS_FRM_MAP_LIST, appAccessFromMapList);
175 159
			getIBSSDynaBean().set(IBSSApplicationUserConstants.APPLICATION_USER_VIEW_BEAN, applicationUserViewBean);
176 160
			
177 161
			AdminNavigationGroup appUserAccess = getIBSSessionObjects ().getUserAccess ().get (FunctionCodeEnum.APPLICATION_USER_MAINTENANCE.getAccessName ());
......
211 195
		{
212 196
			IBSSErrorHandler.handleServiceError (e, c_oClass);
213 197
		}
214
		finally
215
		{
216
			if(session!=null)
217
			{
218
				session.clear();
219
				session.close();
220
			}
221
		}
222 198
		IBSSLogger.debug (c_oClass, "Exiting execute");
223 199
	}
224 200
}

Also available in: Unified diff