Project

General

Profile

« Previous | Next » 

Revision 61455

Added by Konstantinos Spyrou almost 3 years ago

replaced hasAnyRole with hasAnyAuthority

View differences:

modules/uoa-repository-manager-service/trunk/src/main/java/eu/dnetlib/repo/manager/controllers/RepositoryController.java
86 86 
    @RequestMapping(value = "/getRepositoryById/{id}", method = RequestMethod.GET,
87 87 
            produces = MediaType.APPLICATION_JSON_VALUE)
88 88 
    @ResponseBody
89 
    @PostAuthorize("hasAnyRole('SUPER_ADMINISTRATOR', 'CONTENT_PROVIDER_DASHBOARD_ADMINISTRATOR') or @authorizationService.isMemberOf(#id) or (returnObject.registeredBy=='null' and hasAuthority('REGISTERED_USER'))")
89 
    @PostAuthorize("hasAnyAuthority('SUPER_ADMINISTRATOR', 'CONTENT_PROVIDER_DASHBOARD_ADMINISTRATOR') or @authorizationService.isMemberOf(#id) or (returnObject.registeredBy=='null' and hasAuthority('REGISTERED_USER'))")
90 90 
    public Repository getRepositoryById(@PathVariable("id") String id) throws JSONException, ResourceNotFoundException {
91 91 
        Repository repo = repositoryService.getRepositoryById(id);
92 92 

  		












  

    
      modules/uoa-repository-manager-service/trunk/src/main/java/eu/dnetlib/repo/manager/controllers/PiWikController.java
    
  





  41
  41
  
    

  		




  42
  42
  
    
    @RequestMapping(value = "/getPiwikSiteForRepo/{repositoryId}" , method = RequestMethod.GET,produces = MediaType.APPLICATION_JSON_VALUE)


  		




  43
  43
  
    
    @ResponseBody


  		




  44
  
  
    
    @PreAuthorize("hasAnyRole('SUPER_ADMINISTRATOR', 'CONTENT_PROVIDER_DASHBOARD_ADMINISTRATOR') or @authorizationService.isMemberOf(#repositoryId) or (@repositoryService.getRepositoryById(#repositoryId).registeredBy=='null' and hasAuthority('REGISTERED_USER'))")


  		




  
  44
  
    
    @PreAuthorize("hasAnyAuthority('SUPER_ADMINISTRATOR', 'CONTENT_PROVIDER_DASHBOARD_ADMINISTRATOR') or @authorizationService.isMemberOf(#repositoryId) or (@repositoryService.getRepositoryById(#repositoryId).registeredBy=='null' and hasAuthority('REGISTERED_USER'))")


  		




  45
  45
  
    
    public PiwikInfo getPiwikSiteForRepo(@PathVariable("repositoryId") String repositoryId) {


  		




  46
  46
  
    
        return piWikService.getPiwikSiteForRepo(repositoryId);


  		




  47
  47
  
    
    }


  		




  48
  48
  
    

  		




  49
  49
  
    
    @RequestMapping(value = "/savePiwikInfo" , method = RequestMethod.POST,produces = MediaType.APPLICATION_JSON_VALUE)


  		




  50
  
  
    
    @PreAuthorize("hasAnyRole('SUPER_ADMINISTRATOR', 'CONTENT_PROVIDER_DASHBOARD_ADMINISTRATOR') or @authorizationService.isMemberOf(#piwikInfo.repositoryId) or (@repositoryService.getRepositoryById(#piwikInfo.repositoryId).registeredBy=='null' and hasAuthority('REGISTERED_USER'))")


  		




  
  50
  
    
    @PreAuthorize("hasAnyAuthority('SUPER_ADMINISTRATOR', 'CONTENT_PROVIDER_DASHBOARD_ADMINISTRATOR') or @authorizationService.isMemberOf(#piwikInfo.repositoryId) or (@repositoryService.getRepositoryById(#piwikInfo.repositoryId).registeredBy=='null' and hasAuthority('REGISTERED_USER'))")


  		




  51
  51
  
    
    public PiwikInfo savePiwikInfo(@RequestBody PiwikInfo piwikInfo) {


  		




  52
  52
  
    
        return piWikService.savePiwikInfo(piwikInfo);


  		




  53
  53
  
    
    }


  		




  ......




  156
  156
  
    

  		




  157
  157
  
    
    @RequestMapping(value = "/getOpenaireId/{repositoryId}" , method = RequestMethod.GET,produces = MediaType.APPLICATION_JSON_VALUE)


  		




  158
  158
  
    
    @ResponseBody


  		




  159
  
  
    
    @PreAuthorize("hasAnyRole('SUPER_ADMINISTRATOR', 'CONTENT_PROVIDER_DASHBOARD_ADMINISTRATOR') or @authorizationService.isMemberOf(#repositoryId) or (@repositoryService.getRepositoryById(#repositoryId).registeredBy=='null' and hasAuthority('REGISTERED_USER'))")


  		




  
  159
  
    
    @PreAuthorize("hasAnyAuthority('SUPER_ADMINISTRATOR', 'CONTENT_PROVIDER_DASHBOARD_ADMINISTRATOR') or @authorizationService.isMemberOf(#repositoryId) or (@repositoryService.getRepositoryById(#repositoryId).registeredBy=='null' and hasAuthority('REGISTERED_USER'))")


  		




  160
  160
  
    
    public String getOpenaireId(@PathVariable("repositoryId") String repositoryId){


  		




  161
  161
  
    
        return piWikService.getOpenaireId(repositoryId);


  		




  162
  162
  
    
    }


  		












Also available in:  Unified diff