directus 9.22.4 → 9.23.3

package/dist/services/shares.js

@@ -4,19 +4,20 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SharesService = void 0;
-const items_1 = require("./items");
 const argon2_1 = __importDefault(require("argon2"));
 const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
-const ms_1 = __importDefault(require("ms"));
-const exceptions_1 = require("../exceptions");
 const env_1 = __importDefault(require("../env"));
-const authorization_1 = require("./authorization");
-const users_1 = require("./users");
-const mail_1 = require("./mail");
-const user_name_1 = require("../utils/user-name");
+const exceptions_1 = require("../exceptions");
+const get_milliseconds_1 = require("../utils/get-milliseconds");
 const md_1 = require("../utils/md");
 const url_1 = require("../utils/url");
+const user_name_1 = require("../utils/user-name");
+const authorization_1 = require("./authorization");
+const items_1 = require("./items");
+const mail_1 = require("./mail");
+const users_1 = require("./users");
 class SharesService extends items_1.ItemsService {
+    authorizationService;
     constructor(options) {
         super('directus_shares', options);
         this.authorizationService = new authorization_1.AuthorizationService({
@@ -30,7 +31,6 @@ class SharesService extends items_1.ItemsService {
         return super.createOne(data, opts);
     }
     async login(payload) {
-        var _a, _b, _c;
         const { nanoid } = await import('nanoid');
         const record = await this.knex
             .select({
@@ -80,20 +80,20 @@ class SharesService extends items_1.ItemsService {
             issuer: 'directus',
         });
         const refreshToken = nanoid(64);
-        const refreshTokenExpiration = new Date(Date.now() + (0, ms_1.default)(env_1.default.REFRESH_TOKEN_TTL));
+        const refreshTokenExpiration = new Date(Date.now() + (0, get_milliseconds_1.getMilliseconds)(env_1.default.REFRESH_TOKEN_TTL, 0));
         await this.knex('directus_sessions').insert({
             token: refreshToken,
             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,
+            ip: this.accountability?.ip,
+            user_agent: this.accountability?.userAgent,
+            origin: this.accountability?.origin,
             share: record.share_id,
         });
         await this.knex('directus_sessions').delete().where('expires', '<', new Date());
         return {
             accessToken,
             refreshToken,
-            expires: (0, ms_1.default)(env_1.default.ACCESS_TOKEN_TTL),
+            expires: (0, get_milliseconds_1.getMilliseconds)(env_1.default.ACCESS_TOKEN_TTL),
         };
     }
     /**
@@ -101,8 +101,7 @@ class SharesService extends items_1.ItemsService {
      * if you have read access to that particular share
      */
     async invite(payload) {
-        var _a;
-        if (!((_a = this.accountability) === null || _a === void 0 ? void 0 : _a.user))
+        if (!this.accountability?.user)
             throw new exceptions_1.ForbiddenException();
         const share = await this.readOne(payload.share, { fields: ['collection'] });
         const usersService = new users_1.UsersService({

package/dist/services/specifications.d.ts

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

package/dist/services/specifications.js

@@ -6,8 +6,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SpecificationService = void 0;
 const specs_1 = __importDefault(require("@directus/specs"));
 const lodash_1 = require("lodash");
-// @ts-ignore
 const package_json_1 = require("../../package.json");
+const constants_1 = require("../constants");
 const database_1 = __importDefault(require("../database"));
 const env_1 = __importDefault(require("../env"));
 const get_relation_type_1 = require("../utils/get-relation-type");
@@ -15,10 +15,17 @@ const collections_1 = require("./collections");
 const fields_1 = require("./fields");
 const graphql_1 = require("./graphql");
 const relations_1 = require("./relations");
-const constants_1 = require("../constants");
 // @ts-ignore
 const format_title_1 = __importDefault(require("@directus/format-title"));
 class SpecificationService {
+    accountability;
+    knex;
+    schema;
+    fieldsService;
+    collectionsService;
+    relationsService;
+    oas;
+    graphql;
     constructor(options) {
         this.accountability = options.accountability || null;
         this.knex = options.knex || (0, database_1.default)();
@@ -36,93 +43,13 @@ class SpecificationService {
 }
 exports.SpecificationService = SpecificationService;
 class OASSpecsService {
+    accountability;
+    knex;
+    schema;
+    fieldsService;
+    collectionsService;
+    relationsService;
     constructor(options, { fieldsService, collectionsService, relationsService, }) {
-        this.fieldTypes = {
-            alias: {
-                type: 'string',
-            },
-            bigInteger: {
-                type: 'integer',
-                format: 'int64',
-            },
-            binary: {
-                type: 'string',
-                format: 'binary',
-            },
-            boolean: {
-                type: 'boolean',
-            },
-            csv: {
-                type: 'array',
-                items: {
-                    type: 'string',
-                },
-            },
-            date: {
-                type: 'string',
-                format: 'date',
-            },
-            dateTime: {
-                type: 'string',
-                format: 'date-time',
-            },
-            decimal: {
-                type: 'number',
-            },
-            float: {
-                type: 'number',
-                format: 'float',
-            },
-            hash: {
-                type: 'string',
-            },
-            integer: {
-                type: 'integer',
-            },
-            json: {},
-            string: {
-                type: 'string',
-            },
-            text: {
-                type: 'string',
-            },
-            time: {
-                type: 'string',
-                format: 'time',
-            },
-            timestamp: {
-                type: 'string',
-                format: 'timestamp',
-            },
-            unknown: {
-                type: undefined,
-            },
-            uuid: {
-                type: 'string',
-                format: 'uuid',
-            },
-            geometry: {
-                type: 'object',
-            },
-            'geometry.Point': {
-                type: 'object',
-            },
-            'geometry.LineString': {
-                type: 'object',
-            },
-            'geometry.Polygon': {
-                type: 'object',
-            },
-            'geometry.MultiPoint': {
-                type: 'object',
-            },
-            'geometry.MultiLineString': {
-                type: 'object',
-            },
-            'geometry.MultiPolygon': {
-                type: 'object',
-            },
-        };
         this.accountability = options.accountability || null;
         this.knex = options.knex || (0, database_1.default)();
         this.schema = options.schema;
@@ -131,11 +58,10 @@ class OASSpecsService {
         this.relationsService = relationsService;
     }
     async generate() {
-        var _a, _b;
         const collections = await this.collectionsService.readByQuery();
         const fields = await this.fieldsService.readAll();
         const relations = (await this.relationsService.readAll());
-        const permissions = (_b = (_a = this.accountability) === null || _a === void 0 ? void 0 : _a.permissions) !== null && _b !== void 0 ? _b : [];
+        const permissions = this.accountability?.permissions ?? [];
         const tags = await this.generateTags(collections);
         const paths = await this.generatePaths(permissions, tags);
         const components = await this.generateComponents(collections, fields, relations, tags);
@@ -152,14 +78,15 @@ class OASSpecsService {
                     description: 'Your current Directus instance.',
                 },
             ],
-            tags,
             paths,
-            components,
         };
+        if (tags)
+            spec.tags = tags;
+        if (components)
+            spec.components = components;
         return spec;
     }
     async generateTags(collections) {
-        var _a;
         const systemTags = (0, lodash_1.cloneDeep)(specs_1.default.tags);
         const tags = [];
         // System tags that don't have an associated collection are always readable to the user
@@ -180,18 +107,20 @@ class OASSpecsService {
                 }
             }
             else {
-                tags.push({
+                const tag = {
                     name: 'Items' + (0, format_title_1.default)(collection.collection).replace(/ /g, ''),
-                    description: ((_a = collection.meta) === null || _a === void 0 ? void 0 : _a.note) || undefined,
                     'x-collection': collection.collection,
-                });
+                };
+                if (collection.meta?.note) {
+                    tag.description = collection.meta.note;
+                }
+                tags.push(tag);
             }
         }
         // Filter out the generic Items information
         return tags.filter((tag) => tag.name !== 'Items');
     }
     async generatePaths(permissions, tags) {
-        var _a, _b, _c, _d, _e;
         const paths = {};
         if (!tags)
             return paths;
@@ -200,11 +129,11 @@ class OASSpecsService {
             if (isSystem) {
                 for (const [path, pathItem] of Object.entries(specs_1.default.paths)) {
                     for (const [method, operation] of Object.entries(pathItem)) {
-                        if ((_a = operation.tags) === null || _a === void 0 ? void 0 : _a.includes(tag.name)) {
+                        if (operation.tags?.includes(tag.name)) {
                             if (!paths[path]) {
                                 paths[path] = {};
                             }
-                            const hasPermission = ((_b = this.accountability) === null || _b === void 0 ? void 0 : _b.admin) === true ||
+                            const hasPermission = this.accountability?.admin === true ||
                                 'x-collection' in tag === false ||
                                 !!permissions.find((permission) => permission.collection === tag['x-collection'] &&
                                     permission.action === this.getActionForMethod(method));
@@ -212,7 +141,7 @@ class OASSpecsService {
                                 if ('parameters' in pathItem) {
                                     paths[path][method] = {
                                         ...operation,
-                                        parameters: [...((_c = pathItem.parameters) !== null && _c !== void 0 ? _c : []), ...((_d = operation === null || operation === void 0 ? void 0 : operation.parameters) !== null && _d !== void 0 ? _d : [])],
+                                        parameters: [...(pathItem.parameters ?? []), ...(operation?.parameters ?? [])],
                                     };
                                 }
                                 else {
@@ -228,7 +157,7 @@ class OASSpecsService {
                 const detailBase = (0, lodash_1.cloneDeep)(specs_1.default.paths['/items/{collection}/{id}']);
                 const collection = tag['x-collection'];
                 for (const method of ['post', 'get', 'patch', 'delete']) {
-                    const hasPermission = ((_e = this.accountability) === null || _e === void 0 ? void 0 : _e.admin) === true ||
+                    const hasPermission = this.accountability?.admin === true ||
                         !!permissions.find((permission) => permission.collection === collection && permission.action === this.getActionForMethod(method));
                     if (hasPermission) {
                         if (!paths[`/items/${collection}`])
@@ -332,13 +261,12 @@ class OASSpecsService {
         return paths;
     }
     async generateComponents(collections, fields, relations, tags) {
-        var _a;
         let components = (0, lodash_1.cloneDeep)(specs_1.default.components);
         if (!components)
             components = {};
         components.schemas = {};
         // Always includes the schemas with these names
-        if (((_a = specs_1.default.components) === null || _a === void 0 ? void 0 : _a.schemas) !== null) {
+        if (specs_1.default.components?.schemas !== null) {
             for (const schemaName of constants_1.OAS_REQUIRED_SCHEMAS) {
                 if (specs_1.default.components.schemas[schemaName] !== null) {
                     components.schemas[schemaName] = (0, lodash_1.cloneDeep)(specs_1.default.components.schemas[schemaName]);
@@ -377,7 +305,7 @@ class OASSpecsService {
         return components;
     }
     filterCollectionFromParams(parameters) {
-        return parameters.filter((param) => (param === null || param === void 0 ? void 0 : param.$ref) !== '#/components/parameters/Collection');
+        return parameters.filter((param) => param?.$ref !== '#/components/parameters/Collection');
     }
     getActionForMethod(method) {
         switch (method) {
@@ -393,16 +321,15 @@ class OASSpecsService {
         }
     }
     generateField(field, relations, tags, fields) {
-        var _a, _b;
-        let propertyObject = {
-            nullable: (_a = field.schema) === null || _a === void 0 ? void 0 : _a.is_nullable,
-            description: ((_b = field.meta) === null || _b === void 0 ? void 0 : _b.note) || undefined,
-        };
-        const relation = relations.find((relation) => {
-            var _a;
-            return (relation.collection === field.collection && relation.field === field.field) ||
-                (relation.related_collection === field.collection && ((_a = relation.meta) === null || _a === void 0 ? void 0 : _a.one_field) === field.field);
-        });
+        let propertyObject = {};
+        if (field.schema && 'is_nullable' in field.schema) {
+            propertyObject.nullable = field.schema.is_nullable;
+        }
+        if (field.meta?.note) {
+            propertyObject.description = field.meta.note;
+        }
+        const relation = relations.find((relation) => (relation.collection === field.collection && relation.field === field.field) ||
+            (relation.related_collection === field.collection && relation.meta?.one_field === field.field));
         if (!relation) {
             propertyObject = {
                 ...propertyObject,
@@ -417,7 +344,7 @@ class OASSpecsService {
             });
             if (relationType === 'm2o') {
                 const relatedTag = tags.find((tag) => tag['x-collection'] === relation.related_collection);
-                const relatedPrimaryKeyField = fields.find((field) => { var _a; return field.collection === relation.related_collection && ((_a = field.schema) === null || _a === void 0 ? void 0 : _a.is_primary_key); });
+                const relatedPrimaryKeyField = fields.find((field) => field.collection === relation.related_collection && field.schema?.is_primary_key);
                 if (!relatedTag || !relatedPrimaryKeyField)
                     return propertyObject;
                 propertyObject.oneOf = [
@@ -431,7 +358,7 @@ class OASSpecsService {
             }
             else if (relationType === 'o2m') {
                 const relatedTag = tags.find((tag) => tag['x-collection'] === relation.collection);
-                const relatedPrimaryKeyField = fields.find((field) => { var _a; return field.collection === relation.collection && ((_a = field.schema) === null || _a === void 0 ? void 0 : _a.is_primary_key); });
+                const relatedPrimaryKeyField = fields.find((field) => field.collection === relation.collection && field.schema?.is_primary_key);
                 if (!relatedTag || !relatedPrimaryKeyField)
                     return propertyObject;
                 propertyObject.type = 'array';
@@ -463,8 +390,97 @@ class OASSpecsService {
         }
         return propertyObject;
     }
+    fieldTypes = {
+        alias: {
+            type: 'string',
+        },
+        bigInteger: {
+            type: 'integer',
+            format: 'int64',
+        },
+        binary: {
+            type: 'string',
+            format: 'binary',
+        },
+        boolean: {
+            type: 'boolean',
+        },
+        csv: {
+            type: 'array',
+            items: {
+                type: 'string',
+            },
+        },
+        date: {
+            type: 'string',
+            format: 'date',
+        },
+        dateTime: {
+            type: 'string',
+            format: 'date-time',
+        },
+        decimal: {
+            type: 'number',
+        },
+        float: {
+            type: 'number',
+            format: 'float',
+        },
+        hash: {
+            type: 'string',
+        },
+        integer: {
+            type: 'integer',
+        },
+        json: {},
+        string: {
+            type: 'string',
+        },
+        text: {
+            type: 'string',
+        },
+        time: {
+            type: 'string',
+            format: 'time',
+        },
+        timestamp: {
+            type: 'string',
+            format: 'timestamp',
+        },
+        unknown: {},
+        uuid: {
+            type: 'string',
+            format: 'uuid',
+        },
+        geometry: {
+            type: 'object',
+        },
+        'geometry.Point': {
+            type: 'object',
+        },
+        'geometry.LineString': {
+            type: 'object',
+        },
+        'geometry.Polygon': {
+            type: 'object',
+        },
+        'geometry.MultiPoint': {
+            type: 'object',
+        },
+        'geometry.MultiLineString': {
+            type: 'object',
+        },
+        'geometry.MultiPolygon': {
+            type: 'object',
+        },
+    };
 }
 class GraphQLSpecsService {
+    accountability;
+    knex;
+    schema;
+    items;
+    system;
     constructor(options) {
         this.accountability = options.accountability || null;
         this.knex = options.knex || (0, database_1.default)();

package/dist/services/tfa.d.ts

@@ -1,6 +1,6 @@
-import { Knex } from 'knex';
+import type { Knex } from 'knex';
+import type { AbstractServiceOptions, PrimaryKey } from '../types';
 import { ItemsService } from './items';
-import { AbstractServiceOptions, PrimaryKey } from '../types';
 export declare class TFAService {
     knex: Knex;
     itemsService: ItemsService;

package/dist/services/tfa.js

@@ -9,6 +9,8 @@ const database_1 = __importDefault(require("../database"));
 const exceptions_1 = require("../exceptions");
 const items_1 = require("./items");
 class TFAService {
+    knex;
+    itemsService;
     constructor(options) {
         this.knex = options.knex || (0, database_1.default)();
         this.itemsService = new items_1.ItemsService('directus_users', options);
@@ -18,29 +20,29 @@ class TFAService {
             return otplib_1.authenticator.check(otp, secret);
         }
         const user = await this.knex.select('tfa_secret').from('directus_users').where({ id: key }).first();
-        if (!(user === null || user === void 0 ? void 0 : user.tfa_secret)) {
+        if (!user?.tfa_secret) {
             throw new exceptions_1.InvalidPayloadException(`User "${key}" doesn't have TFA enabled.`);
         }
         return otplib_1.authenticator.check(otp, user.tfa_secret);
     }
     async generateTFA(key) {
         const user = await this.knex.select('email', 'tfa_secret').from('directus_users').where({ id: key }).first();
-        if ((user === null || user === void 0 ? void 0 : user.tfa_secret) !== null) {
+        if (user?.tfa_secret !== null) {
             throw new exceptions_1.InvalidPayloadException('TFA Secret is already set for this user');
         }
-        if (!(user === null || user === void 0 ? void 0 : user.email)) {
+        if (!user?.email) {
             throw new exceptions_1.InvalidPayloadException('User must have a valid email to enable TFA');
         }
         const secret = otplib_1.authenticator.generateSecret();
         const project = await this.knex.select('project_name').from('directus_settings').limit(1).first();
         return {
             secret,
-            url: otplib_1.authenticator.keyuri(user.email, (project === null || project === void 0 ? void 0 : project.project_name) || 'Directus', secret),
+            url: otplib_1.authenticator.keyuri(user.email, project?.project_name || 'Directus', secret),
         };
     }
     async enableTFA(key, otp, secret) {
         const user = await this.knex.select('tfa_secret').from('directus_users').where({ id: key }).first();
-        if ((user === null || user === void 0 ? void 0 : user.tfa_secret) !== null) {
+        if (user?.tfa_secret !== null) {
             throw new exceptions_1.InvalidPayloadException('TFA Secret is already set for this user');
         }
         if (!otplib_1.authenticator.check(otp, secret)) {

package/dist/services/users.d.ts

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