From 981bc17a606bf8dd33253937631c9825b42716fa Mon Sep 17 00:00:00 2001 From: Maek Twain Date: Thu, 28 Nov 2019 08:03:17 +0530 Subject: [PATCH] Adding vnd.ms-excel MIME type support in BulkImportWorkbookServiceImpl (#650) --- .../service/BulkImportWorkbookServiceImpl.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/service/BulkImportWorkbookServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/service/BulkImportWorkbookServiceImpl.java index 40626ddde..a99dd9089 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/service/BulkImportWorkbookServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/service/BulkImportWorkbookServiceImpl.java @@ -98,9 +98,12 @@ public class BulkImportWorkbookServiceImpl implements BulkImportWorkbookService final String fileType = tika.detect(tikaInputStream); final String fileExtension = Files.getFileExtension(fileDetail.getFileName()).toLowerCase(); ImportFormatType format = ImportFormatType.of(fileExtension); - if (!fileType.contains("msoffice")) { - throw new GeneralPlatformDomainRuleException("error.msg.invalid.file.extension", - "Uploaded file extension is not recognized."); + if (!fileType.contains("msoffice") && !fileType.contains("application/vnd.ms-excel")) { + // We had a problem where we tried to upload the downloaded file from the import options, it was somehow changed the + // extension we use this fix. + throw new GeneralPlatformDomainRuleException("error.msg.invalid.file.extension", + "Uploaded file extension is not recognized."); + } Workbook workbook = new HSSFWorkbook(clonedInputStreamWorkbook); GlobalEntityType entityType=null;