directus 9.10.0 → 9.12.0

package/dist/database/migrations/20220429C-drop-non-null-from-ip-of-activity.d.ts

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

package/dist/database/migrations/20220429C-drop-non-null-from-ip-of-activity.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.down = exports.up = void 0;
+async function up(knex) {
+    await knex.schema.alterTable('directus_activity', (table) => {
+        table.setNullable('ip');
+    });
+}
+exports.up = up;
+async function down(knex) {
+    await knex.schema.alterTable('directus_activity', (table) => {
+        table.dropNullable('ip');
+    });
+}
+exports.down = down;

package/dist/database/migrations/20220429D-drop-non-null-from-sender-of-notifications.d.ts

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

package/dist/database/migrations/20220429D-drop-non-null-from-sender-of-notifications.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.down = exports.up = void 0;
+async function up(knex) {
+    await knex.schema.alterTable('directus_notifications', (table) => {
+        table.setNullable('sender');
+    });
+}
+exports.up = up;
+async function down(knex) {
+    await knex.schema.alterTable('directus_notifications', (table) => {
+        table.dropNullable('sender');
+    });
+}
+exports.down = down;

package/dist/database/run-ast.js

@@ -93,14 +93,9 @@ async function parseCurrentLevel(schema, collection, children, query) {
     const nestedCollectionNodes = [];
     for (const child of children) {
         if (child.type === 'field') {
-            const fieldKey = (0, strip_function_1.stripFunction)(child.name);
-            if (columnsInCollection.includes(fieldKey) || fieldKey === '*') {
-                columnsToSelectInternal.push(child.name); // maintain original name here (includes functions)
-                if (query.alias) {
-                    columnsToSelectInternal.push(...Object.entries(query.alias)
-                        .filter(([_key, value]) => value === child.name)
-                        .map(([key]) => key));
-                }
+            const fieldName = (0, strip_function_1.stripFunction)(child.name);
+            if (columnsInCollection.includes(fieldName)) {
+                columnsToSelectInternal.push(child.fieldKey);
             }
             continue;
         }
@@ -126,7 +121,7 @@ async function parseCurrentLevel(schema, collection, children, query) {
     const columnsToSelect = [...new Set(columnsToSelectInternal)];
     const fieldNodes = columnsToSelect.map((column) => {
         var _a;
-        return (_a = children.find((childNode) => childNode.type === 'field' && (childNode.fieldKey === column || childNode.name === column))) !== null && _a !== void 0 ? _a : {
+        return (_a = children.find((childNode) => childNode.type === 'field' && childNode.fieldKey === column)) !== null && _a !== void 0 ? _a : {
             type: 'field',
             name: column,
             fieldKey: column,
@@ -137,6 +132,11 @@ async function parseCurrentLevel(schema, collection, children, query) {
 function getColumnPreprocessor(knex, schema, table) {
     const helpers = (0, helpers_1.getHelpers)(knex);
     return function (fieldNode) {
+        var _a;
+        let alias = undefined;
+        if (fieldNode.name !== fieldNode.fieldKey) {
+            alias = fieldNode.fieldKey;
+        }
         let field;
         if (fieldNode.type === 'field') {
             field = schema.collections[table].fields[(0, strip_function_1.stripFunction)(fieldNode.name)];
@@ -144,11 +144,7 @@ function getColumnPreprocessor(knex, schema, table) {
         else {
             field = schema.collections[fieldNode.relation.collection].fields[fieldNode.relation.field];
         }
-        let alias = undefined;
-        if (fieldNode.name !== fieldNode.fieldKey) {
-            alias = fieldNode.fieldKey;
-        }
-        if (field.type.startsWith('geometry')) {
+        if ((_a = field === null || field === void 0 ? void 0 : field.type) === null || _a === void 0 ? void 0 : _a.startsWith('geometry')) {
             return helpers.st.asText(table, field.field);
         }
         return (0, get_column_1.getColumn)(knex, table, fieldNode.name, alias, schema);

package/dist/database/seeds/05-activity.yaml

@@ -20,7 +20,6 @@ columns:
   user_agent:
     type: string
     length: 255
-    nullabel: false
   collection:
     type: string
     length: 64

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

@@ -68,3 +68,7 @@ data:
   - collection: directus_shares
     icon: share
     note: $t:directus_collection.directus_shares
+  - collection: directus_flows
+    note: $t:directus_collection.directus_flows
+  - collection: directus_operations
+    note: $t:directus_collection.directus_operations

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

@@ -37,6 +37,9 @@ fields:
 
   - field: timestamp
     display: datetime
+    special:
+      - date-created
+      - cast-timestamp
     options:
       relative: true
     width: half

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

@@ -8,7 +8,9 @@ fields:
   - field: panels
     special: o2m
   - field: date_created
-    special: date-created
+    special:
+      - date-created
+      - cast-timestamp
   - field: user_created
     special: user-created
   - field: note

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

@@ -0,0 +1,21 @@
+table: directus_flows
+
+fields:
+  - field: id
+    special: uuid
+  - field: name
+  - field: icon
+  - field: color
+  - field: note
+  - field: status
+  - field: trigger
+  - field: accountability
+  - field: options
+    special: cast-json
+  - field: operation
+  - field: operations
+    special: o2m
+  - field: date_created
+    special: date-created
+  - field: user_created
+    special: user-created

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

@@ -3,7 +3,9 @@ table: directus_notifications
 fields:
   - field: id
   - field: timestamp
-    special: date-created
+    special:
+      - date-created
+      - cast-timestamp
   - field: status
   - field: recipient
   - field: sender

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

@@ -0,0 +1,19 @@
+table: directus_operations
+
+fields:
+  - field: id
+    special: uuid
+  - field: name
+  - field: key
+  - field: type
+  - field: position_x
+  - field: position_y
+  - field: options
+    special: cast-json
+  - field: resolve
+  - field: reject
+  - field: flow
+  - field: date_created
+    special: date-created
+  - field: user_created
+    special: user-created

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

@@ -17,7 +17,9 @@ fields:
   - field: options
     special: cast-json
   - field: date_created
-    special: date-created
+    special:
+      - date-created
+      - cast-timestamp
   - field: user_created
     special: user-created
   - field: dashboard

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

@@ -51,7 +51,9 @@ fields:
     readonly: true
 
   - field: date_created
-    special: date-created
+    special:
+      - date-created
+      - cast-timestamp
     width: half
     readonly: true
     conditions:

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

@@ -135,10 +135,8 @@ fields:
       template: '{{ name }}'
 
   - field: token
-    interface: token
-    options:
-      iconRight: vpn_key
-      placeholder: $t:fields.directus_users.token_placeholder
+    interface: system-token
+    special: conceal
     width: full
 
   - field: id

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

@@ -61,6 +61,20 @@ data:
     many_field: dashboard
     one_collection: directus_dashboards
     one_field: panels
+  - many_collection: directus_flows
+    many_field: operation
+    one_collection: directus_operations
+  - many_collection: directus_operations
+    many_field: flow
+    one_collection: directus_flows
+    one_field: operations
+    one_deselect_action: delete
+  - many_collection: directus_operations
+    many_field: resolve
+    one_collection: directus_operations
+  - many_collection: directus_operations
+    many_field: reject
+    one_collection: directus_operations
   - many_collection: directus_files
     many_field: modified_by
     one_collection: directus_users
@@ -88,6 +102,12 @@ data:
   - many_collection: directus_panels
     many_field: user_created
     one_collection: directus_users
+  - many_collection: directus_flows
+    many_field: user_created
+    one_collection: directus_users
+  - many_collection: directus_operations
+    many_field: user_created
+    one_collection: directus_users
   - many_collection: directus_notifications
     many_field: recipient
     one_collection: directus_users

package/dist/env.d.ts

@@ -1,6 +1,6 @@
 /**
  * @NOTE
- * See example.env for all possible keys
+ * For all possible keys, see: https://docs.directus.io/configuration/config-options/
  */
 declare let env: Record<string, any>;
 export default env;

package/dist/env.js

@@ -1,7 +1,7 @@
 "use strict";
 /**
  * @NOTE
- * See example.env for all possible keys
+ * For all possible keys, see: https://docs.directus.io/configuration/config-options/
  */
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
@@ -14,6 +14,156 @@ const lodash_1 = require("lodash");
 const path_1 = __importDefault(require("path"));
 const require_yaml_1 = require("./utils/require-yaml");
 const utils_1 = require("@directus/shared/utils");
+const parse_json_1 = require("./utils/parse-json");
+// keeping this here for now to prevent a circular import to constants.ts
+const allowedEnvironmentVars = [
+    // general
+    'CONFIG_PATH',
+    'HOST',
+    'PORT',
+    'PUBLIC_URL',
+    'LOG_LEVEL',
+    'LOG_STYLE',
+    'MAX_PAYLOAD_SIZE',
+    'ROOT_REDIRECT',
+    'SERVE_APP',
+    'GRAPHQL_INTROSPECTION',
+    'LOGGER_.+',
+    // server
+    'SERVER_.+',
+    // database
+    'DB_.+',
+    // security
+    'KEY',
+    'SECRET',
+    'ACCESS_TOKEN_TTL',
+    'REFRESH_TOKEN_TTL',
+    'REFRESH_TOKEN_COOKIE_DOMAIN',
+    'REFRESH_TOKEN_COOKIE_SECURE',
+    'REFRESH_TOKEN_COOKIE_SAME_SITE',
+    'REFRESH_TOKEN_COOKIE_NAME',
+    'PASSWORD_RESET_URL_ALLOW_LIST',
+    'USER_INVITE_URL_ALLOW_LIST',
+    'IP_TRUST_PROXY',
+    'IP_CUSTOM_HEADER',
+    'ASSETS_CONTENT_SECURITY_POLICY',
+    'IMPORT_IP_DENY_LIST',
+    'CONTENT_SECURITY_POLICY_.+',
+    'HSTS_.+',
+    // hashing
+    'HASH_.+',
+    // cors
+    'CORS_ENABLED',
+    'CORS_ORIGIN',
+    'CORS_METHODS',
+    'CORS_ALLOWED_HEADERS',
+    'CORS_EXPOSED_HEADERS',
+    'CORS_CREDENTIALS',
+    'CORS_MAX_AGE',
+    // rate limiting
+    'RATE_LIMITER_.+',
+    // cache
+    'CACHE_ENABLED',
+    'CACHE_TTL',
+    'CACHE_CONTROL_S_MAXAGE',
+    'CACHE_AUTO_PURGE',
+    'CACHE_SYSTEM_TTL',
+    'CACHE_SCHEMA',
+    'CACHE_PERMISSIONS',
+    'CACHE_NAMESPACE',
+    'CACHE_STORE',
+    'CACHE_STATUS_HEADER',
+    'CACHE_REDIS',
+    'CACHE_REDIS_HOST',
+    'CACHE_REDIS_PORT',
+    'CACHE_REDIS_PASSWORD',
+    'CACHE_MEMCACHE',
+    // storage
+    'STORAGE_LOCATIONS',
+    'STORAGE_.+_DRIVER',
+    'STORAGE_.+_ROOT',
+    'STORAGE_.+_KEY',
+    'STORAGE_.+_SECRET',
+    'STORAGE_.+_BUCKET',
+    'STORAGE_.+_REGION',
+    'STORAGE_.+_ENDPOINT',
+    'STORAGE_.+_ACL',
+    'STORAGE_.+_CONTAINER_NAME',
+    'STORAGE_.+_ACCOUNT_NAME',
+    'STORAGE_.+_ACCOUNT_KEY',
+    'STORAGE_.+_ENDPOINT',
+    'STORAGE_.+_KEY_FILENAME',
+    'STORAGE_.+_BUCKET',
+    // metadata
+    'FILE_METADATA_ALLOW_LIST',
+    // assets
+    'ASSETS_CACHE_TTL',
+    'ASSETS_TRANSFORM_MAX_CONCURRENT',
+    'ASSETS_TRANSFORM_IMAGE_MAX_DIMENSION',
+    'ASSETS_TRANSFORM_MAX_OPERATIONS',
+    'ASSETS_CONTENT_SECURITY_POLICY',
+    // auth
+    'AUTH_PROVIDERS',
+    'AUTH_DISABLE_DEFAULT',
+    'AUTH_.+_DRIVER',
+    'AUTH_.+_CLIENT_ID',
+    'AUTH_.+_CLIENT_SECRET',
+    'AUTH_.+_SCOPE',
+    'AUTH_.+_AUTHORIZE_URL',
+    'AUTH_.+_ACCESS_URL',
+    'AUTH_.+_PROFILE_URL',
+    'AUTH_.+_IDENTIFIER_KEY',
+    'AUTH_.+_EMAIL_KEY',
+    'AUTH_.+_FIRST_NAME_KEY',
+    'AUTH_.+_LAST_NAME_KEY',
+    'AUTH_.+_ALLOW_PUBLIC_REGISTRATION',
+    'AUTH_.+_DEFAULT_ROLE_ID',
+    'AUTH_.+_ICON',
+    'AUTH_.+_PARAMS',
+    'AUTH_.+_ISSUER_URL',
+    'AUTH_.+_AUTH_REQUIRE_VERIFIED_EMAIL',
+    'AUTH_.+_CLIENT_URL',
+    'AUTH_.+_BIND_DN',
+    'AUTH_.+_BIND_PASSWORD',
+    'AUTH_.+_USER_DN',
+    'AUTH_.+_USER_ATTRIBUTE',
+    'AUTH_.+_USER_SCOPE',
+    'AUTH_.+_MAIL_ATTRIBUTE',
+    'AUTH_.+_FIRST_NAME_ATTRIBUTE',
+    'AUTH_.+_LAST_NAME_ATTRIBUTE',
+    'AUTH_.+_GROUP_DN',
+    'AUTH_.+_GROUP_ATTRIBUTE',
+    'AUTH_.+_GROUP_SCOPE',
+    // extensions
+    'EXTENSIONS_PATH',
+    'EXTENSIONS_AUTO_RELOAD',
+    // emails
+    'EMAIL_FROM',
+    'EMAIL_TRANSPORT',
+    'EMAIL_SENDMAIL_NEW_LINE',
+    'EMAIL_SENDMAIL_PATH',
+    'EMAIL_SMTP_HOST',
+    'EMAIL_SMTP_PORT',
+    'EMAIL_SMTP_USER',
+    'EMAIL_SMTP_PASSWORD',
+    'EMAIL_SMTP_POOL',
+    'EMAIL_SMTP_SECURE',
+    'EMAIL_SMTP_IGNORE_TLS',
+    'EMAIL_MAILGUN_API_KEY',
+    'EMAIL_MAILGUN_DOMAIN',
+    'EMAIL_MAILGUN_HOST',
+    'EMAIL_SES_CREDENTIALS__ACCESS_KEY_ID',
+    'EMAIL_SES_CREDENTIALS__SECRET_ACCESS_KEY',
+    'EMAIL_SES_REGION',
+    // admin account
+    'ADMIN_EMAIL',
+    'ADMIN_PASSWORD',
+    // telemetry
+    'TELEMETRY',
+    // limits & optimization
+    'RELATIONAL_BATCH_SIZE',
+    'EXPORT_BATCH_SIZE',
+].map((name) => new RegExp(`^${name}$`));
 const acceptedEnvTypes = ['string', 'number', 'regex', 'array', 'json'];
 const defaults = {
     CONFIG_PATH: path_1.default.resolve(process.cwd(), '.env'),
@@ -179,15 +329,17 @@ function processValues(env) {
         let newKey;
         if (key.length > 5 && key.endsWith('_FILE')) {
             newKey = key.slice(0, -5);
-            if (newKey in env) {
-                throw new Error(`Duplicate environment variable encountered: you can't use "${newKey}" and "${key}" simultaneously.`);
-            }
-            try {
-                value = fs_1.default.readFileSync(value, { encoding: 'utf8' });
-                key = newKey;
-            }
-            catch {
-                throw new Error(`Failed to read value from file "${value}", defined in environment variable "${key}".`);
+            if (allowedEnvironmentVars.some((pattern) => pattern.test(newKey))) {
+                if (newKey in env) {
+                    throw new Error(`Duplicate environment variable encountered: you can't use "${newKey}" and "${key}" simultaneously.`);
+                }
+                try {
+                    value = fs_1.default.readFileSync(value, { encoding: 'utf8' });
+                    key = newKey;
+                }
+                catch {
+                    throw new Error(`Failed to read value from file "${value}", defined in environment variable "${key}".`);
+                }
             }
         }
         // Convert values with a type prefix
@@ -212,7 +364,7 @@ function processValues(env) {
                     env[key] = tryJSON(value);
                     break;
                 case 'boolean':
-                    env[key] = value === 'true' || value === true || value === '1' || value === 1;
+                    env[key] = toBoolean(value);
             }
             continue;
         }
@@ -255,9 +407,12 @@ function processValues(env) {
 }
 function tryJSON(value) {
     try {
-        return JSON.parse(value);
+        return (0, parse_json_1.parseJSON)(value);
     }
     catch {
         return value;
     }
 }
+function toBoolean(value) {
+    return value === 'true' || value === true || value === '1' || value === 1;
+}

package/dist/exceptions/index.d.ts

@@ -7,6 +7,7 @@ export * from './invalid-credentials';
 export * from './invalid-ip';
 export * from './invalid-otp';
 export * from './invalid-payload';
+export * from './invalid-provider';
 export * from './invalid-query';
 export * from './invalid-token';
 export * from './method-not-allowed';

package/dist/exceptions/index.js

@@ -19,6 +19,7 @@ __exportStar(require("./invalid-credentials"), exports);
 __exportStar(require("./invalid-ip"), exports);
 __exportStar(require("./invalid-otp"), exports);
 __exportStar(require("./invalid-payload"), exports);
+__exportStar(require("./invalid-provider"), exports);
 __exportStar(require("./invalid-query"), exports);
 __exportStar(require("./invalid-token"), exports);
 __exportStar(require("./method-not-allowed"), exports);

package/dist/exceptions/invalid-provider.d.ts

@@ -0,0 +1,4 @@
+import { BaseException } from '@directus/shared/exceptions';
+export declare class InvalidProviderException extends BaseException {
+    constructor(message?: string);
+}

package/dist/exceptions/invalid-provider.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.InvalidProviderException = void 0;
+const exceptions_1 = require("@directus/shared/exceptions");
+class InvalidProviderException extends exceptions_1.BaseException {
+    constructor(message = 'Invalid provider.') {
+        super(message, 403, 'INVALID_PROVIDER');
+    }
+}
+exports.InvalidProviderException = InvalidProviderException;

package/dist/exceptions/range-not-satisfiable.d.ts

@@ -1,5 +1,5 @@
-import { Range } from '@directus/drive';
 import { BaseException } from '@directus/shared/exceptions';
+import { Range } from '@directus/drive';
 export declare class RangeNotSatisfiableException extends BaseException {
-    constructor(range: Range);
+    constructor(range?: Range);
 }

package/dist/exceptions/range-not-satisfiable.js

@@ -4,7 +4,11 @@ exports.RangeNotSatisfiableException = void 0;
 const exceptions_1 = require("@directus/shared/exceptions");
 class RangeNotSatisfiableException extends exceptions_1.BaseException {
     constructor(range) {
-        super(`Range "${range.start}-${range.end}" is invalid or the file's size doesn't match the requested range.`, 416, 'RANGE_NOT_SATISFIABLE');
+        var _a, _b;
+        const rangeString = range && ((range === null || range === void 0 ? void 0 : range.start) !== undefined || (range === null || range === void 0 ? void 0 : range.end) !== undefined)
+            ? `"${(_a = range.start) !== null && _a !== void 0 ? _a : ''}-${(_b = range.end) !== null && _b !== void 0 ? _b : ''}" `
+            : '';
+        super(`Range ${rangeString}is invalid or the file's size doesn't match the requested range.`, 416, 'RANGE_NOT_SATISFIABLE');
     }
 }
 exports.RangeNotSatisfiableException = RangeNotSatisfiableException;

package/dist/extensions.d.ts

@@ -29,9 +29,12 @@ declare class ExtensionManager {
     private getSharedDepsMapping;
     private registerHooks;
     private registerEndpoints;
+    private registerOperations;
     private registerHook;
     private registerEndpoint;
+    private registerOperation;
     private unregisterHooks;
     private unregisterEndpoints;
+    private unregisterOperations;
 }
 export {};