directus 9.0.0 → 9.1.2

package/dist/middleware/get-permissions.js

@@ -3,112 +3,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-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 async_handler_1 = __importDefault(require("../utils/async-handler"));
-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"));
+const get_permissions_1 = require("../utils/get-permissions");
 const getPermissions = (0, async_handler_1.default)(async (req, res, next) => {
-    const database = (0, database_1.default)();
-    const { systemCache } = (0, cache_1.getCache)();
-    let permissions = [];
     if (!req.accountability) {
-        throw new Error('"getPermissions" needs to be used after the "authenticate" middleware');
+        throw new Error('getPermissions middleware needs to be called after authenticate');
     }
-    if (!req.schema) {
-        throw new Error('"getPermissions" needs to be used after the "schema" middleware');
-    }
-    const { user, role, app, admin } = req.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) {
-            req.accountability.permissions = cachedPermissions;
-            return next();
-        }
-    }
-    if (req.accountability.admin !== true) {
-        const permissionsForRole = await database
-            .select('*')
-            .from('directus_permissions')
-            .where({ role: req.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 (req.accountability.app === true) {
-            permissions = (0, merge_permissions_1.mergePermissions)(permissions, app_access_permissions_1.appAccessMinimalPermissions.map((perm) => ({ ...perm, role: req.accountability.role })));
-        }
-        const usersService = new users_1.UsersService({ schema: req.schema });
-        const rolesService = new roles_1.RolesService({ schema: req.schema });
-        const filterContext = {};
-        if (req.accountability.user && requiredPermissionData.$CURRENT_USER.length > 0) {
-            filterContext.$CURRENT_USER = await usersService.readOne(req.accountability.user, {
-                fields: requiredPermissionData.$CURRENT_USER,
-            });
-        }
-        if (req.accountability.role && requiredPermissionData.$CURRENT_ROLE.length > 0) {
-            filterContext.$CURRENT_ROLE = await rolesService.readOne(req.accountability.role, {
-                fields: requiredPermissionData.$CURRENT_ROLE,
-            });
-        }
-        permissions = permissions.map((permission) => {
-            permission.permissions = (0, utils_1.parseFilter)(permission.permissions, req.accountability, filterContext);
-            permission.validation = (0, utils_1.parseFilter)(permission.validation, req.accountability, filterContext);
-            permission.presets = (0, utils_1.parseFilter)(permission.presets, req.accountability, filterContext);
-            return permission;
-        });
-        if (env_1.default.CACHE_PERMISSIONS !== false) {
-            await systemCache.set(cacheKey, permissions);
-        }
-    }
-    req.accountability.permissions = permissions;
+    req.accountability.permissions = await (0, get_permissions_1.getPermissions)(req.accountability, req.schema);
     return next();
 });
 exports.default = getPermissions;

package/dist/server.js

