refactor Struts action classes

1 files changed, 36 insertions, 58 deletions

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/UserManagementAction.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/UserManagementAction.java
index 0c475b1d5..382dc6372 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/UserManagementAction.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/UserManagementAction.java
@@ -41,6 +41,7 @@ import at.gv.egovernment.moa.id.commons.db.ex.MOADatabaseException;
 import at.gv.egovernment.moa.id.configuration.Constants;
 import at.gv.egovernment.moa.id.configuration.auth.AuthenticatedUser;
 import at.gv.egovernment.moa.id.configuration.data.UserDatabaseFrom;
+import at.gv.egovernment.moa.id.configuration.exception.BasicActionException;
 import at.gv.egovernment.moa.id.configuration.exception.ConfigurationException;
 import at.gv.egovernment.moa.id.configuration.helper.AuthenticationHelper;
 import at.gv.egovernment.moa.id.configuration.helper.FormDataHelper;
@@ -53,18 +54,12 @@ import at.gv.egovernment.moa.util.MiscUtil;
 
 import com.opensymphony.xwork2.ActionSupport;
 
-public class UserManagementAction extends ActionSupport 
-	implements ServletRequestAware, ServletResponseAware {
+public class UserManagementAction extends BasicAction {
 	
 	private static final Logger log = Logger.getLogger(UserManagementAction.class);
 	
 	private static final long serialVersionUID = 1L;
 
-	private HttpServletRequest request;
-//	private HttpServletResponse response;
-
-	private AuthenticatedUser authUser = null; 
-
 	private List<AuthenticatedUser> userlist = null;
 	private UserDatabaseFrom user = null;
 	
@@ -75,14 +70,18 @@ public class UserManagementAction extends ActionSupport
 	private String formID;
 	
 	public String init() {
-		HttpSession session = request.getSession();
+		try {
+			populateBasicInformations();
+			
+		} catch (BasicActionException e) {
+			return Constants.STRUTS_ERROR;
+			
+		}
+		
 		if (session == null) {
 			log.info("No http Session found.");
 			return Constants.STRUTS_ERROR;
 		}
-		
-		Object authUserObj = session.getAttribute(Constants.SESSION_AUTH);
-		authUser = (AuthenticatedUser) authUserObj;
 				
 		if (authUser.isAdmin()) {
 			
@@ -122,15 +121,14 @@ public class UserManagementAction extends ActionSupport
 	}
 	
 	public String createuser() {
-		HttpSession session = request.getSession();
-		if (session == null) {
-			log.info("No http Session found.");
+		try {
+			populateBasicInformations();
+			
+		} catch (BasicActionException e) {
 			return Constants.STRUTS_ERROR;
+			
 		}
 		
-		Object authUserObj = session.getAttribute(Constants.SESSION_AUTH);
-		
-		authUser = (AuthenticatedUser) authUserObj;
 		nextPage = Constants.STRUTS_RETURNAREA_VALUES.usermanagementInit.name();
 		
 		if (authUser.isAdmin()) {
@@ -149,15 +147,14 @@ public class UserManagementAction extends ActionSupport
 	}
 	
 	public String edituser() {
-		HttpSession session = request.getSession();
-		if (session == null) {
-			log.info("No http Session found.");
+		try {
+			populateBasicInformations();
+			
+		} catch (BasicActionException e) {
 			return Constants.STRUTS_ERROR;
+			
 		}
 		
-		Object authUserObj = session.getAttribute(Constants.SESSION_AUTH);
-		authUser = (AuthenticatedUser) authUserObj;
-		
 		Object nextPageAttr = session.getAttribute(Constants.SESSION_RETURNAREA);	
 		if (nextPageAttr != null && nextPageAttr instanceof String 
 				&& MiscUtil.isNotEmpty((String)nextPageAttr) ) {
@@ -202,14 +199,13 @@ public class UserManagementAction extends ActionSupport
 	}
 	
 	public String saveuser() {	
-		HttpSession session = request.getSession();
-		if (session == null) {
-			log.info("No http Session found.");
+		try {
+			populateBasicInformations();
+			
+		} catch (BasicActionException e) {
 			return Constants.STRUTS_ERROR;
+			
 		}
-		
-		Object authUserObj = session.getAttribute(Constants.SESSION_AUTH);
-		authUser = (AuthenticatedUser) authUserObj;
 
 		Object formidobj = session.getAttribute(Constants.SESSION_FORMID);
 		if (formidobj != null && formidobj instanceof String) {
@@ -349,15 +345,14 @@ public class UserManagementAction extends ActionSupport
 	}
 	
 	public String deleteuser() {
-		HttpSession session = request.getSession();
-		if (session == null) {
-			log.info("No http Session found.");
+		try {
+			populateBasicInformations();
+			
+		} catch (BasicActionException e) {
 			return Constants.STRUTS_ERROR;
+			
 		}
 		
-		Object authUserObj = session.getAttribute(Constants.SESSION_AUTH);
-		authUser = (AuthenticatedUser) authUserObj;
-		
 		Object formidobj = session.getAttribute(Constants.SESSION_FORMID);
 		if (formidobj != null && formidobj instanceof String) {
 			String formid = (String) formidobj;
@@ -446,16 +441,15 @@ public class UserManagementAction extends ActionSupport
 	}
 	
 	public String sendVerificationMail () {
-		HttpSession session = request.getSession();
-		if (session == null) {
-			log.info("No http Session found.");
+		try {
+			populateBasicInformations();
+			
+		} catch (BasicActionException e) {
 			return Constants.STRUTS_ERROR;
+			
 		}
 		
-		String 	message = LanguageHelper.getErrorString("error.mail.verification", request);
-		
-		Object authUserObj = session.getAttribute(Constants.SESSION_AUTH);
-		authUser = (AuthenticatedUser) authUserObj;
+		String message = new String();
 		
 		if (authUser != null) {
 			UserDatabase dbuser = ConfigurationDBRead.getUserWithID(authUser.getUserID());
@@ -547,15 +541,6 @@ public class UserManagementAction extends ActionSupport
 		return null;
 	}
 		
-	public void setServletResponse(HttpServletResponse response) {
-//		this.response = response;
-		
-	}
-
-	public void setServletRequest(HttpServletRequest request) {
-		this.request = request;
-		
-	}
 
 	/**
 	 * @return the userlist
@@ -600,13 +585,6 @@ public class UserManagementAction extends ActionSupport
 	}
 
 	/**
-	 * @return the authUser
-	 */
-	public AuthenticatedUser getAuthUser() {
-		return authUser;
-	}
-
-	/**
 	 * @return the newUser
 	 */
 	public boolean isNewUser() {