Merge pull request #436 from oneblink/ON-43615

ON-43615 # Setting of `contentType` to use detection when content typ…

CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+### Changed
+
+- Setting of `contentType` to use detection when content type is not provided
+
 ## [16.0.0] - 2024-09-25
 
 ### Added

package.json

@@ -14,6 +14,7 @@
     "@sentry/tracing": "^7.77.0",
     "date-fns": "^2.30.0",
     "file-saver": "^2.0.5",
+    "file-type-checker": "^1.1.2",
     "jwt-decode": "^4.0.0",
     "localforage": "^1.10.0",
     "lodash.clonedeep": "^4.5.0",

src/approvals-service.ts

@@ -17,7 +17,9 @@ export type FormSubmissionApprovalsResponse = {
     formSubmissionApproval: ApprovalTypes.FormSubmissionApproval
     formApprovalFlowInstance: ApprovalTypes.FormApprovalFlowInstance
     formSubmissionMeta: SubmissionTypes.FormSubmissionMeta
-    latestSuccessfulFormSubmissionPayment: SubmissionTypes.FormSubmissionPayment | undefined
+    latestSuccessfulFormSubmissionPayment:
+      | SubmissionTypes.FormSubmissionPayment
+      | undefined
   }>
 }
 

src/services/uploadAttachment.ts

@@ -1,6 +1,7 @@
 import { SubmissionTypes } from '@oneblink/types'
 import { ProgressListener } from '../types/submissions'
 import generateOneBlinkUploader from './generateOneBlinkUploader'
+import fileTypeChecker from 'file-type-checker'
 
 export type UploadAttachmentConfiguration = {
   fileName: string
@@ -64,8 +65,15 @@ export default async function uploadAttachment(
   abortSignal?: AbortSignal,
 ): Promise<SubmissionTypes.FormSubmissionAttachment> {
   const oneblinkUploader = generateOneBlinkUploader()
-  // S3 defaults unknown file types to the following, do the same here for our submission model
-  const _contentType = contentType || 'application/octet-stream'
+
+  let _contentType = contentType || 'application/octet-stream' // S3 default for unknown content type
+  if (!contentType) {
+    const buffer = await data.arrayBuffer()
+    const detectedType = fileTypeChecker.detectFile(buffer)
+    if (detectedType) {
+      _contentType = detectedType.mimeType
+    }
+  }
   const result = await oneblinkUploader.uploadAttachment({
     formId,
     fileName,