directus 9.4.0 → 9.5.0

package/dist/middleware/authenticate.js

@@ -27,6 +27,7 @@ const database_1 = __importDefault(require("../database"));
 const env_1 = __importDefault(require("../env"));
 const exceptions_1 = require("../exceptions");
 const async_handler_1 = __importDefault(require("../utils/async-handler"));
+const get_ip_from_req_1 = require("../utils/get-ip-from-req");
 const is_directus_jwt_1 = __importDefault(require("../utils/is-directus-jwt"));
 /**
  * Verify the passed JWT and assign the user ID and role to `req`
@@ -37,7 +38,7 @@ const authenticate = (0, async_handler_1.default)(async (req, res, next) => {
         role: null,
         admin: false,
         app: false,
-        ip: req.ip.startsWith('::ffff:') ? req.ip.substring(7) : req.ip,
+        ip: (0, get_ip_from_req_1.getIPFromReq)(req),
         userAgent: req.get('user-agent'),
     };
     const database = (0, database_1.default)();

package/dist/middleware/rate-limiter.js

@@ -9,6 +9,7 @@ const env_1 = __importDefault(require("../env"));
 const exceptions_1 = require("../exceptions");
 const rate_limiter_1 = require("../rate-limiter");
 const async_handler_1 = __importDefault(require("../utils/async-handler"));
+const get_ip_from_req_1 = require("../utils/get-ip-from-req");
 const validate_env_1 = require("../utils/validate-env");
 let checkRateLimit = (req, res, next) => next();
 if (env_1.default.RATE_LIMITER_ENABLED === true) {
@@ -16,7 +17,7 @@ if (env_1.default.RATE_LIMITER_ENABLED === true) {
     exports.rateLimiter = (0, rate_limiter_1.createRateLimiter)();
     checkRateLimit = (0, async_handler_1.default)(async (req, res, next) => {
         try {
-            await exports.rateLimiter.consume(req.ip, 1);
+            await exports.rateLimiter.consume((0, get_ip_from_req_1.getIPFromReq)(req), 1);
         }
         catch (rateLimiterRes) {
             if (rateLimiterRes instanceof Error)

package/dist/services/assets.js

@@ -52,9 +52,6 @@ class AssetsService {
             .from('directus_settings')
             .first();
         const systemPublicKeys = Object.values(publicSettings || {});
-        if (systemPublicKeys.includes(id) === false && ((_a = this.accountability) === null || _a === void 0 ? void 0 : _a.admin) !== true) {
-            await this.authorizationService.checkAccess('read', 'directus_files', id);
-        }
         /**
          * This is a little annoying. Postgres will error out if you're trying to search in `where`
          * with a wrong type. In case of directus_files where id is a uuid, we'll have to verify the
@@ -63,6 +60,9 @@ class AssetsService {
         const isValidUUID = (0, uuid_validate_1.default)(id, 4);
         if (isValidUUID === false)
             throw new exceptions_1.ForbiddenException();
+        if (systemPublicKeys.includes(id) === false && ((_a = this.accountability) === null || _a === void 0 ? void 0 : _a.admin) !== true) {
+            await this.authorizationService.checkAccess('read', 'directus_files', id);
+        }
         const file = (await this.knex.select('*').from('directus_files').where({ id }).first());
         if (!file)
             throw new exceptions_1.ForbiddenException();

package/dist/services/authentication.d.ts

@@ -1,7 +1,7 @@
 import { Knex } from 'knex';
 import { ActivityService } from './activity';
-import { AbstractServiceOptions, SchemaOverview, LoginResult } from '../types';
-import { Accountability } from '@directus/shared/types';
+import { AbstractServiceOptions, LoginResult } from '../types';
+import { Accountability, SchemaOverview } from '@directus/shared/types';
 export declare class AuthenticationService {
     knex: Knex;
     accountability: Accountability | null;

package/dist/services/authentication.js

@@ -43,7 +43,7 @@ class AuthenticationService {
         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')
-            .innerJoin('directus_roles as r', 'u.role', 'r.id')
+            .leftJoin('directus_roles as r', 'u.role', 'r.id')
             .where('u.id', await provider.getUserID((0, lodash_1.cloneDeep)(payload)))
             .andWhere('u.provider', providerName)
             .first();
@@ -204,14 +204,16 @@ class AuthenticationService {
             .from('directus_sessions AS s')
             .leftJoin('directus_users AS u', 's.user', 'u.id')
             .leftJoin('directus_shares AS d', 's.share', 'd.id')
-            .joinRaw('LEFT JOIN directus_roles AS r ON r.id IN (u.role, d.role)')
+            .leftJoin('directus_roles AS r', (join) => {
+            join.onIn('r.id', [this.knex.ref('u.role'), this.knex.ref('d.role')]);
+        })
             .where('s.token', refreshToken)
-            .andWhere('s.expires', '>=', this.knex.fn.now())
+            .andWhere('s.expires', '>=', new Date())
             .andWhere((subQuery) => {
-            subQuery.whereNull('d.date_end').orWhere('d.date_end', '>=', this.knex.fn.now());
+            subQuery.whereNull('d.date_end').orWhere('d.date_end', '>=', new Date());
         })
             .andWhere((subQuery) => {
-            subQuery.whereNull('d.date_start').orWhere('d.date_start', '<=', this.knex.fn.now());
+            subQuery.whereNull('d.date_start').orWhere('d.date_start', '<=', new Date());
         })
             .first();
         if (!record || (!record.share_id && !record.user_id)) {
@@ -247,6 +249,9 @@ class AuthenticationService {
                 collection: record.share_collection,
                 item: record.share_item,
             };
+            tokenPayload.app_access = false;
+            tokenPayload.admin_access = false;
+            delete tokenPayload.id;
         }
         const customClaims = await emitter_1.default.emitFilter('auth.jwt', tokenPayload, {
             status: 'pending',

package/dist/services/authorization.d.ts

@@ -1,7 +1,6 @@
 import { Knex } from 'knex';
-import { Accountability } from '@directus/shared/types';
-import { AbstractServiceOptions, AST, Item, PrimaryKey, SchemaOverview } from '../types';
-import { PermissionsAction } from '@directus/shared/types';
+import { AbstractServiceOptions, AST, Item, PrimaryKey } from '../types';
+import { PermissionsAction, Accountability, SchemaOverview } from '@directus/shared/types';
 import { PayloadService } from './payload';
 export declare class AuthorizationService {
     knex: Knex;

package/dist/services/collections.d.ts

@@ -1,8 +1,8 @@
 import SchemaInspector from '@directus/schema';
 import { Knex } from 'knex';
 import Keyv from 'keyv';
-import { AbstractServiceOptions, Collection, CollectionMeta, SchemaOverview, MutationOptions } from '../types';
-import { Accountability, RawField } from '@directus/shared/types';
+import { AbstractServiceOptions, Collection, CollectionMeta, MutationOptions } from '../types';
+import { Accountability, RawField, SchemaOverview } from '@directus/shared/types';
 import { Table } from 'knex-schema-inspector/dist/types/table';
 export declare type RawCollection = {
     collection: string;

package/dist/services/collections.js

@@ -114,12 +114,14 @@ class CollectionsService {
                     }
                     return field;
                 });
-                await trx.schema.createTable(payload.collection, (table) => {
-                    for (const field of payload.fields) {
-                        if (field.type && constants_1.ALIAS_TYPES.includes(field.type) === false) {
-                            fieldsService.addColumnToTable(table, field);
+                await trx.transaction(async (schemaTrx) => {
+                    await schemaTrx.schema.createTable(payload.collection, (table) => {
+                        for (const field of payload.fields) {
+                            if (field.type && constants_1.ALIAS_TYPES.includes(field.type) === false) {
+                                fieldsService.addColumnToTable(table, field);
+                            }
                         }
-                    }
+                    });
                 });
                 const fieldPayloads = payload.fields.filter((field) => field.meta).map((field) => field.meta);
                 await fieldItemsService.createMany(fieldPayloads);
@@ -371,7 +373,9 @@ class CollectionsService {
                         .update({ one_allowed_collections: newAllowedCollections })
                         .where({ id: relation.meta.id });
                 }
-                await trx.schema.dropTable(collectionKey);
+                await trx.transaction(async (schemaTrx) => {
+                    await schemaTrx.schema.dropTable(collectionKey);
+                });
             }
         });
         if (this.cache && env_1.default.CACHE_AUTO_PURGE && (opts === null || opts === void 0 ? void 0 : opts.autoPurgeCache) !== false) {

package/dist/services/fields.d.ts

@@ -3,9 +3,8 @@ import { Knex } from 'knex';
 import { Column } from 'knex-schema-inspector/dist/types/column';
 import { ItemsService } from '../services/items';
 import { PayloadService } from '../services/payload';
-import { AbstractServiceOptions, SchemaOverview } from '../types';
-import { Accountability } from '@directus/shared/types';
-import { Field, RawField, Type } from '@directus/shared/types';
+import { AbstractServiceOptions } from '../types';
+import { Field, RawField, Type, Accountability, SchemaOverview } from '@directus/shared/types';
 import { Helpers } from '../database/helpers';
 import Keyv from 'keyv';
 export declare class FieldsService {

package/dist/services/fields.js

@@ -224,8 +224,10 @@ class FieldsService {
                     this.addColumnToTable(table, hookAdjustedField);
                 }
                 else {
-                    await trx.schema.alterTable(collection, (table) => {
-                        this.addColumnToTable(table, hookAdjustedField);
+                    await trx.transaction(async (schemaTrx) => {
+                        await schemaTrx.schema.alterTable(collection, (table) => {
+                            this.addColumnToTable(table, hookAdjustedField);
+                        });
                     });
                 }
             }
@@ -387,8 +389,10 @@ class FieldsService {
             if (this.schema.collections[collection] &&
                 field in this.schema.collections[collection].fields &&
                 this.schema.collections[collection].fields[field].alias === false) {
-                await trx.schema.table(collection, (table) => {
-                    table.dropColumn(field);
+                await trx.transaction(async (schemaTrx) => {
+                    await schemaTrx.schema.table(collection, (table) => {
+                        table.dropColumn(field);
+                    });
                 });
             }
         });

package/dist/services/graphql.d.ts

@@ -1,9 +1,10 @@
 import { ArgumentNode, FormattedExecutionResult, FragmentDefinitionNode, GraphQLError, GraphQLResolveInfo, GraphQLScalarType, GraphQLSchema, ObjectFieldNode, SelectionNode } from 'graphql';
+import { SchemaOverview } from '@directus/shared/types';
 import { ObjectTypeComposer, SchemaComposer } from 'graphql-compose';
 import { Knex } from 'knex';
 import { BaseException } from '@directus/shared/exceptions';
 import { Accountability, Query } from '@directus/shared/types';
-import { AbstractServiceOptions, GraphQLParams, Item, SchemaOverview } from '../types';
+import { AbstractServiceOptions, GraphQLParams, Item } from '../types';
 import { ItemsService } from './items';
 export declare const GraphQLGeoJSON: GraphQLScalarType;
 export declare const GraphQLDate: GraphQLScalarType;
@@ -70,7 +71,7 @@ export declare class GraphQLService {
      * Effectively merges the selections with the fragments used in those selections
      */
     replaceFragmentsInSelections(selections: readonly SelectionNode[] | undefined, fragments: Record<string, FragmentDefinitionNode>): readonly SelectionNode[] | null;
