fix(web): ignore leftover desktop instance URL in the browser

This commit is contained in:
tianma-if committed 2026-09-17 23:47:42 +08:00
1 parent de7e006e57
commit 5ee1e5745e
2 files changed
+10 -2

No files matched your search

+8
View File
@@ -147,6 +147,14 @@ describe("desktop instance setup", () => {
window.edgeeverDesktop.apiBaseUrl = "";
});
test("ignores a leftover desktop instance URL in the browser", () => {
storage.set(DESKTOP_API_BASE_URL_STORAGE_KEY, "https://example.workers.dev");
window.edgeeverDesktop.isAvailable = false;
expect(getConfiguredDesktopApiBaseUrl()).toBe("");
window.edgeeverDesktop.isAvailable = true;
expect(getConfiguredDesktopApiBaseUrl()).toBe("https://example.workers.dev");
});
test("preserves the desktop token when refreshing the same authenticated session", async () => {
await cacheDesktopSession({
authRequired: true,
+2 -2
View File
@@ -102,14 +102,14 @@ export const clearCachedDesktopSession = () => {
};
export const getConfiguredDesktopApiBaseUrl = () => {
if (typeof window === "undefined") return "";
if (typeof window === "undefined" || !window.edgeeverDesktop?.isAvailable) return "";
try {
const savedUrl = (window.localStorage.getItem(DESKTOP_API_BASE_URL_STORAGE_KEY) ?? "").trim();
if (savedUrl) return savedUrl.replace(/\/$/, "");
} catch {}
const bridgeUrl = (window.edgeeverDesktop?.apiBaseUrl ?? "").trim();
const bridgeUrl = (window.edgeeverDesktop.apiBaseUrl ?? "").trim();
return bridgeUrl.replace(/\/$/, "");
};