@@ -111,7 +111,7 @@ async function createServer() {
         logger_1.default.info('Database connections destroyed');
     }
     async function onShutdown() {
-        emitter_1.default.emitAction('server.stop', {}, {
+        emitter_1.default.emitAction('server.stop', { server }, {
             database: (0, database_1.default)(),
             schema: null,
             accountability: null,
@@ -137,7 +137,7 @@ async function startServer() {
             // No need to log/warn here. The update message is only an informative nice-to-have
         });
         logger_1.default.info(`Server started at http://localhost:${port}`);
-        emitter_1.default.emitAction('server.start', {}, {
+        emitter_1.default.emitAction('server.start', { server }, {
             database: (0, database_1.default)(),
             schema: null,
             accountability: null,

package/dist/services/activity.d.ts

@@ -1,8 +1,10 @@
-import { AbstractServiceOptions } from '../types';
-import { ItemsService } from './index';
-/**
- * @TODO only return activity of the collections you have access to
- */
+import { AbstractServiceOptions, PrimaryKey, Item } from '../types';
+import { ItemsService, MutationOptions } from './index';
+import { NotificationsService } from './notifications';
+import { UsersService } from './users';
 export declare class ActivityService extends ItemsService {
+    notificationsService: NotificationsService;
+    usersService: UsersService;
     constructor(options: AbstractServiceOptions);
+    createOne(data: Partial<Item>, opts?: MutationOptions): Promise<PrimaryKey>;
 }

package/dist/services/activity.js

@@ -1,13 +1,92 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ActivityService = void 0;
+const types_1 = require("../types");
 const index_1 = require("./index");
-/**
- * @TODO only return activity of the collections you have access to
- */
+const notifications_1 = require("./notifications");
+const users_1 = require("./users");
+const authorization_1 = require("./authorization");
+const get_permissions_1 = require("../utils/get-permissions");
+const forbidden_1 = require("../exceptions/forbidden");
+const logger_1 = __importDefault(require("../logger"));
+const user_name_1 = require("../utils/user-name");
+const lodash_1 = require("lodash");
+const env_1 = __importDefault(require("../env"));
 class ActivityService extends index_1.ItemsService {
     constructor(options) {
         super('directus_activity', options);
+        this.notificationsService = new notifications_1.NotificationsService({ schema: this.schema });
+        this.usersService = new users_1.UsersService({ schema: this.schema });
+    }
+    async createOne(data, opts) {
+        var _a, _b, _c, _d, _e, _f, _g, _h;
+        if (data.action === types_1.Action.COMMENT && typeof data.comment === 'string') {
+            const usersRegExp = new RegExp(/@[0-9A-F]{8}-[0-9A-F]{4}-4[0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}/gi);
+            const mentions = (0, lodash_1.uniq)((_a = data.comment.match(usersRegExp)) !== null && _a !== void 0 ? _a : []);
+            const sender = await this.usersService.readOne(this.accountability.user, {
+                fields: ['id', 'first_name', 'last_name', 'email'],
+            });
+            for (const mention of mentions) {
+                const userID = mention.substring(1);
+                const user = await this.usersService.readOne(userID, {
+                    fields: ['id', 'first_name', 'last_name', 'email', 'role.id', 'role.admin_access', 'role.app_access'],
+                });
+                const accountability = {
+                    user: userID,
+                    role: (_c = (_b = user.role) === null || _b === void 0 ? void 0 : _b.id) !== null && _c !== void 0 ? _c : null,
+                    admin: (_e = (_d = user.role) === null || _d === void 0 ? void 0 : _d.admin_access) !== null && _e !== void 0 ? _e : null,
+                    app: (_g = (_f = user.role) === null || _f === void 0 ? void 0 : _f.app_access) !== null && _g !== void 0 ? _g : null,
+                };
+                accountability.permissions = await (0, get_permissions_1.getPermissions)(accountability, this.schema);
+                const authorizationService = new authorization_1.AuthorizationService({ schema: this.schema, accountability });
+                const usersService = new users_1.UsersService({ schema: this.schema, accountability });
+                try {
+                    await authorizationService.checkAccess('read', data.collection, data.item);
+                    const templateData = await usersService.readByQuery({
+                        fields: ['id', 'first_name', 'last_name', 'email'],
+                        filter: { id: { _in: mentions.map((mention) => mention.substring(1)) } },
+                    });
+                    const userPreviews = templateData.reduce((acc, user) => {
+                        acc[user.id] = `<em>${(0, user_name_1.userName)(user)}</em>`;
+                        return acc;
+                    }, {});
+                    let comment = data.comment;
+                    for (const mention of mentions) {
+                        comment = comment.replace(mention, (_h = userPreviews[mention.substring(1)]) !== null && _h !== void 0 ? _h : '@Unknown User');
+                    }
+                    comment = `> ${comment}`;
+                    const message = `
+Hello ${(0, user_name_1.userName)(user)},
+
+${(0, user_name_1.userName)(sender)} has mentioned you in a comment:
+
+${comment}
+
+<a href="${env_1.default.PUBLIC_URL}/admin/content/${data.collection}/${data.item}">Click here to view.</a>
+`;
+                    await this.notificationsService.createOne({
+                        recipient: userID,
+                        sender: sender.id,
+                        subject: `You were mentioned in ${data.collection}`,
+                        message,
+                        collection: data.collection,
+                        item: data.item,
+                    });
+                }
+                catch (err) {
+                    if (err instanceof forbidden_1.ForbiddenException) {
+                        logger_1.default.warn(`User ${userID} doesn't have proper permissions to receive notification for this item.`);
+                    }
+                    else {
+                        throw err;
+                    }
+                }
+            }
+        }
+        return super.createOne(data, opts);
     }
 }
 exports.ActivityService = ActivityService;

package/dist/services/authentication.js

@@ -128,6 +128,7 @@ class AuthenticationService {
             status: 'pending',
             user: user === null || user === void 0 ? void 0 : user.id,
             provider: providerName,
+            type: 'login',
         }, {
             database: this.knex,
             schema: this.schema,
@@ -196,7 +197,20 @@ class AuthenticationService {
         }
         const provider = (0, auth_1.getAuthProvider)(user.provider);
         const newSessionData = await provider.refresh((0, lodash_1.clone)(user), sessionData);
-        const accessToken = jsonwebtoken_1.default.sign({ id: user.id }, env_1.default.SECRET, {
+        const tokenPayload = {
+            id: user.id,
+        };
+        const customClaims = await emitter_1.default.emitFilter('auth.jwt', tokenPayload, {
+            status: 'pending',
+            user: user === null || user === void 0 ? void 0 : user.id,
+            provider: user.provider,
+            type: 'refresh',
+        }, {
+            database: this.knex,
+            schema: this.schema,
+            accountability: this.accountability,
+        });
+        const accessToken = jsonwebtoken_1.default.sign(customClaims, env_1.default.SECRET, {
             expiresIn: env_1.default.ACCESS_TOKEN_TTL,
             issuer: 'directus',
         });

package/dist/services/collections.js

@@ -171,11 +171,22 @@ class CollectionsService {
         }));
         meta.push(...collections_1.systemCollectionRows);
         if (this.accountability && this.accountability.admin !== true) {
-            const collectionsYouHavePermissionToRead = this.accountability
+            const collectionsGroups = meta.reduce((meta, item) => ({
+                ...meta,
+                [item.collection]: item.group,
+            }), {});
+            let collectionsYouHavePermissionToRead = this.accountability
                 .permissions.filter((permission) => {
                 return permission.action === 'read';
             })
                 .map(({ collection }) => collection);
+            for (const collection of collectionsYouHavePermissionToRead) {
+                const group = collectionsGroups[collection];
+                if (group)
+                    collectionsYouHavePermissionToRead.push(group);
+                delete collectionsGroups[collection];
+            }
+            collectionsYouHavePermissionToRead = [...new Set([...collectionsYouHavePermissionToRead])];
             tablesInDatabase = tablesInDatabase.filter((table) => {
                 return collectionsYouHavePermissionToRead.includes(table.name);
             });

package/dist/services/graphql.js

@@ -28,6 +28,7 @@ const folders_1 = require("./folders");
 const items_1 = require("./items");
 const permissions_1 = require("./permissions");
 const presets_1 = require("./presets");
+const notifications_1 = require("./notifications");
 const relations_1 = require("./relations");
 const revisions_1 = require("./revisions");
 const roles_1 = require("./roles");
@@ -1252,6 +1253,8 @@ class GraphQLService {
                 return new permissions_1.PermissionsService(opts);
             case 'directus_presets':
                 return new presets_1.PresetsService(opts);
+            case 'directus_notifications':
+                return new notifications_1.NotificationsService(opts);
             case 'directus_revisions':
                 return new revisions_1.RevisionsService(opts);
             case 'directus_roles':

package/dist/services/index.d.ts

@@ -11,6 +11,7 @@ export * from './graphql';
 export * from './import';
 export * from './mail';
 export * from './meta';
+export * from './notifications';
 export * from './panels';
 export * from './payload';
 export * from './permissions';

package/dist/services/index.js

@@ -24,6 +24,7 @@ __exportStar(require("./graphql"), exports);
 __exportStar(require("./import"), exports);
 __exportStar(require("./mail"), exports);
 __exportStar(require("./meta"), exports);
+__exportStar(require("./notifications"), exports);
 __exportStar(require("./panels"), exports);
 __exportStar(require("./payload"), exports);
 __exportStar(require("./permissions"), exports);

package/dist/services/mail/index.js

@@ -33,10 +33,10 @@ class MailService {
     async send(options) {
         const { template, ...emailOptions } = options;
         let { html } = options;
-        const from = options.from || env_1.default.EMAIL_FROM;
+        const defaultTemplateData = await this.getDefaultTemplateData();
+        const from = `${defaultTemplateData.projectName} <${options.from || env_1.default.EMAIL_FROM}>`;
         if (template) {
             let templateData = template.data;
-            const defaultTemplateData = await this.getDefaultTemplateData();
             templateData = {
                 ...defaultTemplateData,
                 ...templateData,

package/dist/services/mail/templates/base.liquid

@@ -1,95 +1,163 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-
+<!doctype html>
+<html lang="en">
 <head>
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-	<meta name="viewport" content="width=device-width">
-	<meta name="format-detection" content="telephone=no">
-
-	<title>{{ projectName }} Email Service</title>
-
-	<style type="text/css">
-	   body {
-			margin: 0;
-			padding: 20px;
-			background-color: #eceff1;
-			-webkit-font-smoothing: antialiased;
-			-webkit-text-size-adjust: none;
-			-ms-text-size-adjust: none;
-			font-weight: 400;
-			font-size: 14px;
-			color: #546e7a;
-			font-family: 'Roboto', Helvetica, Helvetica, Arial, sans-serif;
-			letter-spacing: 0;
-		}
-
-		a {
-			display: inline-block;
-			height: 52px;
-			width: auto;
-			min-width: 154px;
-			padding: 0 20px;
-			font-size: 16px;
-			font-weight: bold;
-			line-height: 52px;
-			cursor: pointer;
-			border-radius: 4px;
-			text-decoration: none !important;
-			color: white !important;
-			background-color: {{ projectColor }};
-		}
-
-		a:hover {
-			filter: brightness(105%);
-		}
-
-		p {
-			margin: 20px 0 20px 0;
-		}
-	</style>
+
+<title>{{ projectName }} Email Service</title>
+
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+
+<style type="text/css" id="hs-inline-css">
+/*<![CDATA[*/
+
+/* CLIENT-SPECIFIC STYLES */
+body, table, td, a {
+	-webkit-text-size-adjust: 100%;
+	-ms-text-size-adjust: 100%;
+	-webkit-font-smoothing: antialiased;
+	}
+table, td { mso-table-lspace: 0pt; mso-table-rspace: 0pt; }
+img { -ms-interpolation-mode: bicubic; }
+
+/* RESET STYLES */
+img { border: 0; height: auto; line-height: 100%; outline: none; text-decoration: none; }
+table { border-collapse: collapse !important; }
+body { height: 100% !important; margin: 0 !important; padding: 0 !important; width: 100% !important; }
+
+/* iOS BLUE LINKS */
+a[x-apple-data-detectors] {
+   color: inherit !important;
+   text-decoration: none !important;
+   font-size: inherit !important;
+   font-family: inherit !important;
+   font-weight: inherit !important;
+   line-height: inherit !important;
+}
+body a {
+    color: #00C897;
+    text-decoration: none;
+}
+hr {
+    width:66%;
+    margin:40px auto;
+    border:1px solid #d3dae4;
+}
+
+/* MOBILE STYLES */
+@media screen and (max-width: 600px) {
+ .img-max {
+   width: 100% !important;
+   max-width: 100% !important;
+   height: auto !important;
+ }
+
+ .max-width {
+   max-width: 100% !important;
+ }
+
+ #content {
+   padding-left: 5% !important;
+   padding-right: 5% !important;
+   padding-top: 30px !important;
+   padding-bottom: 30px !important;
+ }
+}
+
+/* DARK MODE */
+@media (prefers-color-scheme: dark) {
+    #background {
+    	background-color: #172940 !important;
+    }
+    #content {
+    	background-color: #071930 !important;
+        color: #FFFFFF !important;
+    }
+    .link {
+    	color: #00c897 !important;
+    }
+    .button {
+    	background-color:#0BA582 !important;
+    }
+    hr {
+      border:1px solid #172940 !important;
+    }
+}
+
+/* ANDROID CENTER FIX */
+div[style*="margin: 16px 0;"] {
+	margin: 0 !important;
+}
+
+blockquote {
+	background: #f0f4f9 !important;
+	border-radius: 4px !important;
+	margin: 0 !important;
+	padding: 24px !important;
+}
+
+blockquote > p {
+	margin: 0 !important;
+}
+/*]]>*/
+</style>
+
+<meta name="generator" content="Directus">
+<meta property="og:url" content="http://directus-20534155.hs-sites.com/7dea362b-3fac-3e00-956a-4952a3d4f474">
+<meta name="x-apple-disable-message-reformatting">
+<meta name="robots" content="noindex,follow">
+
 </head>
+<body style="-webkit-text-size-adjust:100%; -ms-text-size-adjust:100%; height:100% !important; width:100% !important; margin:0 !important; padding:0; !important background-color:#f6f6f6" bgcolor="#f6f6f6">
 
-<body>
-	<table border="0" cellpadding="0" cellspacing="0" width="100%">
-		<tr>
-			<td style="padding: 0;">
-				<table align="center" border="0" cellpadding="0" cellspacing="0" width="600"
-					style="border: 0 solid #263238; border-collapse: collapse;">
-					<tr>
-						<td align="center" bgcolor="{{ projectColor }}"
-							style="padding: 30px 0 30px 0; border-radius: 4px 4px 0 0;">
-							<img src="{{ projectLogo }}" alt="{{ projectName }}" width="130"
-								style="display: block;" />
-						</td>
-					</tr>
+	<!-- HIDDEN PREHEADER TEXT -->
+	<div class="preview-text" style="display:none;font-size:1px;color:#172940;line-height:1px;max-height:0px;max-width:0px;opacity:0;overflow:hidden;">		&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌&nbsp;‌</div>
+
+	<table role="presentation" border="0" cellpadding="0" cellspacing="0" width="100%" style="-webkit-text-size-adjust:100%; -ms-text-size-adjust:100%; mso-table-lspace:0pt; mso-table-rspace:0pt; border-collapse:collapse !important">
+		<tbody>
+			<tr>
+				<td id="background" align="center" valign="top" width="100%" bgcolor="#172940" style="-webkit-text-size-adjust:100%; -ms-text-size-adjust:100%; mso-table-lspace:0pt; mso-table-rspace:0pt; background-size:cover; padding:50px 15px 0 15px; background-color:#172940">
+					<!--[if (gte mso 9)|(IE)]>
+					<table role="presentation" align="center" border="0" cellspacing="0" cellpadding="0" width="600">
 					<tr>
-						<td bgcolor="#ffffff" style="padding: 30px; border-radius: 0 0 4px 4px;">
-							<table border="0" cellpadding="0" cellspacing="0" width="100%">
-								<tr>
-									<td
-										style="color: #546e7a; font-family: Helvetica, Arial, sans-serif; padding: 0; line-height: 1.5; font-size: 16px;">
+					<td align="center" valign="top" width="600">
+					<![endif]-->
+					<table role="presentation" align="center" border="0" cellpadding="0" cellspacing="0" width="100%" style="-webkit-text-size-adjust:100%; -ms-text-size-adjust:100%; mso-table-lspace:0pt; mso-table-rspace:0pt; border-collapse:collapse !important; max-width:600px">
+						<tbody>
+							<tr>
+								<td align="left" valign="top" style="-webkit-text-size-adjust:100%; -ms-text-size-adjust:100%; mso-table-lspace:0pt; mso-table-rspace:0pt; padding:0 0 30px 0">
+									<table><tbody><tr><td align="center" valign="middle" style="background-color:{{ projectColor }};width:48px;height:48px;border-radius:4px;padding:6px;">
+										<img id="logo" src="{{ projectLogo }}" alt="{{ projectName }} Logo" width="40" height="auto" border="0" style="-ms-interpolation-mode:bicubic; border:0; height:auto; line-height:100%; outline:none; text-decoration:none; display:block; width:40px;object-fit:contain;">
+									</td></tr></tbody></table>
+								</td>
+							</tr>
+							<tr>
+								<td id="content" align="left" valign="top" style="-webkit-text-size-adjust:100%; -ms-text-size-adjust:100%; mso-table-lspace:0pt; mso-table-rspace:0pt; padding:40px 50px 50px 50px; font-family:Open Sans, Helvetica, Arial, sans-serif; border-radius:4px; box-shadow:0 4px 0 #15253A; background-color:#FFFFFE; color:#172940; font-size:15px; line-height:26px; margin:0" bgcolor="#FFFFFE">
+									<div id="hs_cos_wrapper_email_template_main_email_body" class="hs_cos_wrapper hs_cos_wrapper_widget hs_cos_wrapper_type_module" style="color: inherit; font-size: inherit; line-height: inherit;" data-hs-cos-general-type="widget" data-hs-cos-type="module">
+
 										{% block content %}{{ html }}{% endblock %}
-									</td>
-								</tr>
-							</table>
-						</td>
-					</tr>
-					<tr>
-						<td bgcolor="#eceff1" style="padding: 20px 30px 0 32px;">
-							<table border="0" cellpadding="0" cellspacing="0" width="100%">
-								<tr>
-									<td style="color:#b0bec5; font-family:Helvetica, Arial, sans-serif; font-size:12px;"
-										width="75%">
+
+									</div>
+								</td>
+							</tr>
+							<tr>
+								<td align="center" valign="middle" style="-webkit-text-size-adjust:100%; -ms-text-size-adjust:100%; mso-table-lspace:0pt; mso-table-rspace:0pt; padding:25px 0; font-family:Open Sans, Helvetica, Arial, sans-serif; color:#FFFFFE">
+									<p style="margin-bottom: 1em; color: #A2B5CD;font-size: 12px; line-height: 16px;">
+										Sent by the team at {{ projectName }} — <a style="-webkit-text-size-adjust:100%; -ms-text-size-adjust:100%; text-decoration:none; color:#A2B5CD" class="unsubscribe" data-unsubscribe="true" href="{{ url }}" data-hs-link-id="0" target="_blank">Manage Emails</a><br>
 										{% block footer %}{% endblock %}
-									</td>
-								</tr>
-							</table>
-						</td>
+									</p>
+								</td>
+							</tr>
+						</tbody>
+					</table>
+					<!--[if (gte mso 9)|(IE)]>
+					</td>
 					</tr>
-				</table>
-			</td>
-		</tr>
+					</table>
+					<![endif]-->
+        </td>
+    	</tr>
+		</tbody>
 	</table>
 </body>
-
 </html>

package/dist/services/mail/templates/password-reset.liquid

@@ -7,17 +7,18 @@
 
 <p style="text-align: center; padding: 20px 0;">
     <a href="{{ url }}">
-        Click to reset your password
+        <b>Reset Your Password</b>
     </a>
 </p>
 
 <p>
 	<b>Important: This link will expire in 24 hours.</b>
+    <br>
 </p>
 
 <p>
     Thank you,<br>
-    {{ projectName }}
+    The {{ projectName }} Team
 </p>
 
 {% endblock %}