directus 9.8.0 → 9.10.0

package/README.md

@@ -16,7 +16,7 @@ view, author, and manage your raw database content. Our performant and flexible
 schema, and includes rule-based permissions, event/web hooks, custom endpoints, numerous auth options, configurable
 storage adapters, and much more.
 
-Current database support includes: PostgreSQL, MySQL, SQLite, MS-SQL Server, OracleDB, MariaDB, and varients such as AWS
+Current database support includes: PostgreSQL, MySQL, SQLite, MS-SQL Server, OracleDB, MariaDB, and variants such as AWS
 Aurora/Redshift or Google Cloud Platform SQL.
 
 Learn more at...

package/dist/__mocks__/cache.d.ts

@@ -0,0 +1,5 @@
+/// <reference types="jest" />
+export declare const getCache: jest.Mock<any, any>;
+export declare const flushCaches: jest.Mock<any, any>;
+export declare const clearSystemCache: jest.Mock<any, any>;
+export declare const setSystemCache: jest.Mock<any, any>;

package/dist/__mocks__/cache.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.setSystemCache = exports.clearSystemCache = exports.flushCaches = exports.getCache = void 0;
+exports.getCache = jest.fn().mockReturnValue({ cache: undefined, systemCache: undefined, lockCache: undefined });
+exports.flushCaches = jest.fn();
+exports.clearSystemCache = jest.fn();
+exports.setSystemCache = jest.fn();

package/dist/app.js

@@ -119,6 +119,9 @@ async function createApp() {
             connectSrc: ["'self'", 'https://*'],
         },
     }, (0, get_config_from_env_1.getConfigFromEnv)('CONTENT_SECURITY_POLICY_'))));
+    if (env_1.default.HSTS_ENABLED) {
+        app.use(helmet_1.default.hsts((0, get_config_from_env_1.getConfigFromEnv)('HSTS_', ['HSTS_ENABLED'])));
+    }
     await emitter_1.default.emitInit('app.before', { app });
     await emitter_1.default.emitInit('middlewares.before', { app });
     app.use(logger_1.expressLogger);

package/dist/auth/drivers/ldap.js

