@quatrain/storage-supabase 1.2.5 → 1.2.7

package/dist/SupabaseStorageAdapter.js

@@ -117,7 +117,7 @@ class SupabaseStorageAdapter extends storage_1.AbstractStorageAdapter {
                 const { error } = yield this._client
                     .from(file.bucket)
                     .upload(file.ref, new Blob([node_fs_1.default.readFileSync(stream)]), {
-                    upsert: true,
+                    upsert: storage_1.Storage.defaultUpsert,
                     contentType: file.contentType,
                 });
                 if (error !== null) {
@@ -134,7 +134,7 @@ class SupabaseStorageAdapter extends storage_1.AbstractStorageAdapter {
                     .from(file.bucket)
                     .upload(file.ref, content, {
                     //   cacheControl: '3600',
-                    upsert: false,
+                    upsert: storage_1.Storage.defaultUpsert,
                     contentType: file.contentType,
                 });
                 if (error !== null) {
@@ -204,9 +204,25 @@ class SupabaseStorageAdapter extends storage_1.AbstractStorageAdapter {
             // TODO: Le client Supabase JS ne supporte pas nativement l'override du ResponseCacheControl dans createSignedUrl.
             // La variable publicCacheDuration / cacheControl n'est donc pas gérée correctement ici pour le moment.
             // Voir si le SDK de Supabase permet de la supporter dans le futur.
+            let download = false;
+            if (action === 'download') {
+                download = true;
+            }
+            else if (extra.download !== undefined) {
+                download = extra.download;
+            }
+            else if (extra.responseDisposition && extra.responseDisposition.includes('attachment')) {
+                const match = extra.responseDisposition.match(/filename="([^"]+)"/);
+                if (match && match[1]) {
+                    download = match[1];
+                }
+                else {
+                    download = true;
+                }
+            }
             const { data, error } = yield this._client
                 .from(file.bucket)
-                .createSignedUrl(file.ref, expiresIn, { download: true });
+                .createSignedUrl(file.ref, expiresIn, { download });
             if (error !== null) {
                 throw new Error(`Unable to get signed url: ${error}`);
             }
@@ -306,7 +322,7 @@ class SupabaseStorageAdapter extends storage_1.AbstractStorageAdapter {
         return __awaiter(this, arguments, void 0, function* (file, _expiresIn = 7200) {
             const { data, error } = yield this._client
                 .from(file.bucket)
-                .createSignedUploadUrl(file.ref, { upsert: true });
+                .createSignedUploadUrl(file.ref, { upsert: storage_1.Storage.defaultUpsert });
             if (error !== null) {
                 throw new Error(`Unable to get signed upload url: ${error}`);
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quatrain/storage-supabase",
-  "version": "1.2.5",
+  "version": "1.2.7",
   "description": "Storage adapter for Supabase Storage",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -31,10 +31,10 @@
     "typescript": "^5.1.5"
   },
   "dependencies": {
-    "@quatrain/core": "^1.2.6",
-    "@quatrain/storage": "^1.2.6",
+    "@quatrain/core": "^1.2.16",
+    "@quatrain/storage": "^1.2.12",
     "@supabase/storage-js": "^2.7.2",
-    "@supabase/supabase-js": "^2.87.3"
+    "@supabase/supabase-js": "^2.108.2"
   },
   "scripts": {
     "test-ci": "jest --runInBand",

package/src/SupabaseStorageAdapter.ts

@@ -120,7 +120,7 @@ export class SupabaseStorageAdapter extends AbstractStorageAdapter {
          const { error } = await this._client
             .from(file.bucket)
             .upload(file.ref, new Blob([fs.readFileSync(stream)]), {
-               upsert: true,
+               upsert: Storage.defaultUpsert,
                contentType: file.contentType,
             })
          if (error !== null) {
@@ -136,7 +136,7 @@ export class SupabaseStorageAdapter extends AbstractStorageAdapter {
             .from(file.bucket)
             .upload(file.ref, content, {
                //   cacheControl: '3600',
-               upsert: false,
+               upsert: Storage.defaultUpsert,
                contentType: file.contentType,
             })
          if (error !== null) {
@@ -214,9 +214,23 @@ export class SupabaseStorageAdapter extends AbstractStorageAdapter {
       // La variable publicCacheDuration / cacheControl n'est donc pas gérée correctement ici pour le moment.
       // Voir si le SDK de Supabase permet de la supporter dans le futur.
       
+      let download: boolean | string = false
+      if (action === 'download') {
+         download = true
+      } else if (extra.download !== undefined) {
+         download = extra.download
+      } else if (extra.responseDisposition && extra.responseDisposition.includes('attachment')) {
+         const match = extra.responseDisposition.match(/filename="([^"]+)"/)
+         if (match && match[1]) {
+            download = match[1]
+         } else {
+            download = true
+         }
+      }
+
       const { data, error } = await this._client
          .from(file.bucket)
-         .createSignedUrl(file.ref, expiresIn, { download: true })
+         .createSignedUrl(file.ref, expiresIn, { download })
 
       if (error !== null) {
          throw new Error(`Unable to get signed url: ${error}`)
@@ -330,7 +344,7 @@ export class SupabaseStorageAdapter extends AbstractStorageAdapter {
    ): Promise<FileResponseLinkType> {
       const { data, error } = await this._client
          .from(file.bucket)
-         .createSignedUploadUrl(file.ref, { upsert: true })
+         .createSignedUploadUrl(file.ref, { upsert: Storage.defaultUpsert })
 
       if (error !== null) {
          throw new Error(`Unable to get signed upload url: ${error}`)