@directus/api 20.0.0 → 20.1.0

package/dist/cli/commands/bootstrap/index.js

@@ -72,5 +72,6 @@ async function createDefaultAdmin(schema) {
         adminPassword = nanoid(12);
         logger.info(`No admin password provided. Defaulting to "${adminPassword}"`);
     }
-    await usersService.createOne({ email: adminEmail, password: adminPassword, role, ...defaultAdminUser });
+    const token = env['ADMIN_TOKEN'] ?? null;
+    await usersService.createOne({ email: adminEmail, password: adminPassword, token, role, ...defaultAdminUser });
 }

package/dist/database/run-ast.js

@@ -210,10 +210,18 @@ async function getDBQuery(schema, knex, table, fieldNodes, query) {
                 }
                 innerQuerySortRecords.push({ alias: sortAlias, order: sortRecord.order });
             });
-            dbQuery.orderByRaw(orderByString, orderByFields);
             if (hasMultiRelationalSort) {
                 dbQuery = helpers.schema.applyMultiRelationalSort(knex, dbQuery, table, primaryKey, orderByString, orderByFields);
+                // Start order by with directus_row_number. The directus_row_number is derived from a window function that
+                // is ordered by the sort fields within every primary key partition. That ensures that the result with the
+                // row number = 1 is the top-most row of every partition, according to the selected sort fields.
+                // Since the only relevant result is the first row of this partition, adding the directus_row_number to the
+                // order by here ensures that all rows with a directus_row_number = 1 show up first in the inner query result,
+                // and are correctly truncated by the limit, but not earlier.
+                orderByString = `?? asc, ${orderByString}`;
+                orderByFields.unshift(knex.ref('directus_row_number'));
             }
