From 99069fe5f72d2a023b94dd4c1adaa2e9b0ad0f6f Mon Sep 17 00:00:00 2001 From: marcobaobao Date: Fri, 7 Feb 2025 09:45:26 +0100 Subject: [PATCH] fixed proxy subdir malformed string --- frontend/src/atoms/settings.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/frontend/src/atoms/settings.ts b/frontend/src/atoms/settings.ts index 00929db..986531f 100644 --- a/frontend/src/atoms/settings.ts +++ b/frontend/src/atoms/settings.ts @@ -121,11 +121,14 @@ export const appTitleState = atomWithStorage( export const serverAddressAndPortState = atom((get) => { if (get(servedFromReverseProxySubDirState)) { return `${get(serverAddressState)}/${get(servedFromReverseProxySubDirState)}/` + .replaceAll('"', '') // TODO: atomWithStorage put extra double quotes on strings } if (get(servedFromReverseProxyState)) { return `${get(serverAddressState)}` + .replaceAll('"', '') } return `${get(serverAddressState)}:${get(serverPortState)}` + .replaceAll('"', '') }) export const serverURL = atom((get) => @@ -135,14 +138,12 @@ export const serverURL = atom((get) => export const rpcWebSocketEndpoint = atom((get) => { const proto = window.location.protocol === 'https:' ? 'wss:' : 'ws:' return `${proto}//${get(serverAddressAndPortState)}/rpc/ws` -} -) +}) export const rpcHTTPEndpoint = atom((get) => { const proto = window.location.protocol return `${proto}//${get(serverAddressAndPortState)}/rpc/http` -} -) +}) export const serverSideCookiesState = atom>(async (get) => await pipe( ffetch>(`${get(serverURL)}/api/v1/cookies`), @@ -180,5 +181,4 @@ export const settingsState = atom((get) => ({ listView: get(listViewState), servedFromReverseProxy: get(servedFromReverseProxyState), appTitle: get(appTitleState) -}) -) +}))