directus 9.0.0 → 9.1.2

package/dist/services/mail/templates/user-invitation.liquid

@@ -2,18 +2,18 @@
 {% block content %}
 
 <p>
-    Hello. You have been invited to join {{ projectName }}. Please click the button below to accept this invitation and join the project:
+    You have been invited to join <i>{{ projectName }}</i>. Please click the button below to accept this invitation and join the project:
 </p>
 
 <p style="text-align: center; padding: 20px 0;">
     <a href="{{ url }}">
-        Join {{ projectName }}
+        <b>Join {{ projectName }}</b>
     </a>
 </p>
 
 <p>
-    Thank You,<br>
-    {{ projectName }}
+    Thank you,<br>
+    The {{ projectName }} Team
 </p>
 
 {% endblock %}

package/dist/services/notifications.d.ts

@@ -0,0 +1,12 @@
+import { UsersService, MailService } from '.';
+import { AbstractServiceOptions, PrimaryKey } from '../types';
+import { ItemsService, MutationOptions } from './items';
+import { Notification } from '@directus/shared/types';
+export declare class NotificationsService extends ItemsService {
+    usersService: UsersService;
+    mailService: MailService;
+    constructor(options: AbstractServiceOptions);
+    createOne(data: Partial<Notification>, opts?: MutationOptions): Promise<PrimaryKey>;
+    createMany(data: Partial<Notification>[], opts?: MutationOptions): Promise<PrimaryKey[]>;
+    sendEmail(data: Partial<Notification>): Promise<void>;
+}

package/dist/services/notifications.js

@@ -0,0 +1,41 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NotificationsService = void 0;
+const _1 = require(".");
+const items_1 = require("./items");
+const md_1 = require("../utils/md");
+class NotificationsService extends items_1.ItemsService {
+    constructor(options) {
+        super('directus_notifications', options);
+        this.usersService = new _1.UsersService({ schema: this.schema });
+        this.mailService = new _1.MailService({ schema: this.schema, accountability: this.accountability });
+    }
+    async createOne(data, opts) {
+        await this.sendEmail(data);
+        return super.createOne(data, opts);
+    }
+    async createMany(data, opts) {
+        for (const notification of data) {
+            await this.sendEmail(notification);
+        }
+        return super.createMany(data, opts);
+    }
+    async sendEmail(data) {
+        if (data.recipient) {
+            const user = await this.usersService.readOne(data.recipient, { fields: ['email', 'email_notifications'] });
+            if (user.email && user.email_notifications === true) {
+                await this.mailService.send({
+                    template: {
+                        name: 'base',
+                        data: {
+                            html: data.message ? (0, md_1.md)(data.message) : '',
+                        },
+                    },
+                    to: user.email,
+                    subject: data.subject,
+                });
+            }
+        }
+    }
+}
+exports.NotificationsService = NotificationsService;

package/dist/services/users.js

