Project

General

Profile

« Previous | Next » 

Revision 61441

Added by Antonis Lempesis almost 3 years ago

merged branch aai_roles_new to trunk

View differences:

DashboardController.java
36 36 
    @RequestMapping(value = "/getRepositoriesSummary/{page}/{size}" , method = RequestMethod.GET,
37 37 
            produces = MediaType.APPLICATION_JSON_VALUE)
38 38 
    @ResponseBody
39 
    @PreAuthorize("hasRole('ROLE_USER')")
39 
    @PreAuthorize("hasAuthority('REGISTERED_USER')")
40 40 
    public List<RepositorySummaryInfo> getRepositoriesSummaryInfo(
41 41 
                                                                  @PathVariable("page") String page,
42 42 
                                                                  @PathVariable("size") String size) throws JSONException {
......
46 46 
    @RequestMapping(value = "/collectionMonitorSummary/{repoId}" , method = RequestMethod.GET,
47 47 
            produces = MediaType.APPLICATION_JSON_VALUE)
48 48 
    @ResponseBody
49 
    @PreAuthorize("hasRole('ROLE_USER')")
49 
    @PreAuthorize("hasAuthority('REGISTERED_USER')")
50 50 
    public CollectionMonitorSummary getCollectionMonitorSummary(
51 51 
            @PathVariable("repoId") String repoId,
52 52 
            @RequestParam(name = "size", required = false, defaultValue = "20") int size) throws JSONException {
......
72 72 
    @RequestMapping(value = "/usageSummary/{repoId}" , method = RequestMethod.GET,
73 73 
            produces = MediaType.APPLICATION_JSON_VALUE)
74 74 
    @ResponseBody
75 
    @PreAuthorize("hasRole('ROLE_USER')")
75 
    @PreAuthorize("hasAuthority('REGISTERED_USER')")
76 76 
    public UsageSummary getUsageSummary(
77 77 
            @PathVariable("repoId") String repoId
78 78 
    ) throws RepositoryServiceException {
......
82 82 
    @RequestMapping(value = "/brokerSummary/{ds_name}" , method = RequestMethod.GET,
83 83 
            produces = MediaType.APPLICATION_JSON_VALUE)
84 84 
    @ResponseBody
85 
    @PreAuthorize("hasRole('ROLE_USER')")
85 
    @PreAuthorize("hasAuthority('REGISTERED_USER')")
86 86 
    public BrokerSummary getBrokerSummary(
87 87 
            @PathVariable("ds_name") String datasourceName) throws BrokerException {
88 88 
        return new BrokerSummary(brokerService.getSimpleSubscriptionsOfUser( ((OIDCAuthenticationToken) SecurityContextHolder.getContext().getAuthentication()).getUserInfo().getEmail()), brokerService.getTopicsForDatasource(datasourceName));

Also available in: Unified diff