From 3f0600fed70512f87dc20fe039695d1681a73d39 Mon Sep 17 00:00:00 2001 From: "Sam X. Chen" Date: Sat, 17 Aug 2019 19:17:57 -0400 Subject: Add Feature: enable two-way webhooks - stage one --- models/integrations.js | 18 ++++++++++++++---- models/settings.js | 1 + 2 files changed, 15 insertions(+), 4 deletions(-) (limited to 'models') diff --git a/models/integrations.js b/models/integrations.js index 0b2e08c6..0313c959 100644 --- a/models/integrations.js +++ b/models/integrations.js @@ -88,16 +88,26 @@ Integrations.attachSchema( }, }), ); - +Integrations.Const = { + GLOBAL_WEBHOOK_ID: '_global', + WEBHOOK_TYPES: ['outgoing-webhooks', 'bidirectional-webhooks'], +}; +const permissionHelper = { + allow(userId, doc) { + const user = Users.findOne(userId); + const isAdmin = user && Meteor.user().isAdmin; + return isAdmin || allowIsBoardAdmin(userId, Boards.findOne(doc.boardId)); + }, +}; Integrations.allow({ insert(userId, doc) { - return allowIsBoardAdmin(userId, Boards.findOne(doc.boardId)); + return permissionHelper.allow(userId, doc); }, update(userId, doc) { - return allowIsBoardAdmin(userId, Boards.findOne(doc.boardId)); + return permissionHelper.allow(userId, doc); }, remove(userId, doc) { - return allowIsBoardAdmin(userId, Boards.findOne(doc.boardId)); + return permissionHelper.allow(userId, doc); }, fetch: ['boardId'], }); diff --git a/models/settings.js b/models/settings.js index 4a0359d5..80c2d8e0 100644 --- a/models/settings.js +++ b/models/settings.js @@ -147,6 +147,7 @@ if (Meteor.isServer) { }:${doc.mailServer.port}/`; } Accounts.emailTemplates.from = doc.mailServer.from; + console.log('Settings saved:', Accounts.emailTemplates); } }); -- cgit v1.2.3-1-g7c22