directus 9.23.3 → 9.23.4

package/dist/services/items.js

@@ -205,7 +205,7 @@ class ItemsService {
                 }
             }
         }
-        if (this.cache && env_1.default.CACHE_AUTO_PURGE && opts?.autoPurgeCache !== false) {
+        if (this.cache && env_1.default['CACHE_AUTO_PURGE'] && opts?.autoPurgeCache !== false) {
             await this.cache.clear();
         }
         return primaryKey;
@@ -242,7 +242,7 @@ class ItemsService {
                 }
             }
         }
-        if (this.cache && env_1.default.CACHE_AUTO_PURGE && opts?.autoPurgeCache !== false) {
+        if (this.cache && env_1.default['CACHE_AUTO_PURGE'] && opts?.autoPurgeCache !== false) {
             await this.cache.clear();
         }
         return primaryKeys;
@@ -381,7 +381,7 @@ class ItemsService {
             });
         }
         finally {
-            if (this.cache && env_1.default.CACHE_AUTO_PURGE && opts?.autoPurgeCache !== false) {
+            if (this.cache && env_1.default['CACHE_AUTO_PURGE'] && opts?.autoPurgeCache !== false) {
                 await this.cache.clear();
             }
         }
@@ -506,7 +506,7 @@ class ItemsService {
                 }
             }
         });
-        if (this.cache && env_1.default.CACHE_AUTO_PURGE && opts?.autoPurgeCache !== false) {
+        if (this.cache && env_1.default['CACHE_AUTO_PURGE'] && opts?.autoPurgeCache !== false) {
             await this.cache.clear();
         }
         if (opts?.emitEvents !== false) {
@@ -581,7 +581,7 @@ class ItemsService {
             }
             return primaryKeys;
         });
-        if (this.cache && env_1.default.CACHE_AUTO_PURGE && opts?.autoPurgeCache !== false) {
+        if (this.cache && env_1.default['CACHE_AUTO_PURGE'] && opts?.autoPurgeCache !== false) {
             await this.cache.clear();
         }
         return primaryKeys;
@@ -648,7 +648,7 @@ class ItemsService {
                 })));
             }
         });
