Skip to content
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

Jump to bottom

fix: LivechatSessionTaken webhook event called without agent param #33209

Merged
merged 4 commits into from
Sep 18, 2024
Merged

fix: LivechatSessionTaken webhook event called without agent param #33209

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
15b585c
find room before calling aftertakeinquiry
KevLehman Sep 4, 2024
f1ce8b6
Create spicy-rocks-burn.md
KevLehman Sep 4, 2024
c417b3b
Update RoutingManager.ts
KevLehman Sep 5, 2024
57c126c
Merge branch 'develop' into fix/livechat-session-taken-missing-agent
kodiakhq[bot] Sep 18, 2024
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
5 changes: 5 additions & 0 deletions .changeset/spicy-rocks-burn.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

Fixed `LivechatSessionTaken` webhook event being called without the `agent` param, which represents the agent serving the room.
16 changes: 13 additions & 3 deletions apps/meteor/app/livechat/server/lib/RoutingManager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,11 +265,21 @@ export const RoutingManager: Routing = {

logger.info(`Inquiry ${inquiry._id} taken by agent ${agent.agentId}`);

// assignAgent changes the room data to add the agent serving the conversation. afterTakeInquiry expects room object to be updated
const inq = await this.assignAgent(inquiry as InquiryWithAgentInfo, room, agent);
const roomAfterUpdate = await LivechatRooms.findOneById(rid);

if (!roomAfterUpdate) {
// This should never happen
throw new Error('error-room-not-found');
}

callbacks.runAsync(
'livechat.afterTakeInquiry',
{
inquiry: await this.assignAgent(inquiry as InquiryWithAgentInfo, room, agent),
room,
inquiry: inq,
// @eslint-disable-next-line @typescript-eslint/no-non-null-assertion
KevLehman marked this conversation as resolved.
Show resolved Hide resolved
room: roomAfterUpdate,
},
agent,
);
Expand All @@ -282,7 +292,7 @@ export const RoutingManager: Routing = {
queuedAt: undefined,
});

return LivechatRooms.findOneById(rid);
return roomAfterUpdate;
},

async transferRoom(room, guest, transferData) {
Expand Down
Loading