Skip to content

[IMPROVE] Return open room if available for visitors #22742

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
KevLehman merged 8 commits into from
Jul 26, 2021
Merged

[IMPROVE] Return open room if available for visitors #22742

Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e988ab4
Try to find an open room for the visitor before requesting a new one
KevLehman Jul 22, 2021
0fe9ce3
Merge branch 'develop' into improve/check-room-exists-before-creating
renatobecker Jul 23, 2021
7ba30b5
Update endpoint to use provided department to create the room if not …
KevLehman Jul 23, 2021
f9dc120
Merge branch 'improve/check-room-exists-before-creating' of github.co…
KevLehman Jul 23, 2021
151e5fa
Check if visitor has an open room before creating a new one.
renatobecker Jul 26, 2021
403e617
Merge branch 'develop' into improve/check-room-exists-before-creating
renatobecker Jul 26, 2021
4a41ea1
Merge branch 'develop' into improve/check-room-exists-before-creating
KevLehman Jul 26, 2021
dcd5a7d
Merge branch 'develop' into improve/check-room-exists-before-creating
KevLehman Jul 26, 2021
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
32 changes: 21 additions & 11 deletions app/livechat/server/api/v1/room.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,20 @@ API.v1.addRoute('livechat/room', {

const extraCheckParams = onCheckRoomParams(defaultCheckParams);

try {
check(this.queryParams, extraCheckParams);
check(this.queryParams, extraCheckParams);

const { token, rid: roomId, agentId, ...extraParams } = this.queryParams;
const { token, rid: roomId, agentId, ...extraParams } = this.queryParams;

const guest = findGuest(token);
if (!guest) {
throw new Meteor.Error('invalid-token');
const guest = findGuest(token);
if (!guest) {
throw new Meteor.Error('invalid-token');
}

let room;
if (!roomId) {
room = LivechatRooms.findOneOpenByVisitorToken(token, {});
if (room) {
return API.v1.success({ room, newRoom: false });
}

let agent;
Expand All @@ -39,13 +45,17 @@ API.v1.addRoute('livechat/room', {
agent = { agentId, username };
}

const rid = roomId || Random.id();
const room = Promise.await(getRoom({ guest, rid, agent, extraParams }));
Comment thread
KevLehman marked this conversation as resolved.

const rid = Random.id();
room = Promise.await(getRoom({ guest, rid, agent, extraParams }));
return API.v1.success(room);
} catch (e) {
return API.v1.failure(e);
}

room = LivechatRooms.findOneOpenByRoomIdAndVisitorToken(roomId, token, {});
if (!room) {
throw new Meteor.Error('invalid-room');
}

return API.v1.success({ room, newRoom: false });
},
});

Expand Down