@directus/api 21.0.0-rc.0 → 21.0.0

package/dist/controllers/users.js

@@ -7,6 +7,7 @@ import useCollection from '../middleware/use-collection.js';
 import { validateBatch } from '../middleware/validate-batch.js';
 import { AuthenticationService } from '../services/authentication.js';
 import { MetaService } from '../services/meta.js';
+import { RolesService } from '../services/roles.js';
 import { TFAService } from '../services/tfa.js';
 import { UsersService } from '../services/users.js';
 import asyncHandler from '../utils/async-handler.js';
@@ -261,6 +262,33 @@ router.post('/me/tfa/enable/', asyncHandler(async (req, _res, next) => {
     if (!req.body.otp) {
         throw new InvalidPayloadError({ reason: `"otp" is required` });
     }
+    // Override permissions only when enforce TFA is enabled in role
+    if (req.accountability.role) {
+        const rolesService = new RolesService({
+            schema: req.schema,
+        });
+        const role = (await rolesService.readOne(req.accountability.role));
+        if (role && role.enforce_tfa) {
+            const existingPermission = await req.accountability.permissions?.find((p) => p.collection === 'directus_users' && p.action === 'update');
+            if (existingPermission) {
+                existingPermission.fields = ['tfa_secret'];
+                existingPermission.permissions = { id: { _eq: req.accountability.user } };
+                existingPermission.presets = null;
+                existingPermission.validation = null;
+            }
+            else {
+                (req.accountability.permissions || (req.accountability.permissions = [])).push({
+                    action: 'update',
+                    collection: 'directus_users',
+                    fields: ['tfa_secret'],
+                    permissions: { id: { _eq: req.accountability.user } },
+                    presets: null,
+                    role: req.accountability.role,
+                    validation: null,
+                });
+            }
+        }
+    }
     const service = new TFAService({
         accountability: req.accountability,
         schema: req.schema,
@@ -275,6 +303,33 @@ router.post('/me/tfa/disable', asyncHandler(async (req, _res, next) => {
     if (!req.body.otp) {
         throw new InvalidPayloadError({ reason: `"otp" is required` });
     }
+    // Override permissions only when enforce TFA is enabled in role
+    if (req.accountability.role) {
+        const rolesService = new RolesService({
+            schema: req.schema,
+        });
+        const role = (await rolesService.readOne(req.accountability.role));
+        if (role && role.enforce_tfa) {
+            const existingPermission = await req.accountability.permissions?.find((p) => p.collection === 'directus_users' && p.action === 'update');
+            if (existingPermission) {
+                existingPermission.fields = ['tfa_secret'];
+                existingPermission.permissions = { id: { _eq: req.accountability.user } };
+                existingPermission.presets = null;
+                existingPermission.validation = null;
+            }
+            else {
+                (req.accountability.permissions || (req.accountability.permissions = [])).push({
+                    action: 'update',
+                    collection: 'directus_users',
+                    fields: ['tfa_secret'],
+                    permissions: { id: { _eq: req.accountability.user } },
+                    presets: null,
+                    role: req.accountability.role,
+                    validation: null,
+                });
+            }
+        }
+    }
     const service = new TFAService({
         accountability: req.accountability,
         schema: req.schema,

package/dist/database/helpers/fn/types.d.ts

@@ -1,10 +1,9 @@
-import type { Filter, Query, SchemaOverview } from '@directus/types';
+import type { Query, SchemaOverview } from '@directus/types';
 import type { Knex } from 'knex';
 import { DatabaseHelper } from '../types.js';
 export type FnHelperOptions = {
     type: string | undefined;
     query: Query | undefined;
-    cases: Filter[] | undefined;
     originalCollectionName: string | undefined;
 };
 export declare abstract class FnHelper extends DatabaseHelper {

package/dist/database/helpers/fn/types.js

@@ -28,7 +28,7 @@ export class FnHelper extends DatabaseHelper {
                     collection: relation.collection,
                 },
             };
-            countQuery = applyFilter(this.knex, this.schema, countQuery, options.query.filter, relation.collection, aliasMap, options.cases ?? []).query;
+            countQuery = applyFilter(this.knex, this.schema, countQuery, options.query.filter, relation.collection, aliasMap).query;
         }
         return this.knex.raw('(' + countQuery.toQuery() + ')');
     }

package/dist/database/helpers/geometry/dialects/mssql.d.ts

@@ -6,7 +6,7 @@ export declare class GeometryHelperMSSQL extends GeometryHelper {
     isTrue(expression: Knex.Raw): Knex.Raw<any>;
     isFalse(expression: Knex.Raw): Knex.Raw<any>;
     createColumn(table: Knex.CreateTableBuilder, field: RawField | Field): Knex.ColumnBuilder;
-    asText(table: string, column: string, alias: string | false): Knex.Raw;
+    asText(table: string, column: string): Knex.Raw;
     fromText(text: string): Knex.Raw;
     _intersects(key: string, geojson: GeoJSONGeometry): Knex.Raw;
     _intersects_bbox(key: string, geojson: GeoJSONGeometry): Knex.Raw;

package/dist/database/helpers/geometry/dialects/mssql.js

@@ -12,10 +12,8 @@ export class GeometryHelperMSSQL extends GeometryHelper {
         }
         return table.specificType(field.field, 'geometry');
     }
-    asText(table, column, alias) {
-        if (alias)
-            return this.knex.raw('??.??.STAsText() as ??', [table, column, alias]);
-        return this.knex.raw('??.??.STAsText()', [table, column]);
+    asText(table, column) {
+        return this.knex.raw('??.??.STAsText() as ??', [table, column, column]);
     }
     fromText(text) {
         return this.knex.raw('geometry::STGeomFromText(?, 4326)', text);

package/dist/database/helpers/geometry/dialects/mysql.js

@@ -1,7 +1,7 @@
 import { GeometryHelper } from '../types.js';
 export class GeometryHelperMySQL extends GeometryHelper {
     collect(table, column) {
-        return this.knex.raw(`concat('geometrycollection(', group_concat(? separator ', '), ')'`, this.asText(table, column, column));
+        return this.knex.raw(`concat('geometrycollection(', group_concat(? separator ', '), ')'`, this.asText(table, column));
     }
     fromText(text) {
         return this.knex.raw('st_geomfromtext(?)', text);

package/dist/database/helpers/geometry/dialects/oracle.d.ts

@@ -6,7 +6,7 @@ export declare class GeometryHelperOracle extends GeometryHelper {
     isTrue(expression: Knex.Raw): Knex.Raw<any>;
     isFalse(expression: Knex.Raw): Knex.Raw<any>;
     createColumn(table: Knex.CreateTableBuilder, field: RawField | Field): Knex.ColumnBuilder;
-    asText(table: string, column: string, alias: string | false): Knex.Raw;
+    asText(table: string, column: string): Knex.Raw;
     asGeoJSON(table: string, column: string): Knex.Raw;
     fromText(text: string): Knex.Raw;
     _intersects(key: string, geojson: GeoJSONGeometry): Knex.Raw;

package/dist/database/helpers/geometry/dialects/oracle.js

@@ -12,10 +12,8 @@ export class GeometryHelperOracle extends GeometryHelper {
         }
         return table.specificType(field.field, 'sdo_geometry');
     }
-    asText(table, column, alias) {
-        if (alias)
-            return this.knex.raw('sdo_util.to_wktgeometry(??.??) as ??', [table, column, alias]);
-        return this.knex.raw('sdo_util.to_wktgeometry(??.??)', [table, column]);
+    asText(table, column) {
+        return this.knex.raw('sdo_util.to_wktgeometry(??.??) as ??', [table, column, column]);
     }
     asGeoJSON(table, column) {
         return this.knex.raw('sdo_util.to_geojson(??.??) as ??', [table, column, column]);
@@ -32,6 +30,6 @@ export class GeometryHelperOracle extends GeometryHelper {
         return this.knex.raw(`sdo_overlapbdyintersect(sdo_geom.sdo_mbr(??), sdo_geom.sdo_mbr(?))`, [key, geometry]);
     }
     collect(table, column) {
-        return this.knex.raw(`concat('geometrycollection(', listagg(?, ', '), ')'`, this.asText(table, column, column));
+        return this.knex.raw(`concat('geometrycollection(', listagg(?, ', '), ')'`, this.asText(table, column));
     }
 }

package/dist/database/helpers/geometry/types.d.ts

@@ -7,7 +7,7 @@ export declare abstract class GeometryHelper extends DatabaseHelper {
     isTrue(expression: Knex.Raw): Knex.Raw<any>;
     isFalse(expression: Knex.Raw): Knex.Raw<any>;
     createColumn(table: Knex.CreateTableBuilder, field: RawField | Field): Knex.ColumnBuilder;
-    asText(table: string, column: string, alias: string | false): Knex.Raw;
+    asText(table: string, column: string): Knex.Raw;
     fromText(text: string): Knex.Raw;
     fromGeoJSON(geojson: GeoJSONGeometry): Knex.Raw;
     _intersects(key: string, geojson: GeoJSONGeometry): Knex.Raw;

package/dist/database/helpers/geometry/types.js

@@ -14,10 +14,8 @@ export class GeometryHelper extends DatabaseHelper {
         const type = field.type.split('.')[1] ?? 'geometry';
         return table.specificType(field.field, type);
     }
-    asText(table, column, alias) {
-        if (alias)
-            return this.knex.raw('st_astext(??.??) as ??', [table, column, alias]);
-        return this.knex.raw('st_astext(??.??)', [table, column]);
+    asText(table, column) {
+        return this.knex.raw('st_astext(??.??) as ??', [table, column, column]);
     }
     fromText(text) {
         return this.knex.raw('st_geomfromtext(?, 4326)', text);

package/dist/database/index.js

@@ -106,7 +106,6 @@ export function getDatabase() {
         };
     }
     if (client === 'mysql') {
-        Object.assign(knexConfig, { client: 'mysql2' });
         poolConfig.afterCreate = async (conn, callback) => {
             logger.trace('Retrieving database version');
             const run = promisify(conn.query.bind(conn));
@@ -123,15 +122,19 @@ export function getDatabase() {
     }
     database = knex.default(knexConfig);
     validateDatabaseCharset(database);
-    const times = {};
+    const times = new Map();
     database
-        .on('query', (queryInfo) => {
-        times[queryInfo.__knexUid] = performance.now();
+        .on('query', ({ __knexUid }) => {
+        times.set(__knexUid, performance.now());
     })
         .on('query-response', (_response, queryInfo) => {
-        const delta = performance.now() - times[queryInfo.__knexUid];
-        logger.trace(`[${delta.toFixed(3)}ms] ${queryInfo.sql} [${queryInfo.bindings.join(', ')}]`);
-        delete times[queryInfo.__knexUid];
+        const time = times.get(queryInfo.__knexUid);
+        let delta;
+        if (time) {
+            delta = performance.now() - time;
+            times.delete(queryInfo.__knexUid);
+        }
+        logger.trace(`[${delta ? delta.toFixed(3) : '?'}ms] ${queryInfo.sql} [${(queryInfo.bindings ?? []).join(', ')}]`);
     });
     return database;
 }
@@ -186,7 +189,7 @@ export async function validateDatabaseConnection(database) {
 export function getDatabaseClient(database) {
     database = database ?? getDatabase();
     switch (database.client.constructor.name) {
-        case 'Client_MySQL2':
+        case 'Client_MySQL':
             return 'mysql';
         case 'Client_PG':
             return 'postgres';

package/dist/database/migrations/20240305A-change-useragent-type.js

@@ -7,7 +7,7 @@ export async function up(knex) {
     ]);
 }
 export async function down(knex) {
-    const helper = await getHelpers(knex).schema;
+    const helper = getHelpers(knex).schema;
     const opts = {
         nullable: false,
         length: 255,

package/dist/database/migrations/20240716A-update-files-date-fields.js

@@ -0,0 +1,33 @@
+import { getHelpers } from '../helpers/index.js';
+export async function up(knex) {
+    const helper = getHelpers(knex).schema;
+    const isMysql = helper.isOneOfClients(['mysql']);
+    if (isMysql) {
+        // Knex creates invalid statement on MySQL, see https://github.com/knex/knex/issues/1888
+        await knex.schema.raw('ALTER TABLE `directus_files` CHANGE `uploaded_on` `created_on` TIMESTAMP NOT NULL DEFAULT current_timestamp();');
+    }
+    else {
+        await knex.schema.alterTable('directus_files', (table) => {
+            table.renameColumn('uploaded_on', 'created_on');
+        });
+    }
+    await knex.schema.alterTable('directus_files', (table) => {
+        table.timestamp('uploaded_on');
+    });
+    await knex('directus_files').update('uploaded_on', knex.ref('created_on'));
+}
+export async function down(knex) {
+    await knex.schema.alterTable('directus_files', (table) => {
+        table.dropColumn('uploaded_on');
+    });
+    const helper = getHelpers(knex).schema;
+    const isMysql = helper.isOneOfClients(['mysql']);
+    if (isMysql) {
+        await knex.schema.raw('ALTER TABLE `directus_files` CHANGE `created_on` `uploaded_on` TIMESTAMP NOT NULL DEFAULT current_timestamp();');
+    }
+    else {
+        await knex.schema.alterTable('directus_files', (table) => {
+            table.renameColumn('created_on', 'uploaded_on');
+        });
+    }
+}

package/dist/database/{run-ast/types.d.ts → run-ast.d.ts}

@@ -1,6 +1,7 @@
+import type { Item, SchemaOverview } from '@directus/types';
 import type { Knex } from 'knex';
-import type { AST } from '../../types/ast.js';
-export interface RunASTOptions {
+import type { AST, NestedCollectionNode } from '../types/ast.js';
+type RunASTOptions = {
     /**
      * Query override for the current level
      */
@@ -17,4 +18,9 @@ export interface RunASTOptions {
      * Whether or not to strip out non-requested required fields automatically (eg IDs / FKs)
      */
     stripNonRequested?: boolean;
-}
+};
+/**
+ * Execute a given AST using Knex. Returns array of items based on requested AST.
+ */
+export default function runAST(originalAST: AST | NestedCollectionNode, schema: SchemaOverview, options?: RunASTOptions): Promise<null | Item | Item[]>;
+export {};