diff options
Diffstat (limited to 'id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/ImportExportAction.java')
-rw-r--r-- | id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/ImportExportAction.java | 66 |
1 files changed, 22 insertions, 44 deletions
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/ImportExportAction.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/ImportExportAction.java index fb2a931fd..84093cc7a 100644 --- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/ImportExportAction.java +++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/ImportExportAction.java @@ -51,23 +51,18 @@ import at.gv.egovernment.moa.id.config.legacy.BuildFromLegacyConfig; import at.gv.egovernment.moa.id.configuration.Constants; import at.gv.egovernment.moa.id.configuration.auth.AuthenticatedUser; import at.gv.egovernment.moa.id.configuration.config.ConfigurationProvider; +import at.gv.egovernment.moa.id.configuration.exception.BasicActionException; import at.gv.egovernment.moa.id.configuration.helper.LanguageHelper; import at.gv.egovernment.moa.id.util.Random; import com.opensymphony.xwork2.ActionSupport; -public class ImportExportAction extends ActionSupport -implements ServletRequestAware, ServletResponseAware { +public class ImportExportAction extends BasicAction { private static final Logger log = Logger.getLogger(ImportExportAction.class); - private static final long serialVersionUID = 1L; - private HttpServletRequest request; -// private HttpServletResponse response; - private AuthenticatedUser authUser; private String formID; - private File fileUpload = null; private String fileUploadContentType = null; private String fileUploadFileName = null; @@ -75,15 +70,14 @@ implements ServletRequestAware, ServletResponseAware { private InputStream fileInputStream; public String init() { - 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; - if (authUser.isAdmin()) { formID = Random.nextRandom(); @@ -99,15 +93,14 @@ implements ServletRequestAware, ServletResponseAware { } public String importLegacyConfig() { - 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; @@ -214,15 +207,14 @@ implements ServletRequestAware, ServletResponseAware { } public String downloadXMLConfig() { - 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; @@ -304,15 +296,14 @@ implements ServletRequestAware, ServletResponseAware { public String importXMLConfig() { - 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; @@ -449,19 +440,6 @@ implements ServletRequestAware, ServletResponseAware { this.fileUploadFileName = fileUploadFileName; } - /** - * @return the authUser - */ - public AuthenticatedUser getAuthUser() { - return authUser; - } - - public void setServletResponse(HttpServletResponse response) { -// this.response = response; - } - public void setServletRequest(HttpServletRequest request) { - this.request = request; - } public InputStream getFileInputStream() { return fileInputStream; |