-    injectSystemResolvers(schemaComposer: SchemaComposer<GraphQLParams['contextValue']>, { CreateCollectionTypes, ReadCollectionTypes, DeleteCollectionTypes, }: {
+    injectSystemResolvers(schemaComposer: SchemaComposer<GraphQLParams['contextValue']>, { CreateCollectionTypes, ReadCollectionTypes, UpdateCollectionTypes, DeleteCollectionTypes, }: {
         CreateCollectionTypes: Record<string, ObjectTypeComposer<any, any>>;
         ReadCollectionTypes: Record<string, ObjectTypeComposer<any, any>>;
         UpdateCollectionTypes: Record<string, ObjectTypeComposer<any, any>>;

package/dist/services/graphql.js

@@ -334,6 +334,8 @@ class GraphQLService {
             }
             for (const relation of schema[action].relations) {
                 if (relation.related_collection) {
+                    if (SYSTEM_DENY_LIST.includes(relation.related_collection))
+                        continue;
                     (_a = CollectionTypes[relation.collection]) === null || _a === void 0 ? void 0 : _a.addFields({
                         [relation.field]: {
                             type: CollectionTypes[relation.related_collection],
@@ -768,6 +770,8 @@ class GraphQLService {
             }
             for (const relation of schema.read.relations) {
                 if (relation.related_collection) {
+                    if (SYSTEM_DENY_LIST.includes(relation.related_collection))
+                        continue;
                     (_a = ReadableCollectionFilterTypes[relation.collection]) === null || _a === void 0 ? void 0 : _a.addFields({
                         [relation.field]: ReadableCollectionFilterTypes[relation.related_collection],
                     });
@@ -1303,7 +1307,7 @@ class GraphQLService {
         })).filter((s) => s);
         return result;
     }
-    injectSystemResolvers(schemaComposer, { CreateCollectionTypes, ReadCollectionTypes, DeleteCollectionTypes, }, schema) {
+    injectSystemResolvers(schemaComposer, { CreateCollectionTypes, ReadCollectionTypes, UpdateCollectionTypes, DeleteCollectionTypes, }, schema) {
         var _a, _b, _c, _d, _e;
         const AuthTokens = schemaComposer.createObjectTC({
             name: 'auth_tokens',
@@ -1393,10 +1397,10 @@ class GraphQLService {
                 resolve: async () => {
                     const extensionManager = (0, extensions_1.getExtensionManager)();
                     return {
-                        interfaces: extensionManager.listExtensions('interface'),
-                        displays: extensionManager.listExtensions('display'),
-                        layouts: extensionManager.listExtensions('layout'),
-                        modules: extensionManager.listExtensions('module'),
+                        interfaces: extensionManager.getExtensionsList('interface'),
+                        displays: extensionManager.getExtensionsList('display'),
+                        layouts: extensionManager.getExtensionsList('layout'),
+                        modules: extensionManager.getExtensionsList('module'),
                     };
                 },
             },
@@ -2127,6 +2131,32 @@ class GraphQLService {
                 },
             });
         }
+        if ('directus_users' in schema.update.collections) {
+            schemaComposer.Mutation.addFields({
+                update_users_me: {
+                    type: ReadCollectionTypes['directus_users'],
+                    args: {
+                        data: (0, graphql_compose_1.toInputObjectType)(UpdateCollectionTypes['directus_users']),
+                    },
+                    resolve: async (_, args, __, info) => {
+                        var _a, _b, _c;
+                        if (!((_a = this.accountability) === null || _a === void 0 ? void 0 : _a.user))
+                            return null;
+                        const service = new users_1.UsersService({
+                            schema: this.schema,
+                            accountability: this.accountability,
+                        });
+                        await service.updateOne(this.accountability.user, args.data);
+                        if ('directus_users' in ReadCollectionTypes) {
+                            const selections = this.replaceFragmentsInSelections((_c = (_b = info.fieldNodes[0]) === null || _b === void 0 ? void 0 : _b.selectionSet) === null || _c === void 0 ? void 0 : _c.selections, info.fragments);
+                            const query = this.getQuery(args, selections || [], info.variableValues);
+                            return await service.readOne(this.accountability.user, query);
+                        }
+                        return true;
+                    },
+                },
+            });
+        }
         if ('directus_activity' in schema.create.collections) {
             schemaComposer.Mutation.addFields({
                 create_comment: {

package/dist/services/import.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" />
 import { Knex } from 'knex';
-import { AbstractServiceOptions, SchemaOverview } from '../types';
-import { Accountability } from '@directus/shared/types';
+import { AbstractServiceOptions } from '../types';
+import { Accountability, SchemaOverview } from '@directus/shared/types';
 export declare class ImportService {
     knex: Knex;
     accountability: Accountability | null;

package/dist/services/import.js

@@ -31,9 +31,10 @@ class ImportService {
             case 'application/json':
                 return await this.importJSON(collection, stream);
             case 'text/csv':
+            case 'application/vnd.ms-excel':
                 return await this.importCSV(collection, stream);
             default:
-                throw new exceptions_1.InvalidPayloadException(`Can't import files of type "${mimetype}"`);
+                throw new exceptions_1.UnsupportedMediaTypeException(`Can't import files of type "${mimetype}"`);
         }
     }
     importJSON(collection, stream) {

package/dist/services/items.d.ts

@@ -1,7 +1,7 @@
 import { Knex } from 'knex';
 import Keyv from 'keyv';
-import { Accountability, Query, PermissionsAction } from '@directus/shared/types';
-import { AbstractService, AbstractServiceOptions, Item as AnyItem, PrimaryKey, SchemaOverview, MutationOptions } from '../types';
+import { Accountability, Query, PermissionsAction, SchemaOverview } from '@directus/shared/types';
+import { AbstractService, AbstractServiceOptions, Item as AnyItem, PrimaryKey, MutationOptions } from '../types';
 export declare type QueryOptions = {
     stripNonRequested?: boolean;
     permissionsAction?: PermissionsAction;

package/dist/services/items.js

@@ -70,7 +70,9 @@ class ItemsService {
             // Run all hooks that are attached to this event so the end user has the chance to augment the
             // item that is about to be saved
             const payloadAfterHooks = (opts === null || opts === void 0 ? void 0 : opts.emitEvents) !== false
-                ? await emitter_1.default.emitFilter(`${this.eventScope}.create`, payload, {
+                ? await emitter_1.default.emitFilter(this.eventScope === 'items'
+                    ? ['items.create', `${this.collection}.items.create`]
+                    : `${this.eventScope}.create`, payload, {
                     collection: this.collection,
                 }, {
                     database: trx,
@@ -85,7 +87,7 @@ class ItemsService {
             const { payload: payloadWithA2O, revisions: revisionsA2O } = await payloadService.processA2O(payloadWithM2O);
             const payloadWithoutAliases = (0, lodash_1.pick)(payloadWithA2O, (0, lodash_1.without)(fields, ...aliases));
             const payloadWithTypeCasting = await payloadService.processValues('create', payloadWithoutAliases);
-            // In case of manual string / UUID primary keys, they PK already exists in the object we're saving.
+            // In case of manual string / UUID primary keys, the PK already exists in the object we're saving.
             let primaryKey = payloadWithTypeCasting[primaryKeyField];
             try {
                 const result = await trx.insert(payloadWithoutAliases).into(this.collection).returning(primaryKeyField);
@@ -146,14 +148,14 @@ class ItemsService {
             return primaryKey;
         });
         if ((opts === null || opts === void 0 ? void 0 : opts.emitEvents) !== false) {
-            emitter_1.default.emitAction(`${this.eventScope}.create`, {
+            emitter_1.default.emitAction(this.eventScope === 'items' ? ['items.create', `${this.collection}.items.create`] : `${this.eventScope}.create`, {
                 payload,
                 key: primaryKey,
                 collection: this.collection,
             }, {
                 // This hook is called async. If we would pass the transaction here, the hook can be
                 // called after the transaction is done #5460
-                database: (0, database_1.default)(),
+                database: this.knex || (0, database_1.default)(),
                 schema: this.schema,
                 accountability: this.accountability,
             });
@@ -189,11 +191,6 @@ class ItemsService {
      * Get items by query
      */
     async readByQuery(query, opts) {
-        const authorizationService = new authorization_1.AuthorizationService({
-            accountability: this.accountability,
-            knex: this.knex,
-            schema: this.schema,
-        });
         let ast = await (0, get_ast_from_query_1.default)(this.collection, query, this.schema, {
             accountability: this.accountability,
             // By setting the permissions action, you can read items using the permissions for another
@@ -203,6 +200,11 @@ class ItemsService {
             knex: this.knex,
         });
         if (this.accountability && this.accountability.admin !== true) {
+            const authorizationService = new authorization_1.AuthorizationService({
+                accountability: this.accountability,
+                knex: this.knex,
+                schema: this.schema,
+            });
             ast = await authorizationService.processAST(ast, opts === null || opts === void 0 ? void 0 : opts.permissionsAction);
         }
         const records = await (0, run_ast_1.default)(ast, this.schema, {
@@ -213,7 +215,7 @@ class ItemsService {
         if (records === null) {
             throw new exceptions_1.ForbiddenException();
         }
-        const filteredRecords = await emitter_1.default.emitFilter(`${this.eventScope}.read`, records, {
+        const filteredRecords = await emitter_1.default.emitFilter(this.eventScope === 'items' ? ['items.read', `${this.collection}.items.read`] : `${this.eventScope}.read`, records, {
             query,
             collection: this.collection,
         }, {
@@ -221,12 +223,12 @@ class ItemsService {
             schema: this.schema,
             accountability: this.accountability,
         });
-        emitter_1.default.emitAction(`${this.eventScope}.read`, {
+        emitter_1.default.emitAction(this.eventScope === 'items' ? ['items.read', `${this.collection}.items.read`] : `${this.eventScope}.read`, {
             payload: filteredRecords,
             query,
             collection: this.collection,
         }, {
-            database: (0, database_1.default)(),
+            database: this.knex || (0, database_1.default)(),
             schema: this.schema,
             accountability: this.accountability,
         });
@@ -288,7 +290,9 @@ class ItemsService {
         // Run all hooks that are attached to this event so the end user has the chance to augment the
         // item that is about to be saved
         const payloadAfterHooks = (opts === null || opts === void 0 ? void 0 : opts.emitEvents) !== false
-            ? await emitter_1.default.emitFilter(`${this.eventScope}.update`, payload, {
+            ? await emitter_1.default.emitFilter(this.eventScope === 'items'
+                ? ['items.update', `${this.collection}.items.update`]
+                : `${this.eventScope}.update`, payload, {
                 keys,
                 collection: this.collection,
             }, {
@@ -379,14 +383,14 @@ class ItemsService {
             await this.cache.clear();
         }
         if ((opts === null || opts === void 0 ? void 0 : opts.emitEvents) !== false) {
-            emitter_1.default.emitAction(`${this.eventScope}.update`, {
+            emitter_1.default.emitAction(this.eventScope === 'items' ? ['items.update', `${this.collection}.items.update`] : `${this.eventScope}.update`, {
                 payload,
                 keys,
                 collection: this.collection,
             }, {
                 // This hook is called async. If we would pass the transaction here, the hook can be
                 // called after the transaction is done #5460
-                database: (0, database_1.default)(),
+                database: this.knex || (0, database_1.default)(),
                 schema: this.schema,
                 accountability: this.accountability,
             });
@@ -461,7 +465,7 @@ class ItemsService {
             await authorizationService.checkAccess('delete', this.collection, keys);
         }
         if ((opts === null || opts === void 0 ? void 0 : opts.emitEvents) !== false) {
-            await emitter_1.default.emitFilter(`${this.eventScope}.delete`, keys, {
+            await emitter_1.default.emitFilter(this.eventScope === 'items' ? ['items.delete', `${this.collection}.items.delete`] : `${this.eventScope}.delete`, keys, {
                 collection: this.collection,
             }, {
                 database: this.knex,
@@ -490,13 +494,13 @@ class ItemsService {
             await this.cache.clear();
         }
         if ((opts === null || opts === void 0 ? void 0 : opts.emitEvents) !== false) {
-            emitter_1.default.emitAction(`${this.eventScope}.delete`, {
+            emitter_1.default.emitAction(this.eventScope === 'items' ? ['items.delete', `${this.collection}.items.delete`] : `${this.eventScope}.delete`, {
                 payload: keys,
                 collection: this.collection,
             }, {
                 // This hook is called async. If we would pass the transaction here, the hook can be
                 // called after the transaction is done #5460
-                database: (0, database_1.default)(),
+                database: this.knex || (0, database_1.default)(),
                 schema: this.schema,
                 accountability: this.accountability,
             });

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

@@ -1,6 +1,6 @@
 import { Knex } from 'knex';
-import { AbstractServiceOptions, SchemaOverview } from '../../types';
-import { Accountability } from '@directus/shared/types';
+import { AbstractServiceOptions } from '../../types';
+import { Accountability, SchemaOverview } from '@directus/shared/types';
 import { Transporter, SendMailOptions } from 'nodemailer';
 export declare type EmailOptions = SendMailOptions & {
     template?: {

package/dist/services/meta.d.ts

@@ -1,6 +1,6 @@
 import { Knex } from 'knex';
-import { AbstractServiceOptions, SchemaOverview } from '../types';
-import { Accountability, Query } from '@directus/shared/types';
+import { AbstractServiceOptions } from '../types';
+import { Accountability, Query, SchemaOverview } from '@directus/shared/types';
 export declare class MetaService {
     knex: Knex;
     accountability: Accountability | null;

package/dist/services/payload.d.ts

@@ -1,6 +1,6 @@
 import { Knex } from 'knex';
-import { AbstractServiceOptions, Item, PrimaryKey, SchemaOverview } from '../types';
-import { Accountability } from '@directus/shared/types';
+import { AbstractServiceOptions, Item, PrimaryKey } from '../types';
+import { Accountability, SchemaOverview } from '@directus/shared/types';
 import { Helpers } from '../database/helpers';
 declare type Action = 'create' | 'read' | 'update';
 declare type Transformers = {

package/dist/services/relations.d.ts

@@ -1,10 +1,10 @@
 import { Knex } from 'knex';
-import { AbstractServiceOptions, SchemaOverview, Relation, RelationMeta } from '../types';
-import { Accountability } from '@directus/shared/types';
+import { SchemaOverview, Relation, RelationMeta, Accountability } from '@directus/shared/types';
 import { ItemsService, QueryOptions } from './items';
 import { PermissionsService } from './permissions';
 import SchemaInspector from '@directus/schema';
 import Keyv from 'keyv';
+import { AbstractServiceOptions } from '../types';
 export declare class RelationsService {
     knex: Knex;
     permissionsService: PermissionsService;

package/dist/services/server.d.ts

@@ -1,6 +1,6 @@
 import { Knex } from 'knex';
-import { AbstractServiceOptions, SchemaOverview } from '../types';
-import { Accountability } from '@directus/shared/types';
+import { AbstractServiceOptions } from '../types';
+import { Accountability, SchemaOverview } from '@directus/shared/types';
 import { SettingsService } from './settings';
 export declare class ServerService {
     knex: Knex;

package/dist/services/server.js

@@ -52,6 +52,7 @@ class ServerService {
         const projectInfo = await this.settingsService.readSingleton({
             fields: [
                 'project_name',
+                'project_descriptor',
                 'project_logo',
                 'project_color',
                 'public_foreground',

package/dist/services/shares.js

@@ -46,10 +46,10 @@ class SharesService extends items_1.ItemsService {
             .from('directus_shares')
             .where('id', payload.share)
             .andWhere((subQuery) => {
-            subQuery.whereNull('date_end').orWhere('date_end', '>=', this.knex.fn.now());
+            subQuery.whereNull('date_end').orWhere('date_end', '>=', new Date());
         })
             .andWhere((subQuery) => {
-            subQuery.whereNull('date_start').orWhere('date_start', '<=', this.knex.fn.now());
+            subQuery.whereNull('date_start').orWhere('date_start', '<=', new Date());
         })
             .andWhere((subQuery) => {
             subQuery.whereNull('max_uses').orWhere('max_uses', '>=', this.knex.ref('times_used'));

package/dist/services/specifications.d.ts

@@ -1,7 +1,7 @@
 import { Knex } from 'knex';
 import { OpenAPIObject } from 'openapi3-ts';
-import { AbstractServiceOptions, SchemaOverview } from '../types';
-import { Accountability } from '@directus/shared/types';
+import { AbstractServiceOptions } from '../types';
+import { Accountability, SchemaOverview } from '@directus/shared/types';
 import { CollectionsService } from './collections';
 import { FieldsService } from './fields';
 import { GraphQLService } from './graphql';

package/dist/services/users.d.ts

@@ -1,7 +1,6 @@
 import { Knex } from 'knex';
-import { AbstractServiceOptions, Item, PrimaryKey, SchemaOverview, MutationOptions } from '../types';
-import { Query } from '@directus/shared/types';
-import { Accountability } from '@directus/shared/types';
+import { AbstractServiceOptions, Item, PrimaryKey, MutationOptions } from '../types';
+import { Query, SchemaOverview, Accountability } from '@directus/shared/types';
 import { ItemsService } from './items';
 export declare class UsersService extends ItemsService {
     knex: Knex;

package/dist/services/utils.d.ts

@@ -1,6 +1,6 @@
 import { Knex } from 'knex';
-import { AbstractServiceOptions, PrimaryKey, SchemaOverview } from '../types';
-import { Accountability } from '@directus/shared/types';
+import { AbstractServiceOptions, PrimaryKey } from '../types';
+import { Accountability, SchemaOverview } from '@directus/shared/types';
 export declare class UtilsService {
     knex: Knex;
     accountability: Accountability | null;

package/dist/types/ast.d.ts

@@ -1,5 +1,4 @@
-import { Query } from '@directus/shared/types';
-import { Relation } from './relation';
+import { Query, Relation } from '@directus/shared/types';
 export declare type M2ONode = {
     type: 'm2o';
     name: string;

package/dist/types/auth.d.ts

@@ -1,5 +1,5 @@
+import { SchemaOverview } from '@directus/shared/types';
 import { Knex } from 'knex';
-import { SchemaOverview } from './schema';
 export interface AuthDriverOptions {
     knex: Knex;
     schema: SchemaOverview;
@@ -22,10 +22,8 @@ export declare type AuthData = Record<string, any> | null;
 export interface Session {
     token: string;
     expires: Date;
-    data: string | Record<string, unknown> | null;
     share: string;
 }
-export declare type SessionData = Record<string, any> | null;
 export declare type DirectusTokenPayload = {
     id?: string;
     role: string | null;

package/dist/types/index.d.ts

@@ -3,15 +3,12 @@ export * from './assets';
 export * from './ast';
 export * from './auth';
 export * from './collection';
-export * from './extensions';
 export * from './files';
 export * from './graphql';
 export * from './items';
 export * from './meta';
 export * from './migration';
-export * from './relation';
 export * from './revision';
-export * from './schema';
 export * from './services';
 export * from './snapshot';
 export * from './webhooks';