@directus/api 28.0.1 → 28.0.3

package/dist/flows.js

@@ -206,7 +206,7 @@ class FlowManager {
                         logger.warn(`Specified collection must be one of: ${enabledCollections.join(', ')}.`);
                         throw new ForbiddenError();
                     }
-                    if (!targetKeys || !Array.isArray(targetKeys)) {
+                    if (requireSelection && (!targetKeys || !Array.isArray(targetKeys))) {
                         logger.warn(`Manual trigger requires "keys" to be specified in the payload`);
                         throw new ForbiddenError();
                     }
@@ -233,15 +233,17 @@ class FlowManager {
                             logger.warn(`Triggering ${targetCollection} is not allowed`);
                             throw new ForbiddenError();
                         }
-                        const service = getService(targetCollection, { schema, accountability, knex: database });
-                        const primaryField = schema.collections[targetCollection].primary;
-                        let keys = await service.readMany(targetKeys, { fields: [primaryField] }, {
-                            emitEvents: false,
-                        });
-                        keys = keys.map((key) => key[primaryField]);
-                        if (targetKeys.some((key) => !keys.includes(key))) {
-                            logger.warn(`Triggering keys ${targetKeys} is not allowed`);
-                            throw new ForbiddenError();
+                        if (Array.isArray(targetKeys) && targetKeys.length > 0) {
+                            const service = getService(targetCollection, { schema, accountability, knex: database });
+                            const primaryField = schema.collections[targetCollection].primary;
+                            const keys = await service.readMany(targetKeys, { fields: [primaryField] }, {
+                                emitEvents: false,
+                            });
+                            const allowedKeys = keys.map((key) => String(key[primaryField]));
+                            if (targetKeys.some((key) => !allowedKeys.includes(String(key)))) {
+                                logger.warn(`Triggering keys ${targetKeys} is not allowed`);
+                                throw new ForbiddenError();
+                            }
                         }
                     }
                     if (flow.options['async']) {

package/dist/services/files.js

@@ -56,14 +56,15 @@ export class FilesService extends ItemsService {
             primaryKey = await this.createOne(payload, { emitEvents: false });
         }
         const fileExtension = path.extname(payload.filename_download) || (payload.type && '.' + extension(payload.type)) || '';
+        const filenameDisk = primaryKey + (fileExtension || '');
         // The filename_disk is the FINAL filename on disk
-        payload.filename_disk ||= primaryKey + (fileExtension || '');
+        payload.filename_disk ||= filenameDisk;
         // If the filename_disk extension doesn't match the new mimetype, update it
         if (isReplacement === true && path.extname(payload.filename_disk) !== fileExtension) {
-            payload.filename_disk = primaryKey + (fileExtension || '');
+            payload.filename_disk = filenameDisk;
         }
         // Temp filename is used for replacements
-        const tempFilenameDisk = 'temp_' + payload.filename_disk;
+        const tempFilenameDisk = 'temp_' + filenameDisk;
         if (!payload.type) {
             payload.type = 'application/octet-stream';
         }
@@ -119,13 +120,19 @@ export class FilesService extends ItemsService {
         }
         // If the file is a replacement, we need to update the DB record with the new payload, delete the old files, and upgrade the temp file
         if (isReplacement === true) {
-            await this.updateOne(primaryKey, payload, { emitEvents: false });
-            // delete the previously saved file and thumbnails to ensure they're generated fresh
-            for await (const filepath of disk.list(String(primaryKey))) {
-                await disk.delete(filepath);
+            try {
+                await this.updateOne(primaryKey, payload, { emitEvents: false });
+                // delete the previously saved file and thumbnails to ensure they're generated fresh
+                for await (const filepath of disk.list(String(primaryKey))) {
+                    await disk.delete(filepath);
+                }
+                // Upgrade the temp file to the final filename
+                await disk.move(tempFilenameDisk, payload.filename_disk);
+            }
+            catch (err) {
+                await cleanUp();
+                throw err;
             }
-            // Upgrade the temp file to the final filename
-            await disk.move(tempFilenameDisk, payload.filename_disk);
         }
         const { size } = await storage.location(data.storage).stat(payload.filename_disk);
         payload.filesize = size;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@directus/api",
-  "version": "28.0.1",
+  "version": "28.0.3",
   "description": "Directus is a real-time API and App dashboard for managing SQL database content",
   "keywords": [
     "directus",
@@ -152,15 +152,15 @@
     "ws": "8.18.1",
     "zod": "3.24.2",
     "zod-validation-error": "3.4.0",
-    "@directus/app": "13.11.1",
+    "@directus/app": "13.11.3",
     "@directus/env": "5.1.0",
     "@directus/constants": "13.0.1",
     "@directus/errors": "2.0.2",
     "@directus/extensions": "3.0.7",
     "@directus/extensions-registry": "3.0.7",
+    "@directus/format-title": "12.0.1",
     "@directus/extensions-sdk": "14.0.0",
     "@directus/memory": "3.0.6",
-    "@directus/format-title": "12.0.1",
     "@directus/pressure": "3.0.6",
     "@directus/schema": "13.0.1",
     "@directus/schema-builder": "0.0.3",
@@ -169,13 +169,13 @@
     "@directus/storage-driver-azure": "12.0.6",
     "@directus/storage-driver-cloudinary": "12.0.6",
     "@directus/storage-driver-gcs": "12.0.6",
-    "@directus/storage-driver-s3": "12.0.6",
     "@directus/storage-driver-local": "12.0.0",
-    "@directus/utils": "13.0.7",
-    "@directus/system-data": "3.1.1",
     "@directus/storage-driver-supabase": "3.0.6",
-    "@directus/validation": "2.0.6",
-    "directus": "11.9.1"
+    "@directus/system-data": "3.1.1",
+    "@directus/utils": "13.0.7",
+    "@directus/storage-driver-s3": "12.0.6",
+    "directus": "11.9.3",
+    "@directus/validation": "2.0.6"
   },
   "devDependencies": {
     "@directus/tsconfig": "3.0.0",