Merge branch 'RED-7140-B' into 'master'

RED-7140: make tenantId available in CompletableFeature.supplyAsync

Closes RED-7140

See merge request redactmanager/persistence-service!56
This commit is contained in:
Ali Oezyetimoglu 2023-07-25 09:58:57 +02:00
commit c3d0a9c2ed

View File

@ -200,8 +200,11 @@ public class DownloadController implements DownloadResource {
public CompletableFuture<ResponseEntity<InputStreamResource>> downloadFile(@RequestParam(STORAGE_ID) String storageId,
@RequestParam(value = "inline", required = false, defaultValue = FALSE) boolean inline) {
var userId = KeycloakSecurity.getUserId();
var tenantId = TenantContext.getTenantId();
return CompletableFuture.supplyAsync(() -> {
TenantContext.setTenantId(tenantId);
var downloadStatus = getDownloadStatus(storageId, userId);
var fileDownloadStream = getFileForDownload(storageId, userId);