Merge branch 'RED-5369' into 'master'
RED-5369: View dossier & access permissions are not working for dossier attributes controller Closes RED-5369 See merge request redactmanager/persistence-service!314
This commit is contained in:
commit
5d13696cec
@ -115,7 +115,7 @@ public class DossierAttributesController implements DossierAttributesResource {
|
||||
}
|
||||
|
||||
|
||||
@PreAuthorize("hasAuthority('" + WRITE_FILE_ATTRIBUTES + "')")
|
||||
@PreAuthorize("hasAuthority('" + WRITE_FILE_ATTRIBUTES + "') && hasPermission(#dossierId, 'Dossier', 'ACCESS_OBJECT')")
|
||||
public DossierAttributes setDossierAttributes(@PathVariable(DOSSIER_ID) String dossierId, @RequestBody DossierAttributes dossierAttributes) {
|
||||
|
||||
accessControlService.verifyUserIsDossierOwner(dossierId);
|
||||
@ -131,7 +131,7 @@ public class DossierAttributesController implements DossierAttributesResource {
|
||||
}
|
||||
|
||||
|
||||
@PreAuthorize("hasAuthority('" + WRITE_DOSSIER_ATTRIBUTES + "')")
|
||||
@PreAuthorize("hasAuthority('" + WRITE_DOSSIER_ATTRIBUTES + "') && hasPermission(#dossierId, 'Dossier', 'ACCESS_OBJECT')")
|
||||
public DossierAttributes addOrUpdateDossierAttribute(String dossierId, DossierAttribute dossierAttribute) {
|
||||
|
||||
accessControlService.verifyUserIsDossierOwner(dossierId);
|
||||
@ -146,7 +146,7 @@ public class DossierAttributesController implements DossierAttributesResource {
|
||||
}
|
||||
|
||||
|
||||
@PreAuthorize("hasAuthority('" + READ_DOSSIER_ATTRIBUTES + "')")
|
||||
@PreAuthorize("hasAuthority('" + READ_DOSSIER_ATTRIBUTES + "') && hasPermission(#dossierId, 'Dossier', 'VIEW_OBJECT')")
|
||||
public DossierAttributes getDossierAttributes(String dossierId) {
|
||||
|
||||
var result = dossierAttributesManagementService.getDossierAttributes(dossierId);
|
||||
@ -161,7 +161,7 @@ public class DossierAttributesController implements DossierAttributesResource {
|
||||
}
|
||||
|
||||
|
||||
@PreAuthorize("hasAuthority('" + WRITE_DOSSIER_ATTRIBUTES + "')")
|
||||
@PreAuthorize("hasAuthority('" + WRITE_DOSSIER_ATTRIBUTES + "') && hasPermission(#dossierId, 'Dossier', 'ACCESS_OBJECT')")
|
||||
public void deleteDossierAttribute(String dossierId, String dossierAttributeId) {
|
||||
|
||||
accessControlService.verifyUserIsDossierOwner(dossierId);
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user