From 233fa50c3b82931ea62e1d8c3fb20d9705a93628 Mon Sep 17 00:00:00 2001
From: tsm-odoo <tsm@odoo.com>
Date: Thu, 26 Oct 2023 13:21:18 +0200
Subject: [PATCH] [FIX] im_livechat: fix visitor leave session on log in
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Before this commit, the `visitor_leave_session` route was called
when a user logged in: the session of the visitor is outdated and
will never be activated again. This causes an error with portal
users since channel members are not based on the guest but on the
current user when available. This commit fixes the issue by not
calling the route: the session will be garbage collected as all
the others.

Steps to reproduce the issue:
- Go to website livechat (public user)
- Start a chat and send a message
- Log in as portal user
- An error occurs

closes odoo/odoo#139631

Signed-off-by: Sébastien Theys (seb) <seb@odoo.com>
---
 .../static/src/embed/common/livechat_service.js  |  2 +-
 addons/website_livechat/models/website.py        |  2 ++
 .../website_livechat_session_user_changes.js     | 16 ++++++++--------
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/addons/im_livechat/static/src/embed/common/livechat_service.js b/addons/im_livechat/static/src/embed/common/livechat_service.js
index 4f72d325ff3..6879953c865 100644
--- a/addons/im_livechat/static/src/embed/common/livechat_service.js
+++ b/addons/im_livechat/static/src/embed/common/livechat_service.js
@@ -90,7 +90,7 @@ export class LivechatService {
                 prevOdooVersion !== currOdooVersion ||
                 (this.sessionCookie && visitorUid !== userId)
             ) {
-                this.leaveSession();
+                this.leaveSession({ notifyServer: false });
             }
             browser.localStorage.setItem(ODOO_VERSION_KEY, currOdooVersion);
         }
diff --git a/addons/website_livechat/models/website.py b/addons/website_livechat/models/website.py
index 2c83e750161..96dfcdbc200 100644
--- a/addons/website_livechat/models/website.py
+++ b/addons/website_livechat/models/website.py
@@ -54,6 +54,8 @@ class Website(models.Model):
                         # linked to another guest in the meantime. We need to
                         # update the channel to link it to the current guest.
                         chat_request_channel.write({'channel_member_ids': [Command.unlink(channel_guest_member.id), Command.create({'guest_id': current_guest.id})]})
+                    if not current_guest and not channel_guest_member:
+                        return {}
                     if not current_guest:
                         channel_guest_member.guest_id._set_auth_cookie()
                         chat_request_channel = chat_request_channel.with_context(guest=channel_guest_member.guest_id.sudo(False))
diff --git a/addons/website_livechat/static/tests/tours/website_livechat_session_user_changes.js b/addons/website_livechat/static/tests/tours/website_livechat_session_user_changes.js
index de8ecaf4c86..035c8fb2a02 100644
--- a/addons/website_livechat/static/tests/tours/website_livechat_session_user_changes.js
+++ b/addons/website_livechat/static/tests/tours/website_livechat_session_user_changes.js
@@ -13,18 +13,18 @@ registry.category("web_tour.tours").add("website_livechat_login_after_chat_start
         },
         {
             trigger: ".o-mail-Composer-input",
-            run: "text Hello",
+            run: "text Hello!",
         },
         {
             trigger: ".o-mail-Composer-input",
             run: function () {
-                $("o-mail-Composer-input").trigger(
-                    $.Event("keydown", { key: "Enter" })
+                this.$anchor[0].dispatchEvent(
+                    new KeyboardEvent("keydown", { key: "Enter", which: 13, bubbles: true })
                 );
             },
         },
         {
-            trigger: ".o-mail-Message-content:contains('Hello')",
+            trigger: ".o-mail-Message-content:contains('Hello!')",
         },
         {
             trigger: "a:contains(Sign in)",
@@ -73,18 +73,18 @@ registry.category("web_tour.tours").add("website_livechat_logout_after_chat_star
         },
         {
             trigger: ".o-mail-Composer-input",
-            run: "text Hello",
+            run: "text Hello!",
         },
         {
             trigger: ".o-mail-Composer-input",
             run: function () {
-                $(".o-mail-Composer-input").trigger(
-                    $.Event("keydown", { key: "Enter" })
+                this.$anchor[0].dispatchEvent(
+                    new KeyboardEvent("keydown", { key: "Enter", which: 13, bubbles: true })
                 );
             },
         },
         {
-            trigger: ".o-mail-Message-content:contains('Hello')",
+            trigger: ".o-mail-Message-content:contains('Hello!')",
         },
         {
             trigger: "header#top a:contains(Mitchell Admin)",