directus 9.15.1 → 9.17.0

package/dist/utils/validate-keys.test.js

@@ -0,0 +1,97 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const validate_keys_1 = require("../../src/utils/validate-keys");
+const uuid_1 = require("uuid");
+const schema = {
+    collections: {
+        pk_integer: {
+            collection: 'pk_integer',
+            primary: 'id',
+            singleton: false,
+            note: 'Sample schema with integer primary key',
+            sortField: null,
+            accountability: null,
+            fields: {
+                id: {
+                    field: 'id',
+                    defaultValue: null,
+                    nullable: false,
+                    generated: false,
+                    type: 'integer',
+                    dbType: 'integer',
+                    precision: null,
+                    scale: null,
+                    special: [],
+                    note: null,
+                    alias: false,
+                    validation: null,
+                },
+            },
+        },
+        pk_uuid: {
+            collection: 'pk_uuid',
+            primary: 'id',
+            singleton: false,
+            note: 'Sample schema with uuid primary key',
+            sortField: null,
+            accountability: null,
+            fields: {
+                id: {
+                    field: 'id',
+                    defaultValue: null,
+                    nullable: false,
+                    generated: false,
+                    type: 'uuid',
+                    dbType: 'uuid',
+                    precision: null,
+                    scale: null,
+                    special: [],
+                    note: null,
+                    alias: false,
+                    validation: null,
+                },
+            },
+        },
+    },
+    relations: [],
+};
+describe('validate keys', () => {
+    describe('of integer type', () => {
+        it('Throws an error when provided with an invalid integer key', () => {
+            expect(() => (0, validate_keys_1.validateKeys)(schema, 'pk_integer', 'id', 'invalid')).toThrowError();
+            expect(() => (0, validate_keys_1.validateKeys)(schema, 'pk_integer', 'id', NaN)).toThrowError();
+        });
+        it('Throws an error when provided with an array containing an invalid integer key', () => {
+            expect(() => (0, validate_keys_1.validateKeys)(schema, 'pk_integer', 'id', [111, 'invalid', 222])).toThrowError();
+            expect(() => (0, validate_keys_1.validateKeys)(schema, 'pk_integer', 'id', [555, NaN, 666])).toThrowError();
+        });
+        it('Does not throw an error when provided with a valid integer key', () => {
+            expect(() => (0, validate_keys_1.validateKeys)(schema, 'pk_integer', 'id', 111)).not.toThrowError();
+            expect(() => (0, validate_keys_1.validateKeys)(schema, 'pk_integer', 'id', '222')).not.toThrowError();
+        });
+        it('Does not throw an error when provided with an array of valid integer keys', () => {
+            expect(() => (0, validate_keys_1.validateKeys)(schema, 'pk_integer', 'id', [111, 222, 333])).not.toThrowError();
+            expect(() => (0, validate_keys_1.validateKeys)(schema, 'pk_integer', 'id', ['444', '555', '666'])).not.toThrowError();
+        });
+    });
+    describe('of uuid type', () => {
+        it('Throws an error when provided with an invalid uuid key', () => {
+            expect(() => (0, validate_keys_1.validateKeys)(schema, 'pk_uuid', 'id', 'fakeuuid-62d9-434d-a7c7-878c8376782e')).toThrowError();
+            expect(() => (0, validate_keys_1.validateKeys)(schema, 'pk_uuid', 'id', 'invalid')).toThrowError();
+            expect(() => (0, validate_keys_1.validateKeys)(schema, 'pk_uuid', 'id', NaN)).toThrowError();
+            expect(() => (0, validate_keys_1.validateKeys)(schema, 'pk_uuid', 'id', 111)).toThrowError();
+        });
+        it('Throws an error when provided with an array containing an invalid uuid key', () => {
+            expect(() => (0, validate_keys_1.validateKeys)(schema, 'pk_uuid', 'id', [(0, uuid_1.v4)(), 'fakeuuid-62d9-434d-a7c7-878c8376782e', (0, uuid_1.v4)()])).toThrowError();
+            expect(() => (0, validate_keys_1.validateKeys)(schema, 'pk_uuid', 'id', [(0, uuid_1.v4)(), 'invalid', (0, uuid_1.v4)()])).toThrowError();
+            expect(() => (0, validate_keys_1.validateKeys)(schema, 'pk_uuid', 'id', [(0, uuid_1.v4)(), NaN, (0, uuid_1.v4)()])).toThrowError();
+            expect(() => (0, validate_keys_1.validateKeys)(schema, 'pk_uuid', 'id', [(0, uuid_1.v4)(), 111, (0, uuid_1.v4)()])).toThrowError();
+        });
+        it('Does not throw an error when provided with a valid uuid key', () => {
+            expect(() => (0, validate_keys_1.validateKeys)(schema, 'pk_uuid', 'id', (0, uuid_1.v4)())).not.toThrowError();
+        });
+        it('Does not throw an error when provided with an array of valid uuid keys', () => {
+            expect(() => (0, validate_keys_1.validateKeys)(schema, 'pk_uuid', 'id', [(0, uuid_1.v4)(), (0, uuid_1.v4)(), (0, uuid_1.v4)()])).not.toThrowError();
+        });
+    });
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "directus",
-  "version": "9.15.1",
+  "version": "9.17.0",
   "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.15.1",
-    "@directus/drive": "9.15.1",
-    "@directus/drive-azure": "9.15.1",
-    "@directus/drive-gcs": "9.15.1",
-    "@directus/drive-s3": "9.15.1",
+    "@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/extensions-sdk": "^9.14.1",
     "@directus/format-title": "^9.15.0",
-    "@directus/schema": "9.15.1",
-    "@directus/shared": "9.15.1",
-    "@directus/specs": "9.15.1",
+    "@directus/schema": "9.17.0",
+    "@directus/shared": "9.17.0",
+    "@directus/specs": "9.17.0",
     "@godaddy/terminus": "^4.10.2",
     "@rollup/plugin-alias": "^3.1.9",
     "@rollup/plugin-virtual": "^2.1.0",
@@ -97,6 +97,7 @@
     "deep-map": "^2.0.0",
     "destroy": "^1.2.0",
     "dotenv": "^10.0.0",
+    "encodeurl": "^1.0.2",
     "eventemitter2": "^6.4.5",
     "execa": "^5.1.1",
     "exifr": "^7.1.3",
@@ -117,17 +118,16 @@
     "jsonwebtoken": "^8.5.1",
     "keyv": "^4.3.0",
     "knex": "2.2.0",
-    "knex-schema-inspector": "^2.0.3",
+    "knex-schema-inspector": "2.0.4",
     "ldapjs": "^2.3.3",
     "liquidjs": "^9.37.0",
     "lodash": "^4.17.21",
-    "macos-release": "^2.4.1",
     "marked": "^4.0.16",
     "micromustache": "^8.0.3",
     "mime-types": "^2.1.35",
     "ms": "^2.1.3",
     "nanoid": "^3.1.23",
-    "node-cron": "^3.0.1",
+    "node-cron": "^3.0.2",
     "node-machine-id": "^1.1.12",
     "nodemailer": "^6.7.5",
     "object-hash": "^2.2.0",
@@ -152,6 +152,7 @@
     "update-check": "^1.5.4",
     "uuid": "^8.3.2",
     "uuid-validate": "0.0.3",
+    "vm2": "^3.9.10",
     "wellknown": "^0.5.0"
   },
   "optionalDependencies": {
@@ -175,6 +176,7 @@
     "@types/cors": "2.8.12",
     "@types/deep-diff": "1.0.1",
     "@types/destroy": "1.0.0",
+    "@types/encodeurl": "^1.0.0",
     "@types/express": "4.17.13",
     "@types/express-pino-logger": "4.0.3",
     "@types/express-serve-static-core": "^4.17.29",