directus 9.15.1 → 9.17.0

package/dist/operations/exec/index.test.js

@@ -0,0 +1,95 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const vm2_1 = require("vm2");
+const index_1 = __importDefault(require("./index"));
+test('Rejects when modules are used without modules being allowed', async () => {
+    const testCode = `
+		const test = require('test');
+	`;
+    await expect(index_1.default.handler({ code: testCode }, {
+        data: {},
+        env: {
+            FLOWS_EXEC_ALLOWED_MODULES: '',
+        },
+    })).rejects.toEqual(new vm2_1.VMError("Cannot find module 'test'"));
+});
+test('Rejects when code contains syntax errors', async () => {
+    const testCode = `
+		~~
+	`;
+    await expect(index_1.default.handler({ code: testCode }, {
+        data: {},
+        env: {
+            FLOWS_EXEC_ALLOWED_MODULES: '',
+        },
+    })).rejects.toEqual(new Error("Couldn't compile code: Unexpected end of input"));
+});
+test('Rejects when returned function does something illegal', async () => {
+    const testCode = `
+		module.exports = function() {
+			return a + b;
+		};
+	`;
+    await expect(index_1.default.handler({ code: testCode }, {
+        data: {},
+        env: {
+            FLOWS_EXEC_ALLOWED_MODULES: '',
+        },
+    })).rejects.toEqual(new ReferenceError('a is not defined'));
+});
+test("Rejects when code doesn't return valid function", async () => {
+    const testCode = `
+		module.exports = false;
+	`;
+    await expect(index_1.default.handler({ code: testCode }, {
+        data: {},
+        env: {
+            FLOWS_EXEC_ALLOWED_MODULES: '',
+        },
+    })).rejects.toEqual(new TypeError('fn is not a function'));
+});
+test('Rejects returned function throws errors', async () => {
+    const testCode = `
+		module.exports = function () {
+			throw new Error('test');
+		};
+	`;
+    await expect(index_1.default.handler({ code: testCode }, {
+        data: {},
+        env: {
+            FLOWS_EXEC_ALLOWED_MODULES: '',
+        },
+    })).rejects.toEqual(new Error('test'));
+});
+test('Executes function when valid', () => {
+    const testCode = `
+		module.exports = function (data) {
+			return { result: data.input + ' test' };
+		};
+	`;
+    expect(index_1.default.handler({ code: testCode }, {
+        data: {
+            input: 'start',
+        },
+        env: {
+            FLOWS_EXEC_ALLOWED_MODULES: '',
+        },
+    })).resolves.toEqual({ result: 'start test' });
+});
+test('Allows modules that are whitelisted', () => {
+    const testCode = `
+		const bytes = require('bytes');
+
+		module.exports = function (data) {
+			return { result: bytes(1000) };
+		};
+	`;
+    expect(index_1.default.handler({ code: testCode }, {
+        env: {
+            FLOWS_EXEC_ALLOWED_MODULES: 'bytes',
+        },
+    })).resolves.toEqual({ result: '1000B' });
+});

package/dist/operations/notification/index.js

