Project

General

Profile

« Previous | Next » 

Revision 57463

Added by Ioannis Diplas over 4 years ago

Changed security expressions to include the case that registeredBy is null

View differences:

PiWikController.java
48 48 

  		




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


  		




  50
  50
  
    
    @ResponseBody


  		




  51
  
  
    
    @PreAuthorize("hasRole('ROLE_ADMIN') or hasRole('ROLE_PROVIDE_ADMIN') or (@repositoryService.getRepositoryById(#repositoryId).registeredBy==authentication.userInfo.email and hasRole('ROLE_USER'))")


  		




  
  51
  
    
    @PreAuthorize("hasRole('ROLE_ADMIN') or hasRole('ROLE_PROVIDE_ADMIN') or ((@repositoryService.getRepositoryById(#repositoryId).registeredBy==authentication.userInfo.email or @repositoryService.getRepositoryById(#repositoryId).registeredBy==null) and hasRole('ROLE_USER'))")


  		




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


  		




  53
  53
  
    
        return piWikService.getPiwikSiteForRepo(repositoryId);


  		




  54
  54
  
    
    }


  		




  55
  55
  
    

  		




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


  		




  57
  
  
    
    @PreAuthorize("hasRole('ROLE_ADMIN') or hasRole('ROLE_PROVIDE_ADMIN') or (@repositoryService.getRepositoryById(#piwikInfo.repositoryId).registeredBy==authentication.userInfo.email and hasRole('ROLE_USER'))")


  		




  
  57
  
    
    @PreAuthorize("hasRole('ROLE_ADMIN') or hasRole('ROLE_PROVIDE_ADMIN') or ((@repositoryService.getRepositoryById(#piwikInfo.repositoryId).registeredBy==authentication.userInfo.email or @repositoryService.getRepositoryById(#piwikInfo.repositoryId).registeredBy==null) and hasRole('ROLE_USER'))")


  		




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


  		




  59
  59
  
    
        return piWikService.savePiwikInfo(piwikInfo);


  		




  60
  60
  
    
    }


  		












Also available in:  Unified diff