@@ -71,12 +71,8 @@ class LDAPAuthDriver extends auth_1.AuthDriver {
                 res.on('searchEntry', () => {
                     resolve();
                 });
-                res.on('error', (err) => {
-                    if (!(err instanceof ldapjs_1.OperationsError)) {
-                        reject(handleError(err));
-                        return;
-                    }
-                    // Rebind on OperationsError
+                res.on('error', () => {
+                    // Attempt to rebind on search error
                     this.bindClient.bind(bindDn, bindPassword, (err) => {
                         if (err) {
                             const error = handleError(err);
@@ -93,8 +89,8 @@ class LDAPAuthDriver extends auth_1.AuthDriver {
                     });
                 });
                 res.on('end', (result) => {
+                    // Handle edge case where authenticated bind user cannot read their own DN
                     if ((result === null || result === void 0 ? void 0 : result.status) === 0) {
-                        // Handle edge case where authenticated bind user could not fetch their own DN
                         reject(new exceptions_1.UnexpectedResponseException('Failed to find bind user record'));
                     }
                 });
@@ -177,12 +173,12 @@ class LDAPAuthDriver extends auth_1.AuthDriver {
         return user === null || user === void 0 ? void 0 : user.id;
     }
     async getUserID(payload) {
-        var _a;
+        var _a, _b, _c;
         if (!payload.identifier) {
             throw new exceptions_1.InvalidCredentialsException();
         }
         await this.validateBindClient();
-        const { userDn, userScope, userAttribute, groupDn, groupScope, groupAttribute } = this.config;
+        const { userDn, userScope, userAttribute, groupDn, groupScope, groupAttribute, defaultRoleId } = this.config;
         const userInfo = await this.fetchUserInfo(userDn, new ldapjs_1.EqualityFilter({
             attribute: userAttribute !== null && userAttribute !== void 0 ? userAttribute : 'cn',
             value: payload.identifier,
@@ -209,7 +205,10 @@ class LDAPAuthDriver extends auth_1.AuthDriver {
         }
         const userId = await this.fetchUserId(userInfo.dn);
         if (userId) {
-            await this.usersService.updateOne(userId, { role: (_a = userRole === null || userRole === void 0 ? void 0 : userRole.id) !== null && _a !== void 0 ? _a : null });
+            // Only sync roles if the AD groups are configured
+            if (groupDn) {
+                await this.usersService.updateOne(userId, { role: (_b = (_a = userRole === null || userRole === void 0 ? void 0 : userRole.id) !== null && _a !== void 0 ? _a : defaultRoleId) !== null && _b !== void 0 ? _b : null });
+            }
             return userId;
         }
         if (!userInfo) {
@@ -221,7 +220,7 @@ class LDAPAuthDriver extends auth_1.AuthDriver {
             last_name: userInfo.lastName,
             email: userInfo.email,
             external_identifier: userInfo.dn,
-            role: userRole === null || userRole === void 0 ? void 0 : userRole.id,
+            role: (_c = userRole === null || userRole === void 0 ? void 0 : userRole.id) !== null && _c !== void 0 ? _c : defaultRoleId,
         });
         return (await this.fetchUserId(userInfo.dn));
     }

package/dist/auth/drivers/oauth2.js

@@ -8,6 +8,7 @@ const express_1 = require("express");
 const openid_client_1 = require("openid-client");
 const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
 const ms_1 = __importDefault(require("ms"));
+const flat_1 = __importDefault(require("flat"));
 const local_1 = require("./local");
 const auth_1 = require("../../auth");
 const env_1 = __importDefault(require("../../env"));
@@ -77,7 +78,7 @@ class OAuth2AuthDriver extends local_1.LocalAuthDriver {
         return user === null || user === void 0 ? void 0 : user.id;
     }
     async getUserID(payload) {
-        var _a;
+        var _a, _b;
         if (!payload.code || !payload.codeVerifier) {
             logger_1.default.trace('[OAuth2] No code or codeVerifier in payload');
             throw new exceptions_1.InvalidCredentialsException();
@@ -91,12 +92,14 @@ class OAuth2AuthDriver extends local_1.LocalAuthDriver {
         catch (e) {
             throw handleError(e);
         }
-        const { emailKey, identifierKey, allowPublicRegistration } = this.config;
+        // Flatten response to support dot indexes
+        userInfo = (0, flat_1.default)(userInfo);
+        const { provider, emailKey, identifierKey, allowPublicRegistration } = this.config;
         const email = userInfo[emailKey !== null && emailKey !== void 0 ? emailKey : 'email'];
         // Fallback to email if explicit identifier not found
-        const identifier = (_a = userInfo[identifierKey]) !== null && _a !== void 0 ? _a : email;
+        const identifier = (_b = ((_a = userInfo[identifierKey]) !== null && _a !== void 0 ? _a : email)) === null || _b === void 0 ? void 0 : _b.toString();
         if (!identifier) {
-            logger_1.default.warn(`[OAuth2] Failed to find user identifier for provider "${this.config.provider}"`);
+            logger_1.default.warn(`[OAuth2] Failed to find user identifier for provider "${provider}"`);
             throw new exceptions_1.InvalidCredentialsException();
         }
         const userId = await this.fetchUserId(identifier);
@@ -111,11 +114,13 @@ class OAuth2AuthDriver extends local_1.LocalAuthDriver {
         }
         // Is public registration allowed?
         if (!allowPublicRegistration) {
-            logger_1.default.trace(`[OAuth2] User doesn't exist, and public registration not allowed for provider "${this.config.provider}"`);
+            logger_1.default.trace(`[OAuth2] User doesn't exist, and public registration not allowed for provider "${provider}"`);
             throw new exceptions_1.InvalidCredentialsException();
         }
         await this.usersService.createOne({
-            provider: this.config.provider,
+            provider,
+            first_name: userInfo[this.config.firstNameKey],
+            last_name: userInfo[this.config.lastNameKey],
             email: email,
             external_identifier: identifier,
             role: this.config.defaultRoleId,

package/dist/auth/drivers/openid.js

@@ -8,6 +8,7 @@ const express_1 = require("express");
 const openid_client_1 = require("openid-client");
 const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
 const ms_1 = __importDefault(require("ms"));
+const flat_1 = __importDefault(require("flat"));
 const local_1 = require("./local");
 const auth_1 = require("../../auth");
 const env_1 = __importDefault(require("../../env"));
@@ -84,7 +85,7 @@ class OpenIDAuthDriver extends local_1.LocalAuthDriver {
         return user === null || user === void 0 ? void 0 : user.id;
     }
     async getUserID(payload) {
-        var _a;
+        var _a, _b;
         if (!payload.code || !payload.codeVerifier) {
             logger_1.default.trace('[OpenID] No code or codeVerifier in payload');
             throw new exceptions_1.InvalidCredentialsException();
@@ -105,12 +106,14 @@ class OpenIDAuthDriver extends local_1.LocalAuthDriver {
         catch (e) {
             throw handleError(e);
         }
-        const { identifierKey, allowPublicRegistration, requireVerifiedEmail } = this.config;
+        // Flatten response to support dot indexes
+        userInfo = (0, flat_1.default)(userInfo);
+        const { provider, identifierKey, allowPublicRegistration, requireVerifiedEmail } = this.config;
         const email = userInfo.email;
         // Fallback to email if explicit identifier not found
-        const identifier = (_a = userInfo[identifierKey !== null && identifierKey !== void 0 ? identifierKey : 'sub']) !== null && _a !== void 0 ? _a : email;
+        const identifier = (_b = (_a = userInfo[identifierKey !== null && identifierKey !== void 0 ? identifierKey : 'sub']) === null || _a === void 0 ? void 0 : _a.toString()) !== null && _b !== void 0 ? _b : email;
         if (!identifier) {
-            logger_1.default.warn(`[OpenID] Failed to find user identifier for provider "${this.config.provider}"`);
+            logger_1.default.warn(`[OpenID] Failed to find user identifier for provider "${provider}"`);
             throw new exceptions_1.InvalidCredentialsException();
         }
         const userId = await this.fetchUserId(identifier);
@@ -126,11 +129,11 @@ class OpenIDAuthDriver extends local_1.LocalAuthDriver {
         const isEmailVerified = !requireVerifiedEmail || userInfo.email_verified;
         // Is public registration allowed?
         if (!allowPublicRegistration || !isEmailVerified) {
-            logger_1.default.trace(`[OpenID] User doesn't exist, and public registration not allowed for provider "${this.config.provider}"`);
+            logger_1.default.trace(`[OpenID] User doesn't exist, and public registration not allowed for provider "${provider}"`);
             throw new exceptions_1.InvalidCredentialsException();
         }
         await this.usersService.createOne({
-            provider: this.config.provider,
+            provider,
             first_name: userInfo.given_name,
             last_name: userInfo.family_name,
             email: email,

package/dist/cli/commands/schema/apply.js

@@ -93,13 +93,19 @@ async function apply(snapshotPath, options) {
             if (snapshotDiff.fields.length > 0) {
                 message += '\n\n' + chalk_1.default.black.underline.bold('Fields:');
                 for (const { collection, field, diff } of snapshotDiff.fields) {
-                    if (((_e = diff[0]) === null || _e === void 0 ? void 0 : _e.kind) === 'E') {
+                    if (((_e = diff[0]) === null || _e === void 0 ? void 0 : _e.kind) === 'E' || (0, apply_snapshot_1.isNestedMetaUpdate)(diff[0])) {
                         message += `\n  - ${chalk_1.default.blue('Update')} ${collection}.${field}`;
                         for (const change of diff) {
+                            const path = change.path.slice(1).join('.');
                             if (change.kind === 'E') {
-                                const path = change.path.slice(1).join('.');
                                 message += `\n    - Set ${path} to ${change.rhs}`;
                             }
+                            else if (change.kind === 'D') {
+                                message += `\n    - Remove ${path}`;
+                            }
+                            else if (change.kind === 'N') {
+                                message += `\n    - Add ${path} and set it to ${change.rhs}`;
+                            }
                         }
                     }
                     else if (((_f = diff[0]) === null || _f === void 0 ? void 0 : _f.kind) === 'D') {
@@ -143,7 +149,7 @@ async function apply(snapshotPath, options) {
                     }
                 }
             }
-            message += 'The following changes will be applied:\n\n' + chalk_1.default.black(message);
+            message = 'The following changes will be applied:\n\n' + chalk_1.default.black(message);
             if (dryRun) {
                 logger_1.default.info(message);
                 process.exit(0);

package/dist/controllers/assets.js

@@ -126,6 +126,11 @@ router.get('/:pk',
     res.setHeader('Content-Type', file.type);
     res.setHeader('Accept-Ranges', 'bytes');
     res.setHeader('Cache-Control', `${access}, max-age=${(0, ms_1.default)(env_1.default.ASSETS_CACHE_TTL) / 1000}`);
+    const unixTime = Date.parse(file.modified_on);
+    if (!Number.isNaN(unixTime)) {
+        const lastModifiedDate = new Date(unixTime);
+        res.setHeader('Last-Modified', lastModifiedDate.toUTCString());
+    }
     if (range) {
         res.setHeader('Content-Range', `bytes ${range.start}-${range.end || stat.size - 1}/${stat.size}`);
         res.status(206);

package/dist/controllers/files.d.ts

@@ -1,2 +1,4 @@
+import { RequestHandler } from 'express';
 declare const router: import("express-serve-static-core").Router;
+export declare const multipartHandler: RequestHandler;
 export default router;

package/dist/controllers/files.js

@@ -3,7 +3,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.multipartHandler = void 0;
 const format_title_1 = __importDefault(require("@directus/format-title"));
+const utils_1 = require("@directus/shared/utils");
 const busboy_1 = __importDefault(require("busboy"));
 const express_1 = __importDefault(require("express"));
 const joi_1 = __importDefault(require("joi"));
@@ -15,10 +17,9 @@ const use_collection_1 = __importDefault(require("../middleware/use-collection")
 const validate_batch_1 = require("../middleware/validate-batch");
 const services_1 = require("../services");
 const async_handler_1 = __importDefault(require("../utils/async-handler"));
-const utils_1 = require("@directus/shared/utils");
 const router = express_1.default.Router();
 router.use((0, use_collection_1.default)('directus_files'));
-const multipartHandler = (0, async_handler_1.default)(async (req, res, next) => {
+const multipartHandler = (req, res, next) => {
     if (req.is('multipart/form-data') === false)
         return next();
     let headers;
@@ -57,6 +58,9 @@ const multipartHandler = (0, async_handler_1.default)(async (req, res, next) =>
         payload[fieldname] = fieldValue;
     });
     busboy.on('file', async (fieldname, fileStream, filename, encoding, mimetype) => {
+        if (!filename) {
+            return busboy.emit('error', new exceptions_1.InvalidPayloadException(`File is missing filename`));
+        }
         fileCount++;
         if (!payload.title) {
             payload.title = (0, format_title_1.default)(path_1.default.parse(filename).name);
@@ -87,12 +91,16 @@ const multipartHandler = (0, async_handler_1.default)(async (req, res, next) =>
     req.pipe(busboy);
     function tryDone() {
         if (savedFiles.length === fileCount) {
+            if (fileCount === 0) {
+                return next(new exceptions_1.InvalidPayloadException(`No files where included in the body`));
+            }
             res.locals.savedFiles = savedFiles;
             return next();
         }
     }
-});
-router.post('/', multipartHandler, (0, async_handler_1.default)(async (req, res, next) => {
+};
+exports.multipartHandler = multipartHandler;
+router.post('/', (0, async_handler_1.default)(exports.multipartHandler), (0, async_handler_1.default)(async (req, res, next) => {
     if (req.is('multipart/form-data') === false) {
         throw new exceptions_1.UnsupportedMediaTypeException(`Unsupported Content-Type header`);
     }
@@ -214,7 +222,7 @@ router.patch('/', (0, validate_batch_1.validateBatch)('update'), (0, async_handl
     }
     return next();
 }), respond_1.respond);
-router.patch('/:pk', multipartHandler, (0, async_handler_1.default)(async (req, res, next) => {
+router.patch('/:pk', (0, async_handler_1.default)(exports.multipartHandler), (0, async_handler_1.default)(async (req, res, next) => {
     const service = new services_1.FilesService({
         accountability: req.accountability,
         schema: req.schema,

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

@@ -0,0 +1,4 @@
+import { DateHelper } from '../types';
+export declare class DateHelperMSSQL extends DateHelper {
+    writeTimestamp(date: string): Date;
+}

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

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DateHelperMSSQL = void 0;
+const types_1 = require("../types");
+const date_fns_1 = require("date-fns");
+class DateHelperMSSQL extends types_1.DateHelper {
+    writeTimestamp(date) {
+        const parsedDate = (0, date_fns_1.parseISO)(date);
+        return new Date(parsedDate.getTime() + parsedDate.getTimezoneOffset() * 60000);
+    }
+}
+exports.DateHelperMSSQL = DateHelperMSSQL;

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

@@ -0,0 +1,5 @@
+import { DateHelper } from '../types';
+export declare class DateHelperMySQL extends DateHelper {
+    readTimestampString(date: string): string;
+    writeTimestamp(date: string): Date;
+}

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

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DateHelperMySQL = void 0;
+const types_1 = require("../types");
+const date_fns_1 = require("date-fns");
+class DateHelperMySQL extends types_1.DateHelper {
+    readTimestampString(date) {
+        const parsedDate = new Date(date);
+        return new Date(parsedDate.getTime() - parsedDate.getTimezoneOffset() * 60000).toISOString();
+    }
+    writeTimestamp(date) {
+        const parsedDate = (0, date_fns_1.parseISO)(date);
+        return new Date(parsedDate.getTime() + parsedDate.getTimezoneOffset() * 60000);
+    }
+}
+exports.DateHelperMySQL = DateHelperMySQL;

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

@@ -0,0 +1,4 @@
+import { DateHelper } from '../types';
+export declare class DateHelperOracle extends DateHelper {
+    fieldFlagForField(fieldType: string): string;
+}

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

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DateHelperOracle = void 0;
+const types_1 = require("../types");
+class DateHelperOracle extends types_1.DateHelper {
+    fieldFlagForField(fieldType) {
+        switch (fieldType) {
+            case 'dateTime':
+                return 'cast-datetime';
+            default:
+                return '';
+        }
+    }
+}
+exports.DateHelperOracle = DateHelperOracle;

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

@@ -1,4 +1,5 @@
 import { DateHelper } from '../types';
 export declare class DateHelperSQLite extends DateHelper {
     parse(date: string): string;
+    fieldFlagForField(fieldType: string): string;
 }

package/dist/database/helpers/date/dialects/sqlite.js

@@ -7,5 +7,13 @@ class DateHelperSQLite extends types_1.DateHelper {
         const newDate = new Date(date);
         return (newDate.getTime() - newDate.getTimezoneOffset() * 60 * 1000).toString();
     }
+    fieldFlagForField(fieldType) {
+        switch (fieldType) {
+            case 'timestamp':
+                return 'cast-timestamp';
+            default:
+                return '';
+        }
+    }
 }
 exports.DateHelperSQLite = DateHelperSQLite;

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

@@ -1,7 +1,7 @@
 export { DateHelperDefault as postgres } from './dialects/default';
 export { DateHelperDefault as redshift } from './dialects/default';
 export { DateHelperDefault as cockroachdb } from './dialects/default';
-export { DateHelperDefault as oracle } from './dialects/default';
-export { DateHelperDefault as mysql } from './dialects/default';
-export { DateHelperDefault as mssql } from './dialects/default';
+export { DateHelperOracle as oracle } from './dialects/oracle';
+export { DateHelperMySQL as mysql } from './dialects/mysql';
+export { DateHelperMSSQL as mssql } from './dialects/mssql';
 export { DateHelperSQLite as sqlite } from './dialects/sqlite';

package/dist/database/helpers/date/index.js

@@ -7,11 +7,11 @@ var default_2 = require("./dialects/default");
 Object.defineProperty(exports, "redshift", { enumerable: true, get: function () { return default_2.DateHelperDefault; } });
 var default_3 = require("./dialects/default");
 Object.defineProperty(exports, "cockroachdb", { enumerable: true, get: function () { return default_3.DateHelperDefault; } });
-var default_4 = require("./dialects/default");
-Object.defineProperty(exports, "oracle", { enumerable: true, get: function () { return default_4.DateHelperDefault; } });
-var default_5 = require("./dialects/default");
-Object.defineProperty(exports, "mysql", { enumerable: true, get: function () { return default_5.DateHelperDefault; } });
-var default_6 = require("./dialects/default");
-Object.defineProperty(exports, "mssql", { enumerable: true, get: function () { return default_6.DateHelperDefault; } });
+var oracle_1 = require("./dialects/oracle");
+Object.defineProperty(exports, "oracle", { enumerable: true, get: function () { return oracle_1.DateHelperOracle; } });
+var mysql_1 = require("./dialects/mysql");
+Object.defineProperty(exports, "mysql", { enumerable: true, get: function () { return mysql_1.DateHelperMySQL; } });
+var mssql_1 = require("./dialects/mssql");
+Object.defineProperty(exports, "mssql", { enumerable: true, get: function () { return mssql_1.DateHelperMSSQL; } });
 var sqlite_1 = require("./dialects/sqlite");
 Object.defineProperty(exports, "sqlite", { enumerable: true, get: function () { return sqlite_1.DateHelperSQLite; } });

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

@@ -1,4 +1,7 @@
 import { DatabaseHelper } from '../types';
 export declare abstract class DateHelper extends DatabaseHelper {
     parse(date: string): string;
+    readTimestampString(date: string): string;
+    writeTimestamp(date: string): Date;
+    fieldFlagForField(_fieldType: string): string;
 }

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

@@ -2,9 +2,19 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DateHelper = void 0;
 const types_1 = require("../types");
+const date_fns_1 = require("date-fns");
 class DateHelper extends types_1.DatabaseHelper {
     parse(date) {
         return date;
     }
+    readTimestampString(date) {
+        return date;
+    }
+    writeTimestamp(date) {
+        return (0, date_fns_1.parseISO)(date);
+    }
+    fieldFlagForField(_fieldType) {
+        return '';
+    }
 }
 exports.DateHelper = DateHelper;

package/dist/database/helpers/fn/dialects/postgres.js

@@ -31,7 +31,11 @@ class FnHelperPostgres extends types_1.FnHelper {
         var _a, _b, _c, _d, _e;
         const type = (_e = (_d = (_c = (_b = (_a = this.schema.collections) === null || _a === void 0 ? void 0 : _a[table]) === null || _b === void 0 ? void 0 : _b.fields) === null || _c === void 0 ? void 0 : _c[column]) === null || _d === void 0 ? void 0 : _d.type) !== null && _e !== void 0 ? _e : 'unknown';
         if (type === 'json') {
-            return this.knex.raw('json_array_length(??.??)', [table, column]);
+            const { dbType } = this.schema.collections[table].fields[column];
+            return this.knex.raw(dbType === 'jsonb' ? 'jsonb_array_length(??.??)' : 'json_array_length(??.??)', [
+                table,
+                column,
+            ]);
         }
         if (type === 'alias') {
             return this._relationalCount(table, column);

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

@@ -5,7 +5,7 @@ import * as fnHelpers from './fn';
 import * as geometryHelpers from './geometry';
 import * as schemaHelpers from './schema';
 export declare function getHelpers(database: Knex): {
-    date: dateHelpers.postgres | dateHelpers.sqlite;
+    date: dateHelpers.postgres | dateHelpers.oracle | dateHelpers.mysql | dateHelpers.mssql | dateHelpers.sqlite;
     st: geometryHelpers.postgres | geometryHelpers.redshift | geometryHelpers.oracle | geometryHelpers.sqlite | geometryHelpers.mysql | geometryHelpers.mssql;
     schema: schemaHelpers.postgres | schemaHelpers.cockroachdb | schemaHelpers.oracle;
 };

package/dist/database/migrations/20220402A-remove-default-value-panel-icon.d.ts

@@ -0,0 +1,3 @@
+import { Knex } from 'knex';
+export declare function up(knex: Knex): Promise<void>;
+export declare function down(knex: Knex): Promise<void>;

package/dist/database/migrations/20220402A-remove-default-value-panel-icon.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.down = exports.up = void 0;
+const helpers_1 = require("../helpers");
+async function up(knex) {
+    const helper = (0, helpers_1.getHelpers)(knex).schema;
+    await helper.changeToString('directus_panels', 'icon', {
+        nullable: true,
+        default: null,
+        length: 30,
+    });
+}
+exports.up = up;
+async function down(knex) {
+    const helper = (0, helpers_1.getHelpers)(knex).schema;
+    await helper.changeToString('directus_panels', 'icon', {
+        nullable: true,
+        default: 'insert_chart',
+        length: 30,
+    });
+}
+exports.down = down;

package/dist/database/run-ast.js

@@ -107,7 +107,7 @@ async function parseCurrentLevel(schema, collection, children, query) {
         if (!child.relation)
             continue;
         if (child.type === 'm2o') {
-            columnsToSelectInternal.push(child.fieldKey);
+            columnsToSelectInternal.push(child.relation.field);
         }
         if (child.type === 'a2o') {
             columnsToSelectInternal.push(child.relation.field);
@@ -126,7 +126,7 @@ async function parseCurrentLevel(schema, collection, children, query) {
     const columnsToSelect = [...new Set(columnsToSelectInternal)];
     const fieldNodes = columnsToSelect.map((column) => {
         var _a;
-        return (_a = children.find((childNode) => childNode.type === 'field' && childNode.fieldKey === column)) !== null && _a !== void 0 ? _a : {
+        return (_a = children.find((childNode) => childNode.type === 'field' && (childNode.fieldKey === column || childNode.name === column))) !== null && _a !== void 0 ? _a : {
             type: 'field',
             name: column,
             fieldKey: column,
@@ -221,7 +221,7 @@ function mergeWithParentItems(schema, nestedItem, parentItem, nestedNode) {
         for (const parentItem of parentItems) {
             const itemChild = nestedItems.find((nestedItem) => {
                 return (nestedItem[schema.collections[nestedNode.relation.related_collection].primary] ==
-                    parentItem[nestedNode.fieldKey]);
+                    parentItem[nestedNode.relation.field]);
             });
             parentItem[nestedNode.fieldKey] = itemChild || null;
         }

package/dist/database/system-data/fields/collections.yaml

@@ -193,7 +193,7 @@ fields:
 
   - field: item_duplication_fields
     special:
-      - json
+      - cast-json
     interface: system-field-tree
     options:
       collectionField: collection

package/dist/database/system-data/fields/settings.yaml

@@ -39,7 +39,6 @@ fields:
     options:
       iconRight: language
       placeholder: en-US
-      includeProjectDefault: false
     translations:
       language: en-US
       translations: Default Language

package/dist/database/system-data/fields/users.yaml

@@ -72,6 +72,8 @@ fields:
   - field: language
     interface: system-language
     width: half
+    options:
+      includeProjectDefault: true
 
   - field: theme
     interface: select-dropdown
@@ -152,6 +154,7 @@ fields:
   - field: last_access
     width: half
     display: datetime
+    readonly: true
     display_options:
       relative: true
 

package/dist/env.js

@@ -14,7 +14,7 @@ const lodash_1 = require("lodash");
 const path_1 = __importDefault(require("path"));
 const require_yaml_1 = require("./utils/require-yaml");
 const utils_1 = require("@directus/shared/utils");
-const acceptedEnvTypes = ['string', 'number', 'regex', 'array'];
+const acceptedEnvTypes = ['string', 'number', 'regex', 'array', 'json'];
 const defaults = {
     CONFIG_PATH: path_1.default.resolve(process.cwd(), '.env'),
     HOST: '0.0.0.0',
@@ -69,6 +69,8 @@ const defaults = {
     SERVE_APP: true,
     RELATIONAL_BATCH_SIZE: 25000,
     EXPORT_BATCH_SIZE: 5000,
+    FILE_METADATA_ALLOW_LIST: 'ifd0.Make,ifd0.Model,exif.FNumber,exif.ExposureTime,exif.FocalLength,exif.ISO',
+    GRAPHQL_INTROSPECTION: true,
 };
 // Allows us to force certain environment variable into a type, instead of relying
 // on the auto-parsed type in processValues. ref #3705
@@ -82,11 +84,13 @@ const typeMap = {
     DB_PORT: 'number',
     DB_EXCLUDE_TABLES: 'array',
     IMPORT_IP_DENY_LIST: 'array',
+    FILE_METADATA_ALLOW_LIST: 'array',
+    GRAPHQL_INTROSPECTION: 'boolean',
 };
 let env = {
     ...defaults,
-    ...getEnv(),
     ...process.env,
+    ...getEnv(),
 };
 process.env = env;
 env = processValues(env);
@@ -98,8 +102,8 @@ exports.default = env;
 function refreshEnv() {
     env = {
         ...defaults,
-        ...getEnv(),
         ...process.env,
+        ...getEnv(),
     };
     process.env = env;
     env = processValues(env);
@@ -207,6 +211,8 @@ function processValues(env) {
                 case 'json':
                     env[key] = tryJSON(value);
                     break;
+                case 'boolean':
+                    env[key] = value === 'true' || value === true || value === '1' || value === 1;
             }
             continue;
         }

package/dist/exceptions/index.d.ts

@@ -13,6 +13,7 @@ export * from './method-not-allowed';
 export * from './range-not-satisfiable';
 export * from './route-not-found';
 export * from './service-unavailable';
+export * from './token-expired';
 export * from './unprocessable-entity';
 export * from './unsupported-media-type';
 export * from './user-suspended';