vmario/docs
1
0
Fork 0
mirror of https://github.com/sismics/docs.git synced 2024-11-16 11:17:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix zip export

Browse Source
This commit is contained in:
Benjamin Gamard 2018-03-09 17:28:08 +01:00
parent de703531f6
commit f167e8ea0a
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs-web/src/main/java/com/sismics/docs/rest/resource/FileResource.java
View File

@ -584,7 +584,7 @@ public class FileResource extends BaseResource {
// Files are encrypted by the creator of them // Files are encrypted by the creator of them
User user = userDao.getById(file.getUserId()); User user = userDao.getById(file.getUserId());
try (InputStream decryptedStream = EncryptionUtil.decryptInputStream(fileInputStream, user.getPrivateKey())) { try (InputStream decryptedStream = EncryptionUtil.decryptInputStream(fileInputStream, user.getPrivateKey())) {
ZipEntry zipEntry = new ZipEntry(file.getFullName(Integer.toString(index))); ZipEntry zipEntry = new ZipEntry(index + "-" + file.getFullName(Integer.toString(index)));
zipOutputStream.putNextEntry(zipEntry); zipOutputStream.putNextEntry(zipEntry);
ByteStreams.copy(decryptedStream, zipOutputStream); ByteStreams.copy(decryptedStream, zipOutputStream);
zipOutputStream.closeEntry(); zipOutputStream.closeEntry();

1
docs-web/src/test/java/com/sismics/docs/rest/TestFileResource.java
View File

@ -161,6 +161,7 @@ public class TestFileResource extends BaseJerseyTest {
.request() .request()
.cookie(TokenBasedSecurityFilter.COOKIE_NAME, file1Token) .cookie(TokenBasedSecurityFilter.COOKIE_NAME, file1Token)
.get(); .get();
Assert.assertEquals(Status.OK, Status.fromStatusCode(response.getStatus()));
is = (InputStream) response.getEntity(); is = (InputStream) response.getEntity();
fileBytes = ByteStreams.toByteArray(is); fileBytes = ByteStreams.toByteArray(is);
Assert.assertEquals(MimeType.APPLICATION_ZIP, MimeTypeUtil.guessMimeType(fileBytes, null)); Assert.assertEquals(MimeType.APPLICATION_ZIP, MimeTypeUtil.guessMimeType(fileBytes, null));