From c10ece29349351f75bdb5e96eb07cb27500c4a35 Mon Sep 17 00:00:00 2001 From: Erik Schannen Date: Fri, 16 Feb 2018 01:00:33 -0500 Subject: [PATCH] - Correct Callbacks schema to ensure compatibility with more recent versions of simpl-schema - Add option to VulcanEmail.send to not swallow errors - Only use md5 module of crypto-js to reduce bundle size --- packages/vulcan-debug/lib/modules/callbacks/schema.js | 4 ++++ packages/vulcan-email/lib/server/email.js | 5 +++-- packages/vulcan-users/lib/avatar.js | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/packages/vulcan-debug/lib/modules/callbacks/schema.js b/packages/vulcan-debug/lib/modules/callbacks/schema.js index 52643074c..d2352f728 100644 --- a/packages/vulcan-debug/lib/modules/callbacks/schema.js +++ b/packages/vulcan-debug/lib/modules/callbacks/schema.js @@ -52,6 +52,10 @@ const schema = { }, }, }, + + 'hooks.$': { + type: Object, + } }; export default schema; diff --git a/packages/vulcan-email/lib/server/email.js b/packages/vulcan-email/lib/server/email.js index f5a49ab9d..a25762f56 100644 --- a/packages/vulcan-email/lib/server/email.js +++ b/packages/vulcan-email/lib/server/email.js @@ -24,7 +24,7 @@ VulcanEmail.addTemplates = templates => { }; VulcanEmail.getTemplate = templateName => Handlebars.compile( - VulcanEmail.templates[templateName], + VulcanEmail.templates[templateName], { noEscape: true, strict: true} ); @@ -59,7 +59,7 @@ VulcanEmail.generateTextVersion = html => { }); } -VulcanEmail.send = (to, subject, html, text) => { +VulcanEmail.send = (to, subject, html, text, throwErrors) => { // TODO: limit who can send emails // TODO: fix this error: Error: getaddrinfo ENOTFOUND @@ -95,6 +95,7 @@ VulcanEmail.send = (to, subject, html, text) => { } catch (error) { console.log("// error while sending email:"); // eslint-disable-line console.log(error); // eslint-disable-line + if (throwErrors) throw error; } } else { diff --git a/packages/vulcan-users/lib/avatar.js b/packages/vulcan-users/lib/avatar.js index c7e6464cd..0dceb90cf 100644 --- a/packages/vulcan-users/lib/avatar.js +++ b/packages/vulcan-users/lib/avatar.js @@ -1,5 +1,5 @@ import Users from './collection.js'; -import CryptoJS from 'crypto-js'; +import md5 from 'crypto-js/md5'; Users.avatar = { @@ -35,7 +35,7 @@ Users.avatar = { hash: function (string) { var self = this; // eslint-disable-next-line babel/new-cap - return CryptoJS.MD5(self.cleanString(string)).toString() + return md5(self.cleanString(string)).toString() }, /**