feat(desktop-client): give login and main views their own BrowserWindow
Spawn a separate window per mode keyed by a ?window= query param so each surface keeps its size, devtools, and renderer state independently. Logout now persists the cleared session and switches windows before awaiting the runtime release, avoiding a stale main-window flash on the way out. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -39,6 +39,7 @@ const apiBaseURL = shallowRef(readStoredApiBaseURL());
|
||||
const pending = shallowRef(false);
|
||||
const error = shallowRef<string | null>(null);
|
||||
let loginPromise: Promise<void> | null = null;
|
||||
let logoutPromise: Promise<void> | null = null;
|
||||
|
||||
function readStoredSession(): DesktopSession | null {
|
||||
if (typeof window === "undefined") {
|
||||
@@ -132,6 +133,39 @@ function createAuthenticatedClient() {
|
||||
});
|
||||
}
|
||||
|
||||
function createSessionBoundAuthenticatedClient(source: DesktopSession) {
|
||||
let accessToken = source.accessToken;
|
||||
let refreshToken = source.refreshToken;
|
||||
|
||||
return createApiClient({
|
||||
baseURL: apiBaseURL.value,
|
||||
timeoutMs: 15000,
|
||||
auth: {
|
||||
getAccessToken: () => accessToken,
|
||||
getRefreshToken: () => refreshToken,
|
||||
setTokens: (tokens: AuthTokens) => {
|
||||
accessToken = tokens.accessToken;
|
||||
refreshToken = tokens.refreshToken;
|
||||
},
|
||||
clearTokens: () => {
|
||||
accessToken = null;
|
||||
refreshToken = null;
|
||||
},
|
||||
async refresh(refreshTokenValue: string): Promise<AuthTokens> {
|
||||
const next = await createPublicClient().post<RefreshResponse, { refresh_token: string }>(
|
||||
"/api/auth/refresh",
|
||||
{ refresh_token: refreshTokenValue },
|
||||
);
|
||||
|
||||
return {
|
||||
accessToken: next.access_token,
|
||||
refreshToken: next.refresh_token,
|
||||
};
|
||||
},
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
function resolveFallbackPlatform(): string {
|
||||
const currentNavigator = globalThis.navigator as Navigator & {
|
||||
userAgentData?: { platform?: string };
|
||||
@@ -416,10 +450,7 @@ async function enterPreview(): Promise<void> {
|
||||
});
|
||||
}
|
||||
|
||||
async function logout(): Promise<void> {
|
||||
error.value = null;
|
||||
const current = session.value;
|
||||
|
||||
async function releaseSessionForLogout(current: DesktopSession | null): Promise<void> {
|
||||
if (current?.mode === "authenticated") {
|
||||
try {
|
||||
await window.desktopBridge?.app?.releaseRuntimeSession?.(true);
|
||||
@@ -428,13 +459,43 @@ async function logout(): Promise<void> {
|
||||
}
|
||||
|
||||
try {
|
||||
await createAuthenticatedClient().post<null, Record<string, never>>("/api/auth/logout", {});
|
||||
await createSessionBoundAuthenticatedClient(current).post<null, Record<string, never>>("/api/auth/logout", {});
|
||||
} catch (err) {
|
||||
console.warn("[desktop-session] auth logout failed", err);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
async function transitionWindowForLogout(): Promise<void> {
|
||||
try {
|
||||
await window.desktopBridge?.app?.setWindowMode?.("login", { source: "logout", animate: true });
|
||||
} catch (err) {
|
||||
console.warn("[desktop-session] logout window transition failed", err);
|
||||
}
|
||||
}
|
||||
|
||||
async function performLogout(): Promise<void> {
|
||||
error.value = null;
|
||||
const current = session.value;
|
||||
const releasePromise = releaseSessionForLogout(current);
|
||||
|
||||
persistSession(null);
|
||||
await transitionWindowForLogout();
|
||||
|
||||
void releasePromise.catch((err) => {
|
||||
console.warn("[desktop-session] background logout release failed", err);
|
||||
});
|
||||
}
|
||||
|
||||
async function logout(): Promise<void> {
|
||||
if (logoutPromise) {
|
||||
return logoutPromise;
|
||||
}
|
||||
|
||||
logoutPromise = performLogout().finally(() => {
|
||||
logoutPromise = null;
|
||||
});
|
||||
return logoutPromise;
|
||||
}
|
||||
|
||||
if (typeof window !== "undefined") {
|
||||
|
||||
Reference in New Issue
Block a user