bug/vas-11487: fix download bug

ProgrammeVitam · Jun 15, 2023 · f1c62b7 · f1c62b7
1 parent dbda331
commit f1c62b7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 12 deletions.
diff --git a/...e-search/src/main/java/fr/gouv/vitamui/archives/search/rest/ArchivesSearchController.java b/...e-search/src/main/java/fr/gouv/vitamui/archives/search/rest/ArchivesSearchController.java
@@ -179,16 +179,15 @@ public ResponseEntity<ResultsDto> findObjectById(final @PathVariable("id") Strin
     public ResponseEntity<Resource> downloadObjectFromUnit(final @PathVariable("id") String id,
                                                            @QueryParam("qualifier") String qualifier,
                                                            @QueryParam("version") Integer version,
-                                                           @QueryParam("tenantId") Integer tenantId,
-                                                           @QueryParam("contractId") String contractId) throws PreconditionFailedException,
+                                                           @QueryParam("tenantId") Integer tenantId) throws PreconditionFailedException,
         InvalidParseOperationException {
-        ParameterChecker.checkParameter("The Identifier, The contractId and The tenantId are mandatory parameters: ",
-            id, contractId, String.valueOf(tenantId));
-        SanityChecker.checkSecureParameter(id, contractId, String.valueOf(tenantId));
+        ParameterChecker.checkParameter("The Identifier and The tenantId are mandatory parameters: ",
+            id, String.valueOf(tenantId));
+        SanityChecker.checkSecureParameter(id, String.valueOf(tenantId));
         LOGGER.debug("Download the Archive Unit Object with ID {}", id);
         ObjectData objectData = new ObjectData();
         ResponseEntity<Resource> responseResource = archivesSearchService.downloadObjectFromUnit(id, qualifier, version,
-            objectData, buildUiHttpContext(tenantId, contractId)).block();
+            objectData, buildUiHttpContext(tenantId)).block();
         List<String> headersValuesContentDispo = responseResource.getHeaders().get(CONTENT_DISPOSITION);
         LOGGER.info("Content-Disposition value is {} ", headersValuesContentDispo);
         String fileNameHeader = isNotEmpty(objectData.getFilename())

diff --git a/ui/ui-collect/src/main/java/fr/gouv/vitamui/collect/rest/ProjectObjectGroupController.java b/ui/ui-collect/src/main/java/fr/gouv/vitamui/collect/rest/ProjectObjectGroupController.java
@@ -85,16 +85,15 @@ public ResponseEntity<Resource> downloadObjectFromUnit(
         @QueryParam("objectId") String objectId,
         @QueryParam("tenantId") Integer tenantId,
         @QueryParam("qualifier") String qualifier,
-        @QueryParam("version") Integer version,
-        @QueryParam("contractId") String contractId) throws PreconditionFailedException,
+        @QueryParam("version") Integer version) throws PreconditionFailedException,
         InvalidParseOperationException {
-        ParameterChecker.checkParameter("The Identifier, The contractId and The tenantId are mandatory parameters: ",
-            unitId, objectId, contractId, String.valueOf(tenantId));
-        SanityChecker.checkSecureParameter(unitId, contractId, objectId);
+        ParameterChecker.checkParameter("The Identifier, and The tenantId are mandatory parameters: ",
+            unitId, objectId, String.valueOf(tenantId));
+        SanityChecker.checkSecureParameter(unitId, objectId);
         LOGGER.debug("Download the Archive Unit Object with Unit ID {}", unitId);
         final ObjectData objectData = new ObjectData();
         ResponseEntity<Resource> responseResource = projectObjectGroupService.downloadObjectFromUnit(unitId, objectId,
-            qualifier, version, objectData, buildUiHttpContext(tenantId, contractId)).block();
+            qualifier, version, objectData, buildUiHttpContext(tenantId)).block();
         List<String> headersValuesContentDispo = responseResource.getHeaders().get(CONTENT_DISPOSITION);
         LOGGER.info("Content-Disposition value is {} ", headersValuesContentDispo);
         String fileNameHeader = isNotEmpty(objectData.getFilename())