directus 9.7.1 → 9.8.0

package/dist/services/shares.js

@@ -16,6 +16,7 @@ const users_1 = require("./users");
 const mail_1 = require("./mail");
 const user_name_1 = require("../utils/user-name");
 const md_1 = require("../utils/md");
+const url_1 = require("../utils/url");
 class SharesService extends items_1.ItemsService {
     constructor(options) {
         super('directus_shares', options);
@@ -116,7 +117,7 @@ Hello!
 
 ${(0, user_name_1.userName)(userInfo)} has invited you to view an item in ${share.collection}.
 
-[Open](${env_1.default.PUBLIC_URL}/admin/shared/${payload.share})
+[Open](${new url_1.Url(env_1.default.PUBLIC_URL).addPath('admin', 'shared', payload.share).toString()})
 `;
         for (const email of payload.emails) {
             await mailService.send({

package/dist/services/users.js

@@ -264,7 +264,9 @@ class UsersService extends items_1.ItemsService {
         });
         const payload = { email, scope: 'password-reset', hash: (0, utils_2.getSimpleHash)('' + user.password) };
         const token = jsonwebtoken_1.default.sign(payload, env_1.default.SECRET, { expiresIn: '1d', issuer: 'directus' });
-        const acceptURL = url ? `${url}?token=${token}` : `${env_1.default.PUBLIC_URL}/admin/reset-password?token=${token}`;
+        const acceptURL = url
+            ? new url_1.Url(url).setQuery('token', token).toString()
+            : new url_1.Url(env_1.default.PUBLIC_URL).addPath('admin', 'reset-password').setQuery('token', token);
         const subjectLine = subject ? subject : 'Password Reset Request';
         await mailService.send({
             to: email,

package/dist/utils/apply-query.js

@@ -11,6 +11,7 @@ const exceptions_1 = require("../exceptions");
 const get_column_1 = require("./get-column");
 const get_relation_type_1 = require("./get-relation-type");
 const helpers_1 = require("../database/helpers");
+const utils_1 = require("@directus/shared/utils");
 const generateAlias = (0, nanoid_1.customAlphabet)('abcdefghijklmnopqrstuvwxyz', 5);
 /**
  * Apply the Query to a given Knex query builder instance
@@ -26,7 +27,7 @@ function applyQuery(knex, collection, dbQuery, query, schema, subQuery = false)
             }
             return {
                 order,
-                column: (0, get_column_1.getColumn)(knex, collection, column, false),
+                column: (0, get_column_1.getColumn)(knex, collection, column, false, schema),
             };
         }));
     }
@@ -43,7 +44,7 @@ function applyQuery(knex, collection, dbQuery, query, schema, subQuery = false)
         applySearch(schema, dbQuery, query.search, collection);
     }
     if (query.group) {
-        dbQuery.groupBy(query.group.map((column) => (0, get_column_1.getColumn)(knex, collection, column, false)));
+        dbQuery.groupBy(query.group.map((column) => (0, get_column_1.getColumn)(knex, collection, column, false, schema)));
     }
     if (query.aggregate) {
         applyAggregate(dbQuery, query.aggregate, collection);
@@ -234,7 +235,7 @@ function applyFilter(knex, schema, rootQuery, rootFilter, collection, subQuery =
         function applyFilterToQuery(key, operator, compareValue, logical = 'and') {
             const [table, column] = key.split('.');
             // Is processed through Knex.Raw, so should be safe to string-inject into these where queries
-            const selectionRaw = (0, get_column_1.getColumn)(knex, table, column, false);
+            const selectionRaw = (0, get_column_1.getColumn)(knex, table, column, false, schema);
             // Knex supports "raw" in the columnName parameter, but isn't typed as such. Too bad..
             // See https://github.com/knex/knex/issues/4518 @TODO remove as any once knex is updated
             // These operators don't rely on a value, and can thus be used without one (eg `?filter[field][_null]`)
@@ -254,6 +255,15 @@ function applyFilter(knex, schema, rootQuery, rootFilter, collection, subQuery =
                     query.where(key, '!=', '');
                 });
             }
+            // Cast filter value (compareValue) based on function used
+            if (column.includes('(') && column.includes(')')) {
+                const functionName = column.split('(')[0];
+                const type = (0, utils_1.getOutputTypeForFunction)(functionName);
+                if (['bigInteger', 'integer', 'float', 'decimal'].includes(type)) {
+                    compareValue = Number(compareValue);
+                }
+            }
+            // Cast filter value (compareValue) based on type of field being filtered against
             const [collection, field] = key.split('.');
             if (collection in schema.collections && field in schema.collections[collection].fields) {
                 const type = schema.collections[collection].fields[field].type;
@@ -265,6 +275,14 @@ function applyFilter(knex, schema, rootQuery, rootFilter, collection, subQuery =
                         compareValue = helpers.date.parse(compareValue);
                     }
                 }
+                if (['bigInteger', 'integer', 'float', 'decimal'].includes(type)) {
+                    if (Array.isArray(compareValue)) {
+                        compareValue = compareValue.map((val) => Number(val));
+                    }
+                    else {
+                        compareValue = Number(compareValue);
+                    }
+                }
             }
             // The following fields however, require a value to be run. If no value is passed, we
             // ignore them. This allows easier use in GraphQL, where you wouldn't be able to

package/dist/utils/get-column.d.ts

@@ -1,12 +1,13 @@
+import { SchemaOverview } from '@directus/shared/types';
 import { Knex } from 'knex';
 /**
- * Return column prefixed by table. If column includes functions (like `year(date_created)`, the
- * column is replaced with the appropriate SQL)
+ * Return column prefixed by table. If column includes functions (like `year(date_created)`), the
+ * column is replaced with the appropriate SQL
  *
  * @param knex Current knex / transaction instance
- * @param collection Collection or alias in which column resides
- * @param field name of the column
+ * @param table Collection or alias in which column resides
+ * @param column name of the column
  * @param alias Whether or not to add a SQL AS statement
  * @returns Knex raw instance
  */
-export declare function getColumn(knex: Knex, table: string, column: string, alias?: string | false): Knex.Raw;
+export declare function getColumn(knex: Knex, table: string, column: string, alias: string | false | undefined, schema: SchemaOverview): Knex.Raw;

package/dist/utils/get-column.js

@@ -1,25 +1,33 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getColumn = void 0;
-const helpers_1 = require("../database/helpers");
 const constants_1 = require("@directus/shared/constants");
+const utils_1 = require("@directus/shared/utils");
+const helpers_1 = require("../database/helpers");
+const exceptions_1 = require("../exceptions");
 const apply_function_to_column_name_1 = require("./apply-function-to-column-name");
 /**
- * Return column prefixed by table. If column includes functions (like `year(date_created)`, the
- * column is replaced with the appropriate SQL)
+ * Return column prefixed by table. If column includes functions (like `year(date_created)`), the
+ * column is replaced with the appropriate SQL
  *
  * @param knex Current knex / transaction instance
- * @param collection Collection or alias in which column resides
- * @param field name of the column
+ * @param table Collection or alias in which column resides
+ * @param column name of the column
  * @param alias Whether or not to add a SQL AS statement
  * @returns Knex raw instance
  */
-function getColumn(knex, table, column, alias = (0, apply_function_to_column_name_1.applyFunctionToColumnName)(column)) {
-    const { date: fn } = (0, helpers_1.getHelpers)(knex);
+function getColumn(knex, table, column, alias = (0, apply_function_to_column_name_1.applyFunctionToColumnName)(column), schema) {
+    var _a, _b, _c, _d;
+    const fn = (0, helpers_1.getFunctions)(knex, schema);
     if (column.includes('(') && column.includes(')')) {
         const functionName = column.split('(')[0];
         const columnName = column.match(constants_1.REGEX_BETWEEN_PARENS)[1];
         if (functionName in fn) {
+            const type = (_d = (_c = (_b = (_a = schema === null || schema === void 0 ? void 0 : schema.collections[table]) === null || _a === void 0 ? void 0 : _a.fields) === null || _b === void 0 ? void 0 : _b[columnName]) === null || _c === void 0 ? void 0 : _c.type) !== null && _d !== void 0 ? _d : 'unknown';
+            const allowedFunctions = (0, utils_1.getFunctionsForType)(type);
+            if (allowedFunctions.includes(functionName) === false) {
+                throw new exceptions_1.InvalidQueryException(`Invalid function specified "${functionName}"`);
+            }
             const result = fn[functionName](table, columnName);
             if (alias) {
                 return knex.raw(result + ' AS ??', [alias]);
@@ -27,7 +35,7 @@ function getColumn(knex, table, column, alias = (0, apply_function_to_column_nam
             return result;
         }
         else {
-            throw new Error(`Invalid function specified "${functionName}"`);
+            throw new exceptions_1.InvalidQueryException(`Invalid function specified "${functionName}"`);
         }
     }
     if (alias && column !== alias) {

package/dist/utils/get-schema.d.ts

@@ -1,5 +1,5 @@
-import { Knex } from 'knex';
 import { Accountability, SchemaOverview } from '@directus/shared/types';
+import { Knex } from 'knex';
 export declare function getSchema(options?: {
     accountability?: Accountability;
     database?: Knex;

package/dist/utils/get-schema.js

@@ -5,17 +5,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getSchema = void 0;
 const schema_1 = __importDefault(require("@directus/schema"));
+const utils_1 = require("@directus/shared/utils");
 const lodash_1 = require("lodash");
+const cache_1 = require("../cache");
+const database_1 = __importDefault(require("../database"));
 const collections_1 = require("../database/system-data/collections");
 const fields_1 = require("../database/system-data/fields");
+const env_1 = __importDefault(require("../env"));
 const logger_1 = __importDefault(require("../logger"));
 const services_1 = require("../services");
-const utils_1 = require("@directus/shared/utils");
 const get_default_value_1 = __importDefault(require("./get-default-value"));
 const get_local_type_1 = __importDefault(require("./get-local-type"));
-const database_1 = __importDefault(require("../database"));
-const cache_1 = require("../cache");
-const env_1 = __importDefault(require("../env"));
 async function getSchema(options) {
     const database = (options === null || options === void 0 ? void 0 : options.database) || (0, database_1.default)();
     const schemaInspector = (0, schema_1.default)(database);
@@ -49,7 +49,7 @@ async function getSchema(options) {
 }
 exports.getSchema = getSchema;
 async function getDatabaseSchema(database, schemaInspector) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e, _f;
     const result = {
         collections: {},
         relations: [],
@@ -95,6 +95,7 @@ async function getDatabaseSchema(database, schemaInspector) {
                     scale: column.numeric_scale || null,
                     special: [],
                     note: null,
+                    validation: null,
                     alias: false,
                 };
             }),
@@ -102,7 +103,7 @@ async function getDatabaseSchema(database, schemaInspector) {
     }
     const fields = [
         ...(await database
-            .select('id', 'collection', 'field', 'special', 'note')
+            .select('id', 'collection', 'field', 'special', 'note', 'validation')
             .from('directus_fields')),
         ...fields_1.systemFieldRows,
     ].filter((field) => (field.special ? (0, utils_1.toArray)(field.special) : []).includes('no-data') === false);
@@ -113,18 +114,22 @@ async function getDatabaseSchema(database, schemaInspector) {
         const column = schemaOverview[field.collection].columns[field.field];
         const special = field.special ? (0, utils_1.toArray)(field.special) : [];
         const type = (existing && (0, get_local_type_1.default)(column, { special })) || 'alias';
+        let validation = (_a = field.validation) !== null && _a !== void 0 ? _a : null;
+        if (validation && typeof validation === 'string')
+            validation = JSON.parse(validation);
         result.collections[field.collection].fields[field.field] = {
             field: field.field,
-            defaultValue: (_a = existing === null || existing === void 0 ? void 0 : existing.defaultValue) !== null && _a !== void 0 ? _a : null,
-            nullable: (_b = existing === null || existing === void 0 ? void 0 : existing.nullable) !== null && _b !== void 0 ? _b : true,
-            generated: (_c = existing === null || existing === void 0 ? void 0 : existing.generated) !== null && _c !== void 0 ? _c : false,
+            defaultValue: (_b = existing === null || existing === void 0 ? void 0 : existing.defaultValue) !== null && _b !== void 0 ? _b : null,
+            nullable: (_c = existing === null || existing === void 0 ? void 0 : existing.nullable) !== null && _c !== void 0 ? _c : true,
+            generated: (_d = existing === null || existing === void 0 ? void 0 : existing.generated) !== null && _d !== void 0 ? _d : false,
             type: type,
             dbType: (existing === null || existing === void 0 ? void 0 : existing.dbType) || null,
             precision: (existing === null || existing === void 0 ? void 0 : existing.precision) || null,
             scale: (existing === null || existing === void 0 ? void 0 : existing.scale) || null,
             special: special,
             note: field.note,
-            alias: (_d = existing === null || existing === void 0 ? void 0 : existing.alias) !== null && _d !== void 0 ? _d : true,
+            alias: (_e = existing === null || existing === void 0 ? void 0 : existing.alias) !== null && _e !== void 0 ? _e : true,
+            validation: (_f = validation) !== null && _f !== void 0 ? _f : null,
         };
     }
     const relationsService = new services_1.RelationsService({ knex: database, schema: result });

package/dist/utils/track.js

@@ -12,6 +12,7 @@ const os_1 = __importDefault(require("os"));
 const package_json_1 = require("../../package.json");
 const env_1 = __importDefault(require("../env"));
 const logger_1 = __importDefault(require("../logger"));
+const utils_1 = require("@directus/shared/utils");
 async function track(event) {
     if (env_1.default.TELEMETRY !== false) {
         const info = await getEnvInfo(event);
@@ -60,7 +61,7 @@ async function getEnvInfo(event) {
             transport: env_1.default.EMAIL_TRANSPORT,
         },
         auth: {
-            providers: env_1.default.AUTH_PROVIDERS.split(',')
+            providers: (0, utils_1.toArray)(env_1.default.AUTH_PROVIDERS)
                 .map((v) => v.trim())
                 .filter((v) => v),
         },
@@ -69,7 +70,7 @@ async function getEnvInfo(event) {
 }
 function getStorageDrivers() {
     const drivers = [];
-    const locations = env_1.default.STORAGE_LOCATIONS.split(',')
+    const locations = (0, utils_1.toArray)(env_1.default.STORAGE_LOCATIONS)
         .map((v) => v.trim())
         .filter((v) => v);
     for (const location of locations) {

package/dist/utils/url.d.ts

@@ -9,7 +9,7 @@ export declare class Url {
     isAbsolute(): boolean;
     isProtocolRelative(): boolean;
     isRootRelative(): boolean;
-    addPath(...paths: string[]): Url;
+    addPath(...paths: (string | number)[]): Url;
     setQuery(key: string, value: string): Url;
     toString({ rootRelative }?: {
         rootRelative: boolean;

package/dist/utils/url.js

@@ -28,7 +28,7 @@ class Url {
         return this.protocol === null && this.host === null;
     }
     addPath(...paths) {
-        const pathToAdd = paths.flatMap((p) => p.split('/')).filter((p) => p !== '');
+        const pathToAdd = paths.flatMap((p) => String(p).split('/')).filter((p) => p !== '');
         for (const pathSegment of pathToAdd) {
             if (pathSegment === '..') {
                 this.path.pop();

package/dist/utils/validate-storage.js

@@ -9,6 +9,7 @@ const logger_1 = __importDefault(require("../logger"));
 const fs_extra_1 = require("fs-extra");
 const fs_1 = require("fs");
 const path_1 = __importDefault(require("path"));
+const utils_1 = require("@directus/shared/utils");
 async function validateStorage() {
     if (env_1.default.DB_CLIENT === 'sqlite3') {
         try {
@@ -18,7 +19,8 @@ async function validateStorage() {
             logger_1.default.warn(`Directory for SQLite database file (${path_1.default.resolve(path_1.default.dirname(env_1.default.DB_FILENAME))}) is not read/writeable!`);
         }
     }
-    if (env_1.default.STORAGE_LOCATIONS.split(',').includes('local')) {
+    const usedStorageDrivers = (0, utils_1.toArray)(env_1.default.STORAGE_LOCATIONS).map((location) => env_1.default[`STORAGE_${location.toUpperCase()}_DRIVER`]);
+    if (usedStorageDrivers.includes('local')) {
         try {
             await (0, fs_extra_1.access)(env_1.default.STORAGE_LOCAL_ROOT, fs_1.constants.R_OK | fs_1.constants.W_OK);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "directus",
-	"version": "9.7.1",
+	"version": "9.8.0",
 	"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.",
@@ -78,16 +78,16 @@
 	],
 	"dependencies": {
 		"@aws-sdk/client-ses": "^3.40.0",
-		"@directus/app": "9.7.1",
-		"@directus/drive": "9.7.1",
-		"@directus/drive-azure": "9.7.1",
-		"@directus/drive-gcs": "9.7.1",
-		"@directus/drive-s3": "9.7.1",
-		"@directus/extensions-sdk": "9.7.1",
-		"@directus/format-title": "9.7.1",
-		"@directus/schema": "9.7.1",
-		"@directus/shared": "9.7.1",
-		"@directus/specs": "9.7.1",
+		"@directus/app": "9.8.0",
+		"@directus/drive": "9.8.0",
+		"@directus/drive-azure": "9.8.0",
+		"@directus/drive-gcs": "9.8.0",
+		"@directus/drive-s3": "9.8.0",
+		"@directus/extensions-sdk": "9.8.0",
+		"@directus/format-title": "9.8.0",
+		"@directus/schema": "9.8.0",
+		"@directus/shared": "9.8.0",
+		"@directus/specs": "9.8.0",
 		"@godaddy/terminus": "^4.9.0",
 		"@rollup/plugin-alias": "^3.1.9",
 		"@rollup/plugin-virtual": "^2.0.3",
@@ -173,7 +173,7 @@
 		"sqlite3": "^5.0.2",
 		"tedious": "^13.0.0"
 	},
-	"gitHead": "7b1594727686ab8bfac416d851b1f0063f38f893",
+	"gitHead": "2a6db01c42dd1d7524962e7153d1d7e1bd63fb2f",
 	"devDependencies": {
 		"@types/async": "3.2.10",
 		"@types/body-parser": "1.19.2",