@directus/api 23.1.2 → 23.2.0

package/dist/services/graphql/index.js

@@ -29,7 +29,6 @@ import { sanitizeQuery } from '../../utils/sanitize-query.js';
 import { validateQuery } from '../../utils/validate-query.js';
 import { AuthenticationService } from '../authentication.js';
 import { CollectionsService } from '../collections.js';
-import { CommentsService } from '../comments.js';
 import { ExtensionsService } from '../extensions.js';
 import { FieldsService } from '../fields.js';
 import { FilesService } from '../files.js';
@@ -196,7 +195,6 @@ export class GraphQLService {
                 CreateCollectionTypes,
                 ReadCollectionTypes,
                 UpdateCollectionTypes,
-                DeleteCollectionTypes,
             }, schema);
         }
         const readableCollections = Object.values(schema.read.collections)
@@ -1650,7 +1648,7 @@ export class GraphQLService {
         })).filter((s) => s);
         return result;
     }
-    injectSystemResolvers(schemaComposer, { CreateCollectionTypes, ReadCollectionTypes, UpdateCollectionTypes, DeleteCollectionTypes, }, schema) {
+    injectSystemResolvers(schemaComposer, { CreateCollectionTypes, ReadCollectionTypes, UpdateCollectionTypes, }, schema) {
         const AuthTokens = schemaComposer.createObjectTC({
             name: 'auth_tokens',
             fields: {
@@ -2764,78 +2762,6 @@ export class GraphQLService {
                 },
             });
         }
-        if ('directus_activity' in schema.create.collections) {
-            schemaComposer.Mutation.addFields({
-                create_comment: {
-                    type: ReadCollectionTypes['directus_activity'] ?? GraphQLBoolean,
-                    args: {
-                        collection: new GraphQLNonNull(GraphQLString),
-                        item: new GraphQLNonNull(GraphQLID),
-                        comment: new GraphQLNonNull(GraphQLString),
-                    },
-                    resolve: async (_, args, __, info) => {
-                        const service = new CommentsService({
-                            accountability: this.accountability,
-                            schema: this.schema,
-                            serviceOrigin: 'activity',
-                        });
-                        const primaryKey = await service.createOne({
-                            ...args,
-                        });
-                        if ('directus_activity' in ReadCollectionTypes) {
-                            const selections = this.replaceFragmentsInSelections(info.fieldNodes[0]?.selectionSet?.selections, info.fragments);
-                            const query = this.getQuery(args, selections || [], info.variableValues);
-                            return await service.readOne(primaryKey, query);
-                        }
-                        return true;
-                    },
-                },
-            });
-        }
-        if ('directus_activity' in schema.update.collections) {
-            schemaComposer.Mutation.addFields({
-                update_comment: {
-                    type: ReadCollectionTypes['directus_activity'] ?? GraphQLBoolean,
-                    args: {
-                        id: new GraphQLNonNull(GraphQLID),
-                        comment: new GraphQLNonNull(GraphQLString),
-                    },
-                    resolve: async (_, args, __, info) => {
-                        const commentsService = new CommentsService({
-                            accountability: this.accountability,
-                            schema: this.schema,
-                            serviceOrigin: 'activity',
-                        });
-                        const primaryKey = await commentsService.updateOne(args['id'], { comment: args['comment'] });
-                        if ('directus_activity' in ReadCollectionTypes) {
-                            const selections = this.replaceFragmentsInSelections(info.fieldNodes[0]?.selectionSet?.selections, info.fragments);
-                            const query = this.getQuery(args, selections || [], info.variableValues);
-                            return { ...(await commentsService.readOne(primaryKey, query)), id: args['id'] };
-                        }
-                        return true;
-                    },
-                },
-            });
-        }
-        if ('directus_activity' in schema.delete.collections) {
-            schemaComposer.Mutation.addFields({
-                delete_comment: {
-                    type: DeleteCollectionTypes['one'],
-                    args: {
-                        id: new GraphQLNonNull(GraphQLID),
-                    },
-                    resolve: async (_, args) => {
-                        const commentsService = new CommentsService({
-                            accountability: this.accountability,
-                            schema: this.schema,
-                            serviceOrigin: 'activity',
-                        });
-                        await commentsService.deleteOne(args['id']);
-                        return { id: args['id'] };
-                    },
-                },
-            });
-        }
         if ('directus_files' in schema.create.collections) {
             schemaComposer.Mutation.addFields({
                 import_file: {

package/dist/services/users.js

@@ -131,7 +131,7 @@ export class UsersService extends ItemsService {
      */
     async createOne(data, opts = {}) {
         try {
-            if ('email' in data) {
+            if ('email' in data && data['email'] !== undefined) {
                 this.validateEmail(data['email']);
                 await this.checkUniqueEmails([data['email']]);
             }

package/dist/services/versions.d.ts

@@ -9,7 +9,6 @@ export declare class VersionsService extends ItemsService {
         outdated: boolean;
         mainHash: string;
     }>;
-    getVersionSavesById(id: PrimaryKey): Promise<Partial<Item>[]>;
     getVersionSaves(key: string, collection: string, item: string | undefined): Promise<Partial<Item>[] | null>;
     createOne(data: Partial<Item>, opts?: MutationOptions): Promise<PrimaryKey>;
     createMany(data: Partial<Item>[], opts?: MutationOptions): Promise<PrimaryKey[]>;

package/dist/services/versions.js

@@ -82,17 +82,6 @@ export class VersionsService extends ItemsService {
         const mainHash = objectHash(mainItem);
         return { outdated: hash !== mainHash, mainHash };
     }
-    async getVersionSavesById(id) {
-        const revisionsService = new RevisionsService({
-            knex: this.knex,
-            schema: this.schema,
-        });
-        const result = await revisionsService.readByQuery({
-            filter: { version: { _eq: id } },
-        });
-        return result.map((revision) => revision['delta']);
-    }
-    // TODO: Remove legacy need to return a version array in subsequent release
     async getVersionSaves(key, collection, item) {
         const filter = {
             key: { _eq: key },
@@ -107,8 +96,7 @@ export class VersionsService extends ItemsService {
         if (versions[0]['delta']) {
             return [versions[0]['delta']];
         }
-        const saves = await this.getVersionSavesById(versions[0]['id']);
-        return saves;
+        return null;
     }
     async createOne(data, opts) {
         await this.validateCreateData(data);
@@ -202,12 +190,7 @@ export class VersionsService extends ItemsService {
             data: revisionDelta,
             delta: revisionDelta,
         });
-        let existingDelta = version['delta'];
-        if (!existingDelta) {
-            const saves = await this.getVersionSavesById(key);
-            existingDelta = assign({}, ...saves);
-        }
-        const finalVersionDelta = assign({}, existingDelta, revisionDelta ? JSON.parse(revisionDelta) : null);
+        const finalVersionDelta = assign({}, version['delta'], revisionDelta ? JSON.parse(revisionDelta) : null);
         const sudoService = new ItemsService(this.collection, {
             knex: this.knex,
             schema: this.schema,
@@ -220,7 +203,7 @@ export class VersionsService extends ItemsService {
         return finalVersionDelta;
     }
     async promote(version, mainHash, fields) {
-        const { id, collection, item, delta } = (await this.readOne(version));
+        const { collection, item, delta } = (await this.readOne(version));
         // will throw an error if the accountability does not have permission to update the item
         if (this.accountability) {
             await validateAccess({
@@ -233,21 +216,18 @@ export class VersionsService extends ItemsService {
                 knex: this.knex,
             });
         }
+        if (!delta) {
+            throw new UnprocessableContentError({
+                reason: `No changes to promote`,
+            });
+        }
         const { outdated } = await this.verifyHash(collection, item, mainHash);
         if (outdated) {
             throw new UnprocessableContentError({
                 reason: `Main item has changed since this version was last updated`,
             });
         }
-        let versionResult;
-        if (delta) {
-            versionResult = delta;
-        }
-        else {
-            const saves = await this.getVersionSavesById(id);
-            versionResult = assign({}, ...saves);
-        }
-        const payloadToUpdate = fields ? pick(versionResult, fields) : versionResult;
+        const payloadToUpdate = fields ? pick(delta, fields) : delta;
         const itemsService = new ItemsService(collection, {
             accountability: this.accountability,
             knex: this.knex,

package/dist/storage/register-locations.js

@@ -6,6 +6,7 @@ export const registerLocations = async (storage) => {
     const env = useEnv();
     const locations = toArray(env['STORAGE_LOCATIONS']);
     const tus = {
+        enabled: RESUMABLE_UPLOADS.ENABLED,
         chunkSize: RESUMABLE_UPLOADS.CHUNK_SIZE,
     };
     locations.forEach((location) => {

package/dist/telemetry/index.d.ts

@@ -1,4 +1,3 @@
 export * from './lib/get-report.js';
-export * from './lib/init-telemetry.js';
 export * from './lib/send-report.js';
 export * from './lib/track.js';

package/dist/telemetry/index.js

@@ -1,4 +1,3 @@
 export * from './lib/get-report.js';
-export * from './lib/init-telemetry.js';
 export * from './lib/send-report.js';
 export * from './lib/track.js';

package/dist/utils/apply-diff.js

@@ -148,7 +148,7 @@ export async function applyDiff(currentSnapshot, snapshotDiff, options) {
                 }
             }
         }
-        const fieldsService = new FieldsService({
+        let fieldsService = new FieldsService({
             knex: trx,
             schema: await getSchema({ database: trx, bypassCache: true }),
         });
@@ -156,6 +156,11 @@ export async function applyDiff(currentSnapshot, snapshotDiff, options) {
             if (diff?.[0]?.kind === DiffKind.NEW && !isNestedMetaUpdate(diff?.[0])) {
                 try {
                     await fieldsService.createField(collection, diff[0].rhs, undefined, mutationOptions);
+                    // Refresh the schema
+                    fieldsService = new FieldsService({
+                        knex: trx,
+                        schema: await getSchema({ database: trx, bypassCache: true }),
+                    });
                 }
                 catch (err) {
                     logger.error(`Failed to create field "${collection}.${field}"`);
@@ -183,14 +188,21 @@ export async function applyDiff(currentSnapshot, snapshotDiff, options) {
             if (diff?.[0]?.kind === DiffKind.DELETE && !isNestedMetaUpdate(diff?.[0])) {
                 try {
                     await fieldsService.deleteField(collection, field, mutationOptions);
+                    // Refresh the schema
+                    fieldsService = new FieldsService({
+                        knex: trx,
+                        schema: await getSchema({ database: trx, bypassCache: true }),
+                    });
                 }
                 catch (err) {
                     logger.error(`Failed to delete field "${collection}.${field}"`);
                     throw err;
                 }
                 // Field deletion also cleans up the relationship. We should ignore any relationship
-                // changes attached to this now non-existing field
-                snapshotDiff.relations = snapshotDiff.relations.filter((relation) => (relation.collection === collection && relation.field === field) === false);
+                // changes attached to this now non-existing field except newly created relationship
+                snapshotDiff.relations = snapshotDiff.relations.filter((relation) => (relation.collection === collection &&
+                    relation.field === field &&
+                    !relation.diff.some((diff) => diff.kind === DiffKind.NEW)) === false);
             }
         }
         const relationsService = new RelationsService({

package/dist/utils/get-service.js

@@ -11,7 +11,7 @@ export function getService(collection, opts) {
         case 'directus_activity':
             return new ActivityService(opts);
         case 'directus_comments':
-            return new CommentsService({ ...opts, serviceOrigin: 'comments' });
+            return new CommentsService(opts);
         case 'directus_dashboards':
             return new DashboardsService(opts);
         case 'directus_files':

package/dist/utils/get-snapshot-diff.js

@@ -25,6 +25,16 @@ export function getSnapshotDiff(current, after) {
             ...current.fields.map((currentField) => {
                 const afterField = after.fields.find((afterField) => afterField.collection === currentField.collection && afterField.field === currentField.field);
                 const isAutoIncrementPrimaryKey = !!currentField.schema?.is_primary_key && !!currentField.schema?.has_auto_increment;
+                // Changing to/from alias fields should delete the current field
+                if (afterField &&
+                    currentField.type !== afterField.type &&
+                    (currentField.type === 'alias' || afterField.type === 'alias')) {
+                    return {
+                        collection: currentField.collection,
+                        field: currentField.field,
+                        diff: deepDiff.diff(sanitizeField(currentField, isAutoIncrementPrimaryKey), sanitizeField(undefined, isAutoIncrementPrimaryKey)),
+                    };
+                }
                 return {
                     collection: currentField.collection,
                     field: currentField.field,
@@ -33,7 +43,13 @@ export function getSnapshotDiff(current, after) {
             }),
             ...after.fields
                 .filter((afterField) => {
-                const currentField = current.fields.find((currentField) => currentField.collection === afterField.collection && afterField.field === currentField.field);
+                let currentField = current.fields.find((currentField) => currentField.collection === afterField.collection && afterField.field === currentField.field);
+                // Changing to/from alias fields should create the new field
+                if (currentField &&
+                    currentField.type !== afterField.type &&
+                    (currentField.type === 'alias' || afterField.type === 'alias')) {
+                    currentField = undefined;
+                }
                 return !!currentField === false;
             })
                 .map((afterField) => ({

package/dist/websocket/controllers/base.js

@@ -16,6 +16,7 @@ import { AuthMode, WebSocketAuthMessage, WebSocketMessage } from '../messages.js
 import { getExpiresAtForToken } from '../utils/get-expires-at-for-token.js';
 import { getMessageType } from '../utils/message.js';
 import { waitForAnyMessage, waitForMessageType } from '../utils/wait-for-message.js';
+import { createDefaultAccountability } from '../../permissions/utils/create-default-accountability.js';
 const TOKEN_CHECK_INTERVAL = 15 * 60 * 1000; // 15 minutes
 const logger = useLogger();
 export default class SocketController {
@@ -116,7 +117,7 @@ export default class SocketController {
         }
         this.server.handleUpgrade(request, socket, head, async (ws) => {
             this.catchInvalidMessages(ws);
-            const state = { accountability: null, expires_at: null };
+            const state = { accountability: createDefaultAccountability(), expires_at: null };
             this.server.emit('connection', ws, state);
         });
     }

package/dist/websocket/controllers/graphql.js

@@ -10,6 +10,7 @@ import { ConnectionParams, WebSocketMessage } from '../messages.js';
 import { getMessageType } from '../utils/message.js';
 import SocketController from './base.js';
 import { registerWebSocketEvents } from './hooks.js';
+import { createDefaultAccountability } from '../../permissions/utils/create-default-accountability.js';
 const logger = useLogger();
 export class GraphQLSubscriptionController extends SocketController {
     gql;
@@ -95,7 +96,7 @@ export class GraphQLSubscriptionController extends SocketController {
     }
     async handleHandshakeUpgrade({ request, socket, head }) {
         this.server.handleUpgrade(request, socket, head, async (ws) => {
-            this.server.emit('connection', ws, { accountability: null, expires_at: null });
+            this.server.emit('connection', ws, { accountability: createDefaultAccountability(), expires_at: null });
             // actual enforcement is handled by the setTokenExpireTimer function
         });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@directus/api",
-  "version": "23.1.2",
+  "version": "23.2.0",
   "description": "Directus is a real-time API and App dashboard for managing SQL database content",
   "keywords": [
     "directus",
@@ -149,29 +149,29 @@
     "ws": "8.18.0",
     "zod": "3.23.8",
     "zod-validation-error": "3.4.0",
-    "@directus/app": "13.3.2",
-    "@directus/constants": "12.0.0",
-    "@directus/env": "3.1.3",
+    "@directus/app": "13.3.4",
+    "@directus/constants": "12.0.1",
+    "@directus/env": "4.1.0",
     "@directus/errors": "1.0.1",
-    "@directus/extensions-registry": "2.0.4",
-    "@directus/extensions": "2.0.4",
-    "@directus/extensions-sdk": "12.1.2",
+    "@directus/extensions": "2.0.6",
+    "@directus/extensions-registry": "2.0.6",
+    "@directus/extensions-sdk": "12.1.4",
     "@directus/format-title": "11.0.0",
-    "@directus/memory": "2.0.4",
-    "@directus/pressure": "2.0.3",
+    "@directus/memory": "2.0.6",
+    "@directus/pressure": "2.0.5",
     "@directus/schema": "12.1.1",
     "@directus/specs": "11.1.0",
     "@directus/storage": "11.0.1",
-    "@directus/storage-driver-azure": "11.1.0",
-    "@directus/storage-driver-gcs": "11.1.0",
-    "@directus/storage-driver-cloudinary": "11.1.0",
+    "@directus/storage-driver-azure": "11.1.2",
+    "@directus/storage-driver-cloudinary": "11.1.2",
+    "@directus/storage-driver-gcs": "11.1.2",
     "@directus/storage-driver-local": "11.0.1",
-    "@directus/storage-driver-s3": "11.0.3",
-    "@directus/storage-driver-supabase": "2.1.0",
-    "@directus/system-data": "2.1.1",
-    "@directus/validation": "1.0.3",
-    "@directus/utils": "12.0.3",
-    "directus": "11.2.1"
+    "@directus/storage-driver-s3": "11.0.5",
+    "@directus/storage-driver-supabase": "2.1.2",
+    "@directus/system-data": "2.1.2",
+    "@directus/utils": "12.0.5",
+    "@directus/validation": "1.0.5",
+    "directus": "11.3.0"
   },
   "devDependencies": {
     "@ngneat/falso": "7.2.0",
@@ -215,7 +215,7 @@
     "vitest": "2.1.2",
     "@directus/random": "1.0.0",
     "@directus/tsconfig": "2.0.0",
-    "@directus/types": "12.2.1"
+    "@directus/types": "12.2.2"
   },
   "optionalDependencies": {
     "@keyv/redis": "3.0.1",