Skip to content

[FIX] User can't invite or join other Omnichannel rooms #18852

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sampaiodiego merged 3 commits into from
Sep 10, 2020
Merged

[FIX] User can't invite or join other Omnichannel rooms #18852

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ba130cb
Fix error on inviting / joining omnichannel rooms.
renatobecker Sep 9, 2020
280622e
Fix condition.
renatobecker Sep 10, 2020
4b8988e
Add callback function to deal with beforeJoinRoom event.
renatobecker Sep 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/lib/server/functions/addUserToRoom.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export const addUserToRoom = function(rid, user, inviter, silenced) {
throw error;
}

if (room.t === 'c' || room.t === 'p') {
if (room.t === 'c' || room.t === 'p' || room.t === 'l') {
// Add a new event, with an optional inviter
callbacks.run('beforeAddedToRoom', { user, inviter }, room);

Expand Down
6 changes: 5 additions & 1 deletion app/livechat/lib/LivechatRoomType.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { ChatRoom } from '../../models';
import { settings } from '../../settings';
import { hasPermission } from '../../authorization';
import { openRoom } from '../../ui-utils';
import { RoomSettingsEnum, UiTextContext, RoomTypeRouteConfig, RoomTypeConfig } from '../../utils';
import { RoomMemberActions, RoomSettingsEnum, UiTextContext, RoomTypeRouteConfig, RoomTypeConfig } from '../../utils';
import { getAvatarURL } from '../../utils/lib/getAvatarURL';

let LivechatInquiry;
Expand Down Expand Up @@ -85,6 +85,10 @@ export default class LivechatRoomType extends RoomTypeConfig {
}
}

allowMemberAction(room, action) {
return [RoomMemberActions.INVITE, RoomMemberActions.JOIN].includes(action);
}

getUiText(context) {
switch (context) {
case UiTextContext.HIDE_WARNING:
Expand Down
8 changes: 8 additions & 0 deletions app/livechat/server/startup.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,14 @@ Meteor.startup(async () => {
}));
}, callbacks.priority.LOW, 'cant-leave-room');

callbacks.add('beforeJoinRoom', function(user, room) {
if (room.t === 'l' && !hasPermission(user._id, 'view-l-room')) {
throw new Meteor.Error('error-user-is-not-agent', 'User is not an Omnichannel Agent', { method: 'beforeJoinRoom' });
}

return user;
}, callbacks.priority.LOW, 'cant-join-room');

createLivechatQueueView();

const monitor = new LivechatAgentActivityMonitor();
Expand Down
2 changes: 1 addition & 1 deletion app/tokenpass/server/startup.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ Meteor.startup(function() {
throw new Meteor.Error('error-not-allowed', 'Token required', { method: 'joinRoom' });
}

return room;
return user;
});
});

Expand Down
2 changes: 1 addition & 1 deletion packages/rocketchat-i18n/i18n/en.i18n.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1522,7 +1522,7 @@
"error-transcript-already-requested": "Transcript already requested",
"error-user-has-no-roles": "User has no roles",
"error-user-is-not-activated": "User is not activated",
"error-user-is-not-agent": "User is not a Omnichannel Agent",
"error-user-is-not-agent": "User is not an Omnichannel Agent",
"error-user-is-offline": "User if offline",
"error-user-limit-exceeded": "The number of users you are trying to invite to #channel_name exceeds the limit set by the administrator",
"error-user-not-in-room": "User is not in this room",
Expand Down