Use capabilities for create-with-upload option

owncloud · Jun 13, 2022 · ed90177 · ed90177
1 parent f523943
commit ed90177
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/packages/web-pkg/src/composables/capability/useCapability.ts b/packages/web-pkg/src/composables/capability/useCapability.ts
@@ -43,3 +43,7 @@ export const useCapabilityFilesTusSupportMaxChunkSize = createCapabilityComposab
   'files.tus_support.max_chunk_size',
   0
 )
+export const useCapabilityFilesTusExtension = createCapabilityComposable<string>(
+  'files.tus_support.extension',
+  ''
+)
diff --git a/packages/web-runtime/src/composables/upload/useUpload.ts b/packages/web-runtime/src/composables/upload/useUpload.ts
@@ -1,5 +1,6 @@
 import { ClientService } from 'web-pkg/src/services'
 import {
+  useCapabilityFilesTusExtension,
   useCapabilityFilesTusSupportHttpMethodOverride,
   useCapabilityFilesTusSupportMaxChunkSize,
   useClientService,
@@ -53,6 +54,7 @@ export function useUpload(options: UploadOptions): UploadResult {
 
   const tusHttpMethodOverride = useCapabilityFilesTusSupportHttpMethodOverride()
   const tusMaxChunkSize = useCapabilityFilesTusSupportMaxChunkSize()
+  const tusExtension = useCapabilityFilesTusExtension()
   const uploadChunkSize = computed((): number => store.getters.configuration.uploadChunkSize)
 
   const headers = computed((): { [key: string]: string } => {
@@ -78,6 +80,7 @@ export function useUpload(options: UploadOptions): UploadResult {
         tusMaxChunkSize: unref(tusMaxChunkSize),
         uploadChunkSize: unref(uploadChunkSize),
         tusHttpMethodOverride: unref(tusHttpMethodOverride),
+        tusExtension: unref(tusExtension),
         headers: unref(headers)
       }
     }

diff --git a/packages/web-runtime/src/services/uppyService.ts b/packages/web-runtime/src/services/uppyService.ts
@@ -34,25 +34,29 @@ export class UppyService {
     tusMaxChunkSize,
     uploadChunkSize,
     tusHttpMethodOverride,
+    tusExtension,
     headers
   }: {
     tusMaxChunkSize: number
     uploadChunkSize: number
     tusHttpMethodOverride: boolean
+    tusExtension: string
     headers: { [key: string]: string }
   }) {
     const chunkSize =
       tusMaxChunkSize > 0 && uploadChunkSize !== Infinity
         ? Math.max(tusMaxChunkSize, uploadChunkSize)
         : uploadChunkSize
 
+    const uploadDataDuringCreation = tusExtension.includes('creation-with-upload')
+
     const tusPluginOptions = {
       headers: headers,
       chunkSize: chunkSize,
       removeFingerprintOnSuccess: true,
       overridePatchMethod: !!tusHttpMethodOverride,
       retryDelays: [0, 500, 1000],
-      uploadDataDuringCreation: true
+      uploadDataDuringCreation
     }
 
     const xhrPlugin = this.uppy.getPlugin('XHRUpload')