From 333528f24d9421522bd905dbf37e1cf087be53f4 Mon Sep 17 00:00:00 2001
From: Cristina Mariscal <cristina.mariscal@apli.jobs>
Date: Thu, 7 Mar 2024 06:16:51 -0600
Subject: [PATCH 1/2] Fixes | referral, DNS filtering, and a bit more.

---
 app/controllers/widgets_controller.rb           |  7 +++++--
 app/javascript/widget/components/ChatFooter.vue |  1 -
 app/javascript/widget/views/Home.vue            | 10 ++++++----
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/app/controllers/widgets_controller.rb b/app/controllers/widgets_controller.rb
index 3ac4ab04da940..6c55c0a0a786d 100644
--- a/app/controllers/widgets_controller.rb
+++ b/app/controllers/widgets_controller.rb
@@ -27,8 +27,11 @@ def set_web_widget
 
   def check_domain
     return if Rails.env.development?
-    return if request.headers['Referer'].downcase.start_with? @web_widget.website_url.downcase
-
+    # support multiple domains from same referer header param
+    domains = @web_widget.website_url.downcase.split("|")
+    domains.each do |domain|
+      return if request.headers['Referer'].downcase.start_with? domain
+    end
     Rails.logger.error('web widget does not match with expected domain')
     render json: { error: 'web widget does not match with expected domain' }, status: :not_found
   end
diff --git a/app/javascript/widget/components/ChatFooter.vue b/app/javascript/widget/components/ChatFooter.vue
index 02811d6762de9..d3f30ee5fe44b 100755
--- a/app/javascript/widget/components/ChatFooter.vue
+++ b/app/javascript/widget/components/ChatFooter.vue
@@ -110,7 +110,6 @@ export default {
     startNewConversation() {
       this.clearConversations();
       this.clearConversationAttributes();
-      this.replaceRoute('prechat-form');
     },
     async sendTranscript() {
       const { email } = this.currentUser;
diff --git a/app/javascript/widget/views/Home.vue b/app/javascript/widget/views/Home.vue
index ebce88186e7d2..b712b34c78ae3 100755
--- a/app/javascript/widget/views/Home.vue
+++ b/app/javascript/widget/views/Home.vue
@@ -14,7 +14,7 @@
 <script>
 import configMixin from '../mixins/configMixin';
 import TeamAvailability from 'widget/components/TeamAvailability';
-import { mapGetters } from 'vuex';
+import { mapGetters, mapActions } from 'vuex';
 import routerMixin from 'widget/mixins/routerMixin';
 export default {
   name: 'Home',
@@ -43,12 +43,14 @@ export default {
     }),
   },
   methods: {
+    ...mapActions('conversation', [
+      'clearConversations',
+    ]),
     startConversation() {
       const ref = new URLSearchParams(window.location.search).get('referral');
       if (ref) {
-        this.$store.dispatch('conversation/createConversation', {});
-      }
-      if (this.preChatFormEnabled && !this.conversationSize) {
+        this.clearConversations();
+      } else if (this.preChatFormEnabled && !this.conversationSize) {
         return this.replaceRoute('prechat-form');
       }
       return this.replaceRoute('messages');

From f72c4d34f000ede3547556692d541284bef8c1b1 Mon Sep 17 00:00:00 2001
From: Cristina Mariscal <cristina.mariscal@apli.jobs>
Date: Thu, 7 Mar 2024 08:07:16 -0600
Subject: [PATCH 2/2] fix unit tests

---
 spec/controllers/widgets_controller_spec.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/spec/controllers/widgets_controller_spec.rb b/spec/controllers/widgets_controller_spec.rb
index 7789bb4786ff9..c47b01710d57d 100644
--- a/spec/controllers/widgets_controller_spec.rb
+++ b/spec/controllers/widgets_controller_spec.rb
@@ -10,12 +10,14 @@
 
   describe 'GET /widget' do
     it 'renders the page correctly when called with website_token' do
+      Rails.env = 'development'
       get widget_url(website_token: web_widget.website_token)
       expect(response).to be_successful
       expect(response.body).not_to include(token)
     end
 
     it 'renders the page correctly when called with website_token and cw_conversation' do
+      Rails.env = 'development'
       get widget_url(website_token: web_widget.website_token, cw_conversation: token)
       expect(response).to be_successful
       expect(response.body).to include(token)