From e33df7fe420d97bcebf7b3baac8164daec3a5f52 Mon Sep 17 00:00:00 2001 From: "ioannis.diplas" Date: Fri, 10 Jan 2020 12:56:27 +0000 Subject: [PATCH] Clearing unnecessary "user" variables --- .../manager/controllers/BrokerController.java | 13 +++++-------- .../controllers/DashboardController.java | 13 +++++-------- .../manager/controllers/MonitorController.java | 12 ++++-------- .../controllers/RepositoryController.java | 17 +++++++---------- .../controllers/ValidatorController.java | 14 +++++--------- 5 files changed, 26 insertions(+), 43 deletions(-) diff --git a/src/main/java/eu/dnetlib/repo/manager/controllers/BrokerController.java b/src/main/java/eu/dnetlib/repo/manager/controllers/BrokerController.java index 0ab3c02..b22b284 100644 --- a/src/main/java/eu/dnetlib/repo/manager/controllers/BrokerController.java +++ b/src/main/java/eu/dnetlib/repo/manager/controllers/BrokerController.java @@ -31,14 +31,12 @@ public class BrokerController{ produces = MediaType.APPLICATION_JSON_VALUE) @ResponseBody @PreAuthorize("hasRole('ROLE_USER')") - public DatasourcesBroker getDatasourcesOfUser(@RequestParam("user") - @ApiParam(value = "User email", required = true) String user, + public DatasourcesBroker getDatasourcesOfUser( @RequestParam("includeShared") @ApiParam(value = "Include shared datasources", required = true , defaultValue = "false") String includeShared, @RequestParam("includeByOthers") @ApiParam(value = "Include datasources of other", required = true,defaultValue = "false") String includeByOthers) throws JSONException { - user = ((OIDCAuthenticationToken) SecurityContextHolder.getContext().getAuthentication()).getUserInfo().getEmail(); - return brokerService.getDatasourcesOfUser(user, includeShared, includeByOthers); + return brokerService.getDatasourcesOfUser(((OIDCAuthenticationToken) SecurityContextHolder.getContext().getAuthentication()).getUserInfo().getEmail(), includeShared, includeByOthers); } @RequestMapping(value = "/getTopicsForDatasource/{datasourceName:.+}" , @@ -72,14 +70,13 @@ public class BrokerController{ return brokerService.showEvents(datasourceName, topic, page, size); } - @RequestMapping(value = "/getSimpleSubscriptionsOfUser/{userEmail}" , + @RequestMapping(value = "/getSimpleSubscriptionsOfUser" , method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) @ResponseBody @PreAuthorize("hasRole('ROLE_USER')") - public Map> getSimpleSubscriptionsOfUser(@PathVariable("userEmail") String userEmail) throws BrokerException{ - userEmail = ((OIDCAuthenticationToken) SecurityContextHolder.getContext().getAuthentication()).getUserInfo().getEmail(); - return brokerService.getSimpleSubscriptionsOfUser(userEmail); + public Map> getSimpleSubscriptionsOfUser() throws BrokerException{ + return brokerService.getSimpleSubscriptionsOfUser(((OIDCAuthenticationToken) SecurityContextHolder.getContext().getAuthentication()).getUserInfo().getEmail()); } @RequestMapping(value = "/subscribe" , method = RequestMethod.POST, diff --git a/src/main/java/eu/dnetlib/repo/manager/controllers/DashboardController.java b/src/main/java/eu/dnetlib/repo/manager/controllers/DashboardController.java index 9b12c4c..e981d4e 100644 --- a/src/main/java/eu/dnetlib/repo/manager/controllers/DashboardController.java +++ b/src/main/java/eu/dnetlib/repo/manager/controllers/DashboardController.java @@ -33,15 +33,14 @@ public class DashboardController { @Autowired private PiWikService piWikService; - @RequestMapping(value = "/getRepositoriesSummary/{userEmail}/{page}/{size}" , method = RequestMethod.GET, + @RequestMapping(value = "/getRepositoriesSummary/{page}/{size}" , method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) @ResponseBody @PreAuthorize("hasRole('ROLE_USER')") - public List getRepositoriesSummaryInfo(@PathVariable("userEmail") String userEmail, + public List getRepositoriesSummaryInfo( @PathVariable("page") String page, @PathVariable("size") String size) throws JSONException { - userEmail = ((OIDCAuthenticationToken) SecurityContextHolder.getContext().getAuthentication()).getUserInfo().getEmail(); - return dashboardService.getRepositoriesSummaryInfo(userEmail, page, size); + return dashboardService.getRepositoriesSummaryInfo(((OIDCAuthenticationToken) SecurityContextHolder.getContext().getAuthentication()).getUserInfo().getEmail(), page, size); } @RequestMapping(value = "/collectionMonitorSummary/{repoId}" , method = RequestMethod.GET, @@ -80,15 +79,13 @@ public class DashboardController { return new UsageSummary(repositoryService.getMetricsInfoForRepository(repoId), piWikService.getPiwikSiteForRepo(repoId)); } - @RequestMapping(value = "/brokerSummary/{email}/{ds_name}" , method = RequestMethod.GET, + @RequestMapping(value = "/brokerSummary/{ds_name}" , method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) @ResponseBody @PreAuthorize("hasRole('ROLE_USER')") public BrokerSummary getBrokerSummary( - @PathVariable("email") String email, @PathVariable("ds_name") String datasourceName) throws BrokerException { - email = ((OIDCAuthenticationToken) SecurityContextHolder.getContext().getAuthentication()).getUserInfo().getEmail(); - return new BrokerSummary(brokerService.getSimpleSubscriptionsOfUser(email), brokerService.getTopicsForDatasource(datasourceName)); + return new BrokerSummary(brokerService.getSimpleSubscriptionsOfUser( ((OIDCAuthenticationToken) SecurityContextHolder.getContext().getAuthentication()).getUserInfo().getEmail()), brokerService.getTopicsForDatasource(datasourceName)); } diff --git a/src/main/java/eu/dnetlib/repo/manager/controllers/MonitorController.java b/src/main/java/eu/dnetlib/repo/manager/controllers/MonitorController.java index bb071ef..e8fb20b 100644 --- a/src/main/java/eu/dnetlib/repo/manager/controllers/MonitorController.java +++ b/src/main/java/eu/dnetlib/repo/manager/controllers/MonitorController.java @@ -30,8 +30,7 @@ public class MonitorController { produces = MediaType.APPLICATION_JSON_VALUE) @ResponseBody @PreAuthorize("hasRole('ROLE_USER')") - public JobsOfUser getJobsOfUser(@RequestParam("user") @ApiParam(value = "User email", required = true) String user, - @RequestParam(value = "jobType", required = false) + public JobsOfUser getJobsOfUser(@RequestParam(value = "jobType", required = false) @ApiParam(value = "Equals to filter job type on validation history page") String jobType, @RequestParam("offset") @ApiParam(value = "Page number", required = true) String offset, @RequestParam(value = "limit", required = false,defaultValue = "10") @ApiParam(value = "Null value") String limit, @@ -39,18 +38,15 @@ public class MonitorController { @RequestParam(value = "dateTo", required = false) @ApiParam(value = "Null value") String dateTo, @RequestParam("validationStatus") @ApiParam(value = "Equals to filter validation jobs", required = false) String validationStatus, @RequestParam("includeJobsTotal") @ApiParam(value = "Always true", required = true) String includeJobsTotal) throws JSONException, ValidatorServiceException { - user = ((OIDCAuthenticationToken) SecurityContextHolder.getContext().getAuthentication()).getUserInfo().getEmail(); - return monitorService.getJobsOfUser(user, jobType, offset, limit, dateFrom, dateTo, validationStatus, includeJobsTotal); + return monitorService.getJobsOfUser(((OIDCAuthenticationToken) SecurityContextHolder.getContext().getAuthentication()).getUserInfo().getEmail(), jobType, offset, limit, dateFrom, dateTo, validationStatus, includeJobsTotal); } @RequestMapping(value = "/getJobsOfUserPerValidationStatus" , method = RequestMethod.GET,produces = MediaType.APPLICATION_JSON_VALUE) @ResponseBody @PreAuthorize("hasRole('ROLE_USER')") - public int getJobsOfUserPerValidationStatus(@RequestBody String user, - @RequestBody String jobType, + public int getJobsOfUserPerValidationStatus(@RequestBody String jobType, @RequestBody String validationStatus) throws JSONException { - user = ((OIDCAuthenticationToken) SecurityContextHolder.getContext().getAuthentication()).getUserInfo().getEmail(); - return monitorService.getJobsOfUserPerValidationStatus(user, jobType, validationStatus); + return monitorService.getJobsOfUserPerValidationStatus(((OIDCAuthenticationToken) SecurityContextHolder.getContext().getAuthentication()).getUserInfo().getEmail(), jobType, validationStatus); } @RequestMapping(value = "/getJobSummary" , method = RequestMethod.GET,produces = MediaType.APPLICATION_JSON_VALUE) 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 22e98ba..14c58ff 100644 --- a/src/main/java/eu/dnetlib/repo/manager/controllers/RepositoryController.java +++ b/src/main/java/eu/dnetlib/repo/manager/controllers/RepositoryController.java @@ -1,6 +1,5 @@ package eu.dnetlib.repo.manager.controllers; -import eu.dnetlib.api.functionality.ValidatorServiceException; import eu.dnetlib.domain.data.Repository; import eu.dnetlib.domain.data.RepositoryInterface; import eu.dnetlib.repo.manager.domain.*; @@ -44,15 +43,14 @@ public class RepositoryController { return repositoryService.getRepositoriesByCountry(country, mode, managed); } - @RequestMapping(value = "/getRepositoriesOfUser/{userEmail}/{page}/{size}",method = RequestMethod.GET, + @RequestMapping(value = "/getRepositoriesOfUser/{page}/{size}",method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) @ResponseBody @PreAuthorize("hasRole('ROLE_USER')") - public List getRepositoriesOfUser(@PathVariable("userEmail") String userEmail, + public List getRepositoriesOfUser( @PathVariable("page") String page, @PathVariable("size") String size) throws JSONException, IOException { - userEmail = ((OIDCAuthenticationToken) SecurityContextHolder.getContext().getAuthentication()).getUserInfo().getEmail(); - return repositoryService.getRepositoriesSnippetOfUser(userEmail, page, size); + return repositoryService.getRepositoriesSnippetOfUser(((OIDCAuthenticationToken) SecurityContextHolder.getContext().getAuthentication()).getUserInfo().getEmail(), page, size); } @RequestMapping(value = "/searchRegisteredRepositories/{page}/{size}",method = RequestMethod.GET, @@ -164,19 +162,18 @@ public class RepositoryController { public RepositoryInterface addRepositoryInterface(@RequestParam("datatype") String datatype, @RequestParam("repoId") String repoId, @RequestParam("registeredBy") String registeredBy, - @RequestBody RepositoryInterface repositoryInterface) throws JSONException, ResourceNotFoundException, ValidatorServiceException { + @RequestBody RepositoryInterface repositoryInterface) throws Exception { return repositoryService.addRepositoryInterface(datatype, repoId, registeredBy, repositoryInterface); } - @RequestMapping(value = "/getUrlsOfUserRepos/{user_email}/{page}/{size}/",method = RequestMethod.GET, + @RequestMapping(value = "/getUrlsOfUserRepos/{page}/{size}/",method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) @ResponseBody @PreAuthorize("hasRole('ROLE_USER')") - public List getUrlsOfUserRepos(@PathVariable("user_email") String userEmail, + public List getUrlsOfUserRepos( @PathVariable("page") String page, @PathVariable("size") String size) throws JSONException { - userEmail = ((OIDCAuthenticationToken) SecurityContextHolder.getContext().getAuthentication()).getUserInfo().getEmail(); - return repositoryService.getUrlsOfUserRepos(userEmail, page, size); + return repositoryService.getUrlsOfUserRepos(((OIDCAuthenticationToken) SecurityContextHolder.getContext().getAuthentication()).getUserInfo().getEmail(), page, size); } @RequestMapping(value = "/getDatasourceVocabularies/{mode}",method = RequestMethod.GET, diff --git a/src/main/java/eu/dnetlib/repo/manager/controllers/ValidatorController.java b/src/main/java/eu/dnetlib/repo/manager/controllers/ValidatorController.java index 3582e14..1811103 100644 --- a/src/main/java/eu/dnetlib/repo/manager/controllers/ValidatorController.java +++ b/src/main/java/eu/dnetlib/repo/manager/controllers/ValidatorController.java @@ -43,15 +43,13 @@ public class ValidatorController { return validatorService.submitJobForValidation(jobForValidation); } - @RequestMapping(value = "/reSubmitJobForValidation/{email}/{jobId}",method = RequestMethod.POST, + @RequestMapping(value = "/reSubmitJobForValidation/{jobId}",method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE) @ResponseBody @PreAuthorize("hasRole('ROLE_USER')") - public ResponseEntity reSubmitJobForValidation(@PathVariable("email") String email, - @PathVariable("jobId") String jobId) throws JSONException, ValidatorServiceException { - email = ((OIDCAuthenticationToken) SecurityContextHolder.getContext().getAuthentication()).getUserInfo().getEmail(); - return validatorService.reSubmitJobForValidation(email, jobId); + public ResponseEntity reSubmitJobForValidation(@PathVariable("jobId") String jobId) throws JSONException, ValidatorServiceException { + return validatorService.reSubmitJobForValidation(((OIDCAuthenticationToken) SecurityContextHolder.getContext().getAuthentication()).getUserInfo().getEmail(), jobId); } @RequestMapping(value = "/getRuleSets/{mode}" , method = RequestMethod.GET,produces = MediaType.APPLICATION_JSON_VALUE) @@ -81,8 +79,7 @@ public class ValidatorController { @RequestMapping(value = "/getStoredJobsNew" , method = RequestMethod.GET,produces = MediaType.APPLICATION_JSON_VALUE) @ResponseBody @PreAuthorize("hasRole('ROLE_USER')") - public List getStoredJobsNew(@RequestParam("user") @ApiParam(value = "User email", required = true) String user, - @RequestParam(value = "jobType", required = false) + public List getStoredJobsNew(@RequestParam(value = "jobType", required = false) @ApiParam(value = "Equals to filter job type on validation history page") String jobType, @RequestParam("offset") @ApiParam(value = "Page number", required = true) String offset, @RequestParam(value = "limit", required = false,defaultValue = "10") @ApiParam(value = "Null value") String limit, @@ -90,8 +87,7 @@ public class ValidatorController { @RequestParam(value = "dateTo", required = false) @ApiParam(value = "Null value") String dateTo, @RequestParam("validationStatus") @ApiParam(value = "Equals to filter validation jobs", required = true) String validationStatus ) throws ValidatorServiceException { - user = ((OIDCAuthenticationToken) SecurityContextHolder.getContext().getAuthentication()).getUserInfo().getEmail(); - return validatorService.getStoredJobsNew(user, jobType, offset, limit, dateFrom, dateTo, validationStatus); + return validatorService.getStoredJobsNew(((OIDCAuthenticationToken) SecurityContextHolder.getContext().getAuthentication()).getUserInfo().getEmail(), jobType, offset, limit, dateFrom, dateTo, validationStatus); } @RequestMapping(value = "/getStoredJobsTotalNumberNew" , method = RequestMethod.GET,produces = MediaType.APPLICATION_JSON_VALUE)