@adminforth/upload 2.15.0 → 2.15.2

package/dist/index.js

@@ -40,7 +40,13 @@ export default class UploadPlugin extends AdminForthPlugin {
                 const pkName = (_a = this.resourceConfig.columns.find((column) => column.primaryKey)) === null || _a === void 0 ? void 0 : _a.name;
                 record = yield this.adminforth.resource(this.resourceConfig.resourceId).get([Filters.EQ(pkName, recordPk)]);
             }
-            const filePath = this.options.filePath({ originalFilename, originalExtension, contentType, record });
+            const sanitizeFileName = (name) => {
+                return name
+                    .normalize("NFKD")
+                    .replace(/[^a-zA-Z0-9._-]/g, "_");
+            };
+            const fileName = sanitizeFileName(originalFilename);
+            const filePath = this.options.filePath({ originalFilename: fileName, originalExtension, contentType, record });
             if (filePath.startsWith('/')) {
                 throw new Error('s3Path should not start with /, please adjust s3path function to not return / at the start of the path');
             }
@@ -136,9 +142,17 @@ export default class UploadPlugin extends AdminForthPlugin {
     ;
     isInternalUrl(url) {
         return __awaiter(this, void 0, void 0, function* () {
+            var _a;
             const adapter = this.options.storageAdapter;
             if (adapter && typeof adapter.isInternalUrl === 'function') {
                 try {
+                    if ((_a = this.options.preview) === null || _a === void 0 ? void 0 : _a.previewUrl) {
+                        const previewUrl = this.options.preview.previewUrl({ filePath: 'test_filepath' });
+                        if (url.startsWith(previewUrl.replace('test_filepath', ''))) {
+                            return true;
+                        }
+                        return false;
+                    }
                     return yield adapter.isInternalUrl(url);
                 }
                 catch (err) {

package/index.ts

@@ -60,7 +60,13 @@ export default class UploadPlugin extends AdminForthPlugin {
           )
         }
 
-        const filePath: string = this.options.filePath({ originalFilename, originalExtension, contentType, record });
+        const sanitizeFileName = (name) => {
+          return name
+            .normalize("NFKD")                
+            .replace(/[^a-zA-Z0-9._-]/g, "_")
+        }        
+        const fileName = sanitizeFileName(originalFilename);  
+        const filePath: string = this.options.filePath({ originalFilename: fileName, originalExtension, contentType, record });
         if (filePath.startsWith('/')) {
           throw new Error('s3Path should not start with /, please adjust s3path function to not return / at the start of the path');
         }
@@ -164,9 +170,15 @@ export default class UploadPlugin extends AdminForthPlugin {
 
   async isInternalUrl(url: string): Promise<boolean> {
     const adapter = this.options.storageAdapter as any;
-
     if (adapter && typeof adapter.isInternalUrl === 'function') {
       try {
+        if(this.options.preview?.previewUrl) {
+          const previewUrl = this.options.preview.previewUrl({ filePath: 'test_filepath' });
+          if (url.startsWith(previewUrl.replace('test_filepath', ''))) {
+            return true;
+          }
+          return false;
+        }
         return await adapter.isInternalUrl(url);
       } catch (err) {
         console.error(`[UploadPlugin] Error calling isInternalUrl on adapter:`, err);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adminforth/upload",
-  "version": "2.15.0",
+  "version": "2.15.2",
   "description": "Plugin for uploading files for adminforth",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",