@@ -6,7 +6,6 @@ const get_accountability_for_role_1 = require("../../utils/get-accountability-fo
 exports.default = (0, utils_1.defineOperationApi)({
     id: 'notification',
     handler: async ({ recipient, subject, message, permissions }, { accountability, database, getSchema }) => {
-        var _a;
         const schema = await getSchema({ database });
         let customAccountability;
         if (!permissions || permissions === '$trigger') {
@@ -27,12 +26,16 @@ exports.default = (0, utils_1.defineOperationApi)({
             knex: database,
         });
         const messageString = message ? (0, utils_1.optionToString)(message) : null;
-        const result = await notificationsService.createOne({
-            recipient,
-            sender: (_a = customAccountability === null || customAccountability === void 0 ? void 0 : customAccountability.user) !== null && _a !== void 0 ? _a : null,
-            subject,
-            message: messageString,
+        const payload = (0, utils_1.toArray)(recipient).map((userId) => {
+            var _a;
+            return {
+                recipient: userId,
+                sender: (_a = customAccountability === null || customAccountability === void 0 ? void 0 : customAccountability.user) !== null && _a !== void 0 ? _a : null,
+                subject,
+                message: messageString,
+            };
         });
+        const result = await notificationsService.createMany(payload);
         return result;
     },
 });

package/dist/operations/request/index.js

@@ -5,14 +5,33 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("@directus/shared/utils");
 const axios_1 = __importDefault(require("axios"));
+const encodeurl_1 = __importDefault(require("encodeurl"));
 exports.default = (0, utils_1.defineOperationApi)({
     id: 'request',
     handler: async ({ url, method, body, headers }) => {
-        const customHeaders = headers === null || headers === void 0 ? void 0 : headers.reduce((acc, { header, value }) => {
+        var _a;
+        const customHeaders = (_a = headers === null || headers === void 0 ? void 0 : headers.reduce((acc, { header, value }) => {
             acc[header] = value;
             return acc;
-        }, {});
-        const result = await (0, axios_1.default)({ url: encodeURI(url), method, data: body, headers: customHeaders });
+        }, {})) !== null && _a !== void 0 ? _a : {};
+        if (!customHeaders['Content-Type'] && isValidJSON(body)) {
+            customHeaders['Content-Type'] = 'application/json';
+        }
+        const result = await (0, axios_1.default)({
+            url: (0, encodeurl_1.default)(url),
+            method,
+            data: body,
+            headers: customHeaders,
+        });
         return { status: result.status, statusText: result.statusText, headers: result.headers, data: result.data };
+        function isValidJSON(value) {
+            try {
+                (0, utils_1.parseJSON)(value);
+                return true;
+            }
+            catch {
+                return false;
+            }
+        }
     },
 });

package/dist/operations/transform/index.d.ts

@@ -1,5 +1,5 @@
 declare type Options = {
-    json: string;
+    json: string | Record<string, any>;
 };
 declare const _default: import("@directus/shared/types").OperationApiConfig<Options>;
 export default _default;

package/dist/operations/transform/index.js

@@ -4,6 +4,6 @@ const utils_1 = require("@directus/shared/utils");
 exports.default = (0, utils_1.defineOperationApi)({
     id: 'transform',
     handler: ({ json }) => {
-        return (0, utils_1.parseJSON)(json);
+        return (0, utils_1.optionToObject)(json);
     },
 });

package/dist/services/authentication.js

@@ -36,15 +36,23 @@ class AuthenticationService {
      * to handle password existence checks elsewhere
      */
     async login(providerName = constants_1.DEFAULT_AUTH_PROVIDER, payload, otp) {
-        var _a, _b;
-        const STALL_TIME = 100;
+        var _a, _b, _c;
+        const STALL_TIME = env_1.default.LOGIN_STALL_TIME;
         const timeStart = perf_hooks_1.performance.now();
         const provider = (0, auth_1.getAuthProvider)(providerName);
+        let userId;
+        try {
+            userId = await provider.getUserID((0, lodash_1.cloneDeep)(payload));
+        }
+        catch (err) {
+            await (0, stall_1.stall)(STALL_TIME, timeStart);
+            throw err;
+        }
         const user = await this.knex
             .select('u.id', 'u.first_name', 'u.last_name', 'u.email', 'u.password', 'u.status', 'u.role', 'r.admin_access', 'r.app_access', 'u.tfa_secret', 'u.provider', 'u.external_identifier', 'u.auth_data')
             .from('directus_users as u')
             .leftJoin('directus_roles as r', 'u.role', 'r.id')
-            .where('u.id', await provider.getUserID((0, lodash_1.cloneDeep)(payload)))
+            .where('u.id', userId)
             .first();
         const updatedPayload = await emitter_1.default.emitFilter('auth.login', payload, {
             status: 'pending',
@@ -151,6 +159,7 @@ class AuthenticationService {
             expires: refreshTokenExpiration,
             ip: (_a = this.accountability) === null || _a === void 0 ? void 0 : _a.ip,
             user_agent: (_b = this.accountability) === null || _b === void 0 ? void 0 : _b.userAgent,
+            origin: (_c = this.accountability) === null || _c === void 0 ? void 0 : _c.origin,
         });
         await this.knex('directus_sessions').delete().where('expires', '<', new Date());
         if (this.accountability) {
@@ -159,6 +168,7 @@ class AuthenticationService {
                 user: user.id,
                 ip: this.accountability.ip,
                 user_agent: this.accountability.userAgent,
+                origin: this.accountability.origin,
                 collection: 'directus_users',
                 item: user.id,
             });

package/dist/services/files.js

@@ -46,6 +46,7 @@ const utils_1 = require("@directus/shared/utils");
 const items_1 = require("./items");
 const net_1 = __importDefault(require("net"));
 const os_1 = __importDefault(require("os"));
+const encodeurl_1 = __importDefault(require("encodeurl"));
 const lookupDNS = (0, util_1.promisify)(dns_1.lookup);
 class FilesService extends items_1.ItemsService {
     constructor(options) {
@@ -229,7 +230,7 @@ class FilesService extends items_1.ItemsService {
         }
         let fileResponse;
         try {
-            fileResponse = await axios_1.default.get(importURL, {
+            fileResponse = await axios_1.default.get((0, encodeurl_1.default)(importURL), {
                 responseType: 'stream',
             });
         }
@@ -240,7 +241,7 @@ class FilesService extends items_1.ItemsService {
             });
         }
         const parsedURL = url_1.default.parse(fileResponse.request.res.responseUrl);
-        const filename = path_1.default.basename(parsedURL.pathname);
+        const filename = decodeURI(path_1.default.basename(parsedURL.pathname));
         const payload = {
             filename_download: filename,
             storage: (0, utils_1.toArray)(env_1.default.STORAGE_LOCATIONS)[0],

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

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

package/dist/services/files.test.js

@@ -0,0 +1,53 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const exifr_1 = __importDefault(require("exifr"));
+const knex_1 = __importDefault(require("knex"));
+const knex_mock_client_1 = require("knex-mock-client");
+const _1 = require(".");
+jest.mock('exifr');
+jest.mock('../../src/database/index', () => {
+    return { getDatabaseClient: jest.fn().mockReturnValue('postgres') };
+});
+jest.requireMock('../../src/database/index');
+describe('Integration Tests', () => {
+    let db;
+    let tracker;
+    beforeAll(async () => {
+        db = (0, knex_1.default)({ client: knex_mock_client_1.MockClient });
+        tracker = (0, knex_mock_client_1.getTracker)();
+    });
+    afterEach(() => {
+        tracker.reset();
+    });
+    describe('Services / Files', () => {
+        describe('getMetadata', () => {
+            let service;
+            let exifrParseSpy;
+            const sampleMetadata = {
+                CustomTagA: 'value a',
+                CustomTagB: 'value b',
+                CustomTagC: 'value c',
+            };
+            beforeEach(() => {
+                exifrParseSpy = jest.spyOn(exifr_1.default, 'parse');
+                service = new _1.FilesService({
+                    knex: db,
+                    schema: { collections: {}, relations: [] },
+                });
+            });
+            it('accepts allowlist metadata tags', async () => {
+                exifrParseSpy.mockReturnValue(Promise.resolve({ ...sampleMetadata }));
+                const bufferContent = 'file buffer content';
+                const allowList = ['CustomTagB', 'CustomTagA'];
+                const metadata = await service.getMetadata(bufferContent, allowList);
+                expect(exifrParseSpy).toHaveBeenCalled();
+                expect(metadata.metadata.CustomTagA).toStrictEqual(sampleMetadata.CustomTagA);
+                expect(metadata.metadata.CustomTagB).toStrictEqual(sampleMetadata.CustomTagB);
+                expect(metadata.metadata.CustomTagC).toBeUndefined();
+            });
+        });
+    });
+});

package/dist/services/flows.js

@@ -39,12 +39,16 @@ class FlowsService extends items_1.ItemsService {
     }
     async deleteOne(key, opts) {
         const flowManager = (0, flows_1.getFlowManager)();
+        // this is to prevent foreign key constraint error on directus_operations resolve/reject during cascade deletion
+        await this.knex('directus_operations').update({ resolve: null, reject: null }).where('flow', key);
         const result = await super.deleteOne(key, opts);
         await flowManager.reload();
         return result;
     }
     async deleteMany(keys, opts) {
         const flowManager = (0, flows_1.getFlowManager)();
+        // this is to prevent foreign key constraint error on directus_operations resolve/reject during cascade deletion
+        await this.knex('directus_operations').update({ resolve: null, reject: null }).whereIn('flow', keys);
         const result = await super.deleteMany(keys, opts);
         await flowManager.reload();
         return result;

package/dist/services/graphql/index.d.ts

@@ -1,6 +1,6 @@
 import { BaseException } from '@directus/shared/exceptions';
 import { Accountability, Query, SchemaOverview } from '@directus/shared/types';
-import { ArgumentNode, FormattedExecutionResult, FragmentDefinitionNode, GraphQLError, GraphQLResolveInfo, GraphQLSchema, ObjectFieldNode, SelectionNode } from 'graphql';
+import { ArgumentNode, FormattedExecutionResult, FragmentDefinitionNode, GraphQLError, GraphQLResolveInfo, GraphQLSchema, SelectionNode } from 'graphql';
 import { ObjectTypeComposer, SchemaComposer } from 'graphql-compose';
 import { Knex } from 'knex';
 import { AbstractServiceOptions, GraphQLParams, Item } from '../../types';
@@ -44,7 +44,7 @@ export declare class GraphQLService {
      * In order to do that, we'll parse over all ArgumentNodes and ObjectFieldNodes to manually recreate an object structure
      * of arguments
      */
-    parseArgs(args: readonly ArgumentNode[] | readonly ObjectFieldNode[], variableValues: GraphQLResolveInfo['variableValues']): Record<string, any>;
+    parseArgs(args: readonly ArgumentNode[], variableValues: GraphQLResolveInfo['variableValues']): Record<string, any>;
     /**
      * Get a Directus Query object from the parsed arguments (rawQuery) and GraphQL AST selectionSet. Converts SelectionSet into
      * Directus' `fields` query for use in the resolver. Also applies variables where appropriate.

package/dist/services/graphql/index.js

@@ -274,7 +274,7 @@ class GraphQLService {
                 CollectionTypes[collection.collection] = schemaComposer.createObjectTC({
                     name: action === 'read' ? collection.collection : `${action}_${collection.collection}`,
                     fields: Object.values(collection.fields).reduce((acc, field) => {
-                        let type = (0, get_graphql_type_1.getGraphQLType)(field.type);
+                        let type = (0, get_graphql_type_1.getGraphQLType)(field.type, field.special);
                         // GraphQL doesn't differentiate between not-null and has-to-be-submitted. We
                         // can't non-null in update, as that would require every not-nullable field to be
                         // submitted on updates
@@ -293,41 +293,43 @@ class GraphQLService {
                                 return obj[field.field];
                             },
                         };
-                        if (field.type === 'date') {
-                            acc[`${field.field}_func`] = {
-                                type: DateFunctions,
-                                resolve: (obj) => {
-                                    const funcFields = Object.keys(DateFunctions.getFields()).map((key) => `${field.field}_${key}`);
-                                    return (0, lodash_1.mapKeys)((0, lodash_1.pick)(obj, funcFields), (_value, key) => key.substring(field.field.length + 1));
-                                },
-                            };
-                        }
-                        if (field.type === 'time') {
-                            acc[`${field.field}_func`] = {
-                                type: TimeFunctions,
-                                resolve: (obj) => {
-                                    const funcFields = Object.keys(TimeFunctions.getFields()).map((key) => `${field.field}_${key}`);
-                                    return (0, lodash_1.mapKeys)((0, lodash_1.pick)(obj, funcFields), (_value, key) => key.substring(field.field.length + 1));
-                                },
-                            };
-                        }
-                        if (field.type === 'dateTime' || field.type === 'timestamp') {
-                            acc[`${field.field}_func`] = {
-                                type: DateTimeFunctions,
-                                resolve: (obj) => {
-                                    const funcFields = Object.keys(DateTimeFunctions.getFields()).map((key) => `${field.field}_${key}`);
-                                    return (0, lodash_1.mapKeys)((0, lodash_1.pick)(obj, funcFields), (_value, key) => key.substring(field.field.length + 1));
-                                },
-                            };
-                        }
-                        if (field.type === 'json' || field.type === 'alias') {
-                            acc[`${field.field}_func`] = {
-                                type: CountFunctions,
-                                resolve: (obj) => {
-                                    const funcFields = Object.keys(CountFunctions.getFields()).map((key) => `${field.field}_${key}`);
-                                    return (0, lodash_1.mapKeys)((0, lodash_1.pick)(obj, funcFields), (_value, key) => key.substring(field.field.length + 1));
-                                },
-                            };
+                        if (action === 'read') {
+                            if (field.type === 'date') {
+                                acc[`${field.field}_func`] = {
+                                    type: DateFunctions,
+                                    resolve: (obj) => {
+                                        const funcFields = Object.keys(DateFunctions.getFields()).map((key) => `${field.field}_${key}`);
+                                        return (0, lodash_1.mapKeys)((0, lodash_1.pick)(obj, funcFields), (_value, key) => key.substring(field.field.length + 1));
+                                    },
+                                };
+                            }
+                            if (field.type === 'time') {
+                                acc[`${field.field}_func`] = {
+                                    type: TimeFunctions,
+                                    resolve: (obj) => {
+                                        const funcFields = Object.keys(TimeFunctions.getFields()).map((key) => `${field.field}_${key}`);
+                                        return (0, lodash_1.mapKeys)((0, lodash_1.pick)(obj, funcFields), (_value, key) => key.substring(field.field.length + 1));
+                                    },
+                                };
+                            }
+                            if (field.type === 'dateTime' || field.type === 'timestamp') {
+                                acc[`${field.field}_func`] = {
+                                    type: DateTimeFunctions,
+                                    resolve: (obj) => {
+                                        const funcFields = Object.keys(DateTimeFunctions.getFields()).map((key) => `${field.field}_${key}`);
+                                        return (0, lodash_1.mapKeys)((0, lodash_1.pick)(obj, funcFields), (_value, key) => key.substring(field.field.length + 1));
+                                    },
+                                };
+                            }
+                            if (field.type === 'json' || field.type === 'alias') {
+                                acc[`${field.field}_func`] = {
+                                    type: CountFunctions,
+                                    resolve: (obj) => {
+                                        const funcFields = Object.keys(CountFunctions.getFields()).map((key) => `${field.field}_${key}`);
+                                        return (0, lodash_1.mapKeys)((0, lodash_1.pick)(obj, funcFields), (_value, key) => key.substring(field.field.length + 1));
+                                    },
+                                };
+                            }
                         }
                         return acc;
                     }, {}),
@@ -639,7 +641,7 @@ class GraphQLService {
                 ReadableCollectionFilterTypes[collection.collection] = schemaComposer.createInputTC({
                     name: `${collection.collection}_filter`,
                     fields: Object.values(collection.fields).reduce((acc, field) => {
-                        const graphqlType = (0, get_graphql_type_1.getGraphQLType)(field.type);
+                        const graphqlType = (0, get_graphql_type_1.getGraphQLType)(field.type, field.special);
                         let filterOperatorType;
                         switch (graphqlType) {
                             case graphql_1.GraphQLBoolean:
@@ -692,7 +694,7 @@ class GraphQLService {
                 AggregatedFields[collection.collection] = schemaComposer.createObjectTC({
                     name: `${collection.collection}_aggregated_fields`,
                     fields: Object.values(collection.fields).reduce((acc, field) => {
-                        const graphqlType = (0, get_graphql_type_1.getGraphQLType)(field.type);
+                        const graphqlType = (0, get_graphql_type_1.getGraphQLType)(field.type, field.special);
                         switch (graphqlType) {
                             case graphql_1.GraphQLInt:
                             case graphql_1.GraphQLFloat:
@@ -736,7 +738,7 @@ class GraphQLService {
                     },
                 };
                 const hasNumericAggregates = Object.values(collection.fields).some((field) => {
-                    const graphqlType = (0, get_graphql_type_1.getGraphQLType)(field.type);
+                    const graphqlType = (0, get_graphql_type_1.getGraphQLType)(field.type, field.special);
                     if (graphqlType === graphql_1.GraphQLInt || graphqlType === graphql_1.GraphQLFloat) {
                         return true;
                     }
@@ -1207,38 +1209,29 @@ class GraphQLService {
     parseArgs(args, variableValues) {
         if (!args || args.length === 0)
             return {};
-        const parseObjectValue = (arg) => {
-            return this.parseArgs(arg.fields, variableValues);
-        };
-        const argsObject = {};
-        for (const argument of args) {
-            if (argument.value.kind === 'ObjectValue') {
-                argsObject[argument.name.value] = parseObjectValue(argument.value);
-            }
-            else if (argument.value.kind === 'Variable') {
-                argsObject[argument.name.value] = variableValues[argument.value.name.value];
-            }
-            else if (argument.value.kind === 'ListValue') {
-                const values = [];
-                for (const valueNode of argument.value.values) {
-                    if (valueNode.kind === 'ObjectValue') {
-                        values.push(this.parseArgs(valueNode.fields, variableValues));
-                    }
-                    else {
-                        if (valueNode.kind === 'Variable') {
-                            values.push(variableValues[valueNode.name.value]);
-                        }
-                        else {
-                            values.push(valueNode.value);
-                        }
-                    }
-                }
-                argsObject[argument.name.value] = values;
-            }
-            else {
-                argsObject[argument.name.value] = argument.value.value;
+        const parse = (node) => {
+            switch (node.kind) {
+                case 'Variable':
+                    return variableValues[node.name.value];
+                case 'ListValue':
+                    return node.values.map(parse);
+                case 'ObjectValue':
+                    return Object.fromEntries(node.fields.map((node) => [node.name.value, parse(node.value)]));
+                case 'NullValue':
+                    return null;
+                case 'StringValue':
+                    return String(node.value);
+                case 'IntValue':
+                case 'FloatValue':
+                    return Number(node.value);
+                case 'BooleanValue':
+                    return Boolean(node.value);
+                case 'EnumValue':
+                default:
+                    return node.value;
             }
-        }
+        };
+        const argsObject = Object.fromEntries(args.map((arg) => [arg.name.value, parse(arg.value)]));
         return argsObject;
     }
     /**
@@ -1624,6 +1617,7 @@ class GraphQLService {
                     const accountability = {
                         ip: req === null || req === void 0 ? void 0 : req.ip,
                         userAgent: req === null || req === void 0 ? void 0 : req.get('user-agent'),
+                        origin: req === null || req === void 0 ? void 0 : req.get('origin'),
                         role: null,
                     };
                     const authenticationService = new authentication_1.AuthenticationService({
@@ -1658,6 +1652,7 @@ class GraphQLService {
                     const accountability = {
                         ip: req === null || req === void 0 ? void 0 : req.ip,
                         userAgent: req === null || req === void 0 ? void 0 : req.get('user-agent'),
+                        origin: req === null || req === void 0 ? void 0 : req.get('origin'),
                         role: null,
                     };
                     const authenticationService = new authentication_1.AuthenticationService({
@@ -1694,6 +1689,7 @@ class GraphQLService {
                     const accountability = {
                         ip: req === null || req === void 0 ? void 0 : req.ip,
                         userAgent: req === null || req === void 0 ? void 0 : req.get('user-agent'),
+                        origin: req === null || req === void 0 ? void 0 : req.get('origin'),
                         role: null,
                     };
                     const authenticationService = new authentication_1.AuthenticationService({
@@ -1718,6 +1714,7 @@ class GraphQLService {
                     const accountability = {
                         ip: req === null || req === void 0 ? void 0 : req.ip,
                         userAgent: req === null || req === void 0 ? void 0 : req.get('user-agent'),
+                        origin: req === null || req === void 0 ? void 0 : req.get('origin'),
                         role: null,
                     };
                     const service = new users_1.UsersService({ accountability, schema: this.schema });
@@ -1742,6 +1739,7 @@ class GraphQLService {
                     const accountability = {
                         ip: req === null || req === void 0 ? void 0 : req.ip,
                         userAgent: req === null || req === void 0 ? void 0 : req.get('user-agent'),
+                        origin: req === null || req === void 0 ? void 0 : req.get('origin'),
                         role: null,
                     };
                     const service = new users_1.UsersService({ accountability, schema: this.schema });
@@ -1902,7 +1900,9 @@ class GraphQLService {
                     name: 'directus_collections_meta',
                     fields: Object.values(schema.read.collections['directus_collections'].fields).reduce((acc, field) => {
                         acc[field.field] = {
-                            type: field.nullable ? (0, get_graphql_type_1.getGraphQLType)(field.type) : (0, graphql_1.GraphQLNonNull)((0, get_graphql_type_1.getGraphQLType)(field.type)),
+                            type: field.nullable
+                                ? (0, get_graphql_type_1.getGraphQLType)(field.type, field.special)
+                                : (0, graphql_1.GraphQLNonNull)((0, get_graphql_type_1.getGraphQLType)(field.type, field.special)),
                             description: field.note,
                         };
                         return acc;
@@ -1951,7 +1951,9 @@ class GraphQLService {
                     name: 'directus_fields_meta',
                     fields: Object.values(schema.read.collections['directus_fields'].fields).reduce((acc, field) => {
                         acc[field.field] = {
-                            type: field.nullable ? (0, get_graphql_type_1.getGraphQLType)(field.type) : (0, graphql_1.GraphQLNonNull)((0, get_graphql_type_1.getGraphQLType)(field.type)),
+                            type: field.nullable
+                                ? (0, get_graphql_type_1.getGraphQLType)(field.type, field.special)
+                                : (0, graphql_1.GraphQLNonNull)((0, get_graphql_type_1.getGraphQLType)(field.type, field.special)),
                             description: field.note,
                         };
                         return acc;
@@ -2038,7 +2040,7 @@ class GraphQLService {
                     name: 'directus_relations_meta',
                     fields: Object.values(schema.read.collections['directus_relations'].fields).reduce((acc, field) => {
                         acc[field.field] = {
-                            type: (0, get_graphql_type_1.getGraphQLType)(field.type),
+                            type: (0, get_graphql_type_1.getGraphQLType)(field.type, field.special),
                             description: field.note,
                         };
                         return acc;
@@ -2308,7 +2310,7 @@ class GraphQLService {
                         comment: (0, graphql_1.GraphQLNonNull)(graphql_1.GraphQLString),
                     },
                     resolve: async (_, args, __, info) => {
-                        var _a, _b, _c, _d, _e;
+                        var _a, _b, _c, _d, _e, _f;
                         const service = new activity_1.ActivityService({
                             accountability: this.accountability,
                             schema: this.schema,
@@ -2319,9 +2321,10 @@ class GraphQLService {
                             user: (_a = this.accountability) === null || _a === void 0 ? void 0 : _a.user,
                             ip: (_b = this.accountability) === null || _b === void 0 ? void 0 : _b.ip,
                             user_agent: (_c = this.accountability) === null || _c === void 0 ? void 0 : _c.userAgent,
+                            origin: (_d = this.accountability) === null || _d === void 0 ? void 0 : _d.origin,
                         });
                         if ('directus_activity' in ReadCollectionTypes) {
-                            const selections = this.replaceFragmentsInSelections((_e = (_d = info.fieldNodes[0]) === null || _d === void 0 ? void 0 : _d.selectionSet) === null || _e === void 0 ? void 0 : _e.selections, info.fragments);
+                            const selections = this.replaceFragmentsInSelections((_f = (_e = info.fieldNodes[0]) === null || _e === void 0 ? void 0 : _e.selectionSet) === null || _f === void 0 ? void 0 : _f.selections, info.fragments);
                             const query = this.getQuery(args, selections || [], info.variableValues);
                             return await service.readOne(primaryKey, query);
                         }