{{ entry.severity }}: {{ entry.timestamp }} (Caller: {{ entry.caller }})
diff --git a/app/apps/server/bridges/commands.js b/app/apps/server/bridges/commands.js
index 9eefe1906117..aab50a25bc29 100644
--- a/app/apps/server/bridges/commands.js
+++ b/app/apps/server/bridges/commands.js
@@ -170,7 +170,7 @@ export class AppCommandsBridge {
Object.freeze(user),
Object.freeze(room),
Object.freeze(params),
- threadId
+ threadId,
);
return Promise.await(this.orch.getManager().getCommandManager().getPreviews(command, context));
}
@@ -185,7 +185,7 @@ export class AppCommandsBridge {
Object.freeze(user),
Object.freeze(room),
Object.freeze(params),
- threadId
+ threadId,
);
Promise.await(this.orch.getManager().getCommandManager().executePreview(command, preview, context));
}
diff --git a/app/apps/server/bridges/listeners.js b/app/apps/server/bridges/listeners.js
index 26f0b7163089..01c039d62e64 100644
--- a/app/apps/server/bridges/listeners.js
+++ b/app/apps/server/bridges/listeners.js
@@ -36,4 +36,14 @@ export class AppListenerBridge {
// this.orch.debugLog(e.stack);
// }
}
+
+ async livechatEvent(inte, room) {
+ const rm = this.orch.getConverters().get('rooms').convertRoom(room);
+ const result = await this.orch.getManager().getListenerManager().executeListener(inte, rm);
+
+ if (typeof result === 'boolean') {
+ return result;
+ }
+ return this.orch.getConverters().get('rooms').convertAppRoom(result);
+ }
}
diff --git a/app/apps/server/bridges/livechat.js b/app/apps/server/bridges/livechat.js
index edd3aabf00be..5437246a0333 100644
--- a/app/apps/server/bridges/livechat.js
+++ b/app/apps/server/bridges/livechat.js
@@ -2,8 +2,9 @@ import { Random } from 'meteor/random';
import { getRoom } from '../../../livechat/server/api/lib/livechat';
import { Livechat } from '../../../livechat/server/lib/Livechat';
-import Rooms from '../../../models/server/models/Rooms';
+import LivechatRooms from '../../../models/server/models/LivechatRooms';
import LivechatVisitors from '../../../models/server/models/LivechatVisitors';
+import LivechatDepartment from '../../../models/server/models/LivechatDepartment';
import Users from '../../../models/server/models/Users';
export class AppLivechatBridge {
@@ -11,6 +12,10 @@ export class AppLivechatBridge {
this.orch = orch;
}
+ isOnline() {
+ return Livechat.online();
+ }
+
async createMessage(message, appId) {
this.orch.debugLog(`The App ${ appId } is creating a new message.`);
@@ -48,14 +53,19 @@ export class AppLivechatBridge {
async createRoom(visitor, agent, appId) {
this.orch.debugLog(`The App ${ appId } is creating a livechat room.`);
- const agentUser = Users.findOneById(agent.id);
- agentUser.agentId = agentUser._id;
+ let agentRoom;
+ if (agent && agent.id) {
+ const user = Users.getAgentInfo(agent.id);
+ agentRoom = Object.assign({}, { agentId: user._id });
+ }
- return this.orch.getConverters().get('rooms').convertRoom(getRoom({
+ const result = await getRoom({
guest: this.orch.getConverters().get('visitors').convertAppVisitor(visitor),
- agent: agentUser,
+ agent: agentRoom,
rid: Random.id(),
- }).room);
+ });
+
+ return this.orch.getConverters().get('rooms').convertRoom(result.room);
}
async closeRoom(room, comment, appId) {
@@ -78,9 +88,9 @@ export class AppLivechatBridge {
let result;
if (departmentId) {
- result = Rooms.findOpenByVisitorTokenAndDepartmentId(visitor.token, departmentId).fetch();
+ result = LivechatRooms.findOpenByVisitorTokenAndDepartmentId(visitor.token, departmentId).fetch();
} else {
- result = Rooms.findOpenByVisitorToken(visitor.token).fetch();
+ result = LivechatRooms.findOpenByVisitorToken(visitor.token).fetch();
}
return result.map((room) => this.orch.getConverters().get('rooms').convertRoom(room));
@@ -130,6 +140,40 @@ export class AppLivechatBridge {
async findVisitors(query, appId) {
this.orch.debugLog(`The App ${ appId } is looking for livechat visitors.`);
+ if (this.orch.isDebugging()) {
+ console.warn('The method AppLivechatBridge.findVisitors is deprecated. Please consider using its alternatives');
+ }
+
return LivechatVisitors.find(query).fetch().map((visitor) => this.orch.getConverters().get('visitors').convertVisitor(visitor));
}
+
+ async findVisitorById(id, appId) {
+ this.orch.debugLog(`The App ${ appId } is looking for livechat visitors.`);
+
+ return this.orch.getConverters().get('visitors').convertById(id);
+ }
+
+ async findVisitorByEmail(email, appId) {
+ this.orch.debugLog(`The App ${ appId } is looking for livechat visitors.`);
+
+ return this.orch.getConverters().get('visitors').convertVisitor(LivechatVisitors.findOneGuestByEmailAddress(email));
+ }
+
+ async findVisitorByToken(token, appId) {
+ this.orch.debugLog(`The App ${ appId } is looking for livechat visitors.`);
+
+ return this.orch.getConverters().get('visitors').convertVisitor(LivechatVisitors.getVisitorByToken(token));
+ }
+
+ async findVisitorByPhoneNumber(phoneNumber, appId) {
+ this.orch.debugLog(`The App ${ appId } is looking for livechat visitors.`);
+
+ return this.orch.getConverters().get('visitors').convertVisitor(LivechatVisitors.findOneVisitorByPhone(phoneNumber));
+ }
+
+ async findDepartmentByIdOrName(value, appId) {
+ this.orch.debugLog(`The App ${ appId } is looking for livechat departments.`);
+
+ return this.orch.getConverters().get('departments').convertDepartment(LivechatDepartment.findOneByIdOrName(value));
+ }
}
diff --git a/app/apps/server/bridges/messages.js b/app/apps/server/bridges/messages.js
index 062efcd64b8a..1071117d180e 100644
--- a/app/apps/server/bridges/messages.js
+++ b/app/apps/server/bridges/messages.js
@@ -1,9 +1,9 @@
-import { Meteor } from 'meteor/meteor';
import { Random } from 'meteor/random';
import { Messages, Users, Subscriptions } from '../../../models';
import { Notifications } from '../../../notifications';
import { updateMessage } from '../../../lib/server/functions/updateMessage';
+import { executeSendMessage } from '../../../lib/server/methods/sendMessage';
export class AppMessageBridge {
constructor(orch) {
@@ -13,13 +13,11 @@ export class AppMessageBridge {
async create(message, appId) {
this.orch.debugLog(`The App ${ appId } is creating a new message.`);
- let msg = this.orch.getConverters().get('messages').convertAppMessage(message);
+ const convertedMessage = this.orch.getConverters().get('messages').convertAppMessage(message);
- Meteor.runAsUser(msg.u._id, () => {
- msg = Meteor.call('sendMessage', msg);
- });
+ const sentMessage = executeSendMessage(convertedMessage.u._id, convertedMessage);
- return msg._id;
+ return sentMessage._id;
}
async getById(messageId, appId) {
@@ -77,7 +75,7 @@ export class AppMessageBridge {
Users.findByIds(users, { fields: { _id: 1 } })
.fetch()
.forEach(({ _id }) =>
- Notifications.notifyUser(_id, 'message', rmsg)
+ Notifications.notifyUser(_id, 'message', rmsg),
);
}
}
diff --git a/app/apps/server/converters/messages.js b/app/apps/server/converters/messages.js
index aaac047a2ef2..9d7afc428941 100644
--- a/app/apps/server/converters/messages.js
+++ b/app/apps/server/converters/messages.js
@@ -135,6 +135,7 @@ export class AppMessagesConverter {
attachments,
reactions: message.reactions,
parseUrls: message.parseUrls,
+ token: message.token,
};
return Object.assign(newMessage, message._unmappedProperties_);
diff --git a/app/apps/server/converters/visitors.js b/app/apps/server/converters/visitors.js
index 66ab62158249..55151577b3fb 100644
--- a/app/apps/server/converters/visitors.js
+++ b/app/apps/server/converters/visitors.js
@@ -48,7 +48,8 @@ export class AppVisitorsConverter {
name: visitor.name,
token: visitor.token,
phone: visitor.phone,
- visitorEmails: visitor.visitorEmails,
+ ...visitor.visitorEmails && { visitorEmails: visitor.visitorEmails },
+ ...visitor.department && { department: visitor.department },
};
return Object.assign(newVisitor, visitor._unmappedProperties_);
diff --git a/app/apps/server/cron.js b/app/apps/server/cron.js
index 0e51170734d9..3201612ea6b6 100644
--- a/app/apps/server/cron.js
+++ b/app/apps/server/cron.js
@@ -93,7 +93,7 @@ export const appsUpdateMarketplaceInfo = Meteor.bindEnvironment(function _appsUp
Promise.await(
Apps.updateAppsMarketplaceInfo(data)
.then(notifyAdminsAboutInvalidApps)
- .then(notifyAdminsAboutRenewedApps)
+ .then(notifyAdminsAboutRenewedApps),
);
});
@@ -104,5 +104,3 @@ SyncedCron.add({
appsUpdateMarketplaceInfo();
},
});
-
-SyncedCron.start();
diff --git a/app/apps/server/storage/logs-storage.js b/app/apps/server/storage/logs-storage.js
index 78ef627ba599..005a69e70c8f 100644
--- a/app/apps/server/storage/logs-storage.js
+++ b/app/apps/server/storage/logs-storage.js
@@ -1,5 +1,6 @@
import { AppConsole } from '@rocket.chat/apps-engine/server/logging';
import { AppLogStorage } from '@rocket.chat/apps-engine/server/storage';
+import { InstanceStatus } from 'meteor/konecty:multiple-instances-status';
export class AppRealLogsStorage extends AppLogStorage {
constructor(model) {
@@ -25,6 +26,8 @@ export class AppRealLogsStorage extends AppLogStorage {
return new Promise((resolve, reject) => {
const item = AppConsole.toStorageEntry(appId, logger);
+ item.instanceId = InstanceStatus.id();
+
try {
const id = this.db.insert(item);
diff --git a/app/assistify/ai/client/chatpalAdoption.js b/app/assistify/ai/client/chatpalAdoption.js
deleted file mode 100644
index 8d3126eeef74..000000000000
--- a/app/assistify/ai/client/chatpalAdoption.js
+++ /dev/null
@@ -1,11 +0,0 @@
-// import { TAPi18n } from 'meteor/tap:i18n';
-// TAPi18n.loadTranslations({
-// en: {
-// CHATPAL_ENTER_SEARCH_STRING: 'Search knowledge base',
-// },
-// de: {
-// CHATPAL_ENTER_SEARCH_STRING: 'Wissensbasis durchsuchen',
-// },
-// });
-
-// TODO: How to overwrite translations
diff --git a/app/assistify/ai/client/index.js b/app/assistify/ai/client/index.js
index 710ea45caeb5..841a5a0ae86a 100644
--- a/app/assistify/ai/client/index.js
+++ b/app/assistify/ai/client/index.js
@@ -4,7 +4,6 @@ import './tabbar.js';
import './models/MessagesExtension.js';
import '../public/stylesheets/smarti.css';
import './hooks/openAiTab.js';
-import './chatpalAdoption.js';
import './views/app/tabbar/smarti.html';
import './views/app/tabbar/smarti.js';
import './smartiLoader.js';
diff --git a/app/assistify/ai/client/tabbar.js b/app/assistify/ai/client/tabbar.js
index 621ab0aadfd0..8ef404ea25e7 100755
--- a/app/assistify/ai/client/tabbar.js
+++ b/app/assistify/ai/client/tabbar.js
@@ -1,12 +1,28 @@
+
+import { Tracker } from 'meteor/tracker';
+
import { TabBar } from '../../../ui-utils/client';
+import { settings } from '../../../settings/client';
+// always remove the TabBar button displaying information from api.ai - we never need that
TabBar.removeButton('external-search');
-TabBar.addButton({
- groups: ['channel', 'group', 'live'],
- id: 'assistify-ai',
- i18nTitle: 'Knowledge_Base',
- icon: 'lightbulb',
- template: 'AssistifySmarti',
- order: 0,
+Tracker.autorun(() => {
+ const enabled = settings.get('Assistify_AI_Enabled');
+ if (enabled) {
+ TabBar.addButton({
+ groups: ['channel', 'group', 'live'],
+ id: 'assistify-ai',
+ i18nTitle: 'Knowledge_Base',
+ icon: 'lightbulb',
+ template: 'AssistifySmarti',
+ order: 0,
+ });
+ } else {
+ try {
+ TabBar.removeButton('assistify-ai');
+ } catch (err) {
+ // may not exist, not an issue
+ }
+ }
});
diff --git a/app/assistify/ai/package.js b/app/assistify/ai/package.js
deleted file mode 100755
index 80cd05201343..000000000000
--- a/app/assistify/ai/package.js
+++ /dev/null
@@ -1,73 +0,0 @@
-// /* globals Npm */
-// Package.describe({
-// name: 'assistify:ai',
-// version: '0.2.0',
-// summary: 'Integration of artificial knowledge',
-// git: 'http://github.com/assistify/Rocket.Chat',
-// documentation: 'README.md',
-// });
-
-// function addDirectory(api, pathInPackage, environment) {
-// const _ = Npm.require('underscore');
-// const fs = Npm.require('fs');
-
-// const PACKAGE_PATH = 'packages/assistify-ai/';
-// const files = _.compact(_.map(fs.readdirSync(PACKAGE_PATH + pathInPackage), function(filename) {
-// return `${ pathInPackage }/${ filename }`;
-// }));
-// api.addFiles(files, environment);
-// }
-
-// Package.onUse(function(api) {
-// api.use(['ecmascript', 'underscore']);
-// api.use('templating', 'client');
-// api.use('meteorhacks:inject-initial'); // for provisioning of svg-icons
-
-// // Extensions to the RocketChat models
-// api.addFiles('client/models/MessagesExtension.js', 'client');
-// api.addFiles('client/models/MessagesExtension.js', 'server');
-
-// // Libraries
-// api.addFiles('server/inject.js', 'server');
-
-// // common components for client and server
-// api.addFiles('models/AssistifySmarti.js', ['client', 'server']);
-
-// // Server business logic
-// addDirectory(api, 'server/lib', 'server');
-// addDirectory(api, 'server/hooks', 'server');
-// addDirectory(api, 'server/methods', 'server');
-
-// // Smarti proxy and router
-// api.addFiles('server/SmartiProxy.js', 'server');
-// api.addFiles('server/SmartiRouter.js', 'server');
-
-// // Configuration
-// api.addFiles('config.js', 'server');
-
-// // migration scripts
-// api.addFiles('server/migrations.js', 'server');
-
-// // Client business logic
-// api.addFiles('client/tabbar.js', 'client');
-// api.addFiles('client/hooks/openAiTab.js', 'client');
-// api.addFiles('client/messageRenderer.js', 'client');
-
-// // client views
-// addDirectory(api, 'client/views/app/tabbar', 'client');
-// api.addFiles('client/smartiLoader.js', 'client');
-
-// // styling
-// api.addFiles('client/public/stylesheets/smarti.css', 'client');
-
-// // Assets
-// api.addAssets('client/public/assistify.png', 'client');
-
-// // UI artifacts which are pre-processed or packaged by the server
-// api.addAssets('client/public/icons.svg', 'server');
-
-// // i18n in Rocket.Chat-package (packages/rocketchat-i18n/i18n
-
-// api.mainModule('assistify-ai.js', 'server');
-
-// });
diff --git a/app/assistify/ai/server/index.js b/app/assistify/ai/server/index.js
index dc57d58e660c..bbe95259af67 100644
--- a/app/assistify/ai/server/index.js
+++ b/app/assistify/ai/server/index.js
@@ -12,5 +12,4 @@ import './hooks/closeLivechatKnowledgeAdapter.js';
import './lib/SmartiAdapter.js';
import './lib/AiApiAdapter.js';
import './lib/KnowledgeAdapterProvider.js';
-import './migrations.js';
import '../../migrations/server/startup/migrations.js';
diff --git a/app/assistify/ai/server/lib/SmartiAdapter.js b/app/assistify/ai/server/lib/SmartiAdapter.js
index 2e1cc7897ee9..f14db05cbd4a 100644
--- a/app/assistify/ai/server/lib/SmartiAdapter.js
+++ b/app/assistify/ai/server/lib/SmartiAdapter.js
@@ -614,7 +614,7 @@ export class SmartiAdapter {
conversationId,
}, {
upsert: true,
- }
+ },
);
}
diff --git a/app/assistify/ai/server/methods/SmartiWidgetBackend.js b/app/assistify/ai/server/methods/SmartiWidgetBackend.js
index 6f1cda903f47..6d150116ebd3 100644
--- a/app/assistify/ai/server/methods/SmartiWidgetBackend.js
+++ b/app/assistify/ai/server/methods/SmartiWidgetBackend.js
@@ -29,7 +29,7 @@ Meteor.methods({
userId(userId) {
return !hasPermission(userId, 'send-many-messages');
},
- }
+ },
)(channelId);
},
@@ -46,7 +46,7 @@ Meteor.methods({
userId(userId) {
return !hasPermission(userId, 'send-many-messages');
},
- }
+ },
)(verbs.get, `conversation/${ conversationId }/analysis`, null, null, (error) => {
// 404 is expected if no mapping exists
if (error.response && error.response.statusCode === 404) {
@@ -66,7 +66,7 @@ Meteor.methods({
userId(userId) {
return !hasPermission(userId, 'send-many-messages');
},
- }
+ },
)(roomId);
},
@@ -87,7 +87,7 @@ Meteor.methods({
userId(userId) {
return !hasPermission(userId, 'send-many-messages');
},
- }
+ },
)(verbs.get, `conversation/${ conversationId }/analysis/template/${ templateIndex }/result/${ creator }`, { start, rows });
},
@@ -113,7 +113,7 @@ Meteor.methods({
userId(userId) {
return !hasPermission(userId, 'send-many-messages');
},
- }
+ },
)(verbs.get, 'conversation/search', params);
SystemLogger.debug('SearchResult: ', JSON.stringify(searchResult, null, 2));
return searchResult;
@@ -139,7 +139,7 @@ function loadSmarti() {
userId(userId) {
return !hasPermission(userId, 'send-many-messages');
},
- }
+ },
)(verbs.get, 'plugin/v1/rocket.chat.js');
if (!script.error && script) {
// add pseudo comment in order to make the script appear in the frontend as a file. This makes it de-buggable
diff --git a/app/assistify/ai/server/migrations.js b/app/assistify/ai/server/migrations.js
deleted file mode 100644
index 81ce7c129c9d..000000000000
--- a/app/assistify/ai/server/migrations.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
-Up to now, there's no "DB version" stored for assistify.
-Until we've got expensive of contradicting migrations, we'll just use this file to write functions running
-on startup which migrate data - ignoring the actual version
- */
diff --git a/app/authorization/client/lib/streamer.js b/app/authorization/client/lib/streamer.js
new file mode 100644
index 000000000000..1aab5af6eb45
--- /dev/null
+++ b/app/authorization/client/lib/streamer.js
@@ -0,0 +1,3 @@
+import { Meteor } from 'meteor/meteor';
+
+export const rolesStreamer = new Meteor.Streamer('roles');
diff --git a/app/authorization/client/startup.js b/app/authorization/client/startup.js
index 3656b7d00432..99c1f06e760d 100644
--- a/app/authorization/client/startup.js
+++ b/app/authorization/client/startup.js
@@ -3,9 +3,15 @@ import { Meteor } from 'meteor/meteor';
import { hasAtLeastOnePermission } from './hasPermission';
import { CachedCollectionManager } from '../../ui-cached-collection';
import { AdminBox } from '../../ui-utils/client/lib/AdminBox';
+import { APIClient } from '../../utils/client';
+import { Roles } from '../../models/client';
+import { rolesStreamer } from './lib/streamer';
Meteor.startup(() => {
- CachedCollectionManager.onLogin(() => Meteor.subscribe('roles'));
+ CachedCollectionManager.onLogin(async () => {
+ const { roles } = await APIClient.v1.get('roles.list');
+ roles.forEach((role) => Roles.insert(role));
+ });
AdminBox.addOption({
href: 'admin-permissions',
@@ -15,4 +21,12 @@ Meteor.startup(() => {
return hasAtLeastOnePermission(['access-permissions', 'access-setting-permissions']);
},
});
+ const events = {
+ changed: (role) => {
+ delete role.type;
+ Roles.upsert({ _id: role.name }, role);
+ },
+ removed: (role) => Roles.remove({ _id: role.name }),
+ };
+ rolesStreamer.on('roles', (role) => events[role.type](role));
});
diff --git a/app/authorization/client/stylesheets/permissions.css b/app/authorization/client/stylesheets/permissions.css
index 4b7532ccb87a..1561d2ebf536 100644
--- a/app/authorization/client/stylesheets/permissions.css
+++ b/app/authorization/client/stylesheets/permissions.css
@@ -120,7 +120,3 @@
}
}
}
-
-.page-container.permissions-manager {
- overflow-y: auto !important;
-}
diff --git a/app/authorization/client/views/permissions.js b/app/authorization/client/views/permissions.js
index d03ac7d52cbb..1ad319988a8e 100644
--- a/app/authorization/client/views/permissions.js
+++ b/app/authorization/client/views/permissions.js
@@ -8,13 +8,12 @@ import { Template } from 'meteor/templating';
import { Roles } from '../../../models';
import { ChatPermissions } from '../lib/ChatPermissions';
import { hasAllPermission } from '../hasPermission';
-
-import { hasAtLeastOnePermission } from '..';
-
import { t } from '../../../utils/client';
import { SideNav } from '../../../ui-utils/client/lib/SideNav';
import { CONSTANTS } from '../../lib';
+import { hasAtLeastOnePermission } from '..';
+
Template.permissions.helpers({
tabsData() {
const {
@@ -85,7 +84,7 @@ Template.permissions.helpers({
_id: 1,
},
limit,
- }
+ },
);
},
@@ -105,7 +104,7 @@ Template.permissions.helpers({
group: 1,
section: 1,
},
- }
+ },
);
},
diff --git a/app/authorization/client/views/permissionsRole.js b/app/authorization/client/views/permissionsRole.js
index 1788e47a2dd2..4e16cd666f54 100644
--- a/app/authorization/client/views/permissionsRole.js
+++ b/app/authorization/client/views/permissionsRole.js
@@ -95,7 +95,7 @@ Template.permissionsRole.helpers({
rules: [
{
collection: 'CachedChannelList',
- subscription: 'channelAndPrivateAutocomplete',
+ endpoint: 'rooms.autocomplete.channelAndPrivate',
field: 'name',
template: Template.roomSearch,
noMatchTemplate: Template.roomSearchEmpty,
@@ -118,7 +118,7 @@ Template.permissionsRole.helpers({
rules: [
{
collection: 'CachedUserList',
- subscription: 'userAutocomplete',
+ endpoint: 'users.autocomplete',
field: 'username',
template: Template.userSearch,
noMatchTemplate: Template.userSearchEmpty,
@@ -256,8 +256,6 @@ Template.permissionsRole.onCreated(async function() {
this.searchRoom = new ReactiveVar();
this.searchUsername = new ReactiveVar();
this.usersInRole = new ReactiveVar([]);
-
- this.subscription = this.subscribe('roles', FlowRouter.getParam('name'));
});
Template.permissionsRole.onRendered(function() {
diff --git a/app/authorization/server/functions/canAccessRoom.js b/app/authorization/server/functions/canAccessRoom.js
index ab4e59b457a7..abfa3e70c631 100644
--- a/app/authorization/server/functions/canAccessRoom.js
+++ b/app/authorization/server/functions/canAccessRoom.js
@@ -18,8 +18,8 @@ export const roomAccessValidators = [
return;
}
- const subscription = await Subscriptions.findOneByRoomIdAndUserId(room._id, user._id);
- if (subscription) {
+ const exists = await Subscriptions.countByRoomIdAndUserId(room._id, user._id);
+ if (exists) {
return true;
}
},
diff --git a/app/authorization/server/functions/hasRole.js b/app/authorization/server/functions/hasRole.js
index 879aeaa01241..0159026d46fe 100644
--- a/app/authorization/server/functions/hasRole.js
+++ b/app/authorization/server/functions/hasRole.js
@@ -1,6 +1,8 @@
-import { Roles } from '../../../models';
+import { Roles } from '../../../models/server/raw';
-export const hasRole = (userId, roleNames, scope) => {
+export const hasRoleAsync = async (userId, roleNames, scope) => {
roleNames = [].concat(roleNames);
return Roles.isUserInRoles(userId, roleNames, scope);
};
+
+export const hasRole = (userId, roleNames, scope) => Promise.await(hasRoleAsync(userId, roleNames, scope));
diff --git a/app/authorization/server/lib/streamer.js b/app/authorization/server/lib/streamer.js
new file mode 100644
index 000000000000..f00103832be8
--- /dev/null
+++ b/app/authorization/server/lib/streamer.js
@@ -0,0 +1,5 @@
+import { Meteor } from 'meteor/meteor';
+
+export const rolesStreamer = new Meteor.Streamer('roles');
+rolesStreamer.allowWrite('none');
+rolesStreamer.allowRead('logged');
diff --git a/app/authorization/server/methods/deleteRole.js b/app/authorization/server/methods/deleteRole.js
index 8613e1761b0a..0b42263c23f8 100644
--- a/app/authorization/server/methods/deleteRole.js
+++ b/app/authorization/server/methods/deleteRole.js
@@ -2,6 +2,7 @@ import { Meteor } from 'meteor/meteor';
import * as Models from '../../../models/server';
import { hasPermission } from '../functions/hasPermission';
+import { rolesStreamer } from '../lib/streamer';
Meteor.methods({
'authorization:deleteRole'(roleName) {
@@ -34,7 +35,13 @@ Meteor.methods({
method: 'authorization:deleteRole',
});
}
-
- return Models.Roles.remove(role.name);
+ const removed = Models.Roles.remove(role.name);
+ if (removed) {
+ rolesStreamer.emit('roles', {
+ type: 'removed',
+ name: roleName,
+ });
+ }
+ return removed;
},
});
diff --git a/app/authorization/server/methods/saveRole.js b/app/authorization/server/methods/saveRole.js
index 5f0998e7d493..64cb3437c9df 100644
--- a/app/authorization/server/methods/saveRole.js
+++ b/app/authorization/server/methods/saveRole.js
@@ -4,6 +4,7 @@ import { Roles } from '../../../models/server';
import { settings } from '../../../settings/server';
import { Notifications } from '../../../notifications/server';
import { hasPermission } from '../functions/hasPermission';
+import { rolesStreamer } from '../lib/streamer';
Meteor.methods({
'authorization:saveRole'(roleData) {
@@ -31,7 +32,10 @@ Meteor.methods({
_id: roleData.name,
});
}
-
+ rolesStreamer.emit('roles', {
+ type: 'changed',
+ ...roleData,
+ });
return update;
},
});
diff --git a/app/authorization/server/publications/permissions/emitter.js b/app/authorization/server/publications/permissions/emitter.js
index ef958ed48502..a7062439eb46 100644
--- a/app/authorization/server/publications/permissions/emitter.js
+++ b/app/authorization/server/publications/permissions/emitter.js
@@ -25,7 +25,7 @@ Permissions.on('change', ({ clientAction, id, data, diff }) => {
Notifications.notifyLoggedInThisInstance(
'permissions-changed',
clientAction,
- data
+ data,
);
if (data.level && data.level === CONSTANTS.SETTINGS_LEVEL) {
@@ -36,7 +36,7 @@ Permissions.on('change', ({ clientAction, id, data, diff }) => {
Notifications.notifyLoggedInThisInstance(
'private-settings-changed',
'updated',
- setting
+ setting,
);
}
});
diff --git a/app/authorization/server/publications/permissions/index.js b/app/authorization/server/publications/permissions/index.js
index 8e74f7b69325..09e7ccffc6c7 100644
--- a/app/authorization/server/publications/permissions/index.js
+++ b/app/authorization/server/publications/permissions/index.js
@@ -16,7 +16,7 @@ Meteor.methods({
remove: Permissions.trashFindDeletedAfter(
updatedAt,
{},
- { fields: { _id: 1, _deletedAt: 1 } }
+ { fields: { _id: 1, _deletedAt: 1 } },
).fetch(),
};
}
diff --git a/app/authorization/server/publications/roles.js b/app/authorization/server/publications/roles.js
index 57e17673eae8..c4ca8d926eb5 100644
--- a/app/authorization/server/publications/roles.js
+++ b/app/authorization/server/publications/roles.js
@@ -4,6 +4,7 @@ import { Roles } from '../../../models';
import { clearCache } from '../functions/hasPermission';
Meteor.publish('roles', function() {
+ console.warn('The publication "roles" is deprecated and will be removed after version v3.0.0');
if (!this.userId) {
return this.ready();
}
diff --git a/app/authorization/server/startup.js b/app/authorization/server/startup.js
index ee430af1de25..3314bd586900 100644
--- a/app/authorization/server/startup.js
+++ b/app/authorization/server/startup.js
@@ -85,6 +85,7 @@ Meteor.startup(function() {
{ _id: 'view-outside-room', roles: ['admin', 'owner', 'moderator', 'user'] },
{ _id: 'view-broadcast-member-list', roles: ['admin', 'owner', 'moderator'] },
{ _id: 'call-management', roles: ['admin', 'owner', 'moderator'] },
+ { _id: 'create-invite-links', roles: ['admin', 'owner', 'moderator'] },
{ _id: 'view-l-room', roles: ['livechat-agent', 'livechat-manager', 'admin'] },
{ _id: 'view-livechat-manager', roles: ['livechat-manager', 'admin'] },
{ _id: 'view-livechat-rooms', roles: ['livechat-manager', 'admin'] },
@@ -148,6 +149,7 @@ Meteor.startup(function() {
});
return previousSettingPermissions;
};
+
const createSettingPermission = function(setting, previousSettingPermissions) {
const permissionId = getSettingPermissionId(setting._id);
const permission = {
diff --git a/app/autotranslate/server/models/Settings.js b/app/autotranslate/server/models/Settings.js
deleted file mode 100644
index 3d90ad772527..000000000000
--- a/app/autotranslate/server/models/Settings.js
+++ /dev/null
@@ -1,21 +0,0 @@
-import { Settings } from '../../../models/server/models/Settings';
-
-Object.assign(Settings, {
- renameSetting(oldId, newId) {
- const oldSetting = Settings.findById(oldId).fetch()[0];
- if (oldSetting) {
- Settings.removeById(oldSetting._id);
-
- // there has been some problem with upsert() when changing the complete doc, so decide explicitly for insert or update
- let newSetting = Settings.findById(newId).fetch()[0];
- if (newSetting) {
- Settings.updateValueById(newId, oldSetting.value);
- } else {
- newSetting = oldSetting;
- newSetting._id = newId;
- delete newSetting.$loki;
- Settings.insert(newSetting);
- }
- }
- },
-});
diff --git a/app/autotranslate/server/msTranslate.js b/app/autotranslate/server/msTranslate.js
index a299a4a927df..4e73f106b3ee 100644
--- a/app/autotranslate/server/msTranslate.js
+++ b/app/autotranslate/server/msTranslate.js
@@ -118,7 +118,7 @@ class MsAutoTranslate extends AutoTranslate {
translations = Object.assign({}, ...targetLanguages.map((language) =>
({
[language]: result.data.map((line) => line.translations.find((translation) => translation.to === language).text).join('\n'),
- })
+ }),
));
}
} catch (e) {
@@ -160,7 +160,7 @@ class MsAutoTranslate extends AutoTranslate {
translations = Object.assign({}, ...targetLanguages.map((language) =>
({
[language]: result.data.map((line) => line.translations.find((translation) => translation.to === language).text).join('\n'),
- })
+ }),
));
}
} catch (e) {
diff --git a/app/autotranslate/server/settings.js b/app/autotranslate/server/settings.js
index 86294cb8e52b..e12e580453df 100644
--- a/app/autotranslate/server/settings.js
+++ b/app/autotranslate/server/settings.js
@@ -9,6 +9,7 @@ Meteor.startup(function() {
section: 'AutoTranslate',
public: true,
});
+
settings.add('AutoTranslate_ServiceProvider', 'google-translate', {
type: 'select',
group: 'Message',
diff --git a/app/callbacks/lib/callbacks.js b/app/callbacks/lib/callbacks.js
index efc44c0ee59d..d602e0384203 100644
--- a/app/callbacks/lib/callbacks.js
+++ b/app/callbacks/lib/callbacks.js
@@ -50,7 +50,7 @@ const createCallbackTimed = (hook, callbacks) =>
callbacks
.map(wrapCallback)
.map(handleResult)
- .reduce(pipe, identity)
+ .reduce(pipe, identity),
);
const create = (hook, cbs) =>
@@ -79,7 +79,7 @@ callbacks.add = function(
hook,
callback,
priority = callbacks.priority.MEDIUM,
- id = Random.id()
+ id = Random.id(),
) {
callbacks[hook] = getHooks(hook);
if (callbacks[hook].find((cb) => cb.id === id)) {
diff --git a/app/cas/client/cas_client.js b/app/cas/client/cas_client.js
index 7046f4d024ed..6cfa3c61d6f6 100644
--- a/app/cas/client/cas_client.js
+++ b/app/cas/client/cas_client.js
@@ -45,7 +45,7 @@ Meteor.loginWithCas = function(options, callback) {
const popup = openCenteredPopup(
loginUrl,
popup_width || 800,
- popup_height || 600
+ popup_height || 600,
);
diff --git a/app/channel-settings-mail-messages/client/views/mailMessagesInstructions.js b/app/channel-settings-mail-messages/client/views/mailMessagesInstructions.js
index 71d0345a10f6..9b8660572c95 100644
--- a/app/channel-settings-mail-messages/client/views/mailMessagesInstructions.js
+++ b/app/channel-settings-mail-messages/client/views/mailMessagesInstructions.js
@@ -3,7 +3,6 @@ import { ReactiveVar } from 'meteor/reactive-var';
import { Blaze } from 'meteor/blaze';
import { Session } from 'meteor/session';
import { Template } from 'meteor/templating';
-import { AutoComplete } from 'meteor/mizzao:autocomplete';
import { Deps } from 'meteor/deps';
import toastr from 'toastr';
@@ -11,6 +10,7 @@ import { ChatRoom } from '../../../models';
import { t, isEmail, handleError, roomTypes } from '../../../utils';
import { settings } from '../../../settings';
import resetSelection from '../resetSelection';
+import { AutoComplete } from '../../../meteor-autocomplete/client';
const filterNames = (old) => {
const reg = new RegExp(`^${ settings.get('UTF8_Names_Validation') }$`);
@@ -39,7 +39,7 @@ Template.mailMessagesInstructions.helpers({
rules: [
{
collection: 'CachedChannelList',
- subscription: 'userAutocomplete',
+ endpoint: 'users.autocomplete',
field: 'username',
template: Template.userSearch,
noMatchTemplate: Template.userSearchEmpty,
@@ -253,7 +253,7 @@ Template.mailMessagesInstructions.onCreated(function() {
rules: [
{
collection: 'UserAndRoom',
- subscription: 'userAutocomplete',
+ endpoint: 'users.autocomplete',
field: 'username',
matchAll: true,
filter,
diff --git a/app/channel-settings/client/views/channelSettings.html b/app/channel-settings/client/views/channelSettings.html
index 9ff3a5886643..9d6f3b23f757 100644
--- a/app/channel-settings/client/views/channelSettings.html
+++ b/app/channel-settings/client/views/channelSettings.html
@@ -411,10 +411,10 @@
- {{#if canLeaveRoom}}
-
- {{/if}}
{{#if canDeleteRoom}}
{{/if}}
diff --git a/app/channel-settings/client/views/channelSettings.js b/app/channel-settings/client/views/channelSettings.js
index 41332e2aa06b..1d56f18ff3c0 100644
--- a/app/channel-settings/client/views/channelSettings.js
+++ b/app/channel-settings/client/views/channelSettings.js
@@ -412,7 +412,7 @@ Template.channelSettingsEditing.onCreated(function() {
canView() {
return roomTypes.roomTypes[room.t].allowRoomSettingChange(
room,
- RoomSettingsEnum.SYSTEM_MESSAGES
+ RoomSettingsEnum.SYSTEM_MESSAGES,
);
},
getValue() {
@@ -425,9 +425,9 @@ Template.channelSettingsEditing.onCreated(function() {
return call('saveRoomSettings', room._id, 'systemMessages', value).then(
() => {
toastr.success(
- t('System_messages_setting_changed_successfully')
+ t('System_messages_setting_changed_successfully'),
);
- }
+ },
);
},
},
@@ -572,9 +572,9 @@ Template.channelSettingsEditing.onCreated(function() {
return call('saveRoomSettings', room._id, 'retentionOverrideGlobal', value).then(
() => {
toastr.success(
- t('Retention_setting_changed_successfully')
+ t('Retention_setting_changed_successfully'),
);
- }
+ },
);
},
},
@@ -596,9 +596,9 @@ Template.channelSettingsEditing.onCreated(function() {
return call('saveRoomSettings', room._id, 'retentionMaxAge', value).then(
() => {
toastr.success(
- t('Retention_setting_changed_successfully')
+ t('Retention_setting_changed_successfully'),
);
- }
+ },
);
},
},
@@ -620,9 +620,9 @@ Template.channelSettingsEditing.onCreated(function() {
return call('saveRoomSettings', room._id, 'retentionExcludePinned', value).then(
() => {
toastr.success(
- t('Retention_setting_changed_successfully')
+ t('Retention_setting_changed_successfully'),
);
- }
+ },
);
},
},
@@ -644,9 +644,9 @@ Template.channelSettingsEditing.onCreated(function() {
return call('saveRoomSettings', room._id, 'retentionFilesOnly', value).then(
() => {
toastr.success(
- t('Retention_setting_changed_successfully')
+ t('Retention_setting_changed_successfully'),
);
- }
+ },
);
},
},
@@ -664,7 +664,7 @@ Template.channelSettingsEditing.onCreated(function() {
save(value) {
return call('saveRoomSettings', room._id, 'encrypted', value).then(() => {
toastr.success(
- t('Encrypted_setting_changed_successfully')
+ t('Encrypted_setting_changed_successfully'),
);
});
},
diff --git a/app/chatpal-search/server/provider/provider.js b/app/chatpal-search/server/provider/provider.js
index a46d935c7250..18ee9a36f42b 100644
--- a/app/chatpal-search/server/provider/provider.js
+++ b/app/chatpal-search/server/provider/provider.js
@@ -315,7 +315,7 @@ class ChatpalProvider extends SearchProvider {
payload.start || 0,
payload.rows || this._settings.get('PageSize'),
callback,
- params
+ params,
);
}
@@ -332,7 +332,7 @@ class ChatpalProvider extends SearchProvider {
this._settings.get('Main_Language'),
this._getAcl(context),
type,
- callback
+ callback,
);
}
}
diff --git a/app/cloud/server/functions/syncWorkspace.js b/app/cloud/server/functions/syncWorkspace.js
index 7435ed4daa77..e4c7bf855424 100644
--- a/app/cloud/server/functions/syncWorkspace.js
+++ b/app/cloud/server/functions/syncWorkspace.js
@@ -72,7 +72,7 @@ export function syncWorkspace(reconnectCheck = false) {
const { data } = result;
- if (data.publicKey) {
+ if (data && data.publicKey) {
Settings.updateValueById('Cloud_Workspace_PublicKey', data.publicKey);
}
diff --git a/app/crowd/server/crowd.js b/app/crowd/server/crowd.js
index 5dc92542603d..ed64c9657884 100644
--- a/app/crowd/server/crowd.js
+++ b/app/crowd/server/crowd.js
@@ -322,7 +322,6 @@ const addCronJob = _.debounce(Meteor.bindEnvironment(function addCronJobDebounce
crowd.sync();
},
});
- SyncedCron.start();
}
}), 500);
diff --git a/app/custom-sounds/client/admin/adminSounds.html b/app/custom-sounds/client/admin/adminSounds.html
index 6fe002af89ce..b4ca2015025a 100644
--- a/app/custom-sounds/client/admin/adminSounds.html
+++ b/app/custom-sounds/client/admin/adminSounds.html
@@ -7,10 +7,10 @@