directus 9.1.0 → 9.2.1

package/dist/utils/get-default-index-name.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getDefaultIndexName = void 0;
-const get_simple_hash_1 = require("./get-simple-hash");
+const utils_1 = require("@directus/shared/utils");
 /**
  * Generate an index name for a given collection + fields combination.
  *
@@ -18,7 +18,7 @@ function getDefaultIndexName(type, collection, fields) {
     const indexName = (table + '_' + fields.join('_') + '_' + type).toLowerCase();
     if (indexName.length <= 60)
         return indexName;
-    const suffix = `__${(0, get_simple_hash_1.simpleHash)(indexName)}_${type}`;
+    const suffix = `__${(0, utils_1.getSimpleHash)(indexName)}_${type}`;
     const prefix = indexName.substring(0, 60 - suffix.length);
     return `${prefix}${suffix}`;
 }

package/dist/utils/get-local-type.js

@@ -1,10 +1,5 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const database_1 = require("../database");
-const database_2 = __importDefault(require("../database"));
 const localTypeMap = {
     // Shared
     boolean: 'boolean',
@@ -100,8 +95,6 @@ const localTypeMap = {
     integerfirst: 'integer',
 };
 function getLocalType(column, field) {
-    const database = (0, database_2.default)();
-    const databaseClient = (0, database_1.getDatabaseClient)(database);
     if (!column)
         return 'alias';
     const dataType = column.data_type.toLowerCase();
@@ -125,13 +118,9 @@ function getLocalType(column, field) {
         return 'decimal';
     }
     /** Handle MS SQL varchar(MAX) (eg TEXT) types */
-    if (dataType === 'nvarchar(MAX)') {
+    if (column.data_type === 'nvarchar' && column.max_length === -1) {
         return 'text';
     }
-    /** Handle Boolean as TINYINT and edgecase MySQL where it still is just tinyint */
-    if (databaseClient === 'mysql' && dataType === 'tinyint(1)') {
-        return 'boolean';
-    }
     return type !== null && type !== void 0 ? type : 'unknown';
 }
 exports.default = getLocalType;

package/dist/utils/sanitize-query.js

@@ -106,17 +106,6 @@ function sanitizeFilter(rawFilter, accountability) {
             logger_1.default.warn('Invalid value passed for filter query parameter.');
         }
     }
