-
-
- 
## Cloudron.io
@@ -201,11 +201,6 @@ Add Rocket.Chat to this world famous time tested small enterprise server today.
## Ubuntu VPS
Follow these [deployment instructions](https://rocket.chat/docs/installation/manual-installation/ubuntu/).
-## WeDeploy
-Install Rocket.Chat on [WeDeploy](https://wedeploy.com):
-
-[](https://console.wedeploy.com/deploy?repo=https://github.com/wedeploy-examples/rocketchat-example)
-
## D2C.io
Deploy Rocket.Chat stack to your server with [D2C](https://d2c.io/). Scale with a single click, check live logs and metrics:
@@ -319,11 +314,12 @@ Read about [how it all started](https://www.synopsys.com/blogs/software-security
## Issues
-[Github Issues](https://github.com/RocketChat/Rocket.Chat/issues) are used to track bugs and tasks on the roadmap.
+[GitHub Issues](https://github.com/RocketChat/Rocket.Chat/issues) are used to track bugs and tasks on the roadmap.
## Feature Requests
-[Feature Request Forums](https://forums.rocket.chat/c/feature-requests) are used to suggest, discuss and upvote feature suggestions.
+[RocketChat/feature-requests](https://github.com/RocketChat/feature-requests) is used to track Rocket.Chat feature requests and discussions. Click [here](https://github.com/RocketChat/feature-requests/issues/new?template=feature_request.md) to open a new feature request.
+[Feature Request Forums](https://forums.rocket.chat/c/feature-requests) stores the historical archives of old feature requests (up to 2018).
### Stack Overflow
diff --git a/app/2fa/server/code/EmailCheck.ts b/app/2fa/server/code/EmailCheck.ts
index 925520547e25d..c847a32658749 100644
--- a/app/2fa/server/code/EmailCheck.ts
+++ b/app/2fa/server/code/EmailCheck.ts
@@ -94,7 +94,7 @@ ${ t('If_you_didnt_try_to_login_in_your_account_please_ignore_this_email') }
return !!valid;
}
- public sendEmailCode(user: IUser): string[] {
+ public sendEmailCode(user: IUser): void {
const emails = this.getUserVerifiedEmails(user);
const random = Random._randomString(6, '0123456789');
const encryptedRandom = bcrypt.hashSync(random, Accounts._bcryptRounds());
@@ -108,8 +108,6 @@ ${ t('If_you_didnt_try_to_login_in_your_account_please_ignore_this_email') }
for (const address of emails) {
this.send2FAEmail(address, random, user);
}
-
- return emails;
}
public processInvalidCode(user: IUser): IProcessInvalidCodeResult {
diff --git a/app/2fa/server/functions/resetTOTP.ts b/app/2fa/server/functions/resetTOTP.ts
new file mode 100644
index 0000000000000..059077929347b
--- /dev/null
+++ b/app/2fa/server/functions/resetTOTP.ts
@@ -0,0 +1,68 @@
+import { Meteor } from 'meteor/meteor';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
+
+import { settings } from '../../../settings/server';
+import * as Mailer from '../../../mailer';
+import { Users } from '../../../models/server/raw/index';
+import { IUser } from '../../../../definition/IUser';
+
+const sendResetNotification = async function(uid: string): Promise${ t('Your_TOTP_has_been_reset') }
+${ t('TOTP_Reset_Other_Key_Warning') }
+ `; + + const from = settings.get('From_Email'); + const subject = t('TOTP_reset_email'); + + for (const address of addresses) { + Meteor.defer(() => { + try { + Mailer.send({ + to: address, + from, + subject, + text, + html, + } as any); + } catch (error) { + throw new Meteor.Error('error-email-send-failed', `Error trying to send email: ${ error.message }`, { + function: 'resetUserTOTP', + message: error.message, + }); + } + }); + } +}; + +export async function resetTOTP(userId: string, notifyUser = false): Promise- {{_ "Discussions"}} -
--
- {{#each room in rooms}} {{> chatRoomItem room }} {{/each}}
-
-
- {{> header sectionName=i18nPageTitle}}
-
- {{#if tabBarVisible}}
- {{#with flexData}}
- {{> flexTabBar}}
- {{/with}}
- {{/if}}
-
- {{/requiresPermission}}
-
diff --git a/app/livechat/client/views/app/livechatDepartmentForm.js b/app/livechat/client/views/app/livechatDepartmentForm.js
deleted file mode 100644
index cb4c8f5e0cb4c..0000000000000
--- a/app/livechat/client/views/app/livechatDepartmentForm.js
+++ /dev/null
@@ -1,367 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-import { ReactiveVar } from 'meteor/reactive-var';
-import { FlowRouter } from 'meteor/kadira:flow-router';
-import { Template } from 'meteor/templating';
-import _ from 'underscore';
-import toastr from 'toastr';
-
-import { TabBar, RocketChatTabBar } from '../../../../ui-utils';
-import { t, handleError } from '../../../../utils';
-import { hasPermission } from '../../../../authorization';
-import { getCustomFormTemplate } from './customTemplates/register';
-import './livechatDepartmentForm.html';
-import { APIClient, roomTypes } from '../../../../utils/client';
-
-const LIST_SIZE = 50;
-
-const saveDepartmentsAgents = async (_id, instance) => {
- const upsert = [...instance.agentsToUpsert.values()];
- const remove = [...instance.agentsToRemove.values()];
- if (!upsert.length && !remove.length) {
- return;
- }
- return APIClient.v1.post(`livechat/department/${ _id }/agents`, {
- upsert,
- remove,
- });
-};
-
-Template.livechatDepartmentForm.helpers({
- department() {
- return Template.instance().department.get();
- },
- agents() {
- return Template.instance().department && !_.isEmpty(Template.instance().department.get()) ? Template.instance().department.get().agents : [];
- },
- departmentAgents() {
- return _.sortBy(Template.instance().departmentAgents.get(), 'username');
- },
- showOnRegistration(value) {
- const department = Template.instance().department.get();
- return department.showOnRegistration === value || (department.showOnRegistration === undefined && value === true);
- },
- showOnOfflineForm(value) {
- const department = Template.instance().department.get();
- return department.showOnOfflineForm === value || (department.showOnOfflineForm === undefined && value === true);
- },
- requestTagBeforeClosingChat() {
- const department = Template.instance().department.get();
- return !!(department && department.requestTagBeforeClosingChat);
- },
- customFieldsTemplate() {
- return getCustomFormTemplate('livechatDepartmentForm');
- },
- data() {
- return { id: FlowRouter.getParam('_id') };
- },
- exceptionsAgents() {
- return _.pluck(Template.instance().departmentAgents.get(), 'username');
- },
- agentModifier() {
- return (filter, text = '') => {
- const f = filter.get();
- return `@${
- f.length === 0
- ? text
- : text.replace(
- new RegExp(filter.get()),
- (part) => `${ part }`,
- )
- }`;
- };
- },
- agentConditions() {
- return { roles: 'livechat-agent' };
- },
- onSelectAgents() {
- return Template.instance().onSelectAgents;
- },
- selectedAgents() {
- return Template.instance().selectedAgents.get();
- },
- onClickTagAgents() {
- return Template.instance().onClickTagAgents;
- },
- flexData() {
- return {
- tabBar: Template.instance().tabBar,
- data: Template.instance().tabBarData.get(),
- };
- },
- tabBarVisible() {
- return Object.values(TabBar.buttons.get())
- .some((button) => button.groups
- .some((group) => group.startsWith('livechat-department')));
- },
- chatClosingTags() {
- return Template.instance().chatClosingTags.get();
- },
- availableDepartmentTags() {
- return Template.instance().availableDepartmentTags.get();
- },
- hasAvailableTags() {
- return [...Template.instance().availableTags.get()].length > 0;
- },
- hasChatClosingTags() {
- return [...Template.instance().chatClosingTags.get()].length > 0;
- },
- onTableScroll() {
- const instance = Template.instance();
- return function(currentTarget) {
- if (currentTarget.offsetHeight + currentTarget.scrollTop < currentTarget.scrollHeight - 100) {
- return;
- }
- const agents = instance.departmentAgents.get();
- if (instance.total.get() > agents.length) {
- instance.offset.set(instance.offset.get() + LIST_SIZE);
- }
- };
- },
- onClickTagOfflineMessageChannel() {
- return Template.instance().onClickTagOfflineMessageChannel;
- },
- selectedOfflineMessageChannel() {
- return Template.instance().offlineMessageChannel.get();
- },
- onSelectOfflineMessageChannel() {
- return Template.instance().onSelectOfflineMessageChannel;
- },
- offlineMessageChannelModifier() {
- return (filter, text = '') => {
- const f = filter.get();
- return `#${ f.length === 0 ? text : text.replace(new RegExp(filter.get()), (part) => `${ part }`) }`;
- };
- },
- channelSelector() {
- return (expression) => ({ name: expression });
- },
-});
-
-Template.livechatDepartmentForm.events({
- 'submit #department-form'(e, instance) {
- e.preventDefault();
- const $btn = instance.$('button.save');
-
- let departmentData;
-
- const _id = $(e.currentTarget).data('id');
-
- if (hasPermission('manage-livechat-departments')) {
- const enabled = instance.$('input[name=enabled]:checked').val();
- const name = instance.$('input[name=name]').val();
- const description = instance.$('textarea[name=description]').val();
- const showOnRegistration = instance.$('input[name=showOnRegistration]:checked').val();
- const email = instance.$('input[name=email]').val();
- const showOnOfflineForm = instance.$('input[name=showOnOfflineForm]:checked').val();
- const requestTagBeforeClosingChat = instance.$('input[name=requestTagBeforeClosingChat]:checked').val();
- const chatClosingTags = instance.chatClosingTags.get();
- const [offlineMessageChannel] = instance.offlineMessageChannel.get();
- const offlineMessageChannelName = (offlineMessageChannel && roomTypes.getRoomName(offlineMessageChannel.t, offlineMessageChannel)) || '';
-
- if (enabled !== '1' && enabled !== '0') {
- return toastr.error(t('Please_select_enabled_yes_or_no'));
- }
-
- if (name.trim() === '') {
- return toastr.error(t('Please_fill_a_name'));
- }
-
- if (email.trim() === '' && showOnOfflineForm === '1') {
- return toastr.error(t('Please_fill_an_email'));
- }
-
- departmentData = {
- enabled: enabled === '1',
- name: name.trim(),
- description: description.trim(),
- showOnRegistration: showOnRegistration === '1',
- showOnOfflineForm: showOnOfflineForm === '1',
- requestTagBeforeClosingChat: requestTagBeforeClosingChat === '1',
- email: email.trim(),
- chatClosingTags,
- offlineMessageChannelName,
- };
- }
-
- const oldBtnValue = $btn.html();
- $btn.html(t('Saving'));
-
- instance.$('.customFormField').each((i, el) => {
- const elField = instance.$(el);
- const name = elField.attr('name');
- departmentData[name] = elField.val();
- });
-
- if (hasPermission('manage-livechat-departments')) {
- Meteor.call('livechat:saveDepartment', _id, departmentData, [], async function(err, result) {
- $btn.html(oldBtnValue);
- if (err) {
- return handleError(err);
- }
-
- await saveDepartmentsAgents(result._id, instance);
- toastr.success(t('Saved'));
- FlowRouter.go('livechat-departments');
- });
- } else if (hasPermission('add-livechat-department-agents')) {
- saveDepartmentsAgents(_id, instance);
- } else {
- throw new Error(t('error-not-authorized'));
- }
- },
-
- 'click .add-agent'(e, instance) {
- e.preventDefault();
-
- const users = instance.selectedAgents.get();
- users.forEach(async (user) => {
- const { _id, username } = user;
-
- const departmentAgents = instance.departmentAgents.get();
- if (departmentAgents.find(({ agentId }) => agentId === _id)) {
- return toastr.error(t('This_agent_was_already_selected'));
- }
- const newAgent = _.clone(user);
- newAgent.agentId = _id;
- delete newAgent._id;
- if (instance.agentsToRemove.has(newAgent.agentId)) {
- instance.agentsToRemove.delete(newAgent.agentId);
- }
- instance.agentsToUpsert.set(newAgent.agentId, { ...newAgent, count: 0, order: 0 });
- departmentAgents.push(newAgent);
- instance.departmentAgents.set(departmentAgents);
- instance.selectedAgents.set(instance.selectedAgents.get().filter((user) => user.username !== username));
- });
- },
-
- 'click button.back'(e/* , instance*/) {
- e.preventDefault();
- FlowRouter.go('livechat-departments');
- },
-
- 'click .remove-agent'(e, instance) {
- e.preventDefault();
- if (instance.agentsToUpsert.has(this.agentId)) {
- instance.agentsToUpsert.delete(this.agentId);
- }
- instance.agentsToRemove.set(this.agentId, this);
-
- instance.departmentAgents.set(instance.departmentAgents.get().filter((agent) => agent.agentId !== this.agentId));
- },
-
- 'keyup .count'(event, instance) {
- const agent = instance.agentsToUpsert.get(this.agentId) || this;
- instance.agentsToUpsert.set(this.agentId, { ...agent, count: parseInt(event.currentTarget.value) || 0 });
- },
-
- 'keyup .order'(event, instance) {
- const agent = instance.agentsToUpsert.get(this.agentId) || this;
- instance.agentsToUpsert.set(this.agentId, { ...agent, order: parseInt(event.currentTarget.value) || 0 });
- },
-
- 'click #addTag'(e, instance) {
- e.stopPropagation();
- e.preventDefault();
-
- const isSelect = [...instance.availableTags.get()].length > 0;
- const elId = isSelect ? '#tagSelect' : '#tagInput';
- const elDefault = isSelect ? 'placeholder' : '';
-
- const tag = $(elId).val();
- const chatClosingTags = [...instance.chatClosingTags.get()];
- if (tag === '' || chatClosingTags.indexOf(tag) > -1) {
- return;
- }
-
- chatClosingTags.push(tag);
- instance.chatClosingTags.set(chatClosingTags);
- $(elId).val(elDefault);
- },
-
- 'click .remove-tag'(e, instance) {
- e.stopPropagation();
- e.preventDefault();
-
- const chatClosingTags = [...instance.chatClosingTags.get()].filter((el) => el !== this.valueOf());
- instance.chatClosingTags.set(chatClosingTags);
- },
-});
-
-Template.livechatDepartmentForm.onCreated(async function() {
- this.agentsToUpsert = new Map();
- this.agentsToRemove = new Map();
- this.department = new ReactiveVar({ enabled: true });
- this.departmentAgents = new ReactiveVar([]);
- this.selectedAgents = new ReactiveVar([]);
- this.tabBar = new RocketChatTabBar();
- this.tabBar.showGroup(FlowRouter.current().route.name);
- this.tabBarData = new ReactiveVar();
- this.chatClosingTags = new ReactiveVar([]);
- this.availableTags = new ReactiveVar([]);
- this.availableDepartmentTags = new ReactiveVar([]);
- this.offset = new ReactiveVar(0);
- this.total = new ReactiveVar(0);
- this.offlineMessageChannel = new ReactiveVar([]);
-
-
- this.onClickTagOfflineMessageChannel = () => {
- this.offlineMessageChannel.set([]);
- };
-
- this.onSelectOfflineMessageChannel = async ({ item }) => {
- const { room } = await APIClient.v1.get(`rooms.info?roomId=${ item._id }`);
- room.text = room.name;
- this.offlineMessageChannel.set([room]);
- };
- this.onSelectAgents = ({ item: agent }) => {
- this.selectedAgents.set([agent]);
- };
-
- this.onClickTagAgents = ({ username }) => {
- this.selectedAgents.set(this.selectedAgents.get().filter((user) => user.username !== username));
- };
-
- this.loadAvailableTags = (departmentId) => {
- Meteor.call('livechat:getTagsList', (err, tagsList) => {
- this.availableTags.set(tagsList || []);
- const tags = this.availableTags.get();
- const availableTags = tags
- .filter(({ departments }) => departments.length === 0 || departments.indexOf(departmentId) > -1)
- .map(({ name }) => name);
- this.availableDepartmentTags.set(availableTags);
- });
- };
- this.autorun(async () => {
- const offset = this.offset.get();
- const { agents, total } = await APIClient.v1.get(`livechat/department/${ FlowRouter.getParam('_id') }/agents?count=${ LIST_SIZE }&offset=${ offset }`);
- this.total.set(total);
- if (offset === 0) {
- this.departmentAgents.set(agents);
- } else {
- this.departmentAgents.set(this.departmentAgents.get().concat(agents));
- }
- });
-
- this.autorun(async () => {
- const id = FlowRouter.getParam('_id');
- if (id) {
- const { department } = await APIClient.v1.get(`livechat/department/${ FlowRouter.getParam('_id') }?includeAgents=false`);
- this.department.set(department);
- this.chatClosingTags.set((department && department.chatClosingTags) || []);
- this.loadAvailableTags(id);
- }
- });
-
- this.autorun(async () => {
- const department = this.department.get();
- let offlineChannel = [];
- if (department?.offlineMessageChannelName) {
- const { room } = await APIClient.v1.get(`rooms.info?roomName=${ department?.offlineMessageChannelName }`);
- if (room) {
- room.text = room.name;
- offlineChannel = [{ ...room }];
- }
- }
- this.offlineMessageChannel.set(offlineChannel);
- });
-});
diff --git a/app/livechat/client/views/app/livechatDepartments.html b/app/livechat/client/views/app/livechatDepartments.html
deleted file mode 100644
index cb3963f6076cf..0000000000000
--- a/app/livechat/client/views/app/livechatDepartments.html
+++ /dev/null
@@ -1,59 +0,0 @@
-
- {{#requiresPermission 'view-livechat-departments'}}
-
-
-
-
-
-
-
- {{#each departments}}
-
- {{description}}
- {{numAgents}}
- {{#if enabled}}{{_ "Yes"}}{{else}}{{_ "No"}}{{/if}}
- {{#if showOnRegistration}}{{_ "Yes"}}{{else}}{{_ "No"}}{{/if}}
-
- {{#requiresPermission 'manage-livechat-departments'}}
-
- {{else}}
- {{/requiresPermission}}
-
-
- {{/each}}
-
- {{/table}}
-
- {{#requiresPermission 'manage-livechat-departments'}}
-
- {{else}}
- {{/requiresPermission}}
- {{/requiresPermission}}
-
diff --git a/app/livechat/client/views/app/livechatDepartments.js b/app/livechat/client/views/app/livechatDepartments.js
deleted file mode 100644
index 97b50f7516033..0000000000000
--- a/app/livechat/client/views/app/livechatDepartments.js
+++ /dev/null
@@ -1,111 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-import { FlowRouter } from 'meteor/kadira:flow-router';
-import { Template } from 'meteor/templating';
-import { ReactiveVar } from 'meteor/reactive-var';
-import { ReactiveDict } from 'meteor/reactive-dict';
-import _ from 'underscore';
-
-import { modal } from '../../../../ui-utils';
-import { t, handleError } from '../../../../utils';
-import './livechatDepartments.html';
-import { APIClient } from '../../../../utils/client';
-
-Template.livechatDepartments.helpers({
- departments() {
- return Template.instance().departments.get();
- },
- isLoading() {
- return Template.instance().state.get('loading');
- },
- isReady() {
- const instance = Template.instance();
- return instance.ready && instance.ready.get();
- },
- onTableScroll() {
- const instance = Template.instance();
- return function(currentTarget) {
- if (
- currentTarget.offsetHeight + currentTarget.scrollTop
- >= currentTarget.scrollHeight - 100
- ) {
- return instance.limit.set(instance.limit.get() + 50);
- }
- };
- },
-});
-
-const DEBOUNCE_TIME_FOR_SEARCH_DEPARTMENTS_IN_MS = 300;
-
-Template.livechatDepartments.events({
- 'click .remove-department'(e, instance) {
- e.preventDefault();
- e.stopPropagation();
-
- modal.open({
- title: t('Are_you_sure'),
- type: 'warning',
- showCancelButton: true,
- confirmButtonColor: '#DD6B55',
- confirmButtonText: t('Yes'),
- cancelButtonText: t('Cancel'),
- closeOnConfirm: false,
- html: false,
- }, () => {
- Meteor.call('livechat:removeDepartment', this._id, (error/* , result*/) => {
- if (error) {
- return handleError(error);
- }
- instance.departments.set(instance.departments.curValue.filter((department) => department._id !== this._id));
- modal.open({
- title: t('Removed'),
- text: t('Department_removed'),
- type: 'success',
- timer: 1000,
- showConfirmButton: false,
- });
- });
- });
- },
-
- 'click .department-info'(e/* , instance*/) {
- e.preventDefault();
- FlowRouter.go('livechat-department-edit', { _id: this._id });
- },
-
- 'keydown #departments-filter'(e) {
- if (e.which === 13) {
- e.stopPropagation();
- e.preventDefault();
- }
- },
- 'keyup #departments-filter': _.debounce((e, t) => {
- e.stopPropagation();
- e.preventDefault();
- t.filter.set(e.currentTarget.value);
- }, DEBOUNCE_TIME_FOR_SEARCH_DEPARTMENTS_IN_MS),
-});
-
-Template.livechatDepartments.onCreated(function() {
- const instance = this;
- this.limit = new ReactiveVar(50);
- this.filter = new ReactiveVar('');
- this.state = new ReactiveDict({
- loading: false,
- });
- this.ready = new ReactiveVar(true);
- this.departments = new ReactiveVar([]);
-
- this.autorun(async function() {
- const limit = instance.limit.get();
- const filter = instance.filter.get();
- let baseUrl = `livechat/department?count=${ limit }`;
-
- if (filter) {
- baseUrl += `&text=${ encodeURIComponent(filter) }`;
- }
-
- const { departments } = await APIClient.v1.get(baseUrl);
- instance.departments.set(departments);
- instance.ready.set(true);
- });
-});
diff --git a/app/livechat/client/views/sideNav/livechat.html b/app/livechat/client/views/sideNav/livechat.html
deleted file mode 100644
index 6c1bad3073c9b..0000000000000
--- a/app/livechat/client/views/sideNav/livechat.html
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
- {{{_ "Showing_results" departments.length}}}
-
-
- {{#table fixed='true' onScroll=onTableScroll}}
-
- {{_ "Name"}}
{{_ "Description"}}
{{_ "Num_Agents"}}
{{_ "Enabled"}}
{{_ "Show_on_registration_page"}}
-
{{name}}
-
-
diff --git a/app/livechat/client/views/sideNav/livechat.js b/app/livechat/client/views/sideNav/livechat.js
deleted file mode 100644
index 0a91cf5e6efbf..0000000000000
--- a/app/livechat/client/views/sideNav/livechat.js
+++ /dev/null
@@ -1,142 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-import { ReactiveVar } from 'meteor/reactive-var';
-import { FlowRouter } from 'meteor/kadira:flow-router';
-import { Session } from 'meteor/session';
-import { Template } from 'meteor/templating';
-
-import { ChatSubscription, Users } from '../../../../models';
-import { KonchatNotification } from '../../../../ui';
-import { settings } from '../../../../settings';
-import { hasPermission } from '../../../../authorization';
-import { t, handleError, getUserPreference } from '../../../../utils';
-import { LivechatInquiry } from '../../collections/LivechatInquiry';
-import { Notifications } from '../../../../notifications/client';
-import { initializeLivechatInquiryStream } from '../../lib/stream/queueManager';
-
-import './livechat.html';
-
-Template.livechat.helpers({
- isActive() {
- const query = {
- t: 'l',
- f: { $ne: true },
- open: true,
- rid: Session.get('openedRoom'),
- };
-
- const options = { fields: { _id: 1 } };
-
- if (ChatSubscription.findOne(query, options)) {
- return 'active';
- }
- },
-
- rooms() {
- const query = {
- t: 'l',
- open: true,
- };
-
- const user = Meteor.userId();
-
- if (getUserPreference(user, 'sidebarShowUnread')) {
- query.alert = { $ne: true };
- }
-
- const sortBy = getUserPreference(user, 'sidebarSortby');
- const sort = sortBy === 'activity' ? { _updatedAt: - 1 } : { fname: 1 };
-
- return ChatSubscription.find(query, { sort });
- },
-
- inquiries() {
- const inqs = LivechatInquiry.find({
- status: 'queued',
- }, {
- sort: {
- queueOrder: 1,
- estimatedWaitingTimeQueue: 1,
- estimatedServiceTimeAt: 1,
- },
- limit: Template.instance().inquiriesLimit.get(),
- });
-
- // for notification sound
- inqs.forEach((inq) => {
- KonchatNotification.newRoom(inq.rid);
- });
-
- return inqs;
- },
-
- showIncomingQueue() {
- const config = Template.instance().routingConfig.get();
- return config.showQueue;
- },
-
- available() {
- const statusLivechat = Template.instance().statusLivechat.get();
-
- return {
- status: statusLivechat === 'available' ? 'status-online' : '',
- icon: statusLivechat === 'available' ? 'icon-toggle-on' : 'icon-toggle-off',
- hint: statusLivechat === 'available' ? t('Available') : t('Not_Available'),
- };
- },
-
- isLivechatAvailable() {
- return Template.instance().statusLivechat.get() === 'available';
- },
-
- showQueueLink() {
- const config = Template.instance().routingConfig.get();
- if (!config.showQueueLink) {
- return false;
- }
- return hasPermission(Meteor.userId(), 'view-livechat-queue') || (Template.instance().statusLivechat.get() === 'available' && settings.get('Livechat_show_queue_list_link'));
- },
-
- activeLivechatQueue() {
- FlowRouter.watchPathChange();
- if (FlowRouter.current().route.name === 'livechat-queue') {
- return 'active';
- }
- },
-});
-
-Template.livechat.events({
- 'click .livechat-status'() {
- Meteor.call('livechat:changeLivechatStatus', (err /* , results*/) => {
- if (err) {
- return handleError(err);
- }
- });
- },
-});
-
-Template.livechat.onCreated(function() {
- this.statusLivechat = new ReactiveVar();
- this.routingConfig = new ReactiveVar({});
- this.inquiriesLimit = new ReactiveVar();
-
- Meteor.call('livechat:getRoutingConfig', (err, config) => {
- if (config) {
- this.routingConfig.set(config);
- }
- });
-
- this.autorun(() => {
- if (Meteor.userId()) {
- const user = Users.findOne(Meteor.userId(), { fields: { statusLivechat: 1 } });
- this.statusLivechat.set(user.statusLivechat);
- } else {
- this.statusLivechat.set();
- }
- });
-
- initializeLivechatInquiryStream(Meteor.userId());
- this.updateAgentDepartments = () => initializeLivechatInquiryStream(Meteor.userId());
- this.autorun(() => this.inquiriesLimit.set(settings.get('Livechat_guest_pool_max_number_incoming_livechats_displayed')));
-
- Notifications.onUser('departmentAgentData', (payload) => this.updateAgentDepartments(payload));
-});
diff --git a/app/livechat/imports/server/rest/upload.js b/app/livechat/imports/server/rest/upload.js
index 4c27811749a6d..3a2cff1938963 100644
--- a/app/livechat/imports/server/rest/upload.js
+++ b/app/livechat/imports/server/rest/upload.js
@@ -96,6 +96,9 @@ API.v1.addRoute('livechat/upload/:rid', {
};
const uploadedFile = Meteor.wrapAsync(fileStore.insert.bind(fileStore))(details, file.fileBuffer);
+ if (!uploadedFile) {
+ return API.v1.error('Invalid file');
+ }
uploadedFile.description = fields.description;
diff --git a/app/livechat/server/index.js b/app/livechat/server/index.js
index dea202128cf2c..ad8f2ca1c2d7a 100644
--- a/app/livechat/server/index.js
+++ b/app/livechat/server/index.js
@@ -80,8 +80,6 @@ import './lib/routing/External';
import './lib/routing/ManualSelection';
import './lib/routing/AutoSelection';
import './lib/stream/agentStatus';
-import './lib/stream/departmentAgents';
-import './lib/stream/queueManager';
import './sendMessageBySMS';
import './api';
import './api/rest';
diff --git a/app/livechat/server/lib/Helper.js b/app/livechat/server/lib/Helper.js
index 42b6e890da1fa..d1e04d9ff2719 100644
--- a/app/livechat/server/lib/Helper.js
+++ b/app/livechat/server/lib/Helper.js
@@ -1,6 +1,5 @@
import { Meteor } from 'meteor/meteor';
import { Match, check } from 'meteor/check';
-import { MongoInternals } from 'meteor/mongo';
import { LivechatTransferEventType } from '@rocket.chat/apps-engine/definition/livechat';
import { Messages, LivechatRooms, Rooms, Subscriptions, Users, LivechatInquiry, LivechatDepartment, LivechatDepartmentAgents } from '../../../models/server';
@@ -9,6 +8,7 @@ import { RoutingManager } from './RoutingManager';
import { callbacks } from '../../../callbacks/server';
import { settings } from '../../../settings';
import { Apps, AppEvents } from '../../../apps/server';
+import notifications from '../../../notifications/server/lib/Notifications';
export const createLivechatRoom = (rid, name, guest, roomInfo = {}, extraData = {}) => {
check(rid, String);
@@ -94,7 +94,7 @@ export const createLivechatInquiry = ({ rid, name, guest, message, initialStatus
return LivechatInquiry.insert(inquiry);
};
-export const createLivechatSubscription = (rid, name, guest, agent) => {
+export const createLivechatSubscription = (rid, name, guest, agent, department) => {
check(rid, String);
check(name, String);
check(guest, Match.ObjectIncluding({
@@ -131,44 +131,12 @@ export const createLivechatSubscription = (rid, name, guest, agent) => {
token,
status,
},
+ ...department && { department },
};
return Subscriptions.insert(subscriptionData);
};
-export const createLivechatQueueView = async () => {
- const { mongo } = MongoInternals.defaultRemoteCollectionDriver();
-
- // recreate the view on every startup
- const list = await mongo.db.listCollections({ name: 'view_livechat_queue_status' }).toArray();
- if (list.length > 0) {
- await mongo.db.dropCollection('view_livechat_queue_status');
- }
-
- await mongo.db.createCollection('view_livechat_queue_status', { // name of the view to create
- viewOn: 'rocketchat_room', // name of source collection from which to create the view
- pipeline: [
- {
- $match: {
- open: true,
- servedBy: { $exists: true },
- },
- },
- {
- $group: {
- _id: '$servedBy._id',
- chats: { $sum: 1 },
- },
- },
- {
- $sort: {
- chats: 1,
- },
- },
- ],
- });
-};
-
export const removeAgentFromSubscription = (rid, { _id, username }) => {
const room = LivechatRooms.findOneById(rid);
const user = Users.findOneById(_id);
@@ -225,7 +193,7 @@ export const normalizeAgent = (agentId) => {
export const dispatchAgentDelegated = (rid, agentId) => {
const agent = normalizeAgent(agentId);
- Livechat.stream.emit(rid, {
+ notifications.streamLivechatRoom.emit(rid, {
type: 'agentData',
data: agent,
});
@@ -287,6 +255,7 @@ export const forwardRoomToAgent = async (room, transferData) => {
export const updateChatDepartment = ({ rid, newDepartmentId, oldDepartmentId }) => {
LivechatRooms.changeDepartmentIdByRoomId(rid, newDepartmentId);
LivechatInquiry.changeDepartmentIdByRoomId(rid, newDepartmentId);
+ Subscriptions.changeDepartmentByRoomId(rid, newDepartmentId);
Meteor.defer(() => {
Apps.triggerEvent(AppEvents.IPostLivechatRoomTransferred, {
diff --git a/app/livechat/server/lib/Livechat.js b/app/livechat/server/lib/Livechat.js
index bdcb69c15cbc7..d5fd07399ebf5 100644
--- a/app/livechat/server/lib/Livechat.js
+++ b/app/livechat/server/lib/Livechat.js
@@ -38,6 +38,7 @@ import { FileUpload } from '../../../file-upload/server';
import { normalizeTransferredByData, parseAgentCustomFields, updateDepartmentAgents } from './Helper';
import { Apps, AppEvents } from '../../../apps/server';
import { businessHourManager } from '../business-hour';
+import notifications from '../../../notifications/server/lib/Notifications';
export const Livechat = {
Analytics,
@@ -1107,7 +1108,7 @@ export const Livechat = {
}
LivechatRooms.findOpenByAgent(userId).forEach((room) => {
- Livechat.stream.emit(room._id, {
+ notifications.streamLivechatRoom.emit(room._id, {
type: 'agentStatus',
status,
});
@@ -1123,7 +1124,7 @@ export const Livechat = {
},
notifyRoomVisitorChange(roomId, visitor) {
- Livechat.stream.emit(roomId, {
+ notifications.streamLivechatRoom.emit(roomId, {
type: 'visitorData',
visitor,
});
@@ -1156,22 +1157,6 @@ export const Livechat = {
},
};
-Livechat.stream = new Meteor.Streamer('livechat-room');
-
-Livechat.stream.allowRead((roomId, extraData) => {
- const room = LivechatRooms.findOneById(roomId);
-
- if (!room) {
- console.warn(`Invalid eventName: "${ roomId }"`);
- return false;
- }
-
- if (room.t === 'l' && extraData && extraData.visitorToken && room.v.token === extraData.visitorToken) {
- return true;
- }
- return false;
-});
-
settings.get('Livechat_history_monitor_type', (key, value) => {
Livechat.historyMonitorType = value;
});
diff --git a/app/livechat/server/lib/RoutingManager.js b/app/livechat/server/lib/RoutingManager.js
index 5558d1be5d0e8..5342050f67f84 100644
--- a/app/livechat/server/lib/RoutingManager.js
+++ b/app/livechat/server/lib/RoutingManager.js
@@ -47,7 +47,6 @@ export const RoutingManager = {
},
async delegateInquiry(inquiry, agent) {
- // return Room Object
const { department, rid } = inquiry;
if (!agent || (agent.username && !Users.findOneOnlineAgentByUsername(agent.username))) {
agent = await this.getNextAgent(department);
@@ -66,8 +65,8 @@ export const RoutingManager = {
username: String,
}));
- const { rid, name, v } = inquiry;
- if (!createLivechatSubscription(rid, name, v, agent)) {
+ const { rid, name, v, department } = inquiry;
+ if (!createLivechatSubscription(rid, name, v, agent, department)) {
throw new Meteor.Error('error-creating-subscription', 'Error creating subscription');
}
diff --git a/app/livechat/server/lib/stream/agentStatus.ts b/app/livechat/server/lib/stream/agentStatus.ts
index 4d875e95ebcc0..c04cd48d5e803 100644
--- a/app/livechat/server/lib/stream/agentStatus.ts
+++ b/app/livechat/server/lib/stream/agentStatus.ts
@@ -2,9 +2,8 @@ import { Meteor } from 'meteor/meteor';
import { Livechat } from '../Livechat';
import { settings } from '../../../../settings/server';
-import { Users } from '../../../../models/server';
-let monitorAgents = false;
+export let monitorAgents = false;
let actionTimeout = 60000;
let action = 'none';
let comment = '';
@@ -28,7 +27,7 @@ settings.get('Livechat_agent_leave_comment', (_key, value) => {
comment = value;
});
-const onlineAgents = {
+export const onlineAgents = {
users: new Set(),
queue: new Map(),
@@ -74,36 +73,3 @@ const onlineAgents = {
}
}),
};
-
-Users.on('change', ({ clientAction, id, diff }) => {
- if (!monitorAgents) {
- return;
- }
-
- if (clientAction !== 'removed' && diff && !diff.status && !diff.statusLivechat) {
- return;
- }
-
- switch (clientAction) {
- case 'updated':
- case 'inserted':
- const agent = Users.findOneAgentById(id, {
- fields: {
- status: 1,
- statusLivechat: 1,
- },
- });
- const serviceOnline = agent && agent.status !== 'offline' && agent.statusLivechat === 'available';
-
- if (serviceOnline) {
- return onlineAgents.add(id);
- }
-
- onlineAgents.remove(id);
-
- break;
- case 'removed':
- onlineAgents.remove(id);
- break;
- }
-});
diff --git a/app/livechat/server/lib/stream/departmentAgents.js b/app/livechat/server/lib/stream/departmentAgents.js
deleted file mode 100644
index a6c6fab751229..0000000000000
--- a/app/livechat/server/lib/stream/departmentAgents.js
+++ /dev/null
@@ -1,29 +0,0 @@
-import { LivechatDepartmentAgents } from '../../../../models/server';
-import { Notifications } from '../../../../notifications';
-
-const fields = { agentId: 1, departmentId: 1 };
-
-const emitNotification = (action, payload = {}) => {
- const { agentId = null } = payload;
- if (!agentId) {
- return;
- }
-
- Notifications.notifyUserInThisInstance(agentId, 'departmentAgentData', {
- action,
- ...payload,
- });
-};
-
-LivechatDepartmentAgents.on('change', ({ clientAction, id }) => {
- switch (clientAction) {
- case 'inserted':
- case 'updated':
- emitNotification(clientAction, LivechatDepartmentAgents.findOneById(id, { fields }));
- break;
-
- case 'removed':
- emitNotification(clientAction, LivechatDepartmentAgents.trashFindOneById(id, { fields }));
- break;
- }
-});
diff --git a/app/livechat/server/lib/stream/queueManager.js b/app/livechat/server/lib/stream/queueManager.js
deleted file mode 100644
index bf30b8397ff89..0000000000000
--- a/app/livechat/server/lib/stream/queueManager.js
+++ /dev/null
@@ -1,52 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-import { hasPermission } from '../../../../authorization/server';
-import { LivechatInquiry } from '../../../../models/server';
-import { LIVECHAT_INQUIRY_QUEUE_STREAM_OBSERVER } from '../../../lib/stream/constants';
-import { RoutingManager } from '../RoutingManager';
-
-const queueDataStreamer = new Meteor.Streamer(LIVECHAT_INQUIRY_QUEUE_STREAM_OBSERVER);
-queueDataStreamer.allowWrite('none');
-queueDataStreamer.allowRead(function() {
- return this.userId ? hasPermission(this.userId, 'view-l-room') : false;
-});
-
-const emitQueueDataEvent = (event, data) => queueDataStreamer.emitWithoutBroadcast(event, data);
-const mountDataToEmit = (type, data) => ({ type, ...data });
-
-LivechatInquiry.on('change', ({ clientAction, id: _id, data: record }) => {
- if (RoutingManager.getConfig().autoAssignAgent) {
- return;
- }
-
- switch (clientAction) {
- case 'inserted':
- emitQueueDataEvent(_id, { ...record, clientAction });
- if (record && record.department) {
- return emitQueueDataEvent(`department/${ record.department }`, mountDataToEmit('added', record));
- }
- emitQueueDataEvent('public', mountDataToEmit('added', record));
- break;
- case 'updated':
- const isUpdatingDepartment = record && record.department;
- const updatedRecord = LivechatInquiry.findOneById(_id);
- emitQueueDataEvent(_id, { ...updatedRecord, clientAction });
- if (updatedRecord && !updatedRecord.department) {
- return emitQueueDataEvent('public', mountDataToEmit('changed', updatedRecord));
- }
- if (isUpdatingDepartment) {
- emitQueueDataEvent('public', mountDataToEmit('changed', updatedRecord));
- }
- emitQueueDataEvent(`department/${ updatedRecord.department }`, mountDataToEmit('changed', updatedRecord));
- break;
-
- case 'removed':
- const removedRecord = LivechatInquiry.trashFindOneById(_id);
- emitQueueDataEvent(_id, { _id, clientAction });
- if (removedRecord && removedRecord.department) {
- return emitQueueDataEvent(`department/${ removedRecord.department }`, mountDataToEmit('removed', { _id }));
- }
- emitQueueDataEvent('public', mountDataToEmit('removed', { _id }));
- break;
- }
-});
diff --git a/app/livechat/server/roomAccessValidator.compatibility.js b/app/livechat/server/roomAccessValidator.compatibility.js
new file mode 100644
index 0000000000000..9e65fb506ccbb
--- /dev/null
+++ b/app/livechat/server/roomAccessValidator.compatibility.js
@@ -0,0 +1,60 @@
+import { LivechatRooms } from '../../models';
+import { hasPermission, hasRole } from '../../authorization';
+import { LivechatDepartment, LivechatDepartmentAgents, LivechatInquiry } from '../../models/server';
+import { RoutingManager } from './lib/RoutingManager';
+
+export const validators = [
+ function(room, user) {
+ if (!user?._id) {
+ return false;
+ }
+ return hasPermission(user._id, 'view-livechat-rooms');
+ },
+ function(room, user) {
+ if (!user?._id) {
+ return false;
+ }
+ const { _id: userId } = user;
+ const { servedBy: { _id: agentId } = {} } = room;
+ return userId === agentId || (!room.open && hasPermission(user._id, 'view-livechat-room-closed-by-another-agent'));
+ },
+ function(room, user, extraData) {
+ if (extraData && extraData.rid) {
+ room = LivechatRooms.findOneById(extraData.rid);
+ }
+ return extraData && extraData.visitorToken && room.v && room.v.token === extraData.visitorToken;
+ },
+ function(room, user) {
+ if (!user?._id) {
+ return false;
+ }
+ const { previewRoom } = RoutingManager.getConfig();
+ if (!previewRoom) {
+ return;
+ }
+
+ let departmentIds;
+ if (!hasRole(user._id, 'livechat-manager')) {
+ const departmentAgents = LivechatDepartmentAgents.findByAgentId(user._id).fetch().map((d) => d.departmentId);
+ departmentIds = LivechatDepartment.find({ _id: { $in: departmentAgents }, enabled: true }).fetch().map((d) => d._id);
+ }
+
+ const filter = {
+ rid: room._id,
+ ...departmentIds && departmentIds.length > 0 && { department: { $in: departmentIds } },
+ };
+
+ const inquiry = LivechatInquiry.findOne(filter, { fields: { status: 1 } });
+ return inquiry && inquiry.status === 'queued';
+ },
+ function(room, user) {
+ if (!room.departmentId || room.open || !user?._id) {
+ return;
+ }
+ const agentOfDepartment = LivechatDepartmentAgents.findOneByAgentIdAndDepartmentId(user._id, room.departmentId);
+ if (!agentOfDepartment) {
+ return;
+ }
+ return hasPermission(user._id, 'view-livechat-room-closed-same-department');
+ },
+];
diff --git a/app/livechat/server/roomAccessValidator.internalService.ts b/app/livechat/server/roomAccessValidator.internalService.ts
new file mode 100644
index 0000000000000..f7e94219b18c1
--- /dev/null
+++ b/app/livechat/server/roomAccessValidator.internalService.ts
@@ -0,0 +1,24 @@
+import { ServiceClass } from '../../../server/sdk/types/ServiceClass';
+import { IAuthorizationLivechat } from '../../../server/sdk/types/IAuthorizationLivechat';
+import { validators } from './roomAccessValidator.compatibility';
+import { api } from '../../../server/sdk/api';
+import { IRoom } from '../../../definition/IRoom';
+import { IUser } from '../../../definition/IUser';
+
+class AuthorizationLivechat extends ServiceClass implements IAuthorizationLivechat {
+ protected name = 'authorization-livechat';
+
+ protected internal = true;
+
+ async canAccessRoom(room: Partial- {{_ "Omnichannel"}} - {{#with available}} - - {{/with}} -
- - {{#if showIncomingQueue}} - {{#if isLivechatAvailable}} -- {{_ "Incoming_Livechats"}} -
--
- {{#each room in inquiries}}
- {{> chatRoomItem room }}
- {{/each}}
-
- {{_ "Open_Livechats"}} -
- {{/if}} - --
- {{#if showQueueLink}}
- {{> sidebarItem active=activeLivechatQueue pathSection="livechat-queue" icon="queue" name="Queue"}}
- {{/if}}
- {{#each room in rooms}}
- {{> chatRoomItem room }}
- {{/each}}
-
- {{> Template.dynamic template="accountSecurity"}}
+ {{> accountSecurity }}