Only add tus_id filter if TUS_ENABLED is true (directus#22929)

sanhup · Jul 4, 2024 · 3e3d287 · 3e3d287
1 parent 48cb2c1
commit 3e3d287
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 9 deletions.
diff --git a/.changeset/eight-clocks-attack.md b/.changeset/eight-clocks-attack.md
@@ -0,0 +1,5 @@
+---
+'@directus/api': patch
+---
+
+Fixed reliance on `tus_id` field when reading files, even if TUS is not enabled
diff --git a/api/src/services/files.ts b/api/src/services/files.ts
@@ -12,6 +12,7 @@ import { PassThrough as PassThroughStream, Transform as TransformStream } from '
 import zlib from 'node:zlib';
 import path from 'path';
 import url from 'url';
+import { RESUMABLE_UPLOADS } from '../constants.js';
 import emitter from '../emitter.js';
 import { useLogger } from '../logger.js';
 import { getAxios } from '../request/index.js';
@@ -274,16 +275,19 @@ export class FilesService extends ItemsService<File> {
 
  override async readByQuery(query: Query, opts?: QueryOptions | undefined) {
  const filteredQuery = cloneDeep(query);
- const filterPartialUploads = { tus_id: { _null: true } };
 
- if (!filteredQuery.filter) {
- filteredQuery.filter = filterPartialUploads;
- } else if ('_and' in filteredQuery.filter && Array.isArray(filteredQuery.filter['_and'])) {
- filteredQuery.filter['_and'].push(filterPartialUploads);
- } else {
- filteredQuery.filter = {
- _and: [filteredQuery.filter, filterPartialUploads],
- };
+ if (RESUMABLE_UPLOADS.ENABLED === true) {
+ const filterPartialUploads = { tus_id: { _null: true } };
+
+ if (!filteredQuery.filter) {
+ filteredQuery.filter = filterPartialUploads;
+ } else if ('_and' in filteredQuery.filter && Array.isArray(filteredQuery.filter['_and'])) {
+ filteredQuery.filter['_and'].push(filterPartialUploads);
+ } else {
+ filteredQuery.filter = {
+ _and: [filteredQuery.filter, filterPartialUploads],
+ };
+ }
  }
 
  return super.readByQuery(filteredQuery, opts);