@directus/api 12.0.1 → 12.0.3

package/dist/auth/drivers/oauth2.js

@@ -183,11 +183,11 @@ const handleError = (e) => {
     if (e instanceof errors.OPError) {
         if (e.error === 'invalid_grant') {
             // Invalid token
-            logger.trace(e, `[OAuth2] Invalid grant`);
+            logger.warn(e, `[OAuth2] Invalid grant`);
             return new InvalidTokenError();
         }
         // Server response error
-        logger.trace(e, `[OAuth2] Unknown OP error`);
+        logger.warn(e, `[OAuth2] Unknown OP error`);
         return new ServiceUnavailableError({
             service: 'oauth2',
             reason: `Service returned unexpected response: ${e.error_description}`,
@@ -195,10 +195,10 @@ const handleError = (e) => {
     }
     else if (e instanceof errors.RPError) {
         // Internal client error
-        logger.trace(e, `[OAuth2] Unknown RP error`);
+        logger.warn(e, `[OAuth2] Unknown RP error`);
         return new InvalidCredentialsError();
     }
-    logger.trace(e, `[OAuth2] Unknown error`);
+    logger.warn(e, `[OAuth2] Unknown error`);
     return e;
 };
 export function createOAuth2AuthRouter(providerName) {

package/dist/auth/drivers/openid.js

@@ -205,11 +205,11 @@ const handleError = (e) => {
     if (e instanceof errors.OPError) {
         if (e.error === 'invalid_grant') {
             // Invalid token
-            logger.trace(e, `[OpenID] Invalid grant`);
+            logger.warn(e, `[OpenID] Invalid grant`);
             return new InvalidTokenError();
         }
         // Server response error
-        logger.trace(e, `[OpenID] Unknown OP error`);
+        logger.warn(e, `[OpenID] Unknown OP error`);
         return new ServiceUnavailableError({
             service: 'openid',
             reason: `Service returned unexpected response: ${e.error_description}`,
@@ -217,10 +217,10 @@ const handleError = (e) => {
     }
     else if (e instanceof errors.RPError) {
         // Internal client error
-        logger.trace(e, `[OpenID] Unknown RP error`);
+        logger.warn(e, `[OpenID] Unknown RP error`);
         return new InvalidCredentialsError();
     }
-    logger.trace(e, `[OpenID] Unknown error`);
+    logger.warn(e, `[OpenID] Unknown error`);
     return e;
 };
 export function createOpenIDAuthRouter(providerName) {

package/dist/auth/drivers/saml.js

@@ -45,7 +45,7 @@ export class SAMLAuthDriver extends LocalAuthDriver {
         if (userID)
             return userID;
         if (!allowPublicRegistration) {
-            logger.trace(`[SAML] User doesn't exist, and public registration not allowed for provider "${provider}"`);
+            logger.warn(`[SAML] User doesn't exist, and public registration not allowed for provider "${provider}"`);
             throw new InvalidCredentialsError();
         }
         const firstName = payload[givenNameKey ?? 'http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname'];

package/dist/operations/notification/index.d.ts

@@ -3,6 +3,8 @@ type Options = {
     subject: string;
     message?: unknown | null;
     permissions: string;
+    collection?: string;
+    item?: string;
 };
 declare const _default: import("@directus/types").OperationApiConfig<Options>;
 export default _default;

package/dist/operations/notification/index.js

@@ -3,7 +3,7 @@ import { NotificationsService } from '../../services/notifications.js';
 import { getAccountabilityForRole } from '../../utils/get-accountability-for-role.js';
 export default defineOperationApi({
     id: 'notification',
-    handler: async ({ recipient, subject, message, permissions }, { accountability, database, getSchema }) => {
+    handler: async ({ recipient, subject, message, permissions, collection, item }, { accountability, database, getSchema }) => {
         const schema = await getSchema({ database });
         let customAccountability;
         if (!permissions || permissions === '$trigger') {
@@ -24,12 +24,16 @@ export default defineOperationApi({
             knex: database,
         });
         const messageString = message ? optionToString(message) : null;
+        const collectionString = message ? optionToString(collection) : null;
+        const itemString = message ? optionToString(item) : null;
         const payload = toArray(recipient).map((userId) => {
             return {
                 recipient: userId,
                 sender: customAccountability?.user ?? null,
                 subject,
                 message: messageString,
+                collection: collectionString,
+                item: itemString,
             };
         });
         const result = await notificationsService.createMany(payload);

package/dist/services/utils.js

@@ -2,6 +2,8 @@ import getDatabase from '../database/index.js';
 import { systemCollectionRows } from '../database/system-data/collections/index.js';
 import emitter from '../emitter.js';
 import { ForbiddenError, InvalidPayloadError } from '../errors/index.js';
+import { getCache } from '../cache.js';
+import { shouldClearCache } from '../utils/should-clear-cache.js';
 export class UtilsService {
     knex;
     accountability;
@@ -95,6 +97,11 @@ export class UtilsService {
                 .andWhere(sortField, '<=', sourceSortValue)
                 .andWhereNot({ [primaryKeyField]: item });
         }
+        // check if cache should be cleared
+        const { cache } = getCache();
+        if (shouldClearCache(cache, undefined, collection)) {
+            await cache.clear();
+        }
         emitter.emitAction(['items.sort', `${collection}.items.sort`], {
             collection,
             item,

package/dist/utils/should-clear-cache.js

@@ -8,11 +8,13 @@ import { getEnv } from '../env.js';
  */
 export function shouldClearCache(cache, opts, collection) {
     const env = getEnv();
-    if (collection && env['CACHE_AUTO_PURGE_IGNORE_LIST'].includes(collection)) {
-        return false;
-    }
-    if (cache && env['CACHE_AUTO_PURGE'] && opts?.autoPurgeCache !== false) {
-        return true;
+    if (env['CACHE_AUTO_PURGE']) {
+        if (collection && env['CACHE_AUTO_PURGE_IGNORE_LIST'].includes(collection)) {
+            return false;
+        }
+        if (cache && opts?.autoPurgeCache !== false) {
+            return true;
+        }
     }
     return false;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@directus/api",
-  "version": "12.0.1",
+  "version": "12.0.3",
   "description": "Directus is a real-time API and App dashboard for managing SQL database content",
   "keywords": [
     "directus",
@@ -143,21 +143,21 @@
     "ws": "8.12.1",
     "zod": "3.21.4",
     "zod-validation-error": "1.0.1",
-    "@directus/app": "10.4.1",
+    "@directus/app": "10.5.0",
     "@directus/constants": "10.2.1",
     "@directus/errors": "0.0.1",
-    "@directus/extensions-sdk": "10.1.5",
-    "@directus/pressure": "1.0.5",
+    "@directus/extensions-sdk": "10.1.6",
+    "@directus/pressure": "1.0.6",
     "@directus/schema": "10.0.1",
     "@directus/specs": "10.1.1",
     "@directus/storage": "10.0.4",
-    "@directus/storage-driver-azure": "10.0.6",
-    "@directus/storage-driver-cloudinary": "10.0.6",
-    "@directus/storage-driver-gcs": "10.0.6",
-    "@directus/storage-driver-local": "10.0.6",
-    "@directus/storage-driver-s3": "10.0.6",
-    "@directus/utils": "10.0.6",
-    "@directus/validation": "0.0.1"
+    "@directus/storage-driver-azure": "10.0.7",
+    "@directus/storage-driver-cloudinary": "10.0.7",
+    "@directus/storage-driver-gcs": "10.0.7",
+    "@directus/storage-driver-local": "10.0.7",
+    "@directus/storage-driver-s3": "10.0.7",
+    "@directus/utils": "10.0.7",
+    "@directus/validation": "0.0.2"
   },
   "devDependencies": {
     "@ngneat/falso": "6.4.0",