-    filters = (0, utils_1.deepMap)(filters, (val) => {
-        try {
-            const parsed = JSON.parse(val);
-            if (typeof parsed == 'number' && !Number.isSafeInteger(parsed))
-                return val;
-            return parsed;
-        }
-        catch {
-            return val;
-        }
-    });
     return (0, utils_1.parseFilter)(filters, accountability);
 }
 function sanitizeLimit(rawLimit) {
@@ -167,7 +156,7 @@ function sanitizeDeep(deep, accountability) {
                 const [parsedKey, parsedValue] = Object.entries(parsedSubQuery)[0];
                 parsedLevel[`_${parsedKey}`] = parsedValue;
             }
-            else {
+            else if ((0, lodash_1.isPlainObject)(value)) {
                 parse(value, [...path, key]);
             }
         }

package/dist/utils/validate-query.js

@@ -100,7 +100,7 @@ function validateFilterPrimitive(value, key) {
         false) {
         throw new exceptions_1.InvalidQueryException(`The filter value for "${key}" has to be a string, number, or boolean`);
     }
-    if (typeof value === 'number' && Number.isNaN(value)) {
+    if (typeof value === 'number' && (Number.isNaN(value) || !Number.isSafeInteger(value))) {
         throw new exceptions_1.InvalidQueryException(`The filter value for "${key}" is not a valid number`);
     }
     if (typeof value === 'string' && value.length === 0) {

package/dist/webhooks.js

@@ -8,7 +8,6 @@ const axios_1 = __importDefault(require("axios"));
 const database_1 = __importDefault(require("./database"));
 const emitter_1 = __importDefault(require("./emitter"));
 const logger_1 = __importDefault(require("./logger"));
-const lodash_1 = require("lodash");
 const services_1 = require("./services");
 const get_schema_1 = require("./utils/get-schema");
 let registered = [];
@@ -17,20 +16,12 @@ async function register() {
     const webhookService = new services_1.WebhooksService({ knex: (0, database_1.default)(), schema: await (0, get_schema_1.getSchema)() });
     const webhooks = await webhookService.readByQuery({ filter: { status: { _eq: 'active' } } });
     for (const webhook of webhooks) {
-        if (webhook.actions.includes('*')) {
-            const event = 'items.*';
-            const handler = createHandler(webhook);
+        for (const action of webhook.actions) {
+            const event = `items.${action}`;
+            const handler = createHandler(webhook, event);
             emitter_1.default.onAction(event, handler);
             registered.push({ event, handler });
         }
-        else {
-            for (const action of webhook.actions) {
-                const event = `items.${action}`;
-                const handler = createHandler(webhook);
-                emitter_1.default.onAction(event, handler);
-                registered.push({ event, handler });
-            }
-        }
     }
 }
 exports.register = register;
@@ -41,19 +32,20 @@ function unregister() {
     registered = [];
 }
 exports.unregister = unregister;
-function createHandler(webhook) {
-    return async (data) => {
-        if (webhook.collections.includes('*') === false && webhook.collections.includes(data.collection) === false)
+function createHandler(webhook, event) {
+    return async (meta, context) => {
+        if (webhook.collections.includes(meta.collection) === false)
             return;
-        const webhookPayload = (0, lodash_1.pick)(data, [
-            'event',
-            'accountability.user',
-            'accountability.role',
-            'collection',
-            'item',
-            'action',
-            'payload',
-        ]);
+        const webhookPayload = {
+            event,
+            accountability: context.accountability
+                ? {
+                    user: context.accountability.user,
+                    role: context.accountability.role,
+                }
+                : null,
+            ...meta,
+        };
         try {
             await (0, axios_1.default)({
                 url: webhook.url,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "directus",
-	"version": "9.1.0",
+	"version": "9.2.1",
 	"license": "GPL-3.0-only",
 	"homepage": "https://github.com/directus/directus#readme",
 	"description": "Directus is a real-time API and App dashboard for managing SQL database content.",
@@ -76,16 +76,16 @@
 	],
 	"dependencies": {
 		"@aws-sdk/client-ses": "^3.40.0",
-		"@directus/app": "9.1.0",
-		"@directus/drive": "9.1.0",
-		"@directus/drive-azure": "9.1.0",
-		"@directus/drive-gcs": "9.1.0",
-		"@directus/drive-s3": "9.1.0",
-		"@directus/extensions-sdk": "9.1.0",
-		"@directus/format-title": "9.1.0",
-		"@directus/schema": "9.1.0",
-		"@directus/shared": "9.1.0",
-		"@directus/specs": "9.1.0",
+		"@directus/app": "9.2.1",
+		"@directus/drive": "9.2.1",
+		"@directus/drive-azure": "9.2.1",
+		"@directus/drive-gcs": "9.2.1",
+		"@directus/drive-s3": "9.2.1",
+		"@directus/extensions-sdk": "9.2.1",
+		"@directus/format-title": "9.2.1",
+		"@directus/schema": "9.2.1",
+		"@directus/shared": "9.2.1",
+		"@directus/specs": "9.2.1",
 		"@godaddy/terminus": "^4.9.0",
 		"@rollup/plugin-alias": "^3.1.2",
 		"@rollup/plugin-virtual": "^2.0.3",
@@ -122,7 +122,7 @@
 		"jsonwebtoken": "^8.5.1",
 		"keyv": "^4.0.3",
 		"knex": "^0.95.11",
-		"knex-schema-inspector": "1.6.4",
+		"knex-schema-inspector": "1.6.6",
 		"ldapjs": "^2.3.1",
 		"liquidjs": "^9.25.0",
 		"lodash": "^4.17.21",
@@ -146,6 +146,7 @@
 		"rate-limiter-flexible": "^2.2.2",
 		"resolve-cwd": "^3.0.0",
 		"rollup": "^2.52.1",
+		"sanitize-html": "^2.6.0",
 		"sharp": "^0.29.0",
 		"stream-json": "^1.7.1",
 		"supertest": "^6.1.6",
@@ -168,7 +169,7 @@
 		"sqlite3": "^5.0.2",
 		"tedious": "^13.0.0"
 	},
-	"gitHead": "7a1c534b36714a721b9f9df52d51f7f74ef1dada",
+	"gitHead": "1d4e9c425c10bcdc5831ae63c1bd03649648eb5e",
 	"devDependencies": {
 		"@types/async": "3.2.10",
 		"@types/atob": "2.1.2",
@@ -198,7 +199,7 @@
 		"@types/nodemailer": "6.4.4",
 		"@types/object-hash": "2.2.1",
 		"@types/qs": "6.9.7",
-		"@types/sanitize-html": "^2.5.0",
+		"@types/sanitize-html": "2.5.0",
 		"@types/sharp": "0.29.4",
 		"@types/stream-json": "1.7.1",
 		"@types/supertest": "2.0.11",
@@ -208,7 +209,6 @@
 		"copyfiles": "2.4.1",
 		"cross-env": "7.0.3",
 		"jest": "27.3.1",
-		"sanitize-html": "^2.5.3",
 		"ts-jest": "27.0.7",
 		"ts-node-dev": "1.1.8",
 		"typescript": "4.5.2"

package/dist/database/functions/dialects/oracle.d.ts

@@ -1,14 +0,0 @@
-import { Knex } from 'knex';
-import { HelperFn } from '../types';
-export declare class HelperOracle implements HelperFn {
-    private knex;
-    constructor(knex: Knex);
-    year(table: string, column: string): Knex.Raw;
-    month(table: string, column: string): Knex.Raw;
-    week(table: string, column: string): Knex.Raw;
-    day(table: string, column: string): Knex.Raw;
-    weekday(table: string, column: string): Knex.Raw;
-    hour(table: string, column: string): Knex.Raw;
-    minute(table: string, column: string): Knex.Raw;
-    second(table: string, column: string): Knex.Raw;
-}

package/dist/database/functions/dialects/postgres.d.ts

@@ -1,14 +0,0 @@
-import { Knex } from 'knex';
-import { HelperFn } from '../types';
-export declare class HelperPostgres implements HelperFn {
-    private knex;
-    constructor(knex: Knex);
-    year(table: string, column: string): Knex.Raw;
-    month(table: string, column: string): Knex.Raw;
-    week(table: string, column: string): Knex.Raw;
-    day(table: string, column: string): Knex.Raw;
-    weekday(table: string, column: string): Knex.Raw;
-    hour(table: string, column: string): Knex.Raw;
-    minute(table: string, column: string): Knex.Raw;
-    second(table: string, column: string): Knex.Raw;
-}

package/dist/database/functions/dialects/sqlite.js

@@ -1,33 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.HelperSQLite = void 0;
-class HelperSQLite {
-    constructor(knex) {
-        this.knex = knex;
-    }
-    year(table, column) {
-        return this.knex.raw("strftime('%Y', ??.??)", [table, column]);
-    }
-    month(table, column) {
-        return this.knex.raw("strftime('%m', ??.??)", [table, column]);
-    }
-    week(table, column) {
-        return this.knex.raw("strftime('%W', ??.??)", [table, column]);
-    }
-    day(table, column) {
-        return this.knex.raw("strftime('%d', ??.??)", [table, column]);
-    }
-    weekday(table, column) {
-        return this.knex.raw("strftime('%w', ??.??)", [table, column]);
-    }
-    hour(table, column) {
-        return this.knex.raw("strftime('%H', ??.??)", [table, column]);
-    }
-    minute(table, column) {
-        return this.knex.raw("strftime('%M', ??.??)", [table, column]);
-    }
-    second(table, column) {
-        return this.knex.raw("strftime('%S', ??.??)", [table, column]);
-    }
-}
-exports.HelperSQLite = HelperSQLite;

package/dist/database/functions/index.d.ts

@@ -1,3 +0,0 @@
-import { Knex } from 'knex';
-import { HelperFn } from './types';
-export declare function FunctionsHelper(knex: Knex): HelperFn;

package/dist/database/functions/index.js

@@ -1,26 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.FunctionsHelper = void 0;
-const postgres_1 = require("./dialects/postgres");
-const mysql_1 = require("./dialects/mysql");
-const mssql_1 = require("./dialects/mssql");
-const sqlite_1 = require("./dialects/sqlite");
-const oracle_1 = require("./dialects/oracle");
-function FunctionsHelper(knex) {
-    switch (knex.client.constructor.name) {
-        case 'Client_MySQL':
-            return new mysql_1.HelperMySQL(knex);
-        case 'Client_PG':
-            return new postgres_1.HelperPostgres(knex);
-        case 'Client_SQLite3':
-            return new sqlite_1.HelperSQLite(knex);
-        case 'Client_Oracledb':
-        case 'Client_Oracle':
-            return new oracle_1.HelperOracle(knex);
-        case 'Client_MSSQL':
-            return new mssql_1.HelperMSSQL(knex);
-        default:
-            throw Error('Unsupported driver used: ' + knex.client.constructor.name);
-    }
-}
-exports.FunctionsHelper = FunctionsHelper;

package/dist/database/functions/types.js

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });

package/dist/database/helpers/date.d.ts

@@ -1,8 +0,0 @@
-import { Knex } from 'knex';
-export declare function getDateHelper(): KnexDate;
-declare class KnexDate {
-    protected knex: Knex;
-    constructor(knex: Knex);
-    parseDate(date: string): string;
-}
-export {};

package/dist/database/helpers/date.js

@@ -1,44 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDateHelper = void 0;
-const __1 = __importDefault(require(".."));
-let dateHelper;
-function getDateHelper() {
-    if (!dateHelper) {
-        const db = (0, __1.default)();
-        const client = db.client.config.client;
-        const constructor = {
-            mysql: KnexDate,
-            mariadb: KnexDate,
-            sqlite3: KnexDate_SQLITE,
-            pg: KnexDate,
-            postgres: KnexDate,
-            redshift: KnexDate,
-            mssql: KnexDate,
-            oracledb: KnexDate,
-        }[client];
-        if (!constructor) {
-            throw new Error(`Geometry helper not implemented on ${client}.`);
-        }
-        dateHelper = new constructor(db);
-    }
-    return dateHelper;
-}
-exports.getDateHelper = getDateHelper;
-class KnexDate {
-    constructor(knex) {
-        this.knex = knex;
-    }
-    parseDate(date) {
-        return date;
-    }
-}
-class KnexDate_SQLITE extends KnexDate {
-    parseDate(date) {
-        const newDate = new Date(date);
-        return (newDate.getTime() - newDate.getTimezoneOffset() * 60 * 1000).toString();
-    }
-}

package/dist/database/helpers/geometry.js

@@ -1,189 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getGeometryHelper = void 0;
-const wellknown_1 = require("wellknown");
-const __1 = require("..");
-const __2 = __importDefault(require(".."));
-let geometryHelper;
-function getGeometryHelper(database) {
-    if (!geometryHelper) {
-        database = database !== null && database !== void 0 ? database : (0, __2.default)();
-        const client = (0, __1.getDatabaseClient)(database);
-        const constructor = {
-            mysql: KnexSpatial_MySQL,
-            sqlite: KnexSpatial_SQLite,
-            postgres: KnexSpatial_PG,
-            redshift: KnexSpatial_Redshift,
-            mssql: KnexSpatial_MSSQL,
-            oracle: KnexSpatial_Oracle,
-        }[client];
-        if (!constructor) {
-            throw new Error(`Geometry helper not implemented on ${client}.`);
-        }
-        geometryHelper = new constructor(database);
-    }
-    return geometryHelper;
-}
-exports.getGeometryHelper = getGeometryHelper;
-class KnexSpatial {
-    constructor(knex) {
-        this.knex = knex;
-    }
-    supported() {
-        return true;
-    }
-    isTrue(expression) {
-        return expression;
-    }
-    isFalse(expression) {
-        return expression.wrap('NOT ', '');
-    }
-    createColumn(table, field) {
-        var _a;
-        const type = (_a = field.type.split('.')[1]) !== null && _a !== void 0 ? _a : 'geometry';
-        return table.specificType(field.field, type);
-    }
-    asText(table, column) {
-        return this.knex.raw('st_astext(??.??) as ??', [table, column, column]);
-    }
-    asGeoJSON(table, column) {
-        return this.knex.raw('st_asgeojson(??.??) as ??', [table, column, column]);
-    }
-    fromText(text) {
-        return this.knex.raw('st_geomfromtext(?, 4326)', text);
-    }
-    fromGeoJSON(geojson) {
-        return this.fromText((0, wellknown_1.stringify)(geojson));
-    }
-    _intersects(key, geojson) {
-        const geometry = this.fromGeoJSON(geojson);
-        return this.knex.raw('st_intersects(??, ?)', [key, geometry]);
-    }
-    intersects(key, geojson) {
-        return this.isTrue(this._intersects(key, geojson));
-    }
-    nintersects(key, geojson) {
-        return this.isFalse(this._intersects(key, geojson));
-    }
-    _intersects_bbox(key, geojson) {
-        const geometry = this.fromGeoJSON(geojson);
-        return this.knex.raw('st_intersects(??, ?)', [key, geometry]);
-    }
-    intersects_bbox(key, geojson) {
-        return this.isTrue(this._intersects_bbox(key, geojson));
-    }
-    nintersects_bbox(key, geojson) {
-        return this.isFalse(this._intersects_bbox(key, geojson));
-    }
-    collect(table, column) {
-        return this.knex.raw('st_astext(st_collect(??.??))', [table, column]);
-    }
-}
-class KnexSpatial_SQLite extends KnexSpatial {
-    async supported() {
-        const res = await this.knex.select('name').from('pragma_function_list').where({ name: 'spatialite_version' });
-        return res.length > 0;
-    }
-    asGeoJSON(table, column) {
-        return this.knex.raw('asgeojson(??.??) as ??', [table, column, column]);
-    }
-}
-class KnexSpatial_PG extends KnexSpatial {
-    async supported() {
-        const res = await this.knex.select('oid').from('pg_proc').where({ proname: 'postgis_version' });
-        return res.length > 0;
-    }
-    createColumn(table, field) {
-        var _a;
-        const type = (_a = field.type.split('.')[1]) !== null && _a !== void 0 ? _a : 'geometry';
-        return table.specificType(field.field, `geometry(${type}, 4326)`);
-    }
-    _intersects_bbox(key, geojson) {
-        const geometry = this.fromGeoJSON(geojson);
-        return this.knex.raw('?? && ?', [key, geometry]);
-    }
-}
-class KnexSpatial_MySQL extends KnexSpatial {
-    collect(table, column) {
-        return this.knex.raw(`concat('geometrycollection(', group_concat(? separator ', '), ')'`, this.asText(table, column));
-    }
-    fromText(text) {
-        return this.knex.raw('st_geomfromtext(?)', text);
-    }
-}
-class KnexSpatial_Redshift extends KnexSpatial {
-    createColumn(table, field) {
-        if (field.type.split('.')[1]) {
-            field.meta.special = [field.type];
-        }
-        return table.specificType(field.field, 'geometry');
-    }
-}
-class KnexSpatial_MSSQL extends KnexSpatial {
-    isTrue(expression) {
-        return expression.wrap(``, ` = 1`);
-    }
-    isFalse(expression) {
-        return expression.wrap(``, ` = 0`);
-    }
-    createColumn(table, field) {
-        if (field.type.split('.')[1]) {
-            field.meta.special = [field.type];
-        }
-        return table.specificType(field.field, 'geometry');
-    }
-    asText(table, column) {
-        return this.knex.raw('??.??.STAsText() as ??', [table, column, column]);
-    }
-    fromText(text) {
-        return this.knex.raw('geometry::STGeomFromText(?, 4326)', text);
-    }
-    _intersects(key, geojson) {
-        const geometry = this.fromGeoJSON(geojson);
-        return this.knex.raw('??.STIntersects(?)', [key, geometry]);
-    }
-    _intersects_bbox(key, geojson) {
-        const geometry = this.fromGeoJSON(geojson);
-        return this.knex.raw('??.STEnvelope().STIntersects(?.STEnvelope())', [key, geometry]);
-    }
-    collect(table, column) {
-        return this.knex.raw('geometry::CollectionAggregate(??.??).STAsText()', [table, column]);
-    }
-}
-class KnexSpatial_Oracle extends KnexSpatial {
-    isTrue(expression) {
-        return expression.wrap(``, ` = 'TRUE'`);
-    }
-    isFalse(expression) {
-        return expression.wrap(``, ` = 'FALSE'`);
-    }
-    createColumn(table, field) {
-        if (field.type.split('.')[1]) {
-            field.meta.special = [field.type];
-        }
-        return table.specificType(field.field, 'sdo_geometry');
-    }
-    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]);
-    }
-    fromText(text) {
-        return this.knex.raw('sdo_geometry(?, 4326)', text);
-    }
-    _intersects(key, geojson) {
-        const geometry = this.fromGeoJSON(geojson);
-        return this.knex.raw(`sdo_overlapbdyintersect(??, ?)`, [key, geometry]);
-    }
-    _intersects_bbox(key, geojson) {
-        const geometry = this.fromGeoJSON(geojson);
-        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));
-    }
-}

package/dist/utils/get-simple-hash.d.ts

@@ -1,5 +0,0 @@
-/**
- * Generate a simple short hash for a given string
- * This is not cryptographically secure in any way, and has a high chance of collision
- */
-export declare function simpleHash(str: string): string;

package/dist/utils/get-simple-hash.js

@@ -1,15 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.simpleHash = void 0;
-/**
- * Generate a simple short hash for a given string
- * This is not cryptographically secure in any way, and has a high chance of collision
- */
-function simpleHash(str) {
-    let hash = 0;
-    for (let i = 0; i < str.length; hash &= hash) {
-        hash = 31 * hash + str.charCodeAt(i++);
-    }
-    return Math.abs(hash).toString(16);
-}
-exports.simpleHash = simpleHash;