@@ -181,6 +181,7 @@ class UsersService extends items_1.ItemsService {
      */
     async deleteMany(keys, opts) {
         await this.checkRemainingAdminExistence(keys);
+        await this.knex('directus_notifications').update({ sender: null }).whereIn('sender', keys);
         await super.deleteMany(keys, opts);
         return keys;
     }

package/dist/types/collection.d.ts

@@ -9,6 +9,7 @@ export declare type CollectionMeta = {
     translations: Record<string, string>;
     item_duplication_fields: string[] | null;
     accountability: 'all' | 'accountability' | null;
+    group: string | null;
 };
 export declare type Collection = {
     collection: string;

package/dist/utils/apply-query.js

@@ -53,18 +53,21 @@ function applyQuery(knex, collection, dbQuery, query, schema, subQuery = false)
     if (query.union && query.union[1].length > 0) {
         const [field, keys] = query.union;
         const queries = keys.map((key) => {
-            let filter = { [field]: { _eq: key } };
-            if (query.filter) {
-                if ('_and' in query.filter) {
-                    query.filter._and.push(filter);
-                    filter = query.filter;
+            const unionFilter = { [field]: { _eq: key } };
+            let filter = (0, lodash_1.cloneDeep)(query.filter);
+            if (filter) {
+                if ('_and' in filter) {
+                    filter._and.push(unionFilter);
                 }
                 else {
                     filter = {
-                        _and: [query.filter, filter],
+                        _and: [filter, unionFilter],
                     };
                 }
             }
+            else {
+                filter = unionFilter;
+            }
             return knex.select('*').from(applyFilter(knex, schema, dbQuery.clone(), filter, collection, subQuery).as('foo'));
         });
         dbQuery = knex.unionAll(queries);
@@ -164,7 +167,7 @@ function applyFilter(knex, schema, rootQuery, rootFilter, collection, subQuery =
                     }
                     dbQuery.leftJoin({ [alias]: pathScope }, (joinClause) => {
                         joinClause
-                            .on(`${parentAlias || parentCollection}.${relation.field}`, '=', knex.raw(`CAST(?? AS VARCHAR(255))`, `${alias}.${schema.collections[pathScope].primary}`))
+                            .on(`${parentAlias || parentCollection}.${relation.field}`, '=', knex.raw(`CAST(?? AS CHAR(255))`, `${alias}.${schema.collections[pathScope].primary}`))
                             .andOnVal(relation.meta.one_collection_field, '=', pathScope);
                     });
                 }

package/dist/utils/apply-snapshot.js

@@ -72,7 +72,7 @@ async function applySnapshot(snapshot, options) {
             }
         }
         const relationsService = new services_1.RelationsService({ knex: trx, schema: await (0, get_schema_1.getSchema)({ database: trx }) });
-        for (const { collection, field, diff } of snapshotDiff.relations) {
+        for (const { collection, field, diff, related_collection } of snapshotDiff.relations) {
             if ((diff === null || diff === void 0 ? void 0 : diff[0].kind) === 'N') {
                 await relationsService.createOne(diff[0].rhs);
             }
@@ -82,7 +82,7 @@ async function applySnapshot(snapshot, options) {
                         return acc;
                     (0, lodash_1.set)(acc, edit.path, edit.rhs);
                     return acc;
-                }, {});
+                }, { collection, field, related_collection });
                 await relationsService.updateOne(collection, field, updates);
             }
             if ((diff === null || diff === void 0 ? void 0 : diff[0].kind) === 'D') {

package/dist/utils/get-local-type.js

@@ -53,8 +53,10 @@ const localTypeMap = {
     blob: 'binary',
     mediumblob: 'binary',
     'int unsigned': 'integer',
-    'tinyint(0)': 'boolean',
-    'tinyint(1)': 'boolean',
+    'tinyint unsigned': 'integer',
+    'smallint unsigned': 'integer',
+    'mediumint unsigned': 'integer',
+    'bigint unsigned': 'integer',
     // MS SQL
     bit: 'boolean',
     smallmoney: 'float',
@@ -100,7 +102,10 @@ const localTypeMap = {
 function getLocalType(column, field) {
     const database = (0, database_2.default)();
     const databaseClient = (0, database_1.getDatabaseClient)(database);
-    const type = column ? localTypeMap[column.data_type.toLowerCase().split('(')[0]] : 'alias';
+    if (!column)
+        return 'alias';
+    const dataType = column.data_type.toLowerCase();
+    const type = localTypeMap[dataType.split('(')[0]];
     const special = field === null || field === void 0 ? void 0 : field.special;
     if (special) {
         if (special.includes('json'))
@@ -111,20 +116,20 @@ function getLocalType(column, field) {
             return 'csv';
         if (special.includes('uuid'))
             return 'uuid';
-        if (type.startsWith('geometry')) {
+        if (type === null || type === void 0 ? void 0 : type.startsWith('geometry')) {
             return special[0] || 'geometry';
         }
     }
     /** Handle Postgres numeric decimals */
-    if (column && column.data_type === 'numeric' && column.numeric_precision !== null && column.numeric_scale !== null) {
+    if (dataType === 'numeric' && column.numeric_precision !== null && column.numeric_scale !== null) {
         return 'decimal';
     }
     /** Handle MS SQL varchar(MAX) (eg TEXT) types */
-    if (column && column.data_type === 'nvarchar' && column.max_length === -1) {
+    if (dataType === 'nvarchar(MAX)') {
         return 'text';
     }
     /** Handle Boolean as TINYINT and edgecase MySQL where it still is just tinyint */
-    if (column && databaseClient === 'mysql' && column.data_type.toLowerCase() === 'tinyint') {
+    if (databaseClient === 'mysql' && dataType === 'tinyint(1)') {
         return 'boolean';
     }
     return type !== null && type !== void 0 ? type : 'unknown';

package/dist/utils/get-permissions.d.ts

@@ -0,0 +1,3 @@
+import { Accountability } from '@directus/shared/types';
+import { SchemaOverview } from '../types';
+export declare function getPermissions(accountability: Accountability, schema: SchemaOverview): Promise<any>;

package/dist/utils/get-permissions.js

@@ -0,0 +1,106 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getPermissions = void 0;
+const utils_1 = require("@directus/shared/utils");
+const lodash_1 = require("lodash");
+const database_1 = __importDefault(require("../database"));
+const app_access_permissions_1 = require("../database/system-data/app-access-permissions");
+const merge_permissions_1 = require("../utils/merge-permissions");
+const users_1 = require("../services/users");
+const roles_1 = require("../services/roles");
+const cache_1 = require("../cache");
+const object_hash_1 = __importDefault(require("object-hash"));
+const env_1 = __importDefault(require("../env"));
+async function getPermissions(accountability, schema) {
+    const database = (0, database_1.default)();
+    const { systemCache } = (0, cache_1.getCache)();
+    let permissions = [];
+    const { user, role, app, admin } = accountability;
+    const cacheKey = `permissions-${(0, object_hash_1.default)({ user, role, app, admin })}`;
+    if (env_1.default.CACHE_PERMISSIONS !== false) {
+        const cachedPermissions = await systemCache.get(cacheKey);
+        if (cachedPermissions) {
+            return cachedPermissions;
+        }
+    }
+    if (accountability.admin !== true) {
+        const permissionsForRole = await database
+            .select('*')
+            .from('directus_permissions')
+            .where({ role: accountability.role });
+        const requiredPermissionData = {
+            $CURRENT_USER: [],
+            $CURRENT_ROLE: [],
+        };
+        permissions = permissionsForRole.map((permissionRaw) => {
+            const permission = (0, lodash_1.cloneDeep)(permissionRaw);
+            if (permission.permissions && typeof permission.permissions === 'string') {
+                permission.permissions = JSON.parse(permission.permissions);
+            }
+            else if (permission.permissions === null) {
+                permission.permissions = {};
+            }
+            if (permission.validation && typeof permission.validation === 'string') {
+                permission.validation = JSON.parse(permission.validation);
+            }
+            else if (permission.validation === null) {
+                permission.validation = {};
+            }
+            if (permission.presets && typeof permission.presets === 'string') {
+                permission.presets = JSON.parse(permission.presets);
+            }
+            else if (permission.presets === null) {
+                permission.presets = {};
+            }
+            if (permission.fields && typeof permission.fields === 'string') {
+                permission.fields = permission.fields.split(',');
+            }
+            else if (permission.fields === null) {
+                permission.fields = [];
+            }
+            const extractPermissionData = (val) => {
+                if (typeof val === 'string' && val.startsWith('$CURRENT_USER.')) {
+                    requiredPermissionData.$CURRENT_USER.push(val.replace('$CURRENT_USER.', ''));
+                }
+                if (typeof val === 'string' && val.startsWith('$CURRENT_ROLE.')) {
+                    requiredPermissionData.$CURRENT_ROLE.push(val.replace('$CURRENT_ROLE.', ''));
+                }
+                return val;
+            };
+            (0, utils_1.deepMap)(permission.permissions, extractPermissionData);
+            (0, utils_1.deepMap)(permission.validation, extractPermissionData);
+            (0, utils_1.deepMap)(permission.presets, extractPermissionData);
+            return permission;
+        });
+        if (accountability.app === true) {
+            permissions = (0, merge_permissions_1.mergePermissions)(permissions, app_access_permissions_1.appAccessMinimalPermissions.map((perm) => ({ ...perm, role: accountability.role })));
+        }
+        const usersService = new users_1.UsersService({ schema });
+        const rolesService = new roles_1.RolesService({ schema });
+        const filterContext = {};
+        if (accountability.user && requiredPermissionData.$CURRENT_USER.length > 0) {
+            filterContext.$CURRENT_USER = await usersService.readOne(accountability.user, {
+                fields: requiredPermissionData.$CURRENT_USER,
+            });
+        }
+        if (accountability.role && requiredPermissionData.$CURRENT_ROLE.length > 0) {
+            filterContext.$CURRENT_ROLE = await rolesService.readOne(accountability.role, {
+                fields: requiredPermissionData.$CURRENT_ROLE,
+            });
+        }
+        permissions = permissions.map((permission) => {
+            permission.permissions = (0, utils_1.parseFilter)(permission.permissions, accountability, filterContext);
+            permission.validation = (0, utils_1.parseFilter)(permission.validation, accountability, filterContext);
+            permission.presets = (0, utils_1.parseFilter)(permission.presets, accountability, filterContext);
+            return permission;
+        });
+        if (env_1.default.CACHE_PERMISSIONS !== false) {
+            await systemCache.set(cacheKey, permissions);
+        }
+    }
+    return permissions;
+}
+exports.getPermissions = getPermissions;

package/dist/utils/md.d.ts

@@ -0,0 +1,4 @@
+/**
+ * Render and sanitize a markdown string
+ */
+export declare function md(str: string): string;

package/dist/utils/md.js

@@ -0,0 +1,15 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.md = void 0;
+const marked_1 = require("marked");
+const sanitize_html_1 = __importDefault(require("sanitize-html"));
+/**
+ * Render and sanitize a markdown string
+ */
+function md(str) {
+    return (0, sanitize_html_1.default)((0, marked_1.parse)(str));
+}
+exports.md = md;

package/dist/utils/sanitize-query.js

@@ -117,8 +117,7 @@ function sanitizeFilter(rawFilter, accountability) {
             return val;
         }
     });
-    filters = (0, utils_1.parseFilter)(filters, accountability);
-    return filters;
+    return (0, utils_1.parseFilter)(filters, accountability);
 }
 function sanitizeLimit(rawLimit) {
     if (rawLimit === undefined || rawLimit === null)
@@ -165,7 +164,8 @@ function sanitizeDeep(deep, accountability) {
                 const parsedSubQuery = sanitizeQuery({ [key.substring(1)]: value }, accountability);
                 // ...however we want to keep them for the nested structure of deep, otherwise there's no
                 // way of knowing when to keep nesting and when to stop
-                parsedLevel[key] = Object.values(parsedSubQuery)[0];
+                const [parsedKey, parsedValue] = Object.entries(parsedSubQuery)[0];
+                parsedLevel[`_${parsedKey}`] = parsedValue;
             }
             else {
                 parse(value, [...path, key]);

package/dist/utils/user-name.d.ts

@@ -0,0 +1,2 @@
+import { User } from '@directus/shared/types';
+export declare function userName(user: Partial<User>): string;

package/dist/utils/user-name.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.userName = void 0;
+function userName(user) {
+    if (user.first_name && user.last_name) {
+        return `${user.first_name} ${user.last_name}`;
+    }
+    if (user.first_name) {
+        return user.first_name;
+    }
+    if (user.email) {
+        return user.email;
+    }
+    return 'Unknown User';
+}
+exports.userName = userName;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "directus",
-	"version": "9.0.0",
+	"version": "9.1.2",
 	"license": "GPL-3.0-only",
 	"homepage": "https://github.com/directus/directus#readme",
 	"description": "Directus is a real-time API and App dashboard for managing SQL database content.",
@@ -75,16 +75,17 @@
 		"example.env"
 	],
 	"dependencies": {
-		"@directus/app": "9.0.0",
-		"@directus/drive": "9.0.0",
-		"@directus/drive-azure": "9.0.0",
-		"@directus/drive-gcs": "9.0.0",
-		"@directus/drive-s3": "9.0.0",
-		"@directus/extensions-sdk": "9.0.0",
-		"@directus/format-title": "9.0.0",
-		"@directus/schema": "9.0.0",
-		"@directus/shared": "9.0.0",
-		"@directus/specs": "9.0.0",
+		"@aws-sdk/client-ses": "^3.40.0",
+		"@directus/app": "9.1.2",
+		"@directus/drive": "9.1.2",
+		"@directus/drive-azure": "9.1.2",
+		"@directus/drive-gcs": "9.1.2",
+		"@directus/drive-s3": "9.1.2",
+		"@directus/extensions-sdk": "9.1.2",
+		"@directus/format-title": "9.1.2",
+		"@directus/schema": "9.1.2",
+		"@directus/shared": "9.1.2",
+		"@directus/specs": "9.1.2",
 		"@godaddy/terminus": "^4.9.0",
 		"@rollup/plugin-alias": "^3.1.2",
 		"@rollup/plugin-virtual": "^2.0.3",
@@ -126,6 +127,7 @@
 		"liquidjs": "^9.25.0",
 		"lodash": "^4.17.21",
 		"macos-release": "^2.4.1",
+		"marked": "^4.0.3",
 		"mime-types": "^2.1.31",
 		"ms": "^2.1.3",
 		"nanoid": "^3.1.23",
@@ -144,6 +146,7 @@
 		"rate-limiter-flexible": "^2.2.2",
 		"resolve-cwd": "^3.0.0",
 		"rollup": "^2.52.1",
+		"sanitize-html": "^2.6.0",
 		"sharp": "^0.29.0",
 		"stream-json": "^1.7.1",
 		"supertest": "^6.1.6",
@@ -166,40 +169,41 @@
 		"sqlite3": "^5.0.2",
 		"tedious": "^13.0.0"
 	},
-	"gitHead": "c95add08ef1386cab6e54546f03d541d889148ed",
+	"gitHead": "9bf033c18dd5bdf6fe4058d915083fd5ca393b05",
 	"devDependencies": {
-		"@types/async": "3.2.9",
+		"@types/async": "3.2.10",
 		"@types/atob": "2.1.2",
-		"@types/body-parser": "1.19.1",
+		"@types/body-parser": "1.19.2",
 		"@types/busboy": "0.3.1",
 		"@types/cookie-parser": "1.4.2",
 		"@types/cors": "2.8.12",
 		"@types/deep-diff": "1.0.1",
 		"@types/destroy": "1.0.0",
 		"@types/express": "4.17.13",
-		"@types/express-pino-logger": "4.0.2",
+		"@types/express-pino-logger": "4.0.3",
 		"@types/express-session": "1.17.4",
 		"@types/flat": "5.0.2",
 		"@types/fs-extra": "9.0.13",
 		"@types/inquirer": "8.1.3",
-		"@types/jest": "27.0.2",
-		"@types/js-yaml": "4.0.4",
+		"@types/jest": "27.0.3",
+		"@types/js-yaml": "4.0.5",
 		"@types/json2csv": "5.0.3",
-		"@types/jsonwebtoken": "8.5.5",
+		"@types/jsonwebtoken": "8.5.6",
 		"@types/keyv": "3.1.3",
 		"@types/ldapjs": "2.2.2",
-		"@types/lodash": "4.14.176",
+		"@types/lodash": "4.14.177",
 		"@types/mime-types": "2.1.1",
 		"@types/ms": "0.7.31",
-		"@types/node": "16.11.6",
+		"@types/node": "16.11.9",
 		"@types/node-cron": "2.0.5",
 		"@types/nodemailer": "6.4.4",
 		"@types/object-hash": "2.2.1",
 		"@types/qs": "6.9.7",
-		"@types/sharp": "0.29.3",
+		"@types/sanitize-html": "^2.5.0",
+		"@types/sharp": "0.29.4",
 		"@types/stream-json": "1.7.1",
 		"@types/supertest": "2.0.11",
-		"@types/uuid": "8.3.1",
+		"@types/uuid": "8.3.3",
 		"@types/uuid-validate": "0.0.1",
 		"@types/wellknown": "0.5.1",
 		"copyfiles": "2.4.1",
@@ -207,6 +211,6 @@
 		"jest": "27.3.1",
 		"ts-jest": "27.0.7",
 		"ts-node-dev": "1.1.8",
-		"typescript": "4.4.4"
+		"typescript": "4.5.2"
 	}
 }