diff --git a/docs-web/src/main/java/com/sismics/docs/rest/resource/FileResource.java b/docs-web/src/main/java/com/sismics/docs/rest/resource/FileResource.java index 43e08aff..81ee815e 100644 --- a/docs-web/src/main/java/com/sismics/docs/rest/resource/FileResource.java +++ b/docs-web/src/main/java/com/sismics/docs/rest/resource/FileResource.java @@ -336,6 +336,7 @@ public class FileResource extends BaseResource { if (!storedfile.exists()) { storedfile = new java.io.File(getClass().getResource("/image/file.png").getFile()); mimeType = MimeType.IMAGE_PNG; + decrypt = false; } } else { storedfile = Paths.get(DirectoryUtil.getStorageDirectory().getPath(), fileId).toFile(); diff --git a/docs-web/src/test/java/com/sismics/docs/rest/TestDocumentResource.java b/docs-web/src/test/java/com/sismics/docs/rest/TestDocumentResource.java index 003f4b80..a4747a28 100644 --- a/docs-web/src/test/java/com/sismics/docs/rest/TestDocumentResource.java +++ b/docs-web/src/test/java/com/sismics/docs/rest/TestDocumentResource.java @@ -18,6 +18,8 @@ import org.junit.Test; import com.google.common.io.ByteStreams; import com.sismics.docs.core.util.DirectoryUtil; import com.sismics.docs.rest.filter.CookieAuthenticationFilter; +import com.sismics.util.mime.MimeType; +import com.sismics.util.mime.MimeTypeUtil; import com.sun.jersey.api.client.ClientResponse; import com.sun.jersey.api.client.ClientResponse.Status; import com.sun.jersey.api.client.WebResource; @@ -296,6 +298,7 @@ public class TestDocumentResource extends BaseJerseyTest { Assert.assertEquals(Status.OK, Status.fromStatusCode(response.getStatus())); InputStream is = response.getEntityInputStream(); byte[] fileBytes = ByteStreams.toByteArray(is); + Assert.assertEquals(MimeType.IMAGE_JPEG, MimeTypeUtil.guessMimeType(fileBytes)); Assert.assertEquals(33691, fileBytes.length); } } \ No newline at end of file