FIX: remove '/' from host in client-control(#1156)

cpvalente · Jul 30, 2024 · ce8b0d9 · ce8b0d9
1 parent e500fa6
commit ce8b0d9
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/apps/client/src/common/components/client-modal/RedirectClientModal.tsx b/apps/client/src/common/components/client-modal/RedirectClientModal.tsx
@@ -38,7 +38,7 @@ export function RedirectClientModal(props: RedirectClientModalProps) {
  onClose();
  };
 
- const host = `${window.location.origin}/`;
+ const host = window.location.origin;
  const canSubmit = path !== currentPath && path !== '';
 
  return (

diff --git a/apps/client/src/common/hooks/useClientPath.ts b/apps/client/src/common/hooks/useClientPath.ts
@@ -12,9 +12,7 @@ export const useClientPath = () => {
 
  // notify of client path changes
  useEffect(() => {
- //remove leading '/' from path
- const fullPath = (pathname.startsWith('/') ? pathname.slice(1) : pathname) + search;
- socketSendJson('set-client-path', fullPath);
+ socketSendJson('set-client-path', pathname + search);
  }, [pathname, search]);
 
  // navigate to new path when received from server

diff --git a/apps/client/src/common/utils/socket.ts b/apps/client/src/common/utils/socket.ts
@@ -36,7 +36,8 @@ export const connectSocket = () => {
  }
 
  socketSendJson('set-client-type', 'ontime');
- socketSendJson('set-client-path', location.pathname);
+
+ socketSendJson('set-client-path', location.pathname + location.search);
  };
 
  websocket.onclose = () => {