-
Notifications
You must be signed in to change notification settings - Fork 23
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #262 from ec-jrc/develop
Pre-release of v2.4.2
- Loading branch information
Showing
41 changed files
with
1,491 additions
and
175 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -20,21 +20,17 @@ services: | |
| - ALLOW_IP_RANGE="0.0.0.0/0" | ||
| volumes: | ||
| - ../../dist/db-scripts/registry2_drop-and-create-and-init.sql.orig:/docker-entrypoint-initdb.d/init.sql | ||
| # - ../../dist/customize-interface/example-profile-developer-docker/dbdumpv1.sql:/docker-entrypoint-initdb.d/init.sql | ||
| # Test database tu use it without installation | ||
| # Test database to use it without installation | ||
| # Be sure file sources-main/resources-configurations_files/system.installed | ||
| # is removed from the war file. If not, installation will be not detected. | ||
| # - ../../dist/customize-interface/example-profile-developer-docker/dbdumpv1.sql:/docker-entrypoint-initdb.d/init_backup.sql | ||
| - ../../dist/customize-interface/example-profile-developer-docker/dump-docker-202205180929.sql:/docker-entrypoint-initdb.d/init_backup.sql | ||
| # - ../../dist/customize-interface/example-profile-developer-docker/fulldump.sql:/docker-entrypoint-initdb.d/init_backup.sql | ||
| # login from example db: [email protected] password | ||
| # login example db: [email protected] password | ||
| expose: | ||
| - "5432" | ||
| ports: | ||
| - 5432:5432 | ||
| networks: | ||
| - main | ||
|
|
||
| web: | ||
| depends_on: | ||
| - db | ||
|
|
@@ -84,6 +80,7 @@ services: | |
| - "8983:8983" | ||
| # volumes: | ||
| # - ../../../solr:/opt/solr/server/solr/re3gistry2 | ||
|
|
||
| entrypoint: | ||
| - docker-entrypoint.sh | ||
| - solr-precreate | ||
|
|
||
109 changes: 109 additions & 0 deletions
109
sources/Re3gistry2/src/main/java/eu/europa/ec/re3gistry2/web/controller/Activate.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,109 @@ | ||
| /* | ||
| * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license | ||
| * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template | ||
| */ | ||
| package eu.europa.ec.re3gistry2.web.controller; | ||
|
|
||
| import eu.europa.ec.re3gistry2.base.utility.BaseConstants; | ||
| import eu.europa.ec.re3gistry2.base.utility.Configuration; | ||
| import eu.europa.ec.re3gistry2.base.utility.PersistenceFactory; | ||
| import eu.europa.ec.re3gistry2.base.utility.WebConstants; | ||
| import eu.europa.ec.re3gistry2.crudimplementation.RegUserCodesManager; | ||
| import eu.europa.ec.re3gistry2.crudimplementation.RegUserManager; | ||
| import eu.europa.ec.re3gistry2.crudimplementation.RegUserRegGroupMappingManager; | ||
| import eu.europa.ec.re3gistry2.javaapi.handler.RegUserHandler; | ||
| import eu.europa.ec.re3gistry2.javaapi.handler.RegUserRegCodesHandler; | ||
| import eu.europa.ec.re3gistry2.model.RegUser; | ||
| import eu.europa.ec.re3gistry2.model.RegUserCodes; | ||
| import eu.europa.ec.re3gistry2.model.RegUserRegGroupMapping; | ||
| import java.io.IOException; | ||
| import java.util.List; | ||
| import javax.persistence.EntityManager; | ||
| import javax.servlet.ServletException; | ||
| import javax.servlet.annotation.WebServlet; | ||
| import javax.servlet.http.HttpServlet; | ||
| import javax.servlet.http.HttpServletRequest; | ||
| import javax.servlet.http.HttpServletResponse; | ||
| import org.apache.logging.log4j.Logger; | ||
|
|
||
| @WebServlet(WebConstants.PAGE_URINAME_ACTIVATE) | ||
| public class Activate extends HttpServlet { | ||
|
|
||
| private void processRequest(HttpServletRequest request, HttpServletResponse response) throws Exception { | ||
|
|
||
| //Init frontend servlet | ||
| //añadir booleano para no login? | ||
| Configuration.getInstance().initServlet(request, response, false, false); | ||
|
|
||
| // Setup the entity manager | ||
| EntityManager entityManager = PersistenceFactory.getEntityManagerFactory().createEntityManager(); | ||
|
|
||
| // Init logger | ||
| Logger logger = Configuration.getInstance().getLogger(); | ||
|
|
||
| // Instantiating managers | ||
| RegUserCodesManager regUserCodesManager = new RegUserCodesManager(entityManager); | ||
| RegUserRegCodesHandler regUserCodesHandler = new RegUserRegCodesHandler(); | ||
| RegUserManager regUserManager = new RegUserManager(entityManager); | ||
| RegUserHandler regUserHandler = new RegUserHandler(); | ||
|
|
||
| // Getting form parameter | ||
| String code = request.getParameter("code"); | ||
|
|
||
| // Getting the user from the code | ||
| RegUserCodes regCode = regUserCodesManager.getByCode(code); | ||
| RegUser regUser = regUserManager.get(regCode.getRegUser()); | ||
| List<RegUserCodes> regCodeAux = regUserCodesManager.getByRegUser(regCode.getRegUser()); | ||
|
|
||
| if(regCode.getAction().equals(BaseConstants.KEY_USER_ACTION_ACTIVATE_USER)){ | ||
| //Enabling the user | ||
| Boolean enabled = regUserHandler.toggleUserEnabled(regUser, Boolean.TRUE); | ||
|
|
||
| if(enabled){ | ||
| //Delete the codes | ||
| for(RegUserCodes r:regCodeAux){ | ||
| regUserCodesHandler.deleteCode(r); | ||
| } | ||
| request.getRequestDispatcher(WebConstants.PAGE_JSP_FOLDER + WebConstants.PAGE_PATH_ACTIVATE+ WebConstants.PAGE_URINAME_ACTIVATE + WebConstants.PAGE_JSP_EXTENSION).forward(request, response); | ||
| }else{ | ||
| //Dispatch request | ||
| request.getRequestDispatcher(WebConstants.PAGE_JSP_FOLDER + WebConstants.PAGE_PATH_REGISTRYMANAGER_USERS_ADD + WebConstants.PAGE_URINAME_REGISTRYMANAGER_USERS_ADD + WebConstants.PAGE_JSP_EXTENSION).forward(request, response); | ||
| } | ||
| }else{ | ||
| //Delete the codes | ||
| for(RegUserCodes r:regCodeAux){ | ||
| regUserCodesHandler.deleteCode(r); | ||
| } | ||
|
|
||
| //Delete the user | ||
| Boolean removed = regUserHandler.removeUser(regUser); | ||
| if(removed){ | ||
| //response.sendRedirect("/help"); | ||
| request.getRequestDispatcher(WebConstants.PAGE_JSP_FOLDER + WebConstants.PAGE_PATH_DELETE_USER+ WebConstants.PAGE_URINAME_DELETE_USER + WebConstants.PAGE_JSP_EXTENSION).forward(request, response); | ||
| }else{ | ||
| //Dispatch request | ||
| request.getRequestDispatcher(WebConstants.PAGE_JSP_FOLDER + WebConstants.PAGE_PATH_REGISTRYMANAGER_USERS_ADD + WebConstants.PAGE_URINAME_REGISTRYMANAGER_USERS_ADD + WebConstants.PAGE_JSP_EXTENSION).forward(request, response); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { | ||
| try { | ||
| processRequest(request, response); | ||
| } catch (Exception ex) { | ||
| Logger logger = Configuration.getInstance().getLogger(); | ||
| logger.error(ex.getMessage(), ex); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { | ||
| try { | ||
| processRequest(request, response); | ||
| } catch (Exception ex) { | ||
| Logger logger = Configuration.getInstance().getLogger(); | ||
| logger.error(ex.getMessage(), ex); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.