@wbce-d9/api 12.4.5 → 12.5.1

package/dist/auth/drivers/saml.js

@@ -118,9 +118,12 @@ export function createSAMLAuthRouter(providerName) {
         const relayState = req.body?.RelayState;
         try {
             const { sp, idp } = getAuthProvider(providerName);
-            const { extract } = await sp.parseLoginResponse(idp, 'post', req);
+            const { extract } = await sp.parseLoginResponse(idp, 'post', {
+                query: req.query,
+                body: req.body,
+            });
             const authService = new AuthenticationService({ accountability: req.accountability, schema: req.schema });
-            const { accessToken, refreshToken, expires } = await authService.login(providerName, extract.attributes);
+            const { accessToken, refreshToken, expires } = await authService.login(providerName, extract.attributes ?? {});
             res.locals['payload'] = {
                 data: {
                     access_token: accessToken,

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

@@ -97,6 +97,6 @@ export default async function init() {
     process.stdout.write(`\nThe configuration can be found in ${chalk.green(rootPath + '/.env')}\n`);
     process.stdout.write(`\nStart Directus by running:\n`);
     process.stdout.write(`  ${chalk.blue('cd')} ${rootPath}\n`);
-    process.stdout.write(`  ${chalk.blue('npx directus')} start\n`);
+    process.stdout.write(`  ${chalk.blue('npx d9')} start\n`);
     process.exit(0);
 }

package/dist/database/migrations/20260617A-add-date-created-to-users.d.ts

@@ -0,0 +1,3 @@
+import type { Knex } from 'knex';
+export declare function up(knex: Knex): Promise<void>;
+export declare function down(knex: Knex): Promise<void>;

package/dist/database/migrations/20260617A-add-date-created-to-users.js

@@ -0,0 +1,12 @@
+export async function up(knex) {
+    await knex.schema.alterTable('directus_users', (table) => {
+        table.timestamp('date_created').nullable();
+        table.timestamp('date_updated').nullable();
+    });
+}
+export async function down(knex) {
+    await knex.schema.alterTable('directus_users', (table) => {
+        table.dropColumn('date_created');
+        table.dropColumn('date_updated');
+    });
+}

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

@@ -164,6 +164,26 @@ fields:
     display_options:
       relative: true
 
+  - field: date_created
+    special:
+      - date-created
+      - cast-timestamp
+    width: half
+    display: datetime
+    readonly: true
+    display_options:
+      relative: true
+
+  - field: date_updated
+    special:
+      - date-updated
+      - cast-timestamp
+    width: half
+    display: datetime
+    readonly: true
+    display_options:
+      relative: true
+
   - field: provider
     width: half
     interface: select-dropdown

package/dist/database/system-data/relations/relations.yaml

@@ -26,6 +26,17 @@ data:
     many_field: activity
     one_collection: directus_activity
     one_field: revisions
+  # `item` + `collection` form an any-to-one (A2O) relation: `item` holds the
+  # referenced record's primary key, `collection` names its collection.
+  # `one_allowed_collections` is filled at runtime in RelationsService.stitchRelations.
+  - many_collection: directus_revisions
+    many_field: item
+    one_collection_field: collection
+    one_allowed_collections: []
+  - many_collection: directus_activity
+    many_field: item
+    one_collection_field: collection
+    one_allowed_collections: []
   - many_collection: directus_presets
     many_field: user
     one_collection: directus_users

package/dist/services/collections.js

@@ -508,7 +508,7 @@ export class CollectionsService {
                         }
                     }
                     const a2oRelationsThatIncludeThisCollection = this.schema.relations.filter((relation) => {
-                        return relation.meta?.one_allowed_collections?.includes(collectionKey);
+                        return !relation.meta?.system && relation.meta?.one_allowed_collections?.includes(collectionKey);
                     });
                     for (const relation of a2oRelationsThatIncludeThisCollection) {
                         const newAllowedCollections = relation

package/dist/services/files.js

@@ -224,7 +224,7 @@ export class FilesService extends ItemsService {
         const payload = {
             filename_download: filename,
             storage: toArray(env['STORAGE_LOCATIONS'])[0],
-            type: fileResponse.headers['content-type'],
+            type: fileResponse.headers['content-type'] ?? null,
             title: formatTitle(filename),
             ...(body || {}),
         };

package/dist/services/graphql/index.js

@@ -369,7 +369,9 @@ export class GraphQLService {
                         [relation.field]: {
                             type: new GraphQLUnionType({
                                 name: `${relation.collection}_${relation.field}_union`,
-                                types: relation.meta.one_allowed_collections.map((collection) => CollectionTypes[collection].getType()),
+                                types: relation.meta.one_allowed_collections
+                                    .filter((collection) => collection in CollectionTypes)
+                                    .map((collection) => CollectionTypes[collection].getType()),
                                 resolveType(_value, context, info) {
                                     let path = [];
                                     let currentPath = info.path;
@@ -383,7 +385,7 @@ export class GraphQLService {
                                         parent = parent[pathPart];
                                     }
                                     const collection = parent[relation.meta.one_collection_field];
-                                    return CollectionTypes[collection].getType().name;
+                                    return CollectionTypes[collection]?.getType().name;
                                 },
                             }),
                             resolve: (obj, _, __, info) => {
@@ -921,6 +923,8 @@ export class GraphQLService {
                 else if (relation.meta?.one_allowed_collections) {
                     ReadableCollectionFilterTypes[relation.collection]?.removeField('item');
                     for (const collection of relation.meta.one_allowed_collections) {
+                        if (!(collection in ReadableCollectionFilterTypes))
+                            continue;
                         ReadableCollectionFilterTypes[relation.collection]?.addFields({
                             [`item__${collection}`]: ReadableCollectionFilterTypes[collection],
                         });

package/dist/services/relations.d.ts

@@ -8,6 +8,14 @@ import type { QueryOptions } from './items.js';
 import { ItemsService } from './items.js';
 import { PermissionsService } from './permissions.js';
 export declare class RelationsService {
+    /**
+     * A2O relations whose `one_allowed_collections` is filled with all collections at read time
+     * (see stitchRelations). Identified by collection + field rather than a sentinel value.
+     */
+    static readonly expandAllRelations: {
+        collection: string;
+        field: string;
+    }[];
     knex: Knex;
     permissionsService: PermissionsService;
     schemaInspector: SchemaInspector;

package/dist/services/relations.js

@@ -10,7 +10,15 @@ import { getDefaultIndexName } from '../utils/get-default-index-name.js';
 import { getSchema } from '../utils/get-schema.js';
 import { ItemsService } from './items.js';
 import { PermissionsService } from './permissions.js';
-export class RelationsService {
+class RelationsService {
+    /**
+     * A2O relations whose `one_allowed_collections` is filled with all collections at read time
+     * (see stitchRelations). Identified by collection + field rather than a sentinel value.
+     */
+    static expandAllRelations = [
+        { collection: 'directus_activity', field: 'item' },
+        { collection: 'directus_revisions', field: 'item' },
+    ];
     knex;
     permissionsService;
     schemaInspector;
@@ -383,6 +391,19 @@ export class RelationsService {
             };
         });
         results.push(...remainingMetaRows);
+        /**
+         * `directus_activity.item` and `directus_revisions.item` are any-to-one (A2O) relations whose
+         * `item` can reference any collection. We declare them as system relations (see relations.yaml)
+         * but their `one_allowed_collections` can't be hardcoded, so we fill it with the current set of
+         * collections here, in memory, on every read. This powers A2O filtering/permissions and the
+         * app's per-collection filter drill-down without persisting an ever-stale list.
+         */
+        for (const relation of results) {
+            const isExpandAll = RelationsService.expandAllRelations.some((r) => r.collection === relation.collection && r.field === relation.field);
+            if (isExpandAll && relation.meta) {
+                relation.meta.one_allowed_collections = Object.keys(this.schema.collections);
+            }
+        }
         return results;
     }
     /**
@@ -445,3 +466,4 @@ export class RelationsService {
         }
     }
 }
+export { RelationsService };

package/dist/services/users.js

@@ -294,17 +294,19 @@ export class UsersService extends ItemsService {
         });
         for (const email of emails) {
             // Check if user is known
-            const user = await this.getUserByEmail(email);
+            let user = await this.getUserByEmail(email);
+            const isEmptyUser = isEmpty(user);
             // Create user first to verify uniqueness if unknown
-            if (isEmpty(user)) {
+            if (isEmptyUser) {
                 await this.createOne({ email, role, status: 'invited' }, opts);
+                user = await this.getUserByEmail(email);
                 // For known users update role if changed
             }
             else if (user.status === 'invited' && user.role !== role) {
                 await this.updateOne(user.id, { role }, opts);
             }
             // Send invite for new and already invited users
-            if (isEmpty(user) || user.status === 'invited') {
+            if (isEmptyUser || user.status === 'invited') {
                 const subjectLine = subject ?? "You've been invited";
                 await mailService.send({
                     to: user.email,

package/dist/utils/apply-query.js

@@ -73,7 +73,7 @@ function addJoin({ path, collection, aliasMap, rootQuery, schema, relations, kne
                 }
                 rootQuery.leftJoin({ [alias]: pathScope }, (joinClause) => {
                     joinClause
-                        .onVal(relation.meta.one_collection_field, '=', pathScope)
+                        .onVal(`${aliasedParentCollection}.${relation.meta.one_collection_field}`, '=', pathScope)
                         .andOn(`${aliasedParentCollection}.${relation.field}`, '=', knex.raw(getHelpers(knex).schema.castA2oPrimaryKey(), `${alias}.${schema.collections[pathScope].primary}`));
                 });
                 aliasMap[aliasKey].collection = pathScope;
@@ -81,7 +81,7 @@ function addJoin({ path, collection, aliasMap, rootQuery, schema, relations, kne
             else if (relationType === 'o2a') {
                 rootQuery.leftJoin({ [alias]: relation.collection }, (joinClause) => {
                     joinClause
-                        .onVal(relation.meta.one_collection_field, '=', parentCollection)
+                        .onVal(`${alias}.${relation.meta.one_collection_field}`, '=', parentCollection)
                         .andOn(`${alias}.${relation.field}`, '=', knex.raw(getHelpers(knex).schema.castA2oPrimaryKey(), `${aliasedParentCollection}.${schema.collections[parentCollection].primary}`));
                 });
                 aliasMap[aliasKey].collection = relation.collection;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wbce-d9/api",
-  "version": "12.4.5",
+  "version": "12.5.1",
   "description": "Directus is a real-time API and App dashboard for managing SQL database content",
   "type": "module",
   "keywords": [
@@ -66,7 +66,7 @@
     "@rollup/plugin-node-resolve": "15.0.2",
     "@rollup/plugin-virtual": "3.0.1",
     "@wbce-d9/format-title": "10.0.0",
-    "axios": "^1.12.0",
+    "axios": "^1.16.0",
     "chalk": "5.2.0",
     "commander": "10.0.1",
     "date-fns": "2.29.3",
@@ -74,8 +74,8 @@
     "express": "^4.21.2",
     "fs-extra": "11.1.1",
     "inquirer": "9.1.5",
-    "joi": "17.9.1",
-    "js-yaml": "4.1.1",
+    "joi": "18.2.1",
+    "js-yaml": "4.2.0",
     "json2csv": "5.0.7",
     "knex": "3.1.0",
     "lodash-es": "4.18.1",
@@ -89,7 +89,7 @@
     "uuid": "14.0.0",
     "wellknown": "0.5.0",
     "@authenio/samlify-node-xmllint": "2.0.0",
-    "@aws-sdk/client-sesv2": "3.1004.0",
+    "@aws-sdk/client-sesv2": "3.1062.0",
     "@godaddy/terminus": "4.12.0",
     "@rollup/plugin-alias": "5.0.0",
     "argon2": "0.44.0",
@@ -120,21 +120,21 @@
     "jsonwebtoken": "9.0.0",
     "keyv": "4.5.2",
     "ldapjs": "2.3.3",
-    "liquidjs": "10.25.7",
+    "liquidjs": "10.26.0",
     "mime-types": "2.1.35",
     "ms": "2.1.3",
     "node-cron": "3.0.2",
     "node-machine-id": "1.1.12",
-    "nodemailer": "8.0.5",
+    "nodemailer": "9.0.3",
     "object-hash": "3.0.0",
     "openid-client": "6.8.2",
     "otplib": "12.0.1",
     "pino-http": "8.3.3",
     "pino-http-print": "3.1.0",
     "pino-pretty": "10.0.0",
-    "qs": "6.14.2",
+    "qs": "6.15.2",
     "rate-limiter-flexible": "2.4.1",
-    "samlify": "2.10.0",
+    "samlify": "2.13.0",
     "sanitize-html": "2.12.1",
     "sharp": "0.32.6",
     "snappy": "7.2.2",
@@ -143,17 +143,17 @@
     "tmp-promise": "3.0.3",
     "tsx": "3.12.6",
     "uuid-validate": "0.0.3",
-    "@wbce-d9/app": "10.0.5",
-    "@wbce-d9/exceptions": "10.0.0",
+    "@wbce-d9/app": "10.1.0",
+    "@wbce-d9/constants": "10.0.0",
     "@wbce-d9/extensions-sdk": "10.0.2",
     "@wbce-d9/schema": "10.0.0",
     "@wbce-d9/storage": "10.0.0",
     "@wbce-d9/specs": "9.26.5",
-    "@wbce-d9/constants": "10.0.0",
-    "@wbce-d9/storage-driver-azure": "10.0.1",
+    "@wbce-d9/exceptions": "10.0.0",
     "@wbce-d9/storage-driver-cloudinary": "10.0.2",
-    "@wbce-d9/storage-driver-local": "10.0.1",
     "@wbce-d9/storage-driver-gcs": "10.0.1",
+    "@wbce-d9/storage-driver-azure": "10.0.1",
+    "@wbce-d9/storage-driver-local": "10.0.1",
     "@wbce-d9/storage-driver-s3": "10.0.1",
     "@wbce-d9/update-check": "10.0.2",
     "@wbce-d9/utils": "10.0.1"
@@ -202,7 +202,7 @@
     "@types/stream-json": "1.7.3",
     "@types/uuid-validate": "0.0.1",
     "copyfiles": "2.4.1",
-    "form-data": "4.0.4",
+    "form-data": "4.0.6",
     "knex-mock-client": "3.0.2",
     "@wbce-d9/types": "10.1.0"
   },