From ee014919952e986f41de4e41ccc4a43691cd34b6 Mon Sep 17 00:00:00 2001 From: spyroukon Date: Tue, 8 Nov 2022 18:37:51 +0000 Subject: [PATCH] 1. fixed auth expression when updating a repository 2. filter out ftp interfaces --- .../repo/manager/controllers/RepositoryController.java | 2 +- .../dnetlib/repo/manager/service/RepositoryServiceImpl.java | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/eu/dnetlib/repo/manager/controllers/RepositoryController.java b/src/main/java/eu/dnetlib/repo/manager/controllers/RepositoryController.java index f7b711c..e711390 100644 --- a/src/main/java/eu/dnetlib/repo/manager/controllers/RepositoryController.java +++ b/src/main/java/eu/dnetlib/repo/manager/controllers/RepositoryController.java @@ -187,7 +187,7 @@ public class RepositoryController { @RequestMapping(value = "/updateRepository", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE) @ResponseBody - @PreAuthorize("hasAuthority('SUPER_ADMINISTRATOR') or hasAuthority('CONTENT_PROVIDER_DASHBOARD_ADMINISTRATOR') or @authorizationService.isMemberOfInterface(#repository.id)") + @PreAuthorize("hasAuthority('SUPER_ADMINISTRATOR') or hasAuthority('CONTENT_PROVIDER_DASHBOARD_ADMINISTRATOR') or @authorizationService.isMemberOf(#repository.id)") public Repository updateRepository(@RequestBody Repository repository, Authentication authentication) throws Exception { return repositoryService.updateRepository(repository, authentication); } diff --git a/src/main/java/eu/dnetlib/repo/manager/service/RepositoryServiceImpl.java b/src/main/java/eu/dnetlib/repo/manager/service/RepositoryServiceImpl.java index 76cf6ed..51dbc3e 100644 --- a/src/main/java/eu/dnetlib/repo/manager/service/RepositoryServiceImpl.java +++ b/src/main/java/eu/dnetlib/repo/manager/service/RepositoryServiceImpl.java @@ -477,8 +477,11 @@ public class RepositoryServiceImpl implements RepositoryService { List res = new ArrayList<>(); for (ApiDetails det: rs.getApi()) { - if (!det.getProtocol().equals("sword") && !det.getProtocol().equals("rest")) + if (!det.getProtocol().equals("sword") && + !det.getProtocol().equals("rest") && + !det.getProtocol().equals("ftp")) { res.add(det); + } } return converter.toRepositoryInterfaceList(res);