directus 9.17.0 → 9.17.3

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

@@ -292,7 +292,7 @@ EXTENSIONS_AUTO_RELOAD=false
 EMAIL_FROM="no-reply@directus.io"
 
 # What to use to send emails. One of
-# sendmail, smtp, mailgun, ses.
+# sendmail, smtp, mailgun, sendgrid, ses.
 EMAIL_TRANSPORT="sendmail"
 EMAIL_SENDMAIL_NEW_LINE="unix"
 EMAIL_SENDMAIL_PATH="/usr/sbin/sendmail"
@@ -319,3 +319,6 @@ EMAIL_SENDMAIL_PATH="/usr/sbin/sendmail"
 ## Email (Mailgun Transport)
 # EMAIL_MAILGUN_API_KEY="key-1234123412341234"
 # EMAIL_MAILGUN_DOMAIN="a domain name from https://app.mailgun.com/app/sending/domains"
+
+## Email (SendGrid Transport)
+# EMAIL_SENDGRID_API_KEY="key-1234123412341234"

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

@@ -1,5 +1,5 @@
 import { SchemaHelper } from '../types';
 export declare class SchemaHelperSQLite extends SchemaHelper {
-    preColumnDelete(): Promise<boolean>;
-    postColumnDelete(): Promise<void>;
+    preColumnChange(): Promise<boolean>;
+    postColumnChange(): Promise<void>;
 }

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

@@ -3,14 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SchemaHelperSQLite = void 0;
 const types_1 = require("../types");
 class SchemaHelperSQLite extends types_1.SchemaHelper {
-    async preColumnDelete() {
+    async preColumnChange() {
         const foreignCheckStatus = (await this.knex.raw('PRAGMA foreign_keys'))[0].foreign_keys === 1;
         if (foreignCheckStatus) {
             await this.knex.raw('PRAGMA foreign_keys = OFF');
         }
         return foreignCheckStatus;
     }
-    async postColumnDelete() {
+    async postColumnChange() {
         await this.knex.raw('PRAGMA foreign_keys = ON');
     }
 }

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

@@ -11,7 +11,7 @@ export declare abstract class SchemaHelper extends DatabaseHelper {
     changeNullable(table: string, column: string, nullable: boolean): Promise<void>;
     changeToType(table: string, column: string, type: typeof KNEX_TYPES[number], options?: Options): Promise<void>;
     protected changeToTypeByCopy(table: string, column: string, type: typeof KNEX_TYPES[number], options: Options): Promise<void>;
-    preColumnDelete(): Promise<boolean>;
-    postColumnDelete(): Promise<void>;
+    preColumnChange(): Promise<boolean>;
+    postColumnChange(): Promise<void>;
 }
 export {};

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

@@ -56,10 +56,10 @@ class SchemaHelper extends types_1.DatabaseHelper {
             await this.changeNullable(table, column, options.nullable);
         }
     }
-    async preColumnDelete() {
+    async preColumnChange() {
         return false;
     }
-    async postColumnDelete() {
+    async postColumnChange() {
         return;
     }
 }

package/dist/env.js

@@ -165,6 +165,7 @@ const allowedEnvironmentVars = [
     'EMAIL_MAILGUN_API_KEY',
     'EMAIL_MAILGUN_DOMAIN',
     'EMAIL_MAILGUN_HOST',
+    'EMAIL_SENDGRID_API_KEY',
     'EMAIL_SES_CREDENTIALS__ACCESS_KEY_ID',
     'EMAIL_SES_CREDENTIALS__SECRET_ACCESS_KEY',
     'EMAIL_SES_REGION',

package/dist/mailer.js

@@ -57,6 +57,12 @@ function getMailer() {
             host: env_1.default.EMAIL_MAILGUN_HOST || 'api.mailgun.net',
         }));
     }
+    else if (transportName === 'sendgrid') {
+        const sg = require('nodemailer-sendgrid');
+        transporter = nodemailer_1.default.createTransport(sg({
+            apiKey: env_1.default.EMAIL_SENDGRID_API_KEY,
+        }));
+    }
     else {
         logger_1.default.warn('Illegal transport given for email. Check the EMAIL_TRANSPORT env var.');
     }

