1 files changed, 15 insertions, 25 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 8e0f0b7f8..8be134442 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
@@ -34,16 +34,14 @@ import org.apache.log4j.Logger;
 import org.apache.struts2.interceptor.ServletRequestAware;
 import org.apache.struts2.interceptor.ServletResponseAware;
 
-import at.gv.egovernment.moa.id.commons.db.ConfigurationDBRead;
-import at.gv.egovernment.moa.id.commons.db.ConfigurationDBUtils;
 import at.gv.egovernment.moa.id.commons.db.dao.config.UserDatabase;
 import at.gv.egovernment.moa.id.commons.db.ex.MOADatabaseException;
 import at.gv.egovernment.moa.id.commons.validation.ValidationHelper;
+import at.gv.egovernment.moa.id.config.webgui.exception.ConfigurationException;
 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;
 import at.gv.egovernment.moa.id.configuration.helper.LanguageHelper;
@@ -89,7 +87,7 @@ public class UserManagementAction extends BasicAction {
 			
 			log.info("Show UserList");
 			
-			List<UserDatabase> dbuserlist = ConfigurationDBRead.getAllUsers();
+			List<UserDatabase> dbuserlist = configuration.getUserManagement().getAllUsers();
 						
 			if (dbuserlist != null) {
 				userlist = FormDataHelper.addFormUsers(dbuserlist);
@@ -98,17 +96,15 @@ public class UserManagementAction extends BasicAction {
 			session.setAttribute(Constants.SESSION_RETURNAREA,
 					Constants.STRUTS_RETURNAREA_VALUES.usermanagementInit.name());
 			
-			ConfigurationDBUtils.closeSession();
 			return Constants.STRUTS_SUCCESS;
 			
 		} else {
 			log.info("User with ID " + authUser.getUserID() + " is not admin. Show only EditUser Frame");
-			UserDatabase dbuser = ConfigurationDBRead.getUserWithID(authUser.getUserID());
+			UserDatabase dbuser = configuration.getUserManagement().getUserWithID(authUser.getUserID());
 			if (dbuser == null) {
 				return Constants.STRUTS_REAUTHENTICATE;
 			}
 			user = new UserDatabaseFrom(dbuser);
-			ConfigurationDBUtils.closeSession();
 			
 			session.setAttribute(Constants.SESSION_RETURNAREA,
 					Constants.STRUTS_RETURNAREA_VALUES.main.name());
@@ -176,7 +172,7 @@ public class UserManagementAction extends BasicAction {
 			}
 			userid = Long.valueOf(useridobj);
 			
-			UserDatabase dbuser = ConfigurationDBRead.getUserWithID(userid);
+			UserDatabase dbuser = configuration.getUserManagement().getUserWithID(userid);
 			if (dbuser == null) {
 				log.info("No User with ID " + userid + " in Database");;
 				addActionError(LanguageHelper.getErrorString("errors.edit.user.userid", request));
@@ -185,14 +181,12 @@ public class UserManagementAction extends BasicAction {
 			user = new UserDatabaseFrom(dbuser);
 			
 			newUser = false;
-			
-			ConfigurationDBUtils.closeSession();
-			
+						
 			return Constants.STRUTS_SUCCESS;
 			
 		} else {
 			log.info("User with ID " + authUser.getUserID() + " is not admin. Show his own EditUser Frame");
-			UserDatabase dbuser = ConfigurationDBRead.getUserWithID(authUser.getUserID());
+			UserDatabase dbuser = configuration.getUserManagement().getUserWithID(authUser.getUserID());
 			user = new UserDatabaseFrom(dbuser);
 			return Constants.STRUTS_SUCCESS;
 		}		
@@ -237,7 +231,7 @@ public class UserManagementAction extends BasicAction {
 			userID = Long.valueOf(useridobj);
 		}
 		
-		UserDatabase dbuser = ConfigurationDBRead.getUserWithID(userID);
+		UserDatabase dbuser = configuration.getUserManagement().getUserWithID(userID);
 		
 		if( dbuser == null) {
 			dbuser = new UserDatabase();
@@ -340,7 +334,6 @@ public class UserManagementAction extends BasicAction {
 			return Constants.STRUTS_SUCCESS;
 		}
 		
-		ConfigurationDBUtils.closeSession();
 		return Constants.STRUTS_SUCCESS;
 	}
 	
@@ -402,20 +395,19 @@ public class UserManagementAction extends BasicAction {
 			nextPage = Constants.STRUTS_RETURNAREA_VALUES.usermanagementInit.name();
 		}
 		
-		UserDatabase dbuser = ConfigurationDBRead.getUserWithID(userID);
+		UserDatabase dbuser = configuration.getUserManagement().getUserWithID(userID);
 		if (dbuser != null) {
-			dbuser.setOnlineApplication(null);
+			dbuser.setOaIDs(null);
 			
 			try {
-				ConfigurationDBUtils.saveOrUpdate(dbuser);
-				ConfigurationDBUtils.delete(dbuser);
+				configuration.getUserManagement().saveOrUpdate(dbuser);
+				configuration.getUserManagement().delete(dbuser);
 				
 				if (authUser.isAdmin()) {
 					MailHelper.sendUserAccountRevocationMail(dbuser);
 				}
 				
-				if (dbuser.getHjid() == authUser.getUserID()) {
-					ConfigurationDBUtils.closeSession();
+				if (dbuser.getHjid().equals(String.valueOf(authUser.getUserID()))) {
 					return Constants.STRUTS_REAUTHENTICATE;
 				}
 					
@@ -431,11 +423,9 @@ public class UserManagementAction extends BasicAction {
 			}
 			
 			finally {
-				ConfigurationDBUtils.closeSession();
 			}
 		}
 		
-		ConfigurationDBUtils.closeSession();
 			
 		return Constants.STRUTS_SUCCESS;
 	}
@@ -452,14 +442,14 @@ public class UserManagementAction extends BasicAction {
 		String message = LanguageHelper.getErrorString("error.mail.send", request);
 		
 		if (authUser != null) {
-			UserDatabase dbuser = ConfigurationDBRead.getUserWithID(authUser.getUserID());
+			UserDatabase dbuser = configuration.getUserManagement().getUserWithID(authUser.getUserID());
 			
 			if (dbuser != null) {	
 				dbuser.setIsMailAddressVerified(false);
 				dbuser.setUserRequestTokken(Random.nextRandom());
 				
 				try {
-					ConfigurationDBUtils.saveOrUpdate(dbuser);
+					configuration.getUserManagement().saveOrUpdate(dbuser);
 
 					MailHelper.sendUserMailAddressVerification(dbuser);
 					
@@ -532,7 +522,7 @@ public class UserManagementAction extends BasicAction {
 		}
 
 		try {
-			ConfigurationDBUtils.saveOrUpdate(dbuser);
+			configuration.getUserManagement().saveOrUpdate(dbuser);
 		} catch (MOADatabaseException e) {
 			log.warn("User information can not be stored in Database.", e);
 			return LanguageHelper.getErrorString("errors.edit.user.save", request);