Project

General

Profile

« Previous | Next » 

Revision 61441

merged branch aai_roles_new to trunk

View differences:

ValidatorServiceImpl.java
127 127
    }
128 128

  
129 129
    @Override
130
    @PreAuthorize("hasRole('ROLE_USER') and #jobForValidation.userEmail == authentication.userInfo.email")
130
    @PreAuthorize("hasAuthority('REGISTERED_USER') and #jobForValidation.userEmail == authentication.userInfo.email")
131 131
    public JobForValidation submitJobForValidation(JobForValidation jobForValidation) throws ValidatorServiceException {
132 132
        LOGGER.debug("Submit job for validation with id : " + jobForValidation.getDatasourceId());
133 133
        try {
......
155 155
    }
156 156

  
157 157
    @Override
158
    @PreAuthorize("hasRole('ROLE_USER') and #email == authentication.userInfo.email")
158
    @PreAuthorize("hasAuthority('REGISTERED_USER') and #email == authentication.userInfo.email")
159 159
    public ResponseEntity<Object> reSubmitJobForValidation(String email,
160 160
                                                           String jobId) throws JSONException, ValidatorServiceException {
161 161
        LOGGER.debug("Resubmit validation job with id : " + jobId);
......
242 242
    }
243 243

  
244 244
    @Override
245
    @PreAuthorize("hasRole('ROLE_USER')")
245
    @PreAuthorize("hasAuthority('REGISTERED_USER')")
246 246
    public List<StoredJob> getStoredJobsNew(String user,
247 247
                                            String jobType,
248 248
                                            String offset,

Also available in: Unified diff