@directus/api 19.3.0 → 19.3.1

package/dist/services/roles.js

@@ -1,16 +1,17 @@
 import { InvalidPayloadError, UnprocessableContentError } from '@directus/errors';
 import { getMatch } from 'ip-matching';
+import { omit } from 'lodash-es';
 import { checkIncreasedUserLimits } from '../telemetry/utils/check-increased-user-limits.js';
 import { getRoleCountsByUsers } from '../telemetry/utils/get-role-counts-by-users.js';
 import {} from '../telemetry/utils/get-user-count.js';
 import { getUserCountsByRoles } from '../telemetry/utils/get-user-counts-by-roles.js';
+import { shouldCheckUserLimits } from '../telemetry/utils/should-check-user-limits.js';
+import { shouldClearCache } from '../utils/should-clear-cache.js';
 import { transaction } from '../utils/transaction.js';
 import { ItemsService } from './items.js';
 import { PermissionsService } from './permissions/index.js';
 import { PresetsService } from './presets.js';
 import { UsersService } from './users.js';
-import { shouldClearCache } from '../utils/should-clear-cache.js';
-import { omit } from 'lodash-es';
 export class RolesService extends ItemsService {
     constructor(options) {
         super('directus_roles', options);
@@ -171,28 +172,31 @@ export class RolesService extends ItemsService {
     }
     async createOne(data, opts) {
         this.assertValidIpAccess(data);
-        const increasedCounts = {
-            admin: 0,
-            app: 0,
-            api: 0,
-        };
-        const existingIds = [];
-        if ('users' in data) {
-            const type = this.getRoleAccessType(data);
-            increasedCounts[type] += data['users'].length;
-            for (const user of data['users']) {
-                if (typeof user === 'string') {
-                    existingIds.push(user);
-                }
-                else if (typeof user === 'object' && 'id' in user) {
-                    existingIds.push(user['id']);
+        if (shouldCheckUserLimits()) {
+            const increasedCounts = {
+                admin: 0,
+                app: 0,
+                api: 0,
+            };
+            const existingIds = [];
+            if ('users' in data) {
+                const type = this.getRoleAccessType(data);
+                increasedCounts[type] += data['users'].length;
+                for (const user of data['users']) {
+                    if (typeof user === 'string') {
+                        existingIds.push(user);
+                    }
+                    else if (typeof user === 'object' && 'id' in user) {
+                        existingIds.push(user['id']);
+                    }
                 }
             }
+            await checkIncreasedUserLimits(this.knex, increasedCounts, existingIds);
         }
-        await checkIncreasedUserLimits(this.knex, increasedCounts, existingIds);
         return super.createOne(data, opts);
     }
     async createMany(data, opts) {
+        const needsUserLimitCheck = shouldCheckUserLimits();
         const increasedCounts = {
             admin: 0,
             app: 0,
@@ -201,7 +205,7 @@ export class RolesService extends ItemsService {
         const existingIds = [];
         for (const partialItem of data) {
             this.assertValidIpAccess(partialItem);
-            if ('users' in partialItem) {
+            if (needsUserLimitCheck && 'users' in partialItem) {
                 const type = this.getRoleAccessType(partialItem);
                 increasedCounts[type] += partialItem['users'].length;
                 for (const user of partialItem['users']) {
@@ -214,121 +218,127 @@ export class RolesService extends ItemsService {
                 }
             }
         }
-        await checkIncreasedUserLimits(this.knex, increasedCounts, existingIds);
+        if (needsUserLimitCheck) {
+            await checkIncreasedUserLimits(this.knex, increasedCounts, existingIds);
+        }
         return super.createMany(data, opts);
     }
     async updateOne(key, data, opts) {
         this.assertValidIpAccess(data);
         try {
-            const increasedCounts = {
-                admin: 0,
-                app: 0,
-                api: 0,
-            };
-            let increasedUsers = 0;
-            const existingIds = [];
-            let existingRole = await this.knex
-                .count('directus_users.id', { as: 'count' })
-                .select('directus_roles.admin_access', 'directus_roles.app_access')
-                .from('directus_users')
-                .where('directus_roles.id', '=', key)
-                .andWhere('directus_users.status', '=', 'active')
-                .leftJoin('directus_roles', 'directus_users.role', '=', 'directus_roles.id')
-                .groupBy('directus_roles.admin_access', 'directus_roles.app_access')
-                .first();
-            if (!existingRole) {
-                try {
-                    const role = (await this.knex
-                        .select('admin_access', 'app_access')
-                        .from('directus_roles')
-                        .where('id', '=', key)
-                        .first()) ?? { admin_access: null, app_access: null };
-                    existingRole = { count: 0, ...role };
-                }
-                catch {
-                    existingRole = { count: 0, admin_access: null, app_access: null };
-                }
-            }
             if ('users' in data) {
                 await this.checkForOtherAdminUsers(key, data['users']);
-                const users = data['users'];
-                if (Array.isArray(users)) {
-                    increasedUsers = users.length - Number(existingRole.count);
-                    for (const user of users) {
-                        if (typeof user === 'string') {
-                            existingIds.push(user);
-                        }
-                        else if (typeof user === 'object' && 'id' in user) {
-                            existingIds.push(user['id']);
-                        }
+            }
+            if (shouldCheckUserLimits()) {
+                const increasedCounts = {
+                    admin: 0,
+                    app: 0,
+                    api: 0,
+                };
+                let increasedUsers = 0;
+                const existingIds = [];
+                let existingRole = await this.knex
+                    .count('directus_users.id', { as: 'count' })
+                    .select('directus_roles.admin_access', 'directus_roles.app_access')
+                    .from('directus_users')
+                    .where('directus_roles.id', '=', key)
+                    .andWhere('directus_users.status', '=', 'active')
+                    .leftJoin('directus_roles', 'directus_users.role', '=', 'directus_roles.id')
+                    .groupBy('directus_roles.admin_access', 'directus_roles.app_access')
+                    .first();
+                if (!existingRole) {
+                    try {
+                        const role = (await this.knex
+                            .select('admin_access', 'app_access')
+                            .from('directus_roles')
+                            .where('id', '=', key)
+                            .first()) ?? { admin_access: null, app_access: null };
+                        existingRole = { count: 0, ...role };
+                    }
+                    catch {
+                        existingRole = { count: 0, admin_access: null, app_access: null };
                     }
                 }
-                else {
-                    increasedUsers += users.create.length;
-                    increasedUsers -= users.delete.length;
-                    const userIds = [];
-                    for (const user of users.update) {
-                        if ('status' in user) {
-                            // account for users being activated and deactivated
-                            if (user['status'] === 'active') {
-                                increasedUsers++;
+                if ('users' in data) {
+                    const users = data['users'];
+                    if (Array.isArray(users)) {
+                        increasedUsers = users.length - Number(existingRole.count);
+                        for (const user of users) {
+                            if (typeof user === 'string') {
+                                existingIds.push(user);
                             }
-                            else {
-                                increasedUsers--;
+                            else if (typeof user === 'object' && 'id' in user) {
+                                existingIds.push(user['id']);
                             }
                         }
-                        userIds.push(user.id);
                     }
-                    try {
-                        const existingCounts = await getRoleCountsByUsers(this.knex, userIds);
-                        if (existingRole.admin_access) {
-                            increasedUsers += existingCounts.app + existingCounts.api;
+                    else {
+                        increasedUsers += users.create.length;
+                        increasedUsers -= users.delete.length;
+                        const userIds = [];
+                        for (const user of users.update) {
+                            if ('status' in user) {
+                                // account for users being activated and deactivated
+                                if (user['status'] === 'active') {
+                                    increasedUsers++;
+                                }
+                                else {
+                                    increasedUsers--;
+                                }
+                            }
+                            userIds.push(user.id);
                         }
-                        else if (existingRole.app_access) {
-                            increasedUsers += existingCounts.admin + existingCounts.api;
+                        try {
+                            const existingCounts = await getRoleCountsByUsers(this.knex, userIds);
+                            if (existingRole.admin_access) {
+                                increasedUsers += existingCounts.app + existingCounts.api;
+                            }
+                            else if (existingRole.app_access) {
+                                increasedUsers += existingCounts.admin + existingCounts.api;
+                            }
+                            else {
+                                increasedUsers += existingCounts.admin + existingCounts.app;
+                            }
                         }
-                        else {
-                            increasedUsers += existingCounts.admin + existingCounts.app;
+                        catch {
+                            // ignore failed user call
                         }
                     }
-                    catch {
-                        // ignore failed user call
-                    }
                 }
-            }
-            let isAccessChanged = false;
-            let accessType = 'api';
-            if ('app_access' in data) {
-                if (data['app_access'] === true) {
-                    accessType = 'app';
-                    if (!existingRole.app_access)
+                let isAccessChanged = false;
+                let accessType = 'api';
+                if ('app_access' in data) {
+                    if (data['app_access'] === true) {
+                        accessType = 'app';
+                        if (!existingRole.app_access)
+                            isAccessChanged = true;
+                    }
+                    else if (existingRole.app_access) {
                         isAccessChanged = true;
+                    }
                 }
                 else if (existingRole.app_access) {
-                    isAccessChanged = true;
+                    accessType = 'app';
                 }
-            }
-            else if (existingRole.app_access) {
-                accessType = 'app';
-            }
-            if ('admin_access' in data) {
-                if (data['admin_access'] === true) {
-                    accessType = 'admin';
-                    if (!existingRole.admin_access)
+                if ('admin_access' in data) {
+                    if (data['admin_access'] === true) {
+                        accessType = 'admin';
+                        if (!existingRole.admin_access)
+                            isAccessChanged = true;
+                    }
+                    else if (existingRole.admin_access) {
                         isAccessChanged = true;
+                    }
                 }
                 else if (existingRole.admin_access) {
-                    isAccessChanged = true;
+                    accessType = 'admin';
                 }
+                if (isAccessChanged) {
+                    increasedCounts[accessType] += Number(existingRole.count);
+                }
+                increasedCounts[accessType] += increasedUsers;
+                await checkIncreasedUserLimits(this.knex, increasedCounts, existingIds);
             }
-            else if (existingRole.admin_access) {
-                accessType = 'admin';
-            }
-            if (isAccessChanged) {
-                increasedCounts[accessType] += Number(existingRole.count);
-            }
-            increasedCounts[accessType] += increasedUsers;
-            await checkIncreasedUserLimits(this.knex, increasedCounts, existingIds);
         }
         catch (err) {
             (opts || (opts = {})).preMutationError = err;
@@ -370,7 +380,7 @@ export class RolesService extends ItemsService {
             if ('admin_access' in data && data['admin_access'] === false) {
                 await this.checkForOtherAdminRoles(keys);
             }
-            if ('admin_access' in data || 'app_access' in data) {
+            if (shouldCheckUserLimits() && ('admin_access' in data || 'app_access' in data)) {
                 const existingCounts = await getUserCountsByRoles(this.knex, keys);
                 const increasedCounts = {
                     admin: 0,

package/dist/services/users.js

@@ -12,6 +12,7 @@ import { checkIncreasedUserLimits } from '../telemetry/utils/check-increased-use
 import { getRoleCountsByRoles } from '../telemetry/utils/get-role-counts-by-roles.js';
 import { getRoleCountsByUsers } from '../telemetry/utils/get-role-counts-by-users.js';
 import {} from '../telemetry/utils/get-user-count.js';
+import { shouldCheckUserLimits } from '../telemetry/utils/should-check-user-limits.js';
 import { getSecret } from '../utils/get-secret.js';
 import isUrlAllowed from '../utils/is-url-allowed.js';
 import { verifyJWT } from '../utils/jwt.js';
@@ -177,7 +178,7 @@ export class UsersService extends ItemsService {
             if (passwords.length) {
                 await this.checkPasswordPolicy(passwords);
             }
-            if (roles.length) {
+            if (shouldCheckUserLimits() && roles.length) {
                 const increasedCounts = {
                     admin: 0,
                     app: 0,
@@ -248,6 +249,7 @@ export class UsersService extends ItemsService {
      */
     async updateMany(keys, data, opts) {
         try {
+            const needsUserLimitCheck = shouldCheckUserLimits();
             if (data['role']) {
                 /*
                  * data['role'] has the following cases:
@@ -270,7 +272,7 @@ export class UsersService extends ItemsService {
                 if (!newRole?.admin_access) {
                     await this.checkRemainingAdminExistence(keys);
                 }
-                if (newRole) {
+                if (needsUserLimitCheck && newRole) {
                     const existingCounts = await getRoleCountsByUsers(this.knex, keys);
                     const increasedCounts = {
                         admin: 0,
@@ -289,13 +291,13 @@ export class UsersService extends ItemsService {
                     await checkIncreasedUserLimits(this.knex, increasedCounts);
                 }
             }
-            if (data['role'] === null) {
+            if (needsUserLimitCheck && data['role'] === null) {
                 await checkIncreasedUserLimits(this.knex, { admin: 0, app: 0, api: 1 });
             }
             if (data['status'] !== undefined && data['status'] !== 'active') {
                 await this.checkRemainingActiveAdmin(keys);
             }
-            if (data['status'] === 'active') {
+            if (needsUserLimitCheck && data['status'] === 'active') {
                 const increasedCounts = await getRoleCountsByUsers(this.knex, keys, { inactiveUsers: true });
                 await checkIncreasedUserLimits(this.knex, increasedCounts);
             }

package/dist/telemetry/utils/should-check-user-limits.d.ts

@@ -0,0 +1,4 @@
+/**
+ * Confirm whether user limits needs to be checked
+ */
+export declare function shouldCheckUserLimits(): boolean;

package/dist/telemetry/utils/should-check-user-limits.js

@@ -0,0 +1,13 @@
+import { useEnv } from '@directus/env';
+/**
+ * Confirm whether user limits needs to be checked
+ */
+export function shouldCheckUserLimits() {
+    const env = useEnv();
+    if (Number(env['USERS_ADMIN_ACCESS_LIMIT']) !== Infinity ||
+        Number(env['USERS_APP_ACCESS_LIMIT']) !== Infinity ||
+        Number(env['USERS_API_ACCESS_LIMIT']) !== Infinity) {
+        return true;
+    }
+    return false;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@directus/api",
-  "version": "19.3.0",
+  "version": "19.3.1",
   "description": "Directus is a real-time API and App dashboard for managing SQL database content",
   "keywords": [
     "directus",
@@ -65,7 +65,7 @@
     "@rollup/plugin-node-resolve": "15.2.3",
     "@rollup/plugin-virtual": "3.0.2",
     "@types/cookie": "0.6.0",
-    "argon2": "0.40.1",
+    "argon2": "0.40.3",
     "async": "3.2.5",
     "axios": "1.7.2",
     "busboy": "1.6.0",
@@ -96,7 +96,7 @@
     "graphql-ws": "5.16.0",
     "helmet": "7.1.0",
     "icc": "3.0.0",
-    "inquirer": "9.2.22",
+    "inquirer": "9.2.23",
     "ioredis": "5.4.1",
     "ip-matching": "2.1.2",
     "isolated-vm": "4.7.2",
@@ -140,35 +140,35 @@
     "sharp": "0.33.3",
     "snappy": "7.2.2",
     "stream-json": "1.8.0",
-    "tar": "7.1.0",
-    "tsx": "4.9.3",
+    "tar": "7.2.0",
+    "tsx": "4.12.0",
     "wellknown": "0.5.0",
     "ws": "8.17.0",
     "zod": "3.23.8",
     "zod-validation-error": "3.2.0",
-    "@directus/app": "12.1.3",
-    "@directus/env": "1.1.6",
     "@directus/constants": "11.0.4",
+    "@directus/app": "12.1.4",
+    "@directus/env": "1.1.6",
+    "@directus/extensions": "1.0.8",
     "@directus/errors": "0.3.2",
-    "@directus/extensions": "1.0.7",
-    "@directus/extensions-registry": "1.0.7",
+    "@directus/extensions-registry": "1.0.8",
+    "@directus/extensions-sdk": "11.0.8",
     "@directus/format-title": "10.1.2",
-    "@directus/extensions-sdk": "11.0.7",
     "@directus/pressure": "1.0.20",
     "@directus/memory": "1.0.9",
-    "@directus/schema": "11.0.2",
+    "@directus/schema": "11.0.3",
     "@directus/specs": "10.2.10",
     "@directus/storage": "10.0.13",
     "@directus/storage-driver-azure": "10.0.22",
-    "@directus/storage-driver-cloudinary": "10.0.22",
     "@directus/storage-driver-gcs": "10.0.23",
     "@directus/storage-driver-local": "10.0.20",
-    "@directus/storage-driver-supabase": "1.0.14",
+    "@directus/storage-driver-cloudinary": "10.0.22",
     "@directus/storage-driver-s3": "10.0.23",
+    "@directus/storage-driver-supabase": "1.0.14",
     "@directus/system-data": "1.0.4",
     "@directus/utils": "11.0.9",
-    "directus": "10.12.0",
-    "@directus/validation": "0.0.17"
+    "@directus/validation": "0.0.17",
+    "directus": "10.12.1"
   },
   "devDependencies": {
     "@ngneat/falso": "7.2.0",
@@ -182,7 +182,7 @@
     "@types/destroy": "1.0.3",
     "@types/encodeurl": "1.0.2",
     "@types/express": "4.17.21",
-    "@types/express-serve-static-core": "4.19.0",
+    "@types/express-serve-static-core": "4.19.3",
     "@types/fs-extra": "11.0.4",
     "@types/glob-to-regexp": "0.4.4",
     "@types/inquirer": "9.0.7",
@@ -211,7 +211,7 @@
     "vitest": "1.5.3",
     "@directus/random": "0.2.8",
     "@directus/tsconfig": "1.0.1",
-    "@directus/types": "11.1.2"
+    "@directus/types": "11.1.3"
   },
   "optionalDependencies": {
     "@keyv/redis": "2.8.4",