diff --git a/app/livechat/server/methods/getDepartmentForwardRestrictions.js b/app/livechat/server/methods/getDepartmentForwardRestrictions.js index e08adc9792ba8..ffb1788bd1506 100644 --- a/app/livechat/server/methods/getDepartmentForwardRestrictions.js +++ b/app/livechat/server/methods/getDepartmentForwardRestrictions.js @@ -8,6 +8,9 @@ Meteor.methods({ throw new Meteor.Error('error-invalid-user', 'Invalid user', { method: 'livechat:getDepartmentForwardRestrictions' }); } - return callbacks.run('livechat.onLoadForwardDepartmentRestrictions', departmentId); + const options = callbacks.run('livechat.onLoadForwardDepartmentRestrictions', { departmentId }); + const { restrictions } = options; + + return restrictions; }, }); diff --git a/ee/app/livechat-enterprise/server/hooks/onLoadForwardDepartmentRestrictions.js b/ee/app/livechat-enterprise/server/hooks/onLoadForwardDepartmentRestrictions.js index 538ce151b30c9..baae278009b7a 100644 --- a/ee/app/livechat-enterprise/server/hooks/onLoadForwardDepartmentRestrictions.js +++ b/ee/app/livechat-enterprise/server/hooks/onLoadForwardDepartmentRestrictions.js @@ -1,17 +1,18 @@ import { callbacks } from '../../../../../app/callbacks'; import { LivechatDepartment } from '../../../../../app/models/server'; -callbacks.add('livechat.onLoadForwardDepartmentRestrictions', (departmentId) => { +callbacks.add('livechat.onLoadForwardDepartmentRestrictions', (options = {}) => { + const { departmentId } = options; if (!departmentId) { - return {}; + return options; } const department = LivechatDepartment.findOneById(departmentId, { fields: { departmentsAllowedToForward: 1 } }); if (!department) { - return {}; + return options; } const { departmentsAllowedToForward } = department; if (!departmentsAllowedToForward) { - return {}; + return options; } - return { _id: { $in: departmentsAllowedToForward } }; + return Object.assign({ restrictions: { _id: { $in: departmentsAllowedToForward } } }, options); }, callbacks.priority.MEDIUM, 'livechat-on-load-forward-department-restrictions');