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'
}}
>
-
- Your chatbot will only work when used from the following domains. When adding domains, exclude the{' '}
- http://
or https://
part.
-
+ Your chatbot will only work when used from the following domains.
:not(style)': { m: 1 }, pt: 2 }}>