MaDgIK
/
uoa-monitor-service
13
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Trunk | Monitor Service]: 

1. RolesUtils.java: Comment all contents of this file (should be removed in next commit). This file is added in uoa-admin-tools-library.
2. StakeholderController.java & TopicController.java & CategoryController.java & SubCategoryController.java & SectionController.java & IndicatorController.java: Import RolesUtils from uoa-admin-tools-library.
3. StakeholderController.java: In "getAllRealStakeholders()" method, add optional parameter "defaultId", to get Stakeholders based on a default profile.
This commit is contained in:
Konstantina Galouni 2021-02-24 19:22:19 +00:00
parent d6901a49f7
commit a284d8449a
7 changed files with 87 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/eu/dnetlib/uoamonitorservice/controllers/CategoryController.java
View File

@ -1,11 +1,11 @@
package eu.dnetlib.uoamonitorservice.controllers; package eu.dnetlib.uoamonitorservice.controllers;
import eu.dnetlib.uoaadmintoolslibrary.handlers.utils.RolesUtils;
import eu.dnetlib.uoamonitorservice.dao.*; import eu.dnetlib.uoamonitorservice.dao.*;
import eu.dnetlib.uoamonitorservice.entities.*; import eu.dnetlib.uoamonitorservice.entities.*;
import eu.dnetlib.uoamonitorservice.handlers.EntityNotFoundException; import eu.dnetlib.uoamonitorservice.handlers.EntityNotFoundException;
import eu.dnetlib.uoaadmintoolslibrary.handlers.ForbiddenException; import eu.dnetlib.uoaadmintoolslibrary.handlers.ForbiddenException;
import eu.dnetlib.uoamonitorservice.handlers.PathNotValidException; import eu.dnetlib.uoamonitorservice.handlers.PathNotValidException;
import eu.dnetlib.uoamonitorservice.handlers.utils.RolesUtils;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.AccessDeniedException; import org.springframework.security.access.AccessDeniedException;

2
src/main/java/eu/dnetlib/uoamonitorservice/controllers/IndicatorController.java
View File

@ -1,12 +1,12 @@
package eu.dnetlib.uoamonitorservice.controllers; package eu.dnetlib.uoamonitorservice.controllers;
import eu.dnetlib.uoaadmintoolslibrary.handlers.utils.RolesUtils;
import eu.dnetlib.uoamonitorservice.dao.*; import eu.dnetlib.uoamonitorservice.dao.*;
import eu.dnetlib.uoamonitorservice.entities.*; import eu.dnetlib.uoamonitorservice.entities.*;
import eu.dnetlib.uoamonitorservice.handlers.EntityNotFoundException; import eu.dnetlib.uoamonitorservice.handlers.EntityNotFoundException;
import eu.dnetlib.uoaadmintoolslibrary.handlers.ForbiddenException; import eu.dnetlib.uoaadmintoolslibrary.handlers.ForbiddenException;
import eu.dnetlib.uoamonitorservice.handlers.PathNotValidException; import eu.dnetlib.uoamonitorservice.handlers.PathNotValidException;
import eu.dnetlib.uoamonitorservice.handlers.utils.RolesUtils;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.AccessDeniedException; import org.springframework.security.access.AccessDeniedException;

2
src/main/java/eu/dnetlib/uoamonitorservice/controllers/SectionController.java
View File

@ -1,11 +1,11 @@
package eu.dnetlib.uoamonitorservice.controllers; package eu.dnetlib.uoamonitorservice.controllers;
import eu.dnetlib.uoaadmintoolslibrary.handlers.utils.RolesUtils;
import eu.dnetlib.uoamonitorservice.dao.*; import eu.dnetlib.uoamonitorservice.dao.*;
import eu.dnetlib.uoamonitorservice.entities.*; import eu.dnetlib.uoamonitorservice.entities.*;
import eu.dnetlib.uoamonitorservice.handlers.EntityNotFoundException; import eu.dnetlib.uoamonitorservice.handlers.EntityNotFoundException;
import eu.dnetlib.uoaadmintoolslibrary.handlers.ForbiddenException; import eu.dnetlib.uoaadmintoolslibrary.handlers.ForbiddenException;
import eu.dnetlib.uoamonitorservice.handlers.PathNotValidException; import eu.dnetlib.uoamonitorservice.handlers.PathNotValidException;
import eu.dnetlib.uoamonitorservice.handlers.utils.RolesUtils;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.AccessDeniedException; import org.springframework.security.access.AccessDeniedException;

15
src/main/java/eu/dnetlib/uoamonitorservice/controllers/StakeholderController.java
View File

