diff --git a/frontend/electron/main.ts b/frontend/electron/main.ts index 55fbeb7..cb6e23a 100644 --- a/frontend/electron/main.ts +++ b/frontend/electron/main.ts @@ -18,11 +18,9 @@ app.whenReady().then(() => { titleBarOverlay: process.platform !== "darwin" }) - // You can use `process.env.VITE_DEV_SERVER_URL` when the vite command is called `serve` if (process.env.VITE_DEV_SERVER_URL) { win.loadURL(process.env.VITE_DEV_SERVER_URL) } else { - // Load your file win.loadFile('dist/index.html'); } }); \ No newline at end of file diff --git a/frontend/src/ui/state.ts b/frontend/src/ui/state.ts index 2150b7d..335dcf3 100644 --- a/frontend/src/ui/state.ts +++ b/frontend/src/ui/state.ts @@ -199,19 +199,24 @@ export const useAppState = create((set, get) => ({ const token = localStorage.getItem('authToken'); if (token) { - const user: User = await (await fetch("/api/user/profile", { + const response = await fetch("/api/user/profile", { headers: getAuthHeaders(token) - })).json(); - - restoreKeys(); + }); - set(() => ({ - user: { - currentUser: user, - authToken: token - }, - currentPage: "chat" - })); + if (response.ok) { + const user: User = await response.json(); + restoreKeys(); + + set(() => ({ + user: { + currentUser: user, + authToken: token + }, + currentPage: "chat" + })); + } else { + throw new Error("Unable to authenticate"); + } } } catch (error) { console.error('Failed to restore user from localStorage:', error);