-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
MDEXP-786 - Export Holdings and Items with Custom Export Profile from…
… Central Tenant - Permissions handling (#506) * MDEXP-786 Squashed
- Loading branch information
1 parent
75f39a0
commit cb30ad7
Showing
20 changed files
with
468 additions
and
14 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
15 changes: 15 additions & 0 deletions
15
src/main/java/org/folio/dataexp/client/PermissionsSelfCheckClient.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| package org.folio.dataexp.client; | ||
|
|
||
| import org.folio.spring.config.FeignClientConfiguration; | ||
| import org.springframework.cloud.openfeign.FeignClient; | ||
| import org.springframework.http.MediaType; | ||
| import org.springframework.web.bind.annotation.GetMapping; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| @FeignClient(name = "data-export", configuration = FeignClientConfiguration.class) | ||
| public interface PermissionsSelfCheckClient { | ||
|
|
||
| @GetMapping(value = "/permissions-self-check", produces = MediaType.APPLICATION_JSON_VALUE) | ||
| List<String> getUserPermissionsForSelfCheck(); | ||
| } |
15 changes: 15 additions & 0 deletions
15
src/main/java/org/folio/dataexp/client/UserPermissionsClient.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| package org.folio.dataexp.client; | ||
|
|
||
| import org.folio.dataexp.domain.dto.UserPermissions; | ||
| import org.folio.spring.config.FeignClientConfiguration; | ||
| import org.springframework.cloud.openfeign.FeignClient; | ||
| import org.springframework.http.MediaType; | ||
| import org.springframework.web.bind.annotation.GetMapping; | ||
| import org.springframework.web.bind.annotation.PathVariable; | ||
|
|
||
| @FeignClient(name = "perms/users", configuration = FeignClientConfiguration.class) | ||
| public interface UserPermissionsClient { | ||
|
|
||
| @GetMapping(value = "/{userId}/permissions?expanded=true&indexField=userId", produces = MediaType.APPLICATION_JSON_VALUE) | ||
| UserPermissions getPermissions(@PathVariable String userId); | ||
| } |
27 changes: 27 additions & 0 deletions
27
src/main/java/org/folio/dataexp/controllers/PermissionsSelfCheckController.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| package org.folio.dataexp.controllers; | ||
|
|
||
| import lombok.RequiredArgsConstructor; | ||
| import lombok.extern.log4j.Log4j2; | ||
| import org.folio.dataexp.client.UserPermissionsClient; | ||
| import org.folio.spring.FolioExecutionContext; | ||
| import org.springframework.http.HttpStatus; | ||
| import org.springframework.http.ResponseEntity; | ||
| import org.springframework.web.bind.annotation.RequestMapping; | ||
| import org.springframework.web.bind.annotation.RestController; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| @RestController | ||
| @RequestMapping("/data-export") | ||
| @RequiredArgsConstructor | ||
| @Log4j2 | ||
| public class PermissionsSelfCheckController implements org.folio.dataexp.rest.resource.PermissionsSelfCheckApi { | ||
| private final FolioExecutionContext folioExecutionContext; | ||
| private final UserPermissionsClient userPermissionsClient; | ||
|
|
||
| @Override | ||
| public ResponseEntity<List<String>> getUsersPermissions() { | ||
| var permissions = userPermissionsClient.getPermissions(folioExecutionContext.getUserId().toString()); | ||
| return new ResponseEntity<>(permissions.getPermissionNames(), HttpStatus.OK); | ||
| } | ||
| } |
22 changes: 22 additions & 0 deletions
22
src/main/java/org/folio/dataexp/domain/dto/UserPermissions.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| package org.folio.dataexp.domain.dto; | ||
|
|
||
| import com.fasterxml.jackson.annotation.JsonProperty; | ||
| import lombok.AllArgsConstructor; | ||
| import lombok.Builder; | ||
| import lombok.Data; | ||
| import lombok.NoArgsConstructor; | ||
| import lombok.With; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
|
|
||
| @Data | ||
| @With | ||
| @Builder(toBuilder = true) | ||
| @NoArgsConstructor | ||
| @AllArgsConstructor | ||
| public class UserPermissions { | ||
|
|
||
| @JsonProperty("permissionNames") | ||
| private List<String> permissionNames = new ArrayList<>(); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
29 changes: 29 additions & 0 deletions
29
src/main/java/org/folio/dataexp/service/permissions/PermissionsProvider.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| package org.folio.dataexp.service.permissions; | ||
|
|
||
| import lombok.RequiredArgsConstructor; | ||
| import org.folio.dataexp.client.PermissionsSelfCheckClient; | ||
| import org.folio.spring.FolioExecutionContext; | ||
| import org.folio.spring.FolioModuleMetadata; | ||
| import org.folio.spring.scope.FolioExecutionContextSetter; | ||
| import org.springframework.cache.annotation.Cacheable; | ||
| import org.springframework.stereotype.Component; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| import static org.folio.dataexp.util.FolioExecutionContextUtil.prepareContextForTenant; | ||
|
|
||
| @Component | ||
| @RequiredArgsConstructor | ||
| public class PermissionsProvider { | ||
|
|
||
| private final PermissionsSelfCheckClient permissionsSelfCheckClient; | ||
| private final FolioExecutionContext folioExecutionContext; | ||
| private final FolioModuleMetadata folioModuleMetadata; | ||
|
|
||
| @Cacheable(cacheNames = "userPermissions") | ||
| public List<String> getUserPermissions(String tenantId, String userId) { | ||
| try (var ignored = new FolioExecutionContextSetter(prepareContextForTenant(tenantId, folioModuleMetadata, folioExecutionContext))) { | ||
| return permissionsSelfCheckClient.getUserPermissionsForSelfCheck(); | ||
| } | ||
| } | ||
| } |
13 changes: 13 additions & 0 deletions
13
src/main/java/org/folio/dataexp/service/permissions/RequiredPermissionResolver.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| package org.folio.dataexp.service.permissions; | ||
|
|
||
| import static org.folio.dataexp.util.Constants.INVENTORY_VIEW_PERMISSION; | ||
|
|
||
| import org.springframework.stereotype.Component; | ||
|
|
||
| @Component | ||
| public class RequiredPermissionResolver { | ||
|
|
||
| public String getReadPermission() { | ||
| return INVENTORY_VIEW_PERMISSION; | ||
| } | ||
| } |
31 changes: 31 additions & 0 deletions
31
src/main/java/org/folio/dataexp/service/validators/PermissionsValidator.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| package org.folio.dataexp.service.validators; | ||
|
|
||
| import lombok.RequiredArgsConstructor; | ||
| import lombok.extern.log4j.Log4j2; | ||
| import org.folio.dataexp.service.permissions.PermissionsProvider; | ||
| import org.folio.dataexp.service.permissions.RequiredPermissionResolver; | ||
| import org.folio.spring.FolioExecutionContext; | ||
| import org.springframework.stereotype.Component; | ||
|
|
||
| @Component | ||
| @RequiredArgsConstructor | ||
| @Log4j2 | ||
| public class PermissionsValidator { | ||
|
|
||
| private final PermissionsProvider permissionsProvider; | ||
| private final RequiredPermissionResolver requiredPermissionResolver; | ||
| private final FolioExecutionContext folioExecutionContext; | ||
|
|
||
| public boolean checkInstanceViewPermissions(String tenantId) { | ||
| return isInstanceViewPermissionExists(tenantId); | ||
| } | ||
|
|
||
| public boolean isInstanceViewPermissionExists(String tenantId) { | ||
| var readPermissionForEntity = requiredPermissionResolver.getReadPermission(); | ||
| var userPermissions = permissionsProvider.getUserPermissions(tenantId, folioExecutionContext.getUserId().toString()); | ||
| var isViewPermissionsExist = userPermissions.contains(readPermissionForEntity); | ||
| log.info("isInstanceViewPermissionExists:: user {} has read permissions {} in tenant {}", folioExecutionContext.getUserId(), | ||
| isViewPermissionsExist, tenantId); | ||
| return isViewPermissionsExist; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.