+            dbQuery.orderByRaw(orderByString, orderByFields);
         }
         else {
             sortRecords.map((sortRecord) => {
@@ -236,7 +244,7 @@ async function getDBQuery(schema, knex, table, fieldNodes, query) {
         .select(fieldNodes.map(preProcess))
         .from(table)
         .innerJoin(knex.raw('??', dbQuery.as('inner')), `${table}.${primaryKey}`, `inner.${primaryKey}`);
-    if (sortRecords && needsInnerQuery) {
+    if (sortRecords) {
         innerQuerySortRecords.map((innerQuerySortRecord) => {
             wrapperQuery.orderBy(`inner.${innerQuerySortRecord.alias}`, innerQuerySortRecord.order);
         });

package/dist/services/files.js

@@ -9,6 +9,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';
@@ -215,17 +216,19 @@ export class FilesService extends ItemsService {
     }
     async readByQuery(query, opts) {
         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);
     }

package/dist/services/items.d.ts

@@ -11,14 +11,14 @@ export type MutationTracker = {
     trackMutations: (count: number) => void;
     getCount: () => number;
 };
-export declare class ItemsService<Item extends AnyItem = AnyItem> implements AbstractService {
-    collection: string;
+export declare class ItemsService<Item extends AnyItem = AnyItem, Collection extends string = string> implements AbstractService {
+    collection: Collection;
     knex: Knex;
     accountability: Accountability | null;
     eventScope: string;
     schema: SchemaOverview;
     cache: Keyv<any> | null;
-    constructor(collection: string, options: AbstractServiceOptions);
+    constructor(collection: Collection, options: AbstractServiceOptions);
     /**
      * Create a fork of the current service, allowing instantiation with different options.
      */

package/dist/services/tus/data-store.js

@@ -109,6 +109,7 @@ export class TusDataStore extends DataStore {
         }
     }
     async write(readable, tus_id, offset) {
+        const logger = useLogger();
         const fileData = await this.getFileById(tus_id);
         const filePath = fileData.filename_disk;
         const sudoService = new ItemsService('directus_files', {
@@ -146,6 +147,7 @@ export class TusDataStore extends DataStore {
             return newOffset;
         }
         catch (err) {
+            logger.error(err, 'Error writing chunk for upload "%s" at offset %d', tus_id, offset);
             if ('status_code' in err && err.status_code === 500) {
                 throw err;
             }

package/dist/websocket/controllers/base.d.ts

@@ -32,7 +32,7 @@ export default abstract class SocketController {
     protected getRateLimiter(): RateLimiterAbstract | null;
     private catchInvalidMessages;
     protected handleUpgrade(request: IncomingMessage, socket: internal.Duplex, head: Buffer): Promise<void>;
-    protected handleTokenUpgrade({ request, socket, head }: UpgradeContext, token: string): Promise<void>;
+    protected handleTokenUpgrade({ request, socket, head }: UpgradeContext, token: string | null): Promise<void>;
     protected handleHandshakeUpgrade({ request, socket, head }: UpgradeContext): Promise<void>;
     createClient(ws: WebSocket, { accountability, expires_at }: AuthenticationState): WebSocketClient;
     protected parseMessage(data: string): WebSocketMessage;

package/dist/websocket/controllers/base.js

@@ -101,13 +101,14 @@ export default class SocketController {
         const cookies = request.headers.cookie ? cookie.parse(request.headers.cookie) : {};
         const context = { request, socket, head };
         const sessionCookieName = env['SESSION_COOKIE_NAME'];
-        if (cookies[sessionCookieName]) {
-            const token = cookies[sessionCookieName];
-            await this.handleTokenUpgrade(context, token);
-            return;
-        }
-        if (this.authentication.mode === 'strict') {
-            const token = query['access_token'];
+        if (this.authentication.mode === 'strict' || query['access_token'] || cookies[sessionCookieName]) {
+            let token = null;
+            if (typeof query['access_token'] === 'string') {
+                token = query['access_token'];
+            }
+            else if (typeof cookies[sessionCookieName] === 'string') {
+                token = cookies[sessionCookieName] ?? null;
+            }
             await this.handleTokenUpgrade(context, token);
             return;
         }
@@ -122,16 +123,19 @@ export default class SocketController {
         });
     }
     async handleTokenUpgrade({ request, socket, head }, token) {
-        let accountability, expires_at;
-        try {
-            accountability = await getAccountabilityForToken(token);
-            expires_at = getExpiresAtForToken(token);
-        }
-        catch {
-            accountability = null;
-            expires_at = null;
+        let accountability = null;
+        let expires_at = null;
+        if (token) {
+            try {
+                accountability = await getAccountabilityForToken(token);
+                expires_at = getExpiresAtForToken(token);
+            }
+            catch {
+                accountability = null;
+                expires_at = null;
+            }
         }
-        if (!accountability || !accountability.user) {
+        if (!token || !accountability || !accountability.user) {
             logger.debug('WebSocket upgrade denied - ' + JSON.stringify(accountability || 'invalid'));
             socket.write('HTTP/1.1 401 Unauthorized\r\n\r\n');
             socket.destroy();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@directus/api",
-  "version": "20.0.0",
+  "version": "20.1.0",
   "description": "Directus is a real-time API and App dashboard for managing SQL database content",
   "keywords": [
     "directus",
@@ -99,7 +99,7 @@
     "graphql-ws": "5.16.0",
     "helmet": "7.1.0",
     "icc": "3.0.0",
-    "inquirer": "9.2.23",
+    "inquirer": "9.3.2",
     "ioredis": "5.4.1",
     "ip-matching": "2.1.2",
     "isolated-vm": "4.7.2",
@@ -135,7 +135,7 @@
     "pino-http": "9.0.0",
     "pino-http-print": "3.1.0",
     "pino-pretty": "11.2.1",
-    "qs": "6.12.1",
+    "qs": "6.12.2",
     "rate-limiter-flexible": "5.0.3",
     "rollup": "4.17.2",
     "samlify": "2.8.10",
@@ -146,32 +146,32 @@
     "tar": "7.4.0",
     "tsx": "4.12.0",
     "wellknown": "0.5.0",
-    "ws": "8.17.1",
+    "ws": "8.18.0",
     "zod": "3.23.8",
     "zod-validation-error": "3.3.0",
-    "@directus/app": "12.2.0",
+    "@directus/app": "12.2.1",
     "@directus/constants": "11.0.4",
+    "@directus/env": "1.3.0",
     "@directus/extensions": "1.0.9",
-    "@directus/errors": "0.3.3",
-    "@directus/env": "1.2.0",
     "@directus/extensions-registry": "1.0.9",
-    "@directus/extensions-sdk": "11.0.9",
     "@directus/format-title": "10.1.2",
+    "@directus/errors": "0.3.3",
     "@directus/memory": "1.0.10",
+    "@directus/extensions-sdk": "11.0.9",
     "@directus/pressure": "1.0.21",
     "@directus/schema": "11.0.3",
     "@directus/specs": "10.2.10",
     "@directus/storage-driver-azure": "10.0.23",
+    "@directus/storage": "10.1.0",
     "@directus/storage-driver-cloudinary": "10.0.23",
     "@directus/storage-driver-gcs": "10.0.24",
-    "@directus/storage": "10.1.0",
     "@directus/storage-driver-local": "10.1.0",
     "@directus/storage-driver-s3": "10.1.0",
-    "@directus/system-data": "1.1.0",
     "@directus/storage-driver-supabase": "1.0.15",
+    "@directus/system-data": "1.1.0",
     "@directus/utils": "11.0.10",
     "@directus/validation": "0.0.18",
-    "directus": "10.13.0"
+    "directus": "10.13.1"
   },
   "devDependencies": {
     "@ngneat/falso": "7.2.0",
@@ -185,7 +185,7 @@
     "@types/destroy": "1.0.3",
     "@types/encodeurl": "1.0.2",
     "@types/express": "4.17.21",
-    "@types/express-serve-static-core": "4.19.3",
+    "@types/express-serve-static-core": "4.19.5",
     "@types/fs-extra": "11.0.4",
     "@types/glob-to-regexp": "0.4.4",
     "@types/inquirer": "9.0.7",
@@ -212,12 +212,12 @@
     "knex-mock-client": "2.0.1",
     "typescript": "5.4.5",
     "vitest": "1.5.3",
-    "@directus/random": "0.2.8",
     "@directus/tsconfig": "1.0.1",
+    "@directus/random": "0.2.8",
     "@directus/types": "11.2.0"
   },
   "optionalDependencies": {
-    "@keyv/redis": "2.8.4",
+    "@keyv/redis": "2.8.5",
     "mysql": "2.18.1",
     "nodemailer-mailgun-transport": "2.1.5",
     "nodemailer-sendgrid": "1.0.3",