Skip to content

Separate permission and directory scopes #222

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Nov 6, 2025
Merged

Separate permission and directory scopes #222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
471c73f
separate permission and directory scopes
benrejebmoh Nov 3, 2025
9db4c5f
rename AccessRightControlTest to PermissionServiceTest
benrejebmoh Nov 3, 2025
d048b4c
Merge branch 'main' into separate-permission-scope
Meklo Nov 5, 2025
bc791d1
Merge branch 'main' into separate-permission-scope
Meklo Nov 6, 2025
6c14a02
update copyright year
benrejebmoh Nov 6, 2025
dffcc03
Merge remote-tracking branch 'origin/separate-permission-scope' into …
benrejebmoh Nov 6, 2025
7bf9aca
fix minor legacy code smell
benrejebmoh Nov 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions src/main/java/org/gridsuite/directory/server/DirectoryController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import org.gridsuite.directory.server.dto.*;
import org.gridsuite.directory.server.dto.elasticsearch.DirectoryElementInfos;
import org.gridsuite.directory.server.services.DirectoryRepositoryService;
import org.gridsuite.directory.server.services.PermissionService;
import org.gridsuite.directory.server.services.RoleService;
import org.springframework.data.domain.Page;
import org.springframework.http.HttpStatus;
Expand All @@ -40,14 +41,17 @@ public class DirectoryController {

private final DirectoryRepositoryService repositoryService;
private final RoleService roleService;
private final PermissionService permissionService;

public DirectoryController(
DirectoryService service,
DirectoryRepositoryService repositoryService,
RoleService roleService) {
RoleService roleService,
PermissionService permissionService) {
this.service = service;
this.repositoryService = repositoryService;
this.roleService = roleService;
this.permissionService = permissionService;
}

@PostMapping(value = "/root-directories", consumes = MediaType.APPLICATION_JSON_VALUE)
Expand Down Expand Up @@ -210,7 +214,7 @@ public ResponseEntity<Void> areElementsAccessible(@RequestParam("ids") List<UUID
if (roleService.isUserExploreAdmin()) {
return ResponseEntity.ok().build();
}
PermissionCheckResult result = service.checkDirectoriesPermission(userId, elementUuids, targetDirectoryUuid, permissionType, recursiveCheck);
PermissionCheckResult result = permissionService.checkDirectoriesPermission(userId, elementUuids, targetDirectoryUuid, permissionType, recursiveCheck);
if (result == PermissionCheckResult.ALLOWED) {
return ResponseEntity.ok().build();
} else {
Expand Down
Loading