fix: site name != host (#2212)

frappe · Sep 19, 2024 · 7eb2b5b · 7eb2b5b
1 parent 8cb698b
commit 7eb2b5b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/frontend/index.html b/frontend/index.html
@@ -184,6 +184,7 @@
 
 		<script>
 			window.csrf_token = "{{ csrf_token }}"
+			window.site_name = '{{ site_name }}'
 			if (!window.frappe) window.frappe = {}
 			frappe.boot = {{ boot }}
 		</script>

diff --git a/frontend/src/socket.js b/frontend/src/socket.js
@@ -6,9 +6,10 @@ import { getCachedResource } from "frappe-ui/src/resources/resources"
 
 export function initSocket() {
 	let host = window.location.hostname
+	let siteName = window.site_name
 	let port = window.location.port ? `:${socketio_port}` : ""
 	let protocol = port ? "http" : "https"
-	let url = `${protocol}://${host}${port}/${host}`
+	let url = `${protocol}://${host}${port}/${siteName}`
 	let socket = io(url, {
 		withCredentials: true,
 		reconnectionAttempts: 5,

diff --git a/hrms/www/hrms.py b/hrms/www/hrms.py
@@ -20,4 +20,6 @@ def get_context_for_dev():
 
 
 def get_boot():
-	return frappe._dict({"push_relay_server_url": frappe.conf.get("push_relay_server_url")})
+	return frappe._dict(
+		{"site_name": frappe.local.site, "push_relay_server_url": frappe.conf.get("push_relay_server_url")}
+	)