From d706ca389fc744740147ff59e1567b8d45b9ee93 Mon Sep 17 00:00:00 2001
From: Ilango <rajagopalilango@gmail.com>
Date: Tue, 5 Mar 2024 17:23:49 +0530
Subject: [PATCH] Detect host from list of allowed urls even if they have
 http/https

---
 packages/server/src/index.ts                                | 6 +++++-
 packages/ui/src/ui-component/dialog/AllowedDomainsDialog.js | 5 +----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/packages/server/src/index.ts b/packages/server/src/index.ts
index d18111e30..260bbdb4e 100644
--- a/packages/server/src/index.ts
+++ b/packages/server/src/index.ts
@@ -1332,7 +1332,11 @@ export class App {
                     if (parsedConfig.allowedOrigins && parsedConfig.allowedOrigins.length > 0 && isValidAllowedOrigins) {
                         const originHeader = req.headers.origin as string
                         const origin = new URL(originHeader).host
-                        isDomainAllowed = parsedConfig.allowedOrigins.includes(origin)
+                        isDomainAllowed =
+                            parsedConfig.allowedOrigins.filter((domain: string) => {
+                                const allowedOrigin = new URL(domain).host
+                                return origin === allowedOrigin
+                            }).length > 0
                     }
                 }
 
diff --git a/packages/ui/src/ui-component/dialog/AllowedDomainsDialog.js b/packages/ui/src/ui-component/dialog/AllowedDomainsDialog.js
index 9a8968e21..426ea1318 100644
--- a/packages/ui/src/ui-component/dialog/AllowedDomainsDialog.js
+++ b/packages/ui/src/ui-component/dialog/AllowedDomainsDialog.js
@@ -145,10 +145,7 @@ const AllowedDomainsDialog = ({ show, dialogProps, onCancel, onConfirm }) => {
                         flexDirection: 'column'
                     }}
                 >
-                    <span>
-                        Your chatbot will only work when used from the following domains. When adding domains, exclude the{' '}
-                        <pre style={{ display: 'inline' }}>http://</pre> or <pre style={{ display: 'inline' }}>https://</pre> part.
-                    </span>
+                    <span>Your chatbot will only work when used from the following domains.</span>
                 </div>
                 <Box sx={{ '& > :not(style)': { m: 1 }, pt: 2 }}>
                     <List>