directus 9.14.5 → 9.16.0

package/dist/app.js

@@ -168,7 +168,7 @@ async function createApp() {
         res.send(constants_1.ROBOTSTXT);
     });
     if (env_1.default.SERVE_APP) {
-        const adminPath = require.resolve('@directus/app');
+        const adminPath = require.resolve('@directus/app', require.main ? { paths: [require.main.filename] } : undefined);
         const adminUrl = new url_1.Url(env_1.default.PUBLIC_URL).addPath('admin');
         // Set the App's base path according to the APIs public URL
         const html = await fs_extra_1.default.readFile(adminPath, 'utf8');
@@ -190,6 +190,7 @@ async function createApp() {
     if (env_1.default.RATE_LIMITER_ENABLED === true) {
         app.use(rate_limiter_1.default);
     }
+    app.get('/server/ping', (req, res) => res.send('pong'));
     app.use(authenticate_1.default);
     app.use(check_ip_1.checkIP);
     app.use(sanitize_query_1.default);

package/dist/auth/drivers/ldap.js

@@ -34,6 +34,7 @@ const get_ip_from_req_1 = require("../../utils/get-ip-from-req");
 const joi_1 = __importDefault(require("joi"));
 const auth_1 = require("../auth");
 const exceptions_1 = require("../../exceptions");
+const record_not_unique_1 = require("../../exceptions/database/record-not-unique");
 const services_1 = require("../../services");
 const async_handler_1 = __importDefault(require("../../utils/async-handler"));
 const env_1 = __importDefault(require("../../env"));
@@ -218,14 +219,23 @@ class LDAPAuthDriver extends auth_1.AuthDriver {
         if (!userInfo) {
             throw new exceptions_1.InvalidCredentialsException();
         }
-        await this.usersService.createOne({
-            provider: this.config.provider,
-            first_name: userInfo.firstName,
-            last_name: userInfo.lastName,
-            email: userInfo.email,
-            external_identifier: userInfo.dn,
-            role: (_c = userRole === null || userRole === void 0 ? void 0 : userRole.id) !== null && _c !== void 0 ? _c : defaultRoleId,
-        });
+        try {
+            await this.usersService.createOne({
+                provider: this.config.provider,
+                first_name: userInfo.firstName,
+                last_name: userInfo.lastName,
+                email: userInfo.email,
+                external_identifier: userInfo.dn,
+                role: (_c = userRole === null || userRole === void 0 ? void 0 : userRole.id) !== null && _c !== void 0 ? _c : defaultRoleId,
+            });
+        }
+        catch (e) {
+            if (e instanceof record_not_unique_1.RecordNotUniqueException) {
+                logger_1.default.warn(e, '[LDAP] Failed to register user. User not unique');
+                throw new exceptions_1.InvalidProviderException();
+            }
+            throw e;
+        }
         return (await this.fetchUserId(userInfo.dn));
     }
     async verify(user, password) {

package/dist/auth/drivers/oauth2.js

@@ -14,6 +14,7 @@ const openid_client_1 = require("openid-client");
 const auth_1 = require("../../auth");
 const env_1 = __importDefault(require("../../env"));
 const exceptions_2 = require("../../exceptions");
+const record_not_unique_1 = require("../../exceptions/database/record-not-unique");
 const logger_1 = __importDefault(require("../../logger"));
 const respond_1 = require("../../middleware/respond");
 const services_1 = require("../../services");
@@ -118,15 +119,24 @@ class OAuth2AuthDriver extends local_1.LocalAuthDriver {
             logger_1.default.trace(`[OAuth2] User doesn't exist, and public registration not allowed for provider "${provider}"`);
             throw new exceptions_2.InvalidCredentialsException();
         }
-        await this.usersService.createOne({
-            provider,
-            first_name: userInfo[this.config.firstNameKey],
-            last_name: userInfo[this.config.lastNameKey],
-            email: email,
-            external_identifier: identifier,
-            role: this.config.defaultRoleId,
-            auth_data: tokenSet.refresh_token && JSON.stringify({ refreshToken: tokenSet.refresh_token }),
-        });
+        try {
+            await this.usersService.createOne({
+                provider,
+                first_name: userInfo[this.config.firstNameKey],
+                last_name: userInfo[this.config.lastNameKey],
+                email: email,
+                external_identifier: identifier,
+                role: this.config.defaultRoleId,
+                auth_data: tokenSet.refresh_token && JSON.stringify({ refreshToken: tokenSet.refresh_token }),
+            });
+        }
+        catch (e) {
+            if (e instanceof record_not_unique_1.RecordNotUniqueException) {
+                logger_1.default.warn(e, '[OAuth2] Failed to register user. User not unique');
+                throw new exceptions_2.InvalidProviderException();
+            }
+            throw e;
+        }
         return (await this.fetchUserId(identifier));
     }
     async login(user) {

package/dist/auth/drivers/openid.js

@@ -14,6 +14,7 @@ const openid_client_1 = require("openid-client");
 const auth_1 = require("../../auth");
 const env_1 = __importDefault(require("../../env"));
 const exceptions_2 = require("../../exceptions");
+const record_not_unique_1 = require("../../exceptions/database/record-not-unique");
 const logger_1 = __importDefault(require("../../logger"));
 const respond_1 = require("../../middleware/respond");
 const services_1 = require("../../services");
@@ -136,15 +137,24 @@ class OpenIDAuthDriver extends local_1.LocalAuthDriver {
             logger_1.default.trace(`[OpenID] User doesn't exist, and public registration not allowed for provider "${provider}"`);
             throw new exceptions_2.InvalidCredentialsException();
         }
-        await this.usersService.createOne({
-            provider,
-            first_name: userInfo.given_name,
-            last_name: userInfo.family_name,
-            email: email,
-            external_identifier: identifier,
-            role: this.config.defaultRoleId,
-            auth_data: tokenSet.refresh_token && JSON.stringify({ refreshToken: tokenSet.refresh_token }),
-        });
+        try {
+            await this.usersService.createOne({
+                provider,
+                first_name: userInfo.given_name,
+                last_name: userInfo.family_name,
+                email: email,
+                external_identifier: identifier,
+                role: this.config.defaultRoleId,
+                auth_data: tokenSet.refresh_token && JSON.stringify({ refreshToken: tokenSet.refresh_token }),
+            });
+        }
+        catch (e) {
+            if (e instanceof record_not_unique_1.RecordNotUniqueException) {
+                logger_1.default.warn(e, '[OpenID] Failed to register user. User not unique');
+                throw new exceptions_2.InvalidProviderException();
+            }
+            throw e;
+        }
         return (await this.fetchUserId(identifier));
     }
     async login(user) {

package/dist/cache.d.ts

@@ -7,3 +7,6 @@ export declare function getCache(): {
 export declare function flushCaches(forced?: boolean): Promise<void>;
 export declare function clearSystemCache(forced?: boolean): Promise<void>;
 export declare function setSystemCache(key: string, value: any, ttl?: number): Promise<void>;
+export declare function getSystemCache(key: string): Promise<Record<string, any>>;
+export declare function setCacheValue(cache: Keyv, key: string, value: Record<string, any> | Record<string, any>[], ttl?: number): Promise<void>;
+export declare function getCacheValue(cache: Keyv, key: string): Promise<any>;

package/dist/cache.js

@@ -3,13 +3,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setSystemCache = exports.clearSystemCache = exports.flushCaches = exports.getCache = void 0;
+exports.getCacheValue = exports.setCacheValue = exports.getSystemCache = exports.setSystemCache = exports.clearSystemCache = exports.flushCaches = exports.getCache = void 0;
 const keyv_1 = __importDefault(require("keyv"));
 const ms_1 = __importDefault(require("ms"));
 const env_1 = __importDefault(require("./env"));
 const logger_1 = __importDefault(require("./logger"));
 const get_config_from_env_1 = require("./utils/get-config-from-env");
 const validate_env_1 = require("./utils/validate-env");
+const compress_1 = require("./utils/compress");
 let cache = null;
 let systemCache = null;
 let lockCache = null;
@@ -49,10 +50,28 @@ exports.clearSystemCache = clearSystemCache;
 async function setSystemCache(key, value, ttl) {
     const { systemCache, lockCache } = getCache();
     if (!(await lockCache.get('system-cache-lock'))) {
-        await systemCache.set(key, value, ttl);
+        await setCacheValue(systemCache, key, value, ttl);
     }
 }
 exports.setSystemCache = setSystemCache;
+async function getSystemCache(key) {
+    const { systemCache } = getCache();
+    return await getCacheValue(systemCache, key);
+}
+exports.getSystemCache = getSystemCache;
+async function setCacheValue(cache, key, value, ttl) {
+    const compressed = await (0, compress_1.compress)(value);
+    await cache.set(key, compressed, ttl);
+}
+exports.setCacheValue = setCacheValue;
+async function getCacheValue(cache, key) {
+    const value = await cache.get(key);
+    if (!value)
+        return undefined;
+    const decompressed = await (0, compress_1.decompress)(value);
+    return decompressed;
+}
+exports.getCacheValue = getCacheValue;
 function getKeyvInstance(ttl, namespaceSuffix) {
     switch (env_1.default.CACHE_STORE) {
         case 'redis':

package/dist/cli/index.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/cli/index.test.js

@@ -0,0 +1,58 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const index_1 = require("./index");
+jest.mock('../../src/env', () => ({
+    ...jest.requireActual('../../src/env').default,
+    EXTENSIONS_PATH: '',
+    SERVE_APP: false,
+    DB_CLIENT: 'pg',
+    DB_HOST: 'localhost',
+    DB_PORT: 5432,
+    DB_DATABASE: 'directus',
+    DB_USER: 'postgres',
+    DB_PASSWORD: 'psql1234',
+}));
+jest.mock('@directus/shared/utils/node/get-extensions', () => ({
+    getPackageExtensions: jest.fn(() => Promise.resolve([])),
+    getLocalExtensions: jest.fn(() => Promise.resolve([customCliExtension])),
+}));
+jest.mock(`/hooks/custom-cli/index.js`, () => customCliHook, { virtual: true });
+const customCliExtension = {
+    path: `/hooks/custom-cli`,
+    name: 'custom-cli',
+    type: 'hook',
+    entrypoint: 'index.js',
+    local: true,
+};
+const beforeHook = jest.fn();
+const afterAction = jest.fn();
+const afterHook = jest.fn(({ program }) => {
+    program.command('custom').action(afterAction);
+});
+const customCliHook = ({ init }) => {
+    init('cli.before', beforeHook);
+    init('cli.after', afterHook);
+};
+const writeOut = jest.fn();
+const writeErr = jest.fn();
+const setup = async () => {
+    const program = await (0, index_1.createCli)();
+    program.exitOverride();
+    program.configureOutput({ writeOut, writeErr });
+    return program;
+};
+beforeEach(jest.clearAllMocks);
+describe('cli hooks', () => {
+    test('should call hooks before and after creating the cli', async () => {
+        const program = await setup();
+        expect(beforeHook).toHaveBeenCalledTimes(1);
+        expect(beforeHook).toHaveBeenCalledWith({ event: 'cli.before', program });
+        expect(afterHook).toHaveBeenCalledTimes(1);
+        expect(afterHook).toHaveBeenCalledWith({ event: 'cli.after', program });
+    });
+    test('should be able to add a custom cli command', async () => {
+        const program = await setup();
+        program.parseAsync(['custom'], { from: 'user' });
+        expect(afterAction).toHaveBeenCalledTimes(1);
+    });
+});

package/dist/cli/utils/create-env/env-stub.liquid

@@ -296,10 +296,10 @@ EMAIL_SENDMAIL_PATH="/usr/sbin/sendmail"
 ## Email (Sendmail Transport)
 
 # What new line style to use in sendmail ["unix"]
-EMAIL_SENDMAIL_NEW_LINE="unix"
+# EMAIL_SENDMAIL_NEW_LINE="unix"
 
 # Path to your sendmail executable ["/usr/sbin/sendmail"]
-EMAIL_SENDMAIL_PATH="/usr/sbin/sendmail"
+# EMAIL_SENDMAIL_PATH="/usr/sbin/sendmail"
 
 ## Email (SMTP Transport)
 # EMAIL_SMTP_HOST="localhost"

package/dist/constants.d.ts

@@ -5,6 +5,7 @@ export declare const FILTER_VARIABLES: string[];
 export declare const ALIAS_TYPES: string[];
 export declare const DEFAULT_AUTH_PROVIDER = "default";
 export declare const COLUMN_TRANSFORMS: string[];
+export declare const GENERATE_SPECIAL: string[];
 export declare const UUID_REGEX = "[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}";
 export declare const COOKIE_OPTIONS: {
     httpOnly: boolean;

package/dist/constants.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ROBOTSTXT = exports.COOKIE_OPTIONS = exports.UUID_REGEX = exports.COLUMN_TRANSFORMS = exports.DEFAULT_AUTH_PROVIDER = exports.ALIAS_TYPES = exports.FILTER_VARIABLES = exports.ASSET_TRANSFORM_QUERY_KEYS = exports.SYSTEM_ASSET_ALLOW_LIST = void 0;
+exports.ROBOTSTXT = exports.COOKIE_OPTIONS = exports.UUID_REGEX = exports.GENERATE_SPECIAL = exports.COLUMN_TRANSFORMS = exports.DEFAULT_AUTH_PROVIDER = exports.ALIAS_TYPES = exports.FILTER_VARIABLES = exports.ASSET_TRANSFORM_QUERY_KEYS = exports.SYSTEM_ASSET_ALLOW_LIST = void 0;
 const env_1 = __importDefault(require("./env"));
 const ms_1 = __importDefault(require("ms"));
 exports.SYSTEM_ASSET_ALLOW_LIST = [
@@ -47,6 +47,7 @@ exports.FILTER_VARIABLES = ['$NOW', '$CURRENT_USER', '$CURRENT_ROLE'];
 exports.ALIAS_TYPES = ['alias', 'o2m', 'm2m', 'm2a', 'o2a', 'files', 'translations'];
 exports.DEFAULT_AUTH_PROVIDER = 'default';
 exports.COLUMN_TRANSFORMS = ['year', 'month', 'day', 'weekday', 'hour', 'minute', 'second'];
+exports.GENERATE_SPECIAL = ['uuid', 'date-created', 'role-created', 'user-created'];
 exports.UUID_REGEX = '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}';
 exports.COOKIE_OPTIONS = {
     httpOnly: true,

package/dist/controllers/assets.js

@@ -12,6 +12,7 @@ const constants_1 = require("../constants");
 const database_1 = __importDefault(require("../database"));
 const env_1 = __importDefault(require("../env"));
 const exceptions_1 = require("../exceptions");
+const logger_1 = __importDefault(require("../logger"));
 const use_collection_1 = __importDefault(require("../middleware/use-collection"));
 const services_1 = require("../services");
 const assets_1 = require("../types/assets");
@@ -147,6 +148,31 @@ router.get('/:pk/:filename?',
         res.setHeader('Content-Length', stat.size);
         return res.end();
     }
-    stream.pipe(res);
+    let isDataSent = false;
+    stream.on('data', (chunk) => {
+        isDataSent = true;
+        res.write(chunk);
+    });
+    stream.on('end', () => {
+        res.end();
+    });
+    stream.on('error', (e) => {
+        logger_1.default.error(e, `Couldn't stream file ${file.id} to the client`);
+        if (!isDataSent) {
+            res.removeHeader('Content-Type');
+            res.removeHeader('Content-Disposition');
+            res.removeHeader('Cache-Control');
+            res.status(500).json({
+                errors: [
+                    {
+                        message: 'An unexpected error occurred.',
+                        extensions: {
+                            code: 'INTERNAL_SERVER_ERROR',
+                        },
+                    },
+                ],
+            });
+        }
+    });
 }));
 exports.default = router;

package/dist/controllers/extensions.js

@@ -9,13 +9,14 @@ const exceptions_1 = require("../exceptions");
 const extensions_1 = require("../extensions");
 const respond_1 = require("../middleware/respond");
 const utils_1 = require("@directus/shared/utils");
+const constants_1 = require("@directus/shared/constants");
 const ms_1 = __importDefault(require("ms"));
 const env_1 = __importDefault(require("../env"));
 const get_cache_headers_1 = require("../utils/get-cache-headers");
 const router = (0, express_1.Router)();
 router.get('/:type', (0, async_handler_1.default)(async (req, res, next) => {
     const type = (0, utils_1.depluralize)(req.params.type);
-    if (!(0, utils_1.isAppExtension)(type)) {
+    if (!(0, utils_1.isIn)(type, constants_1.APP_OR_HYBRID_EXTENSION_TYPES)) {
         throw new exceptions_1.RouteNotFoundException(req.path);
     }
     const extensionManager = (0, extensions_1.getExtensionManager)();
@@ -27,7 +28,7 @@ router.get('/:type', (0, async_handler_1.default)(async (req, res, next) => {
 }), respond_1.respond);
 router.get('/:type/index.js', (0, async_handler_1.default)(async (req, res) => {
     const type = (0, utils_1.depluralize)(req.params.type);
-    if (!(0, utils_1.isAppExtension)(type)) {
+    if (!(0, utils_1.isIn)(type, constants_1.APP_OR_HYBRID_EXTENSION_TYPES)) {
         throw new exceptions_1.RouteNotFoundException(req.path);
     }
     const extensionManager = (0, extensions_1.getExtensionManager)();

package/dist/controllers/files.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/controllers/files.test.js

@@ -0,0 +1,49 @@
+"use strict";
+// @ts-nocheck
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+jest.mock('../../src/cache');
+jest.mock('../../src/database');
+jest.mock('../../src/utils/validate-env');
+const files_1 = require("./files");
+const invalid_payload_1 = require("../exceptions/invalid-payload");
+const stream_1 = require("stream");
+const form_data_1 = __importDefault(require("form-data"));
+describe('multipartHandler', () => {
+    it(`Errors out if request doesn't contain any files to upload`, () => {
+        const fakeForm = new form_data_1.default();
+        fakeForm.append('field', 'test');
+        const req = {
+            headers: fakeForm.getHeaders(),
+            is: jest.fn().mockReturnValue(true),
+            body: fakeForm.getBuffer(),
+            params: {},
+            pipe: (input) => stream.pipe(input),
+        };
+        const stream = new stream_1.PassThrough();
+        stream.push(fakeForm.getBuffer());
+        (0, files_1.multipartHandler)(req, {}, (err) => {
+            expect(err.message).toBe('No files where included in the body');
+            expect(err).toBeInstanceOf(invalid_payload_1.InvalidPayloadException);
+        });
+    });
+    it(`Errors out if uploaded file doesn't include the filename`, () => {
+        const fakeForm = new form_data_1.default();
+        fakeForm.append('file', Buffer.from('<?xml version="1.0" encoding="UTF-8" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg width="100%" height="100%" viewBox="0 0 243 266" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41421;"><g id="Calligraphy"><path d="M67.097,135.868c0,3.151 0.598,14.121 -11.586,14.121c-17.076,0 -15.95,-12.947 -15.95,-12.947c0,-2.521 4.597,-5.638 4.597,-7.318c0,-0.63 0.041,-3.519 -2.27,-3.519c-5.671,0 -5.671,10.083 -5.671,10.083c0,0 0.419,15.336 19.116,15.336c20.205,0 30.04,-23.712 30.04,-30.88c0,-18.197 -51.112,-27.701 -51.112,-57.949c0,1.575 -2.205,-13.864 14.18,-13.864c28.358,0 44.426,42.536 44.426,71.524c0,28.988 -16.699,55.455 -16.699,55.455c0,0 33.4,-25.837 33.4,-76.25c0,-70.264 -46.003,-69.634 -46.003,-69.634c-4.792,0 -7.602,-0.241 -28.398,20.555c-20.797,20.797 -17.646,29.83 -17.646,29.83c0,31.93 49.576,32.35 49.576,55.457Z" style="fill-rule:nonzero;"/><path d="M241.886,174.861c-1.602,-9.142 -15.448,-9.916 -22.675,-9.682c-0.7,-0.003 -1.172,0.02 -1.327,0.03c-8.804,0.01 -19.314,4.179 -33.072,13.115c-3.554,2.308 -7.19,4.847 -10.902,7.562c-6.979,-31.39 -13.852,-63.521 -28.033,-63.521c20.415,-20.119 22.19,-16.272 22.19,-39.054c0,-11.244 14.498,-21.35 14.498,-21.35l-0.296,-2.024c-19.193,5.304 -37.307,-8.577 -42.2,-12.755c5.375,-9.663 9.584,-12.565 9.584,-12.565c1.891,-20.377 15.965,-27.31 15.965,-27.31c1.681,-4.201 6.092,-7.142 6.092,-7.142c-70.162,22.267 -54.247,189.298 -54.247,189.298c-0.475,-55.91 5.238,-92.242 11.977,-115.55c9.094,8.248 24.425,11.765 24.425,11.765c-7.396,3.55 -5.324,12.13 -5.324,19.527c0,7.397 -3.848,10.651 -3.848,10.651l-21.893,22.782c17.043,0.294 23.638,31.657 30.689,63.056c-2.548,2.042 -5.125,4.12 -7.728,6.219c-16.396,13.223 -33.351,26.897 -50.266,37.354c-19.086,11.797 -35.151,17.533 -49.116,17.533c-25.25,0 -44.118,-24.368 -44.118,-46.154c0,-9.838 3.227,-17.831 5.935,-22.805c2.935,-5.39 5.911,-8.503 5.967,-8.561c0.001,0 0.001,0 0.001,-0.001l-0.013,-0.012c1.803,-1.885 4.841,-5.181 10.423,-5.181c20.715,0 27.475,40.776 55.603,40.776c24.857,0 31.834,-20.497 37.286,-31.399c0,0 -8.94,11.12 -21.587,11.12c-27.038,0 -35.323,-40.557 -55.166,-40.557c-13.41,0 -22.743,15.506 -31.029,27.281c0,0 0.018,-0.001 0.048,-0.003c-1.02,1.415 -2.214,3.233 -3.41,5.425c-2.847,5.21 -6.239,13.587 -6.239,23.917c0,22.816 19.801,48.334 46.299,48.334c14.381,0 30.822,-5.84 50.262,-17.858c17.033,-10.529 34.04,-24.246 50.489,-37.511c2.309,-1.862 4.607,-3.715 6.891,-5.549c6.952,30.814 14.606,60.912 33.278,60.912c14.794,0 26.923,-25.445 26.923,-25.445c-7.987,7.101 -13.313,5.621 -13.313,5.621c-13.139,0.379 -19.937,-27.594 -26.48,-56.931c16.455,-12.099 31.46,-20.829 43.488,-20.829l0.072,-0.003c0.082,-0.005 5.246,-0.305 9.957,1.471c-2.95,1.636 -4.947,4.782 -4.947,8.394c0,5.299 4.296,9.594 9.594,9.594c5.298,0 9.594,-4.295 9.594,-9.594c0,-0.826 -0.104,-1.627 -0.301,-2.391Z" style="fill-rule:nonzero;"/></g></svg>'));
+        const req = {
+            headers: fakeForm.getHeaders(),
+            is: jest.fn().mockReturnValue(true),
+            body: fakeForm.getBuffer(),
+            params: {},
+            pipe: (input) => stream.pipe(input),
+        };
+        const stream = new stream_1.PassThrough();
+        stream.push(fakeForm.getBuffer());
+        (0, files_1.multipartHandler)(req, {}, (err) => {
+            expect(err.message).toBe('File is missing filename');
+            expect(err).toBeInstanceOf(invalid_payload_1.InvalidPayloadException);
+        });
+    });
+});

package/dist/controllers/server.js

@@ -36,7 +36,6 @@ router.get('/specs/graphql/:scope?', (0, async_handler_1.default)(async (req, re
     res.attachment(filename);
     res.send(result);
 }));
-router.get('/ping', (req, res) => res.send('pong'));
 router.get('/info', (0, async_handler_1.default)(async (req, res, next) => {
     const service = new services_1.ServerService({
         accountability: req.accountability,

package/dist/database/helpers/schema/dialects/cockroachdb.d.ts

@@ -1,16 +1,5 @@
-import { SchemaHelper } from '../types';
+import { KNEX_TYPES } from '@directus/shared/constants';
+import { Options, SchemaHelper } from '../types';
 export declare class SchemaHelperCockroachDb extends SchemaHelper {
-    changeToText(table: string, column: string, options?: {
-        nullable?: boolean;
-        default?: any;
-    }): Promise<void>;
-    changeToString(table: string, column: string, options?: {
-        nullable?: boolean;
-        default?: any;
-        length?: number;
-    }): Promise<void>;
-    changeToInteger(table: string, column: string, options?: {
-        nullable?: boolean;
-        default?: any;
-    }): Promise<void>;
+    changeToType(table: string, column: string, type: typeof KNEX_TYPES[number], options?: Options): Promise<void>;
 }

package/dist/database/helpers/schema/dialects/cockroachdb.js

@@ -3,14 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SchemaHelperCockroachDb = void 0;
 const types_1 = require("../types");
 class SchemaHelperCockroachDb extends types_1.SchemaHelper {
-    async changeToText(table, column, options = {}) {
-        await this.changeToTypeByCopy(table, column, options, (builder, column) => builder.text(column));
-    }
-    async changeToString(table, column, options = {}) {
-        await this.changeToTypeByCopy(table, column, options, (builder, column, options) => builder.string(column, options.length));
-    }
-    async changeToInteger(table, column, options = {}) {
-        await this.changeToTypeByCopy(table, column, options, (builder, column) => builder.integer(column));
+    async changeToType(table, column, type, options = {}) {
+        await this.changeToTypeByCopy(table, column, type, options);
     }
 }
 exports.SchemaHelperCockroachDb = SchemaHelperCockroachDb;

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

@@ -1,12 +1,5 @@
-import { SchemaHelper } from '../types';
+import { KNEX_TYPES } from '@directus/shared/constants';
+import { Options, SchemaHelper } from '../types';
 export declare class SchemaHelperOracle extends SchemaHelper {
-    changeToText(table: string, column: string, options?: {
-        nullable?: boolean;
-        default?: any;
-    }): Promise<void>;
-    changeToString(table: string, column: string, options?: {
-        nullable?: boolean;
-        default?: any;
-        length?: number;
-    }): Promise<void>;
+    changeToType(table: string, column: string, type: typeof KNEX_TYPES[number], options?: Options): Promise<void>;
 }

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

@@ -3,11 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SchemaHelperOracle = void 0;
 const types_1 = require("../types");
 class SchemaHelperOracle extends types_1.SchemaHelper {
-    async changeToText(table, column, options = {}) {
-        await this.changeToTypeByCopy(table, column, options, (builder, column) => builder.text(column));
-    }
-    async changeToString(table, column, options = {}) {
-        await this.changeToTypeByCopy(table, column, options, (builder, column, options) => builder.string(column, options.length));
+    async changeToType(table, column, type, options = {}) {
+        await this.changeToTypeByCopy(table, column, type, options);
     }
 }
 exports.SchemaHelperOracle = SchemaHelperOracle;

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

@@ -1,26 +1,16 @@
 import { DatabaseHelper } from '../types';
-import { Knex } from 'knex';
+import { KNEX_TYPES } from '@directus/shared/constants';
 declare type Clients = 'mysql' | 'postgres' | 'cockroachdb' | 'sqlite' | 'oracle' | 'mssql' | 'redshift';
+export declare type Options = {
+    nullable?: boolean;
+    default?: any;
+    length?: number;
+};
 export declare abstract class SchemaHelper extends DatabaseHelper {
     isOneOfClients(clients: Clients[]): boolean;
     changeNullable(table: string, column: string, nullable: boolean): Promise<void>;
-    changeToText(table: string, column: string, options?: {
-        nullable?: boolean;
-        default?: any;
-    }): Promise<void>;
-    changeToInteger(table: string, column: string, options?: {
-        nullable?: boolean;
-        default?: any;
-    }): Promise<void>;
-    changeToString(table: string, column: string, options?: {
-        nullable?: boolean;
-        default?: any;
-        length?: number;
-    }): Promise<void>;
-    protected changeToTypeByCopy<Options extends {
-        nullable?: boolean;
-        default?: any;
-    }>(table: string, column: string, options: Options, cb: (builder: Knex.CreateTableBuilder, column: string, options: Options) => Knex.ColumnBuilder): Promise<void>;
+    changeToType(table: string, column: string, type: typeof KNEX_TYPES[number], options?: Options): Promise<void>;
+    protected changeToTypeByCopy(table: string, column: string, type: typeof KNEX_TYPES[number], options: Options): Promise<void>;
     preColumnDelete(): Promise<boolean>;
     postColumnDelete(): Promise<void>;
 }

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

@@ -17,9 +17,9 @@ class SchemaHelper extends types_1.DatabaseHelper {
             }
         });
     }
-    async changeToText(table, column, options = {}) {
+    async changeToType(table, column, type, options = {}) {
         await this.knex.schema.alterTable(table, (builder) => {
-            const b = builder.string(column);
+            const b = type === 'string' ? builder.string(column, options.length) : builder[type](column);
             if (options.nullable === true) {
                 b.nullable();
             }
@@ -32,39 +32,10 @@ class SchemaHelper extends types_1.DatabaseHelper {
             b.alter();
         });
     }
-    async changeToInteger(table, column, options = {}) {
+    async changeToTypeByCopy(table, column, type, options) {
+        const tempName = `${column}__temp`;
         await this.knex.schema.alterTable(table, (builder) => {
-            const b = builder.integer(column);
-            if (options.nullable === true) {
-                b.nullable();
-            }
-            if (options.nullable === false) {
-                b.notNullable();
-            }
-            if (options.default !== undefined) {
-                b.defaultTo(options.default);
-            }
-            b.alter();
-        });
-    }
-    async changeToString(table, column, options = {}) {
-        await this.knex.schema.alterTable(table, (builder) => {
-            const b = builder.string(column, options.length);
-            if (options.nullable === true) {
-                b.nullable();
-            }
-            if (options.nullable === false) {
-                b.notNullable();
-            }
-            if (options.default !== undefined) {
-                b.defaultTo(options.default);
-            }
-            b.alter();
-        });
-    }
-    async changeToTypeByCopy(table, column, options, cb) {
-        await this.knex.schema.alterTable(table, (builder) => {
-            const col = cb(builder, `${column}__temp`, options);
+            const col = type === 'string' ? builder.string(tempName, options.length) : builder[type](tempName);
             if (options.default !== undefined) {
                 col.defaultTo(options.default);
             }
@@ -72,12 +43,12 @@ class SchemaHelper extends types_1.DatabaseHelper {
             // the table)
             col.nullable();
         });
-        await this.knex(table).update(`${column}__temp`, this.knex.ref(column));
+        await this.knex(table).update(tempName, this.knex.ref(column));
         await this.knex.schema.alterTable(table, (builder) => {
             builder.dropColumn(column);
         });
         await this.knex.schema.alterTable(table, (builder) => {
-            builder.renameColumn(`${column}__temp`, column);
+            builder.renameColumn(tempName, column);
         });
         // We're altering the temporary column here. That starts nullable, so we only want to set it
         // to NOT NULL when applicable

package/dist/database/migrations/20201105B-change-webhook-url-type.js

@@ -4,11 +4,12 @@ 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.changeToText('directus_webhooks', 'url');
+    const type = helper.isOneOfClients(['oracle', 'cockroachdb']) ? 'text' : 'string';
+    await helper.changeToType('directus_webhooks', 'url', type);
 }
 exports.up = up;
 async function down(knex) {
-    await (0, helpers_1.getHelpers)(knex).schema.changeToString('directus_webhooks', 'url', {
+    await (0, helpers_1.getHelpers)(knex).schema.changeToType('directus_webhooks', 'url', 'string', {
         nullable: false,
         length: 255,
     });

package/dist/database/migrations/20210312A-webhooks-collections-text.js

@@ -4,11 +4,12 @@ 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.changeToText('directus_webhooks', 'collections');
+    const type = helper.isOneOfClients(['oracle', 'cockroachdb']) ? 'text' : 'string';
+    await helper.changeToType('directus_webhooks', 'collections', type);
 }
 exports.up = up;
 async function down(knex) {
-    await (0, helpers_1.getHelpers)(knex).schema.changeToString('directus_webhooks', 'collections', {
+    await (0, helpers_1.getHelpers)(knex).schema.changeToType('directus_webhooks', 'collections', 'string', {
         nullable: false,
         length: 255,
     });