directus 9.5.1 → 9.5.2

package/dist/auth/drivers/openid.js

@@ -91,12 +91,12 @@ class OpenIDAuthDriver extends local_1.LocalAuthDriver {
         try {
             const client = await this.client;
             tokenSet = await client.callback(this.redirectUrl, { code: payload.code, state: payload.state }, { code_verifier: payload.codeVerifier, state: openid_client_1.generators.codeChallenge(payload.codeVerifier) });
-            const issuer = client.issuer;
-            if (issuer.metadata.userinfo_endpoint) {
-                userInfo = await client.userinfo(tokenSet.access_token);
-            }
-            else {
-                userInfo = tokenSet.claims();
+            userInfo = tokenSet.claims();
+            if (client.issuer.metadata.userinfo_endpoint) {
+                userInfo = {
+                    ...userInfo,
+                    ...(await client.userinfo(tokenSet.access_token)),
+                };
             }
         }
         catch (e) {

package/dist/cli/commands/init/index.js

@@ -8,6 +8,7 @@ const execa_1 = __importDefault(require("execa"));
 const inquirer_1 = __importDefault(require("inquirer"));
 const ora_1 = __importDefault(require("ora"));
 const uuid_1 = require("uuid");
+const joi_1 = __importDefault(require("joi"));
 const run_1 = __importDefault(require("../../../database/migrations/run"));
 const run_2 = __importDefault(require("../../../database/seeds/run"));
 const create_db_connection_1 = __importDefault(require("../../utils/create-db-connection"));
@@ -62,6 +63,13 @@ async function init() {
             name: 'email',
             message: 'Email',
             default: 'admin@example.com',
+            validate: (input) => {
+                const emailSchema = joi_1.default.string().email().required();
+                const { error } = emailSchema.validate(input);
+                if (error)
+                    throw new Error('The email entered is not a valid email address!');
+                return true;
+            },
         },
         {
             type: 'password',

package/dist/database/system-data/app-access-permissions/app-access-permissions.yaml

@@ -62,14 +62,20 @@
   permissions:
     recipient:
       _eq: $CURRENT_USER
-  fields: '*'
 
 - collection: directus_notifications
   action: update
   permissions:
     recipient:
       _eq: $CURRENT_USER
-  fields: 'status'
+  fields:
+    - status
+
+- collection: directus_shares
+  action: read
+  permissions:
+    user_created:
+      _eq: $CURRENT_USER
 
 - collection: directus_users
   action: read

package/dist/database/system-data/fields/collections.yaml

@@ -156,6 +156,8 @@ fields:
         - decimal
         - integer
       allowNone: true
+      allowPrimaryKey: false
+      allowForeignKeys: false
     width: half
 
   - field: accountability_divider

package/dist/services/collections.js

@@ -316,7 +316,9 @@ class CollectionsService {
         }
         await this.knex.transaction(async (trx) => {
             var _a;
-            await trx.schema.dropTable(collectionKey);
+            if (collectionToBeDeleted.schema) {
+                await trx.schema.dropTable(collectionKey);
+            }
             // Make sure this collection isn't used as a group in any other collections
             await trx('directus_collections').update({ group: null }).where({ group: collectionKey });
             if (collectionToBeDeleted.meta) {

package/dist/services/fields.js

@@ -406,7 +406,7 @@ class FieldsService {
         });
     }
     addColumnToTable(table, field, alter = null) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
         let column;
         // Don't attempt to add a DB column for alias / corrupt fields
         if (field.type === 'alias' || field.type === 'unknown')
@@ -457,20 +457,20 @@ class FieldsService {
                 column.notNullable();
             }
         }
-        else if (((_h = field.schema) === null || _h === void 0 ? void 0 : _h.is_nullable) === true) {
+        else {
             if (!alter || alter.is_nullable === false) {
                 column.nullable();
             }
         }
-        if ((_j = field.schema) === null || _j === void 0 ? void 0 : _j.is_primary_key) {
+        if ((_h = field.schema) === null || _h === void 0 ? void 0 : _h.is_primary_key) {
             column.primary().notNullable();
         }
-        else if (((_k = field.schema) === null || _k === void 0 ? void 0 : _k.is_unique) === true) {
+        else if (((_j = field.schema) === null || _j === void 0 ? void 0 : _j.is_unique) === true) {
             if (!alter || alter.is_unique === false) {
                 column.unique();
             }
         }
-        else if (((_l = field.schema) === null || _l === void 0 ? void 0 : _l.is_unique) === false) {
+        else if (((_k = field.schema) === null || _k === void 0 ? void 0 : _k.is_unique) === false) {
             if (alter && alter.is_unique === true) {
                 table.dropUnique([field.field]);
             }

package/dist/services/relations.js

@@ -135,6 +135,10 @@ class RelationsService {
         if (relation.field in this.schema.collections[relation.collection].fields === false) {
             throw new exceptions_1.InvalidPayloadException(`Field "${relation.field}" doesn't exist in collection "${relation.collection}"`);
         }
+        // A primary key should not be a foreign key
+        if (this.schema.collections[relation.collection].primary === relation.field) {
+            throw new exceptions_1.InvalidPayloadException(`Field "${relation.field}" in collection "${relation.collection}" is a primary key`);
+        }
         if (relation.related_collection && relation.related_collection in this.schema.collections === false) {
             throw new exceptions_1.InvalidPayloadException(`Collection "${relation.related_collection}" doesn't exist`);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "directus",
-	"version": "9.5.1",
+	"version": "9.5.2",
 	"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.",
@@ -78,18 +78,18 @@
 	],
 	"dependencies": {
 		"@aws-sdk/client-ses": "^3.40.0",
-		"@directus/app": "9.5.1",
-		"@directus/drive": "9.5.1",
-		"@directus/drive-azure": "9.5.1",
-		"@directus/drive-gcs": "9.5.1",
-		"@directus/drive-s3": "9.5.1",
-		"@directus/extensions-sdk": "9.5.1",
-		"@directus/format-title": "9.5.1",
-		"@directus/schema": "9.5.1",
-		"@directus/shared": "9.5.1",
-		"@directus/specs": "9.5.1",
+		"@directus/app": "9.5.2",
+		"@directus/drive": "9.5.2",
+		"@directus/drive-azure": "9.5.2",
+		"@directus/drive-gcs": "9.5.2",
+		"@directus/drive-s3": "9.5.2",
+		"@directus/extensions-sdk": "9.5.2",
+		"@directus/format-title": "9.5.2",
+		"@directus/schema": "9.5.2",
+		"@directus/shared": "9.5.2",
+		"@directus/specs": "9.5.2",
 		"@godaddy/terminus": "^4.9.0",
-		"@rollup/plugin-alias": "^3.1.2",
+		"@rollup/plugin-alias": "^3.1.9",
 		"@rollup/plugin-virtual": "^2.0.3",
 		"argon2": "^0.28.2",
 		"async": "^3.2.0",
@@ -149,7 +149,7 @@
 		"qs": "^6.9.4",
 		"rate-limiter-flexible": "^2.2.2",
 		"resolve-cwd": "^3.0.0",
-		"rollup": "^2.52.1",
+		"rollup": "^2.67.3",
 		"sanitize-html": "^2.6.0",
 		"sharp": "^0.29.0",
 		"stream-json": "^1.7.1",
@@ -173,7 +173,7 @@
 		"sqlite3": "^5.0.2",
 		"tedious": "^13.0.0"
 	},
-	"gitHead": "c0c412d30b116bd38a2690b62463f775d37db79c",
+	"gitHead": "47a5da78fb5e31d1657c25103adcb63542396b61",
 	"devDependencies": {
 		"@types/async": "3.2.10",
 		"@types/atob": "2.1.2",