-        if (this.cache && env_1.default.CACHE_AUTO_PURGE && opts?.autoPurgeCache !== false) {
+        if (this.cache && env_1.default['CACHE_AUTO_PURGE'] && opts?.autoPurgeCache !== false) {
             await this.cache.clear();
         }
         if (opts?.emitEvents !== false) {

package/dist/services/mail/index.js

@@ -14,7 +14,7 @@ const logger_1 = __importDefault(require("../../logger"));
 const mailer_1 = __importDefault(require("../../mailer"));
 const url_1 = require("../../utils/url");
 const liquidEngine = new liquidjs_1.Liquid({
-    root: [path_1.default.resolve(env_1.default.EXTENSIONS_PATH, 'templates'), path_1.default.resolve(__dirname, 'templates')],
+    root: [path_1.default.resolve(env_1.default['EXTENSIONS_PATH'], 'templates'), path_1.default.resolve(__dirname, 'templates')],
     extname: '.liquid',
 });
 class MailService {
@@ -27,7 +27,7 @@ class MailService {
         this.accountability = opts.accountability || null;
         this.knex = opts?.knex || (0, database_1.default)();
         this.mailer = (0, mailer_1.default)();
-        if (env_1.default.EMAIL_VERIFY_SETUP) {
+        if (env_1.default['EMAIL_VERIFY_SETUP']) {
             this.mailer.verify((error) => {
                 if (error) {
                     logger_1.default.warn(`Email connection failed:`);
@@ -40,7 +40,7 @@ class MailService {
         const { template, ...emailOptions } = options;
         let { html } = options;
         const defaultTemplateData = await this.getDefaultTemplateData();
-        const from = `${defaultTemplateData.projectName} <${options.from || env_1.default.EMAIL_FROM}>`;
+        const from = `${defaultTemplateData.projectName} <${options.from || env_1.default['EMAIL_FROM']}>`;
         if (template) {
             let templateData = template.data;
             templateData = {
@@ -60,7 +60,7 @@ class MailService {
         return info;
     }
     async renderTemplate(template, variables) {
-        const customTemplatePath = path_1.default.resolve(env_1.default.EXTENSIONS_PATH, 'templates', template + '.liquid');
+        const customTemplatePath = path_1.default.resolve(env_1.default['EXTENSIONS_PATH'], 'templates', template + '.liquid');
         const systemTemplatePath = path_1.default.join(__dirname, 'templates', template + '.liquid');
         const templatePath = (await fs_extra_1.default.pathExists(customTemplatePath)) ? customTemplatePath : systemTemplatePath;
         if ((await fs_extra_1.default.pathExists(templatePath)) === false) {
@@ -82,7 +82,7 @@ class MailService {
             projectUrl: projectInfo?.project_url || '',
         };
         function getProjectLogoURL(logoID) {
-            const projectLogoUrl = new url_1.Url(env_1.default.PUBLIC_URL);
+            const projectLogoUrl = new url_1.Url(env_1.default['PUBLIC_URL']);
             if (logoID) {
                 projectLogoUrl.addPath('assets', logoID);
             }

package/dist/services/meta.js

@@ -25,6 +25,7 @@ class MetaService {
                 return this.totalCount(collection);
             if (metaVal === 'filter_count')
                 return this.filterCount(collection, query);
+            return undefined;
         }));
         return results.reduce((metaObject, value, index) => {
             return {

package/dist/services/notifications.js

@@ -36,16 +36,16 @@ class NotificationsService extends items_1.ItemsService {
             const user = await this.usersService.readOne(data.recipient, {
                 fields: ['id', 'email', 'email_notifications', 'role.app_access'],
             });
-            const manageUserAccountUrl = new url_1.Url(env_1.default.PUBLIC_URL).addPath('admin', 'users', user.id).toString();
+            const manageUserAccountUrl = new url_1.Url(env_1.default['PUBLIC_URL']).addPath('admin', 'users', user['id']).toString();
             const html = data.message ? (0, md_1.md)(data.message) : '';
-            if (user.email && user.email_notifications === true) {
+            if (user['email'] && user['email_notifications'] === true) {
                 try {
                     await this.mailService.send({
                         template: {
                             name: 'base',
-                            data: user.role?.app_access ? { url: manageUserAccountUrl, html } : { html },
+                            data: user['role']?.app_access ? { url: manageUserAccountUrl, html } : { html },
                         },
-                        to: user.email,
+                        to: user['email'],
                         subject: data.subject,
                     });
                 }

package/dist/services/revisions.js

@@ -11,14 +11,14 @@ class RevisionsService extends index_1.ItemsService {
         const revision = await super.readOne(pk);
         if (!revision)
             throw new exceptions_1.ForbiddenException();
-        if (!revision.data)
+        if (!revision['data'])
             throw new exceptions_1.InvalidPayloadException(`Revision doesn't contain data to revert to`);
-        const service = new index_1.ItemsService(revision.collection, {
+        const service = new index_1.ItemsService(revision['collection'], {
             accountability: this.accountability,
             knex: this.knex,
             schema: this.schema,
         });
-        await service.updateOne(revision.item, revision.data);
+        await service.updateOne(revision['item'], revision['data']);
     }
 }
 exports.RevisionsService = RevisionsService;

package/dist/services/roles.js

@@ -29,10 +29,10 @@ class RolesService extends items_1.ItemsService {
         // The users that will now be in this new non-admin role
         let userKeys = [];
         if (Array.isArray(users)) {
-            userKeys = users.map((user) => (typeof user === 'string' ? user : user.id)).filter((id) => id);
+            userKeys = users.map((user) => (typeof user === 'string' ? user : user['id'])).filter((id) => id);
         }
         else {
-            userKeys = users.update.map((user) => user.id).filter((id) => id);
+            userKeys = users.update.map((user) => user['id']).filter((id) => id);
         }
         const usersThatWereInRoleBefore = (await this.knex.select('id').from('directus_users').where('role', '=', key)).map((user) => user.id);
         const usersThatAreRemoved = usersThatWereInRoleBefore.filter((id) => Array.isArray(users) ? userKeys.includes(id) === false : users.delete.includes(id) === true);
@@ -58,7 +58,7 @@ class RolesService extends items_1.ItemsService {
     async updateOne(key, data, opts) {
         try {
             if ('users' in data) {
-                await this.checkForOtherAdminUsers(key, data.users);
+                await this.checkForOtherAdminUsers(key, data['users']);
             }
         }
         catch (err) {
@@ -69,7 +69,7 @@ class RolesService extends items_1.ItemsService {
     async updateBatch(data, opts) {
         const primaryKeyField = this.schema.collections[this.collection].primary;
         const keys = data.map((item) => item[primaryKeyField]);
-        const setsToNoAdmin = data.some((item) => item.admin_access === false);
+        const setsToNoAdmin = data.some((item) => item['admin_access'] === false);
         try {
             if (setsToNoAdmin) {
                 await this.checkForOtherAdminRoles(keys);
@@ -82,7 +82,7 @@ class RolesService extends items_1.ItemsService {
     }
     async updateMany(keys, data, opts) {
         try {
-            if ('admin_access' in data && data.admin_access === false) {
+            if ('admin_access' in data && data['admin_access'] === false) {
                 await this.checkForOtherAdminRoles(keys);
             }
         }

package/dist/services/server.js

@@ -70,40 +70,40 @@ class ServerService {
                 'custom_css',
             ],
         });
-        info.project = projectInfo;
+        info['project'] = projectInfo;
         if (this.accountability?.user) {
-            if (env_1.default.RATE_LIMITER_ENABLED) {
-                info.rateLimit = {
-                    points: env_1.default.RATE_LIMITER_POINTS,
-                    duration: env_1.default.RATE_LIMITER_DURATION,
+            if (env_1.default['RATE_LIMITER_ENABLED']) {
+                info['rateLimit'] = {
+                    points: env_1.default['RATE_LIMITER_POINTS'],
+                    duration: env_1.default['RATE_LIMITER_DURATION'],
                 };
             }
             else {
-                info.rateLimit = false;
+                info['rateLimit'] = false;
             }
-            if (env_1.default.RATE_LIMITER_GLOBAL_ENABLED) {
-                info.rateLimitGlobal = {
-                    points: env_1.default.RATE_LIMITER_GLOBAL_POINTS,
-                    duration: env_1.default.RATE_LIMITER_GLOBAL_DURATION,
+            if (env_1.default['RATE_LIMITER_GLOBAL_ENABLED']) {
+                info['rateLimitGlobal'] = {
+                    points: env_1.default['RATE_LIMITER_GLOBAL_POINTS'],
+                    duration: env_1.default['RATE_LIMITER_GLOBAL_DURATION'],
                 };
             }
             else {
-                info.rateLimitGlobal = false;
+                info['rateLimitGlobal'] = false;
             }
-            info.flows = {
-                execAllowedModules: env_1.default.FLOWS_EXEC_ALLOWED_MODULES ? (0, utils_1.toArray)(env_1.default.FLOWS_EXEC_ALLOWED_MODULES) : [],
+            info['flows'] = {
+                execAllowedModules: env_1.default['FLOWS_EXEC_ALLOWED_MODULES'] ? (0, utils_1.toArray)(env_1.default['FLOWS_EXEC_ALLOWED_MODULES']) : [],
             };
         }
         if (this.accountability?.admin === true) {
             const { osType, osVersion } = (0, get_os_info_1.getOSInfo)();
-            info.directus = {
+            info['directus'] = {
                 version: package_json_1.version,
             };
-            info.node = {
+            info['node'] = {
                 version: process.versions.node,
                 uptime: Math.round(process.uptime()),
             };
-            info.os = {
+            info['os'] = {
                 type: osType,
                 version: osVersion,
                 uptime: Math.round(os_1.default.uptime()),
@@ -118,7 +118,7 @@ class ServerService {
         const data = {
             status: 'ok',
             releaseId: package_json_1.version,
-            serviceId: env_1.default.KEY,
+            serviceId: env_1.default['KEY'],
             checks: (0, lodash_1.merge)(...(await Promise.all([
                 testDatabase(),
                 testCache(),
@@ -153,7 +153,7 @@ class ServerService {
         }
         async function testDatabase() {
             const database = (0, database_1.default)();
-            const client = env_1.default.DB_CLIENT;
+            const client = env_1.default['DB_CLIENT'];
             const checks = {};
             // Response time
             // ----------------------------------------------------------------------------------------
@@ -163,7 +163,7 @@ class ServerService {
                     componentType: 'datastore',
                     observedUnit: 'ms',
                     observedValue: 0,
-                    threshold: env_1.default.DB_HEALTHCHECK_THRESHOLD ? +env_1.default.DB_HEALTHCHECK_THRESHOLD : 150,
+                    threshold: env_1.default['DB_HEALTHCHECK_THRESHOLD'] ? +env_1.default['DB_HEALTHCHECK_THRESHOLD'] : 150,
                 },
             ];
             const startTime = perf_hooks_1.performance.now();
@@ -197,7 +197,7 @@ class ServerService {
             return checks;
         }
         async function testCache() {
-            if (env_1.default.CACHE_ENABLED !== true) {
+            if (env_1.default['CACHE_ENABLED'] !== true) {
                 return {};
             }
             const { cache } = (0, cache_1.getCache)();
@@ -208,7 +208,7 @@ class ServerService {
                         componentType: 'cache',
                         observedValue: 0,
                         observedUnit: 'ms',
-                        threshold: env_1.default.CACHE_HEALTHCHECK_THRESHOLD ? +env_1.default.CACHE_HEALTHCHECK_THRESHOLD : 150,
+                        threshold: env_1.default['CACHE_HEALTHCHECK_THRESHOLD'] ? +env_1.default['CACHE_HEALTHCHECK_THRESHOLD'] : 150,
                     },
                 ],
             };
@@ -232,7 +232,7 @@ class ServerService {
             return checks;
         }
         async function testRateLimiter() {
-            if (env_1.default.RATE_LIMITER_ENABLED !== true) {
+            if (env_1.default['RATE_LIMITER_ENABLED'] !== true) {
                 return {};
             }
             const checks = {
@@ -242,7 +242,7 @@ class ServerService {
                         componentType: 'ratelimiter',
                         observedValue: 0,
                         observedUnit: 'ms',
-                        threshold: env_1.default.RATE_LIMITER_HEALTHCHECK_THRESHOLD ? +env_1.default.RATE_LIMITER_HEALTHCHECK_THRESHOLD : 150,
+                        threshold: env_1.default['RATE_LIMITER_HEALTHCHECK_THRESHOLD'] ? +env_1.default['RATE_LIMITER_HEALTHCHECK_THRESHOLD'] : 150,
                     },
                 ],
             };
@@ -266,7 +266,7 @@ class ServerService {
             return checks;
         }
         async function testRateLimiterGlobal() {
-            if (env_1.default.RATE_LIMITER_GLOBAL_ENABLED !== true) {
+            if (env_1.default['RATE_LIMITER_GLOBAL_ENABLED'] !== true) {
                 return {};
             }
             const checks = {
@@ -276,8 +276,8 @@ class ServerService {
                         componentType: 'ratelimiter',
                         observedValue: 0,
                         observedUnit: 'ms',
-                        threshold: env_1.default.RATE_LIMITER_GLOBAL_HEALTHCHECK_THRESHOLD
-                            ? +env_1.default.RATE_LIMITER_GLOBAL_HEALTHCHECK_THRESHOLD
+                        threshold: env_1.default['RATE_LIMITER_GLOBAL_HEALTHCHECK_THRESHOLD']
+                            ? +env_1.default['RATE_LIMITER_GLOBAL_HEALTHCHECK_THRESHOLD']
                             : 150,
                     },
                 ],
@@ -305,7 +305,7 @@ class ServerService {
         async function testStorage() {
             const storage = await (0, storage_1.getStorage)();
             const checks = {};
-            for (const location of (0, utils_1.toArray)(env_1.default.STORAGE_LOCATIONS)) {
+            for (const location of (0, utils_1.toArray)(env_1.default['STORAGE_LOCATIONS'])) {
                 const disk = storage.location(location);
                 const envThresholdKey = `STORAGE_${location}_HEALTHCHECK_THRESHOLD`.toUpperCase();
                 checks[`storage:${location}:responseTime`] = [

package/dist/services/shares.js

@@ -27,7 +27,7 @@ class SharesService extends items_1.ItemsService {
         });
     }
     async createOne(data, opts) {
-        await this.authorizationService.checkAccess('share', data.collection, data.item);
+        await this.authorizationService.checkAccess('share', data['collection'], data['item']);
         return super.createOne(data, opts);
     }
     async login(payload) {
@@ -45,7 +45,7 @@ class SharesService extends items_1.ItemsService {
             share_password: 'password',
         })
             .from('directus_shares')
-            .where('id', payload.share)
+            .where('id', payload['share'])
             .andWhere((subQuery) => {
             subQuery.whereNull('date_end').orWhere('date_end', '>=', new Date());
         })
@@ -59,7 +59,7 @@ class SharesService extends items_1.ItemsService {
         if (!record) {
             throw new exceptions_1.InvalidCredentialsException();
         }
-        if (record.share_password && !(await argon2_1.default.verify(record.share_password, payload.password))) {
+        if (record.share_password && !(await argon2_1.default.verify(record.share_password, payload['password']))) {
             throw new exceptions_1.InvalidCredentialsException();
         }
         await this.knex('directus_shares')
@@ -75,12 +75,12 @@ class SharesService extends items_1.ItemsService {
                 collection: record.share_collection,
             },
         };
-        const accessToken = jsonwebtoken_1.default.sign(tokenPayload, env_1.default.SECRET, {
-            expiresIn: env_1.default.ACCESS_TOKEN_TTL,
+        const accessToken = jsonwebtoken_1.default.sign(tokenPayload, env_1.default['SECRET'], {
+            expiresIn: env_1.default['ACCESS_TOKEN_TTL'],
             issuer: 'directus',
         });
         const refreshToken = nanoid(64);
-        const refreshTokenExpiration = new Date(Date.now() + (0, get_milliseconds_1.getMilliseconds)(env_1.default.REFRESH_TOKEN_TTL, 0));
+        const refreshTokenExpiration = new Date(Date.now() + (0, get_milliseconds_1.getMilliseconds)(env_1.default['REFRESH_TOKEN_TTL'], 0));
         await this.knex('directus_sessions').insert({
             token: refreshToken,
             expires: refreshTokenExpiration,
@@ -93,7 +93,7 @@ class SharesService extends items_1.ItemsService {
         return {
             accessToken,
             refreshToken,
-            expires: (0, get_milliseconds_1.getMilliseconds)(env_1.default.ACCESS_TOKEN_TTL),
+            expires: (0, get_milliseconds_1.getMilliseconds)(env_1.default['ACCESS_TOKEN_TTL']),
         };
     }
     /**
@@ -115,9 +115,9 @@ class SharesService extends items_1.ItemsService {
         const message = `
 Hello!
 
-${(0, user_name_1.userName)(userInfo)} has invited you to view an item in ${share.collection}.
+${(0, user_name_1.userName)(userInfo)} has invited you to view an item in ${share['collection']}.
 
-[Open](${new url_1.Url(env_1.default.PUBLIC_URL).addPath('admin', 'shared', payload.share).toString()})
+[Open](${new url_1.Url(env_1.default['PUBLIC_URL']).addPath('admin', 'shared', payload.share).toString()})
 `;
         for (const email of payload.emails) {
             await mailService.send({

package/dist/services/specifications.js

@@ -74,7 +74,7 @@ class OASSpecsService {
             },
             servers: [
                 {
-                    url: env_1.default.PUBLIC_URL,
+                    url: env_1.default['PUBLIC_URL'],
                     description: 'Your current Directus instance.',
                 },
             ],
@@ -168,7 +168,7 @@ class OASSpecsService {
                             paths[`/items/${collection}`][method] = (0, lodash_1.mergeWith)((0, lodash_1.cloneDeep)(listBase[method]), {
                                 description: listBase[method].description.replace('item', collection + ' item'),
                                 tags: [tag.name],
-                                parameters: 'parameters' in listBase ? this.filterCollectionFromParams(listBase['parameters']) : [],
+                                parameters: 'parameters' in listBase ? this.filterCollectionFromParams(listBase.parameters) : [],
                                 operationId: `${this.getActionForMethod(method)}${tag.name}`,
                                 requestBody: ['get', 'delete'].includes(method)
                                     ? undefined
@@ -213,6 +213,7 @@ class OASSpecsService {
                             }, (obj, src) => {
                                 if (Array.isArray(obj))
                                     return obj.concat(src);
+                                return undefined;
                             });
                         }
                         if (detailBase[method]) {
@@ -220,7 +221,7 @@ class OASSpecsService {
                                 description: detailBase[method].description.replace('item', collection + ' item'),
                                 tags: [tag.name],
                                 operationId: `${this.getActionForMethod(method)}Single${tag.name}`,
-                                parameters: 'parameters' in detailBase ? this.filterCollectionFromParams(detailBase['parameters']) : [],
+                                parameters: 'parameters' in detailBase ? this.filterCollectionFromParams(detailBase.parameters) : [],
                                 requestBody: ['get', 'delete'].includes(method)
                                     ? undefined
                                     : {
@@ -252,6 +253,7 @@ class OASSpecsService {
                             }, (obj, src) => {
                                 if (Array.isArray(obj))
                                     return obj.concat(src);
+                                return undefined;
                             });
                         }
                     }

package/dist/services/users.d.ts

@@ -1,11 +1,7 @@
-import type { Accountability, Query, SchemaOverview } from '@directus/shared/types';
-import type { Knex } from 'knex';
+import type { Query } from '@directus/shared/types';
 import type { AbstractServiceOptions, Item, MutationOptions, PrimaryKey } from '../types';
 import { ItemsService } from './items';
 export declare class UsersService extends ItemsService {
-    knex: Knex;
-    accountability: Accountability | null;
-    schema: SchemaOverview;
     constructor(options: AbstractServiceOptions);
     /**
      * User email has to be unique case-insensitive. This is an additional check to make sure that

package/dist/services/users.js

@@ -20,9 +20,6 @@ const items_1 = require("./items");
 const mail_1 = require("./mail");
 const settings_1 = require("./settings");
 class UsersService extends items_1.ItemsService {
-    knex;
-    accountability;
-    schema;
     constructor(options) {
         super('directus_users', options);
         this.knex = options.knex || (0, database_1.default)();
@@ -131,8 +128,8 @@ class UsersService extends items_1.ItemsService {
      * Create multiple new users
      */
     async createMany(data, opts) {
-        const emails = data.map((payload) => payload.email).filter((email) => email);
-        const passwords = data.map((payload) => payload.password).filter((password) => password);
+        const emails = data['map']((payload) => payload['email']).filter((email) => email);
+        const passwords = data['map']((payload) => payload['password']).filter((password) => password);
         try {
             if (emails.length) {
                 await this.checkUniqueEmails(emails);
@@ -182,44 +179,44 @@ class UsersService extends items_1.ItemsService {
      */
     async updateMany(keys, data, opts) {
         try {
-            if (data.role) {
-                // data.role will be an object with id with GraphQL mutations
-                const roleId = data.role?.id ?? data.role;
+            if (data['role']) {
+                // data['role'] will be an object with id with GraphQL mutations
+                const roleId = data['role']?.id ?? data['role'];
                 const newRole = await this.knex.select('admin_access').from('directus_roles').where('id', roleId).first();
                 if (!newRole?.admin_access) {
                     await this.checkRemainingAdminExistence(keys);
                 }
             }
-            if (data.status !== undefined && data.status !== 'active') {
+            if (data['status'] !== undefined && data['status'] !== 'active') {
                 await this.checkRemainingActiveAdmin(keys);
             }
-            if (data.email) {
+            if (data['email']) {
                 if (keys.length > 1) {
                     throw new record_not_unique_1.RecordNotUniqueException('email', {
                         collection: 'directus_users',
                         field: 'email',
-                        invalid: data.email,
+                        invalid: data['email'],
                     });
                 }
-                await this.checkUniqueEmails([data.email], keys[0]);
+                await this.checkUniqueEmails([data['email']], keys[0]);
             }
-            if (data.password) {
-                await this.checkPasswordPolicy([data.password]);
+            if (data['password']) {
+                await this.checkPasswordPolicy([data['password']]);
             }
-            if (data.tfa_secret !== undefined) {
+            if (data['tfa_secret'] !== undefined) {
                 throw new exceptions_2.InvalidPayloadException(`You can't change the "tfa_secret" value manually.`);
             }
-            if (data.provider !== undefined) {
+            if (data['provider'] !== undefined) {
                 if (this.accountability && this.accountability.admin !== true) {
                     throw new exceptions_2.InvalidPayloadException(`You can't change the "provider" value manually.`);
                 }
-                data.auth_data = null;
+                data['auth_data'] = null;
             }
-            if (data.external_identifier !== undefined) {
+            if (data['external_identifier'] !== undefined) {
                 if (this.accountability && this.accountability.admin !== true) {
                     throw new exceptions_2.InvalidPayloadException(`You can't change the "external_identifier" value manually.`);
                 }
-                data.auth_data = null;
+                data['auth_data'] = null;
             }
         }
         catch (err) {
@@ -266,7 +263,7 @@ class UsersService extends items_1.ItemsService {
     async inviteUser(email, role, url, subject) {
         const opts = {};
         try {
-            if (url && (0, is_url_allowed_1.default)(url, env_1.default.USER_INVITE_URL_ALLOW_LIST) === false) {
+            if (url && (0, is_url_allowed_1.default)(url, env_1.default['USER_INVITE_URL_ALLOW_LIST']) === false) {
                 throw new exceptions_2.InvalidPayloadException(`Url "${url}" can't be used to invite users.`);
             }
         }
@@ -280,9 +277,9 @@ class UsersService extends items_1.ItemsService {
         });
         for (const email of emails) {
             const payload = { email, scope: 'invite' };
-            const token = jsonwebtoken_1.default.sign(payload, env_1.default.SECRET, { expiresIn: '7d', issuer: 'directus' });
+            const token = jsonwebtoken_1.default.sign(payload, env_1.default['SECRET'], { expiresIn: '7d', issuer: 'directus' });
             const subjectLine = subject ?? "You've been invited";
-            const inviteURL = url ? new url_1.Url(url) : new url_1.Url(env_1.default.PUBLIC_URL).addPath('admin', 'accept-invite');
+            const inviteURL = url ? new url_1.Url(url) : new url_1.Url(env_1.default['PUBLIC_URL']).addPath('admin', 'accept-invite');
             inviteURL.setQuery('token', token);
             // Create user first to verify uniqueness
             await this.createOne({ email, role, status: 'invited' }, opts);
@@ -300,7 +297,7 @@ class UsersService extends items_1.ItemsService {
         }
     }
     async acceptInvite(token, password) {
-        const { email, scope } = jsonwebtoken_1.default.verify(token, env_1.default.SECRET, { issuer: 'directus' });
+        const { email, scope } = jsonwebtoken_1.default.verify(token, env_1.default['SECRET'], { issuer: 'directus' });
         if (scope !== 'invite')
             throw new exceptions_2.ForbiddenException();
         const user = await this.knex.select('id', 'status').from('directus_users').where({ email }).first();
@@ -326,7 +323,7 @@ class UsersService extends items_1.ItemsService {
             await (0, stall_1.stall)(STALL_TIME, timeStart);
             throw new exceptions_2.ForbiddenException();
         }
-        if (url && (0, is_url_allowed_1.default)(url, env_1.default.PASSWORD_RESET_URL_ALLOW_LIST) === false) {
+        if (url && (0, is_url_allowed_1.default)(url, env_1.default['PASSWORD_RESET_URL_ALLOW_LIST']) === false) {
             throw new exceptions_2.InvalidPayloadException(`Url "${url}" can't be used to reset passwords.`);
         }
         const mailService = new mail_1.MailService({
@@ -335,10 +332,10 @@ class UsersService extends items_1.ItemsService {
             accountability: this.accountability,
         });
         const payload = { email, scope: 'password-reset', hash: (0, utils_1.getSimpleHash)('' + user.password) };
-        const token = jsonwebtoken_1.default.sign(payload, env_1.default.SECRET, { expiresIn: '1d', issuer: 'directus' });
+        const token = jsonwebtoken_1.default.sign(payload, env_1.default['SECRET'], { expiresIn: '1d', issuer: 'directus' });
         const acceptURL = url
             ? new url_1.Url(url).setQuery('token', token).toString()
-            : new url_1.Url(env_1.default.PUBLIC_URL).addPath('admin', 'reset-password').setQuery('token', token);
+            : new url_1.Url(env_1.default['PUBLIC_URL']).addPath('admin', 'reset-password').setQuery('token', token);
         const subjectLine = subject ? subject : 'Password Reset Request';
         await mailService.send({
             to: email,
@@ -354,7 +351,7 @@ class UsersService extends items_1.ItemsService {
         await (0, stall_1.stall)(STALL_TIME, timeStart);
     }
     async resetPassword(token, password) {
-        const { email, scope, hash } = jsonwebtoken_1.default.verify(token, env_1.default.SECRET, { issuer: 'directus' });
+        const { email, scope, hash } = jsonwebtoken_1.default.verify(token, env_1.default['SECRET'], { issuer: 'directus' });
         if (scope !== 'password-reset' || !hash)
             throw new exceptions_2.ForbiddenException();
         const opts = {};

package/dist/storage/register-locations.js

@@ -6,7 +6,7 @@ const env_1 = require("../env");
 const get_config_from_env_1 = require("../utils/get-config-from-env");
 const registerLocations = async (storage) => {
     const env = (0, env_1.getEnv)();
-    const locations = (0, utils_1.toArray)(env.STORAGE_LOCATIONS);
+    const locations = (0, utils_1.toArray)(env['STORAGE_LOCATIONS']);
     locations.forEach((location) => {
         location = location.trim();
         const driverConfig = (0, get_config_from_env_1.getConfigFromEnv)(`STORAGE_${location.toUpperCase()}_`);

package/dist/utils/apply-query.js

@@ -171,6 +171,7 @@ function applySort(knex, schema, rootQuery, rootSort, collection, aliasMap, retu
     // Clears the order if any, eg: from MSSQL offset
     rootQuery.clear('order');
     rootQuery.orderBy(sortRecords);
+    return undefined;
 }
 exports.applySort = applySort;
 function applyLimit(knex, rootQuery, limit) {
@@ -337,7 +338,7 @@ function applyFilter(knex, schema, rootQuery, rootFilter, collection, aliasMap)
             }
             if (operator === '_nempty' || (operator === '_empty' && compareValue === false)) {
                 dbQuery[logical].andWhere((query) => {
-                    query.whereNotNull(key).orWhere(key, '!=', '');
+                    query.whereNotNull(key).andWhere(key, '!=', '');
                 });
             }
             // The following fields however, require a value to be run. If no value is passed, we

package/dist/utils/dynamic-import.js

@@ -2,6 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.dynamicImport = void 0;
 const dynamicImport = async (mod) => {
-    return process.env.VITEST ? await import(mod) : require(mod);
+    return process.env['VITEST'] ? await import(mod) : require(mod);
 };
 exports.dynamicImport = dynamicImport;

package/dist/utils/generate-hash.js

@@ -10,7 +10,7 @@ function generateHash(stringToHash) {
     const argon2HashConfigOptions = (0, get_config_from_env_1.getConfigFromEnv)('HASH_', 'HASH_RAW'); // Disallow the HASH_RAW option, see https://github.com/directus/directus/discussions/7670#discussioncomment-1255805
     // associatedData, if specified, must be passed as a Buffer to argon2.hash, see https://github.com/ranisalt/node-argon2/wiki/Options#associateddata
     'associatedData' in argon2HashConfigOptions &&
-        (argon2HashConfigOptions.associatedData = Buffer.from(argon2HashConfigOptions.associatedData));
+        (argon2HashConfigOptions['associatedData'] = Buffer.from(argon2HashConfigOptions['associatedData']));
     return argon2_1.default.hash(stringToHash, argon2HashConfigOptions);
 }
 exports.generateHash = generateHash;