@ -1,10 +1,10 @@
package eu.dnetlib.uoamonitorservice.controllers; package eu.dnetlib.uoamonitorservice.controllers;
import eu.dnetlib.uoaadmintoolslibrary.handlers.utils.RolesUtils;
import eu.dnetlib.uoamonitorservice.dao.*; import eu.dnetlib.uoamonitorservice.dao.*;
import eu.dnetlib.uoamonitorservice.entities.*; import eu.dnetlib.uoamonitorservice.entities.*;
import eu.dnetlib.uoamonitorservice.handlers.EntityNotFoundException; import eu.dnetlib.uoamonitorservice.handlers.EntityNotFoundException;
import eu.dnetlib.uoaadmintoolslibrary.handlers.ForbiddenException; import eu.dnetlib.uoaadmintoolslibrary.handlers.ForbiddenException;
import eu.dnetlib.uoamonitorservice.handlers.utils.RolesUtils;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -337,14 +337,19 @@ public class StakeholderController {
} }
@RequestMapping(value = "/stakeholder", method = RequestMethod.GET) @RequestMapping(value = "/stakeholder", method = RequestMethod.GET)
public List<Stakeholder> getAllRealStakeholders(@RequestParam(required = false) String type) { public List<Stakeholder> getAllRealStakeholders(@RequestParam(required = false) String type,
@RequestParam(required = false) String defaultId) {
// log.debug("get all NOT default stakeholders" + (type != null ? " with type: "+type : "")); // log.debug("get all NOT default stakeholders" + (type != null ? " with type: "+type : ""));
List<Stakeholder> stakeholders; List<Stakeholder> stakeholders;
if(type == null) { if(type != null && defaultId != null) {
stakeholders = stakeholderDAO.findByDefaultIdNot(null); stakeholders = stakeholderDAO.findByDefaultIdAndType(defaultId, type);
} else { } else if(defaultId != null) {
stakeholders = stakeholderDAO.findByDefaultId(defaultId);
} else if(type != null) {
stakeholders = stakeholderDAO.findByDefaultIdNotAndType(null, type); stakeholders = stakeholderDAO.findByDefaultIdNotAndType(null, type);
} else {
stakeholders = stakeholderDAO.findByDefaultIdNot(null);
} }
//List<Stakeholder> stakeholdersFull = new ArrayList<>(); //List<Stakeholder> stakeholdersFull = new ArrayList<>();

2
src/main/java/eu/dnetlib/uoamonitorservice/controllers/SubCategoryController.java
View File

@ -1,11 +1,11 @@
package eu.dnetlib.uoamonitorservice.controllers; package eu.dnetlib.uoamonitorservice.controllers;
import eu.dnetlib.uoaadmintoolslibrary.handlers.utils.RolesUtils;
import eu.dnetlib.uoamonitorservice.dao.*; import eu.dnetlib.uoamonitorservice.dao.*;
import eu.dnetlib.uoamonitorservice.entities.*; import eu.dnetlib.uoamonitorservice.entities.*;
import eu.dnetlib.uoamonitorservice.handlers.EntityNotFoundException; import eu.dnetlib.uoamonitorservice.handlers.EntityNotFoundException;
import eu.dnetlib.uoaadmintoolslibrary.handlers.ForbiddenException; import eu.dnetlib.uoaadmintoolslibrary.handlers.ForbiddenException;
import eu.dnetlib.uoamonitorservice.handlers.PathNotValidException; import eu.dnetlib.uoamonitorservice.handlers.PathNotValidException;
import eu.dnetlib.uoamonitorservice.handlers.utils.RolesUtils;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.AccessDeniedException; import org.springframework.security.access.AccessDeniedException;

2
src/main/java/eu/dnetlib/uoamonitorservice/controllers/TopicController.java
View File

@ -1,11 +1,11 @@
package eu.dnetlib.uoamonitorservice.controllers; package eu.dnetlib.uoamonitorservice.controllers;
import eu.dnetlib.uoaadmintoolslibrary.handlers.utils.RolesUtils;
import eu.dnetlib.uoamonitorservice.dao.*; import eu.dnetlib.uoamonitorservice.dao.*;
import eu.dnetlib.uoamonitorservice.entities.*; import eu.dnetlib.uoamonitorservice.entities.*;
import eu.dnetlib.uoamonitorservice.handlers.EntityNotFoundException; import eu.dnetlib.uoamonitorservice.handlers.EntityNotFoundException;
import eu.dnetlib.uoaadmintoolslibrary.handlers.ForbiddenException; import eu.dnetlib.uoaadmintoolslibrary.handlers.ForbiddenException;
import eu.dnetlib.uoamonitorservice.handlers.PathNotValidException; import eu.dnetlib.uoamonitorservice.handlers.PathNotValidException;
import eu.dnetlib.uoamonitorservice.handlers.utils.RolesUtils;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.AccessDeniedException; import org.springframework.security.access.AccessDeniedException;

144
src/main/java/eu/dnetlib/uoamonitorservice/handlers/utils/RolesUtils.java
View File

@ -1,72 +1,72 @@
package eu.dnetlib.uoamonitorservice.handlers.utils; //package eu.dnetlib.uoamonitorservice.handlers.utils;
//
import eu.dnetlib.uoaauthorizationlibrary.security.AuthorizationService; //import eu.dnetlib.uoaauthorizationlibrary.security.AuthorizationService;
import org.apache.log4j.Logger; //import org.apache.log4j.Logger;
//
import java.util.List; //import java.util.List;
//
import org.springframework.beans.factory.annotation.Autowired; //import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; //import org.springframework.stereotype.Component;
//
@Component //@Component
public class RolesUtils { //public class RolesUtils {
@Autowired // @Autowired
private AuthorizationService authorizationService; // private AuthorizationService authorizationService;
//
private final Logger log = Logger.getLogger(this.getClass()); // private final Logger log = Logger.getLogger(this.getClass());
//
public List<String> getRoles() { // public List<String> getRoles() {
return authorizationService.getRoles(); // return authorizationService.getRoles();
} // }
//
public boolean isPortalAdmin(List<String> roles) { // public boolean isPortalAdmin(List<String> roles) {
if(roles == null) { // if(roles == null) {
return false; // return false;
} // }
// log.debug(authorizationService.PORTAL_ADMIN); //// log.debug(authorizationService.PORTAL_ADMIN);
// log.debug("PortalAdmin: "+roles.contains(authorizationService.PORTAL_ADMIN)); //// log.debug("PortalAdmin: "+roles.contains(authorizationService.PORTAL_ADMIN));
return roles.contains(authorizationService.PORTAL_ADMIN); // return roles.contains(authorizationService.PORTAL_ADMIN);
} // }
//
public boolean isCurator(List<String> roles, String type) { // public boolean isCurator(List<String> roles, String type) {
if(roles == null) { // if(roles == null) {
return false; // return false;
} // }
// log.debug(authorizationService.curator(type)); //// log.debug(authorizationService.curator(type));
// log.debug("Curator in "+type+": "+roles.contains(authorizationService.curator(type))); //// log.debug("Curator in "+type+": "+roles.contains(authorizationService.curator(type)));
return roles.contains(authorizationService.curator(type)); // return roles.contains(authorizationService.curator(type));
} // }
//
public boolean isManager(List<String> roles, String type, String id) { // public boolean isManager(List<String> roles, String type, String id) {
if(roles == null) { // if(roles == null) {
return false; // return false;
} // }
// log.debug(authorizationService.manager(type, id)); //// log.debug(authorizationService.manager(type, id));
// log.debug("Manager in "+type+" - "+id+": "+roles.contains(authorizationService.manager(type, id))); //// log.debug("Manager in "+type+" - "+id+": "+roles.contains(authorizationService.manager(type, id)));
return roles.contains(authorizationService.manager(type, id)); // return roles.contains(authorizationService.manager(type, id));
} // }
//
public boolean isMember(List<String> roles, String type, String id) { // public boolean isMember(List<String> roles, String type, String id) {
if(roles == null) { // if(roles == null) {
return false; // return false;
} // }
// log.debug(authorizationService.member(type, id)); //// log.debug(authorizationService.member(type, id));
// log.debug("Member in "+type+" - "+id+": "+roles.contains(authorizationService.member(type, id))); //// log.debug("Member in "+type+" - "+id+": "+roles.contains(authorizationService.member(type, id)));
return roles.contains(authorizationService.member(type, id)); // return roles.contains(authorizationService.member(type, id));
} // }
//
public boolean isLoggedIn(List<String> roles) { // public boolean isLoggedIn(List<String> roles) {
if(roles == null || roles.contains(authorizationService.ANONYMOUS_USER)) { // if(roles == null || roles.contains(authorizationService.ANONYMOUS_USER)) {
return false; // return false;
} // }
return true; // return true;
} // }
//
public boolean hasUpdateAuthority(List<String> roles, String type, String id) { // public boolean hasUpdateAuthority(List<String> roles, String type, String id) {
return isPortalAdmin(roles) || isCurator(roles, type) || isManager(roles, type, id); // return isPortalAdmin(roles) || isCurator(roles, type) || isManager(roles, type, id);
} // }
//
public boolean hasCreateAndDeleteAuthority(List<String> roles, String type) { // public boolean hasCreateAndDeleteAuthority(List<String> roles, String type) {
return isPortalAdmin(roles) || isCurator(roles, type); // return isPortalAdmin(roles) || isCurator(roles, type);
} // }
} //}