package/dist/services/fields.js

@@ -222,6 +222,7 @@ class FieldsService {
         if (this.accountability && this.accountability.admin !== true) {
             throw new exceptions_1.ForbiddenException();
         }
+        const runPostColumnChange = await this.helpers.schema.preColumnChange();
         try {
             const exists = field.field in this.schema.collections[collection].fields ||
                 (0, lodash_1.isNil)(await this.knex.select('id').from('directus_fields').where({ collection, field: field.field }).first()) === false;
@@ -276,6 +277,9 @@ class FieldsService {
             });
         }
         finally {
+            if (runPostColumnChange) {
+                await this.helpers.schema.postColumnChange();
+            }
             if (this.cache && env_1.default.CACHE_AUTO_PURGE) {
                 await this.cache.clear();
             }
@@ -286,6 +290,7 @@ class FieldsService {
         if (this.accountability && this.accountability.admin !== true) {
             throw new exceptions_1.ForbiddenException();
         }
+        const runPostColumnChange = await this.helpers.schema.preColumnChange();
         try {
             const hookAdjustedField = await emitter_1.default.emitFilter(`fields.update`, field, {
                 keys: [field.field],
@@ -341,6 +346,9 @@ class FieldsService {
             return field.field;
         }
         finally {
+            if (runPostColumnChange) {
+                await this.helpers.schema.postColumnChange();
+            }
             if (this.cache && env_1.default.CACHE_AUTO_PURGE) {
                 await this.cache.clear();
             }
@@ -351,7 +359,7 @@ class FieldsService {
         if (this.accountability && this.accountability.admin !== true) {
             throw new exceptions_1.ForbiddenException();
         }
-        const runPostColumnDelete = await this.helpers.schema.preColumnDelete();
+        const runPostColumnChange = await this.helpers.schema.preColumnChange();
         try {
             await emitter_1.default.emitFilter('fields.delete', [field], {
                 collection: collection,
@@ -440,8 +448,8 @@ class FieldsService {
             });
         }
         finally {
-            if (runPostColumnDelete) {
-                await this.helpers.schema.postColumnDelete();
+            if (runPostColumnChange) {
+                await this.helpers.schema.postColumnChange();
             }
             if (this.cache && env_1.default.CACHE_AUTO_PURGE) {
                 await this.cache.clear();

package/dist/services/relations.d.ts

@@ -5,6 +5,7 @@ import { PermissionsService } from './permissions';
 import SchemaInspector from '@directus/schema';
 import Keyv from 'keyv';
 import { AbstractServiceOptions } from '../types';
+import { Helpers } from '../database/helpers';
 export declare class RelationsService {
     knex: Knex;
     permissionsService: PermissionsService;
@@ -13,6 +14,7 @@ export declare class RelationsService {
     schema: SchemaOverview;
     relationsItemService: ItemsService<RelationMeta>;
     systemCache: Keyv<any>;
+    helpers: Helpers;
     constructor(options: AbstractServiceOptions);
     readAll(collection?: string, opts?: QueryOptions): Promise<Relation[]>;
     readOne(collection: string, field: string): Promise<Relation>;

package/dist/services/relations.js

@@ -36,6 +36,7 @@ const schema_1 = __importDefault(require("@directus/schema"));
 const database_1 = __importStar(require("../database"));
 const get_default_index_name_1 = require("../utils/get-default-index-name");
 const cache_1 = require("../cache");
+const helpers_1 = require("../database/helpers");
 class RelationsService {
     constructor(options) {
         this.knex = options.knex || (0, database_1.default)();
@@ -51,6 +52,7 @@ class RelationsService {
             // happens in `filterForbidden` down below
         });
         this.systemCache = (0, cache_1.getCache)().systemCache;
+        this.helpers = (0, helpers_1.getHelpers)(this.knex);
     }
     async readAll(collection, opts) {
         if (this.accountability && this.accountability.admin !== true && this.hasReadAccess === false) {
@@ -150,6 +152,7 @@ class RelationsService {
         if (existingRelation) {
             throw new exceptions_1.InvalidPayloadException(`Field "${relation.field}" in collection "${relation.collection}" already has an associated relationship`);
         }
+        const runPostColumnChange = await this.helpers.schema.preColumnChange();
         try {
             const metaRow = {
                 ...(relation.meta || {}),
@@ -182,6 +185,9 @@ class RelationsService {
             });
         }
         finally {
+            if (runPostColumnChange) {
+                await this.helpers.schema.postColumnChange();
+            }
             await (0, cache_1.clearSystemCache)();
         }
     }
@@ -204,6 +210,7 @@ class RelationsService {
         if (!existingRelation) {
             throw new exceptions_1.InvalidPayloadException(`Field "${field}" in collection "${collection}" doesn't have a relationship.`);
         }
+        const runPostColumnChange = await this.helpers.schema.preColumnChange();
         try {
             await this.knex.transaction(async (trx) => {
                 if (existingRelation.related_collection) {
@@ -247,6 +254,9 @@ class RelationsService {
             });
         }
         finally {
+            if (runPostColumnChange) {
+                await this.helpers.schema.postColumnChange();
+            }
             await (0, cache_1.clearSystemCache)();
         }
     }
@@ -267,6 +277,7 @@ class RelationsService {
         if (!existingRelation) {
             throw new exceptions_1.InvalidPayloadException(`Field "${field}" in collection "${collection}" doesn't have a relationship.`);
         }
+        const runPostColumnChange = await this.helpers.schema.preColumnChange();
         try {
             await this.knex.transaction(async (trx) => {
                 var _a;
@@ -284,6 +295,9 @@ class RelationsService {
             });
         }
         finally {
+            if (runPostColumnChange) {
+                await this.helpers.schema.postColumnChange();
+            }
             await (0, cache_1.clearSystemCache)();
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "directus",
-  "version": "9.17.0",
+  "version": "9.17.3",
   "license": "GPL-3.0-only",
   "homepage": "https://github.com/directus/directus#readme",
   "description": "Directus is a real-time API and App dashboard for managing SQL database content.",
@@ -66,16 +66,16 @@
   ],
   "dependencies": {
     "@aws-sdk/client-ses": "^3.107.0",
-    "@directus/app": "9.17.0",
-    "@directus/drive": "9.17.0",
-    "@directus/drive-azure": "9.17.0",
-    "@directus/drive-gcs": "9.17.0",
-    "@directus/drive-s3": "9.17.0",
+    "@directus/app": "9.17.3",
+    "@directus/drive": "9.17.3",
+    "@directus/drive-azure": "9.17.3",
+    "@directus/drive-gcs": "9.17.3",
+    "@directus/drive-s3": "9.17.3",
     "@directus/extensions-sdk": "^9.14.1",
     "@directus/format-title": "^9.15.0",
-    "@directus/schema": "9.17.0",
-    "@directus/shared": "9.17.0",
-    "@directus/specs": "9.17.0",
+    "@directus/schema": "9.17.3",
+    "@directus/shared": "9.17.3",
+    "@directus/specs": "9.17.3",
     "@godaddy/terminus": "^4.10.2",
     "@rollup/plugin-alias": "^3.1.9",
     "@rollup/plugin-virtual": "^2.1.0",
@@ -147,7 +147,6 @@
     "snappy": "^7.1.1",
     "stream-json": "^1.7.4",
     "strip-bom-stream": "^4.0.0",
-    "supertest": "^6.2.3",
     "tmp-promise": "^3.0.3",
     "update-check": "^1.5.4",
     "uuid": "^8.3.2",
@@ -161,6 +160,7 @@
     "memcached": "^2.2.2",
     "mysql": "^2.18.1",
     "nodemailer-mailgun-transport": "^2.1.4",
+    "nodemailer-sendgrid": "^1.0.3",
     "pg": "^8.7.3",
     "sqlite3": "^5.0.8",
     "tedious": "^13.0.0"
@@ -216,6 +216,7 @@
     "jest": "28.1.2",
     "knex-mock-client": "1.8.4",
     "rimraf": "3.0.2",
+    "supertest": "^6.2.3",
     "ts-jest": "28.0.5",
     "ts-node": "^10.8.2",
     "ts-node-dev": "1.1.8",