diff --git a/apps/maple-research/frontend/bun.lock b/apps/maple-research/frontend/bun.lock index a8481c886..baf3685ec 100644 --- a/apps/maple-research/frontend/bun.lock +++ b/apps/maple-research/frontend/bun.lock @@ -6,7 +6,6 @@ "name": "maple", "dependencies": { "@mapleai/sdk": "file:../../../sdk", - "@opensecret/react-v1": "npm:@opensecret/react@3.4.1", "@radix-ui/react-alert-dialog": "^1.1.15", "@radix-ui/react-checkbox": "^1.3.3", "@radix-ui/react-dialog": "^1.1.15", @@ -256,8 +255,6 @@ "@nodelib/fs.walk": ["@nodelib/fs.walk@1.2.8", "", { "dependencies": { "@nodelib/fs.scandir": "2.1.5", "fastq": "^1.6.0" } }, "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg=="], - "@opensecret/react-v1": ["@opensecret/react@3.4.1", "", { "dependencies": { "@peculiar/x509": "1.14.3", "@stablelib/base64": "2.0.1", "@stablelib/chacha20poly1305": "2.0.1", "@stablelib/random": "2.0.1", "cbor2": "1.12.0", "tweetnacl": "1.0.3", "zod": "3.25.76" }, "peerDependencies": { "react": "^18.0.0 || ^19.0.0" } }, "sha512-9jcmjIljgw5ufHHV5Q/qFXT+B6bnjupCK1zpzGNuyohEcllwQubcdO+tkpZpCu6NgSJUIoe/XgKamMa+A6aFPw=="], - "@peculiar/asn1-cms": ["@peculiar/asn1-cms@2.8.0", "", { "dependencies": { "@peculiar/asn1-schema": "^2.8.0", "@peculiar/asn1-x509": "^2.8.0", "@peculiar/asn1-x509-attr": "^2.8.0", "asn1js": "^3.0.10", "tslib": "^2.8.1" } }, "sha512-NgekZOrSJFSBFLFoLfwePguAWAx7z1+f2TEsWFUMyiqqfntZ4+S/S5hzqME3q4pCA0iOsFKdwiQ35dwY24eVqA=="], "@peculiar/asn1-csr": ["@peculiar/asn1-csr@2.8.0", "", { "dependencies": { "@peculiar/asn1-schema": "^2.8.0", "@peculiar/asn1-x509": "^2.8.0", "asn1js": "^3.0.10", "tslib": "^2.8.1" } }, "sha512-akbF8+uvleHs8sejNPQxwmVFuInAg6FMNHOwMILXfP518YfFJwdR3jr6oNUPOaEJfuEhn/vkNOCIT6ASUd4mbg=="], diff --git a/apps/maple-research/frontend/package.json b/apps/maple-research/frontend/package.json index a70d6622c..a441dbec4 100644 --- a/apps/maple-research/frontend/package.json +++ b/apps/maple-research/frontend/package.json @@ -50,7 +50,6 @@ }, "dependencies": { "@mapleai/sdk": "file:../../../sdk", - "@opensecret/react-v1": "npm:@opensecret/react@3.4.1", "@radix-ui/react-alert-dialog": "^1.1.15", "@radix-ui/react-checkbox": "^1.3.3", "@radix-ui/react-dialog": "^1.1.15", diff --git a/apps/maple-research/frontend/src/components/DesktopSignInUpdateRequired.test.tsx b/apps/maple-research/frontend/src/components/DesktopSignInUpdateRequired.test.tsx new file mode 100644 index 000000000..1601a17cf --- /dev/null +++ b/apps/maple-research/frontend/src/components/DesktopSignInUpdateRequired.test.tsx @@ -0,0 +1,14 @@ +import { describe, expect, test } from "bun:test"; +import { renderToStaticMarkup } from "react-dom/server"; + +import { DesktopSignInUpdateRequired } from "./DesktopSignInUpdateRequired"; + +describe("DesktopSignInUpdateRequired", () => { + test("tells an unsupported release to update and links to the download page", () => { + const markup = renderToStaticMarkup(); + + expect(markup).toContain("Update Maple to sign in"); + expect(markup).toContain("no longer supported"); + expect(markup).toContain('href="https://maple.ai/research#download"'); + }); +}); diff --git a/apps/maple-research/frontend/src/components/DesktopSignInUpdateRequired.tsx b/apps/maple-research/frontend/src/components/DesktopSignInUpdateRequired.tsx new file mode 100644 index 000000000..822bb0b4b --- /dev/null +++ b/apps/maple-research/frontend/src/components/DesktopSignInUpdateRequired.tsx @@ -0,0 +1,27 @@ +import { Button } from "@/components/ui/button"; +import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card"; +import { MARKETING_DOWNLOADS_URL } from "@/config/domains"; + +/** + * Shown instead of the application when a Maple release from before + * Transport V2 opens the hosted sign-in page. The backend no longer serves + * that release, so the only way forward is a current build. + */ +export function DesktopSignInUpdateRequired() { + return ( + + + Update Maple to sign in + + +

+ This version of Maple is no longer supported and can't sign in. Install the latest + version, then sign in again. +

+ +
+
+ ); +} diff --git a/apps/maple-research/frontend/src/legacy/LegacyDesktopOAuthApp.tsx b/apps/maple-research/frontend/src/legacy/LegacyDesktopOAuthApp.tsx deleted file mode 100644 index cd6a9824c..000000000 --- a/apps/maple-research/frontend/src/legacy/LegacyDesktopOAuthApp.tsx +++ /dev/null @@ -1,336 +0,0 @@ -import "../index.css"; - -import { useEffect, useRef, useState } from "react"; -import { - OpenSecretProvider as LegacyOpenSecretProvider, - useOpenSecret as useLegacyOpenSecret -} from "@opensecret/react-v1"; -import { sha256 } from "@noble/hashes/sha256"; -import { bytesToHex } from "@noble/hashes/utils"; -import { v4 as uuidv4 } from "uuid"; -import { Apple } from "@/components/icons/Apple"; -import { Button } from "@/components/ui/button"; -import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card"; -import { openSecretClientConfig } from "@/config/openSecretClientConfig"; -import { - clearDesktopOAuthTransport, - markDesktopOAuthTransport -} from "@/services/desktopOAuthTransport"; -import { getSafeInternalRedirect } from "@/utils/internalRedirect"; -import { Loader2 } from "lucide-react"; - -type OAuthProvider = "github" | "google" | "apple"; - -function readProvider(value: string | null): OAuthProvider | null { - return value === "github" || value === "google" || value === "apple" ? value : null; -} - -function providerFromCallbackPath(pathname: string): OAuthProvider | null { - return readProvider(pathname.match(/^\/auth\/(github|google|apple)\/callback$/u)?.[1] ?? null); -} - -function formatProviderName(provider: OAuthProvider): string { - if (provider === "github") return "GitHub"; - if (provider === "google") return "Google"; - return "Apple"; -} - -function clearBillingToken(): void { - sessionStorage.removeItem("maple_billing_token"); -} - -function buildLegacyDeepLink(selectedPlan?: string): string { - const accessToken = localStorage.getItem("access_token")?.trim(); - const refreshToken = localStorage.getItem("refresh_token")?.trim(); - if (!accessToken || !refreshToken) { - throw new Error("The legacy authentication response did not include both credentials"); - } - - const deepLink = new URL("cloud.opensecret.maple://auth"); - deepLink.searchParams.set("access_token", accessToken); - deepLink.searchParams.set("refresh_token", refreshToken); - - const postAuthRedirect = getSafeInternalRedirect(sessionStorage.getItem("post_auth_redirect")); - sessionStorage.removeItem("post_auth_redirect"); - sessionStorage.removeItem("selected_plan"); - if (!selectedPlan && postAuthRedirect) { - deepLink.searchParams.set("next", postAuthRedirect); - } - - clearDesktopOAuthTransport(); - return deepLink.toString(); -} - -function LegacyDesktopOAuthContent() { - const callbackProvider = providerFromCallbackPath(window.location.pathname); - if (callbackProvider) { - return ; - } - return ; -} - -function LegacyOAuthInitiation() { - const os = useLegacyOpenSecret(); - const search = new URLSearchParams(window.location.search); - const provider = readProvider(search.get("provider")); - const selectedPlan = search.get("selected_plan") ?? undefined; - const next = getSafeInternalRedirect(search.get("next")); - const [error, setError] = useState(null); - const [nativeRedirectUrl, setNativeRedirectUrl] = useState(null); - const started = useRef(false); - - useEffect(() => { - if (started.current || !provider) return; - started.current = true; - markDesktopOAuthTransport("v1"); - - sessionStorage.removeItem("selected_plan"); - if (selectedPlan) sessionStorage.setItem("selected_plan", selectedPlan); - sessionStorage.removeItem("post_auth_redirect"); - if (next) sessionStorage.setItem("post_auth_redirect", next); - - if (provider === "apple") return; - - const initiate = provider === "github" ? os.initiateGitHubAuth : os.initiateGoogleAuth; - void initiate("") - .then(({ auth_url }) => { - window.location.href = auth_url; - }) - .catch((cause: unknown) => { - clearDesktopOAuthTransport(); - console.error(`Failed to initiate legacy ${provider} login:`, cause); - setError(`Failed to initiate ${formatProviderName(provider)} login`); - }); - }, [next, os.initiateGitHubAuth, os.initiateGoogleAuth, provider, selectedPlan]); - - const finishAppleAuth = () => { - try { - clearBillingToken(); - const deepLinkUrl = buildLegacyDeepLink(selectedPlan); - setNativeRedirectUrl(deepLinkUrl); - setTimeout(() => { - window.location.href = deepLinkUrl; - }, 1000); - } catch (cause) { - clearDesktopOAuthTransport(); - console.error("Failed to finish legacy Apple login:", cause); - setError(cause instanceof Error ? cause.message : "Failed to finish Apple login"); - } - }; - - if (!provider) { - return ; - } - if (error) return ; - if (nativeRedirectUrl) { - return ; - } - - if (provider === "apple") { - return ( - - - Apple Sign In - - -

Click the button below to sign in with Apple:

- { - clearDesktopOAuthTransport(); - setError(cause.message); - }} - /> -
-
- ); - } - - return ; -} - -function LegacyOAuthCallback({ provider }: { provider: OAuthProvider }) { - const os = useLegacyOpenSecret(); - const [error, setError] = useState(null); - const [nativeRedirectUrl, setNativeRedirectUrl] = useState(null); - const processed = useRef(false); - - useEffect(() => { - if (processed.current) return; - processed.current = true; - - const search = new URLSearchParams(window.location.search); - const code = search.get("code"); - const state = search.get("state"); - if (!code || !state) { - clearDesktopOAuthTransport(); - setError("Invalid callback parameters"); - return; - } - - const handle = - provider === "github" - ? os.handleGitHubCallback - : provider === "google" - ? os.handleGoogleCallback - : os.handleAppleCallback; - - void handle(code, state, "") - .then(() => { - clearBillingToken(); - const selectedPlan = sessionStorage.getItem("selected_plan") ?? undefined; - const deepLinkUrl = buildLegacyDeepLink(selectedPlan); - setNativeRedirectUrl(deepLinkUrl); - setTimeout(() => { - window.location.href = deepLinkUrl; - }, 1000); - }) - .catch((cause: unknown) => { - clearDesktopOAuthTransport(); - console.error(`Legacy ${provider} authentication callback failed:`, cause); - setError(cause instanceof Error ? cause.message : "Authentication failed"); - }); - }, [os.handleAppleCallback, os.handleGitHubCallback, os.handleGoogleCallback, provider]); - - if (error) return ; - if (nativeRedirectUrl) { - return ; - } - return ; -} - -function LegacyAppleButton({ - onAuthenticated, - onError -}: { - onAuthenticated: () => void; - onError: (error: Error) => void; -}) { - const os = useLegacyOpenSecret(); - const scriptLoaded = useRef(false); - const pending = useRef(false); - - useEffect(() => { - if (scriptLoaded.current) return; - const script = document.createElement("script"); - script.src = - "https://appleid.cdn-apple.com/appleauth/static/jsapi/appleid/1/en_US/appleid.auth.js"; - script.async = true; - document.head.appendChild(script); - scriptLoaded.current = true; - return () => { - script.remove(); - scriptLoaded.current = false; - }; - }, []); - - const signIn = async () => { - if (pending.current) return; - pending.current = true; - try { - if (!window.AppleID) throw new Error("Apple Sign In SDK not loaded"); - const initiation = await os.initiateAppleAuth(""); - // The released V1 callback contract expects the original raw nonce in - // session storage and its SHA-256 digest at Apple. Keep that behavior - // isolated to this compatibility bundle. - const rawNonce = uuidv4(); - const hashedNonce = bytesToHex(sha256(new TextEncoder().encode(rawNonce))); - sessionStorage.setItem("apple_auth_nonce", rawNonce); - sessionStorage.setItem("apple_auth_state", initiation.state || ""); - window.AppleID.auth.init({ - clientId: "cloud.opensecret.maple.services", - scope: "name email", - redirectURI: window.location.origin + "/auth/apple/callback", - state: initiation.state || "", - nonce: hashedNonce, - usePopup: true - }); - - const result = await window.AppleID.auth.signIn(); - if (!result.authorization?.code || !result.authorization.state) { - throw new Error("Missing required authentication data"); - } - await os.handleAppleCallback(result.authorization.code, result.authorization.state, ""); - sessionStorage.removeItem("apple_auth_state"); - onAuthenticated(); - } catch (cause) { - const error = cause instanceof Error ? cause : new Error("Apple authentication failed"); - if ( - error.message !== "user_cancelled_authorize" && - error.message !== "popup_closed_by_user" - ) { - console.error("Legacy Apple authentication failed:", error); - onError(error); - } - } finally { - pending.current = false; - } - }; - - return ( - - ); -} - -function LegacyProcessing({ provider }: { provider: OAuthProvider }) { - return ( - - - Processing {formatProviderName(provider)} Login - - -

Completing authentication...

-
- -
-
-
- ); -} - -function LegacySuccess({ - provider, - deepLinkUrl -}: { - provider: OAuthProvider; - deepLinkUrl: string; -}) { - return ( - - - {formatProviderName(provider)} Authentication Successful - - -

Authentication successful! Tap the button below to return to Maple.

-
- -
-
-
- ); -} - -function LegacyError({ message }: { message: string }) { - return ( - - - Authentication Failed - - -

{message}

- -
-
- ); -} - -export default function LegacyDesktopOAuthApp() { - return ( - - - - ); -} diff --git a/apps/maple-research/frontend/src/main.tsx b/apps/maple-research/frontend/src/main.tsx index aaa7cee9e..2504943ac 100644 --- a/apps/maple-research/frontend/src/main.tsx +++ b/apps/maple-research/frontend/src/main.tsx @@ -1,9 +1,12 @@ -import { StrictMode } from "react"; +import { StrictMode, type ComponentType } from "react"; import { createRoot } from "react-dom/client"; import { isIOS, isTauri, isTauriDesktop, waitForPlatform } from "@/utils/platform"; import { restoreChatTypographyAtLaunch } from "@/services/chatTypographyPreferences"; import { restoreWorkspaceModeAtLaunch } from "@/services/workspaceModePreference"; -import { shouldLoadLegacyDesktopOAuth } from "@/services/desktopOAuthTransport"; +import { + clearRetiredDesktopOAuthMarkers, + isRetiredDesktopOAuthEntry +} from "@/services/desktopOAuthTransport"; import { openSecretClientConfig } from "@/config/openSecretClientConfig"; // Initialize platform detection before rendering @@ -26,19 +29,24 @@ async function initializeApp() { } } if (isTauri()) { - // Keep the V2 SDK out of the hosted V1 compatibility entrypoint. Released - // callbacks select their pinned bundle before any V2 application module is - // imported. const { ensureNativeTransportRoot } = await import("@/services/nativeTransportRoot"); await ensureNativeTransportRoot(openSecretClientConfig().apiUrl); } restoreWorkspaceModeAtLaunch(isTauriDesktop()); + // Markers left by a pre-V2 hosted sign-in must not outlive that flow. + clearRetiredDesktopOAuthMarkers(); + // Create the router only after restoring the launch route so its first - // location snapshot matches the user's saved mode. - const { default: App } = shouldLoadLegacyDesktopOAuth(window.location) - ? await import("./legacy/LegacyDesktopOAuthApp") - : await import("./app"); + // location snapshot matches the user's saved mode. A release from before + // Transport V2 gets an update notice instead of the application. + let App: ComponentType; + if (isRetiredDesktopOAuthEntry(window.location)) { + await import("./index.css"); + App = (await import("./components/DesktopSignInUpdateRequired")).DesktopSignInUpdateRequired; + } else { + App = (await import("./app")).default; + } // Render the app const rootElement = document.getElementById("root")!; diff --git a/apps/maple-research/frontend/src/services/desktopOAuthTransport.test.ts b/apps/maple-research/frontend/src/services/desktopOAuthTransport.test.ts index bb17c4a68..b9e2a1e5d 100644 --- a/apps/maple-research/frontend/src/services/desktopOAuthTransport.test.ts +++ b/apps/maple-research/frontend/src/services/desktopOAuthTransport.test.ts @@ -6,13 +6,12 @@ import { claimTransportV2DesktopOAuthInitiation, clearDesktopOAuthTransport, clearDesktopOAuthTarget, + clearRetiredDesktopOAuthMarkers, isNativeOAuthRedirect, - markDesktopOAuthTransport, + isRetiredDesktopOAuthEntry, markTransportV2DesktopOAuth, mintTransportV2NativeAuthDeepLink, - readDesktopOAuthTransport, - readTransportV2DesktopOAuth, - shouldLoadLegacyDesktopOAuth + readTransportV2DesktopOAuth } from "./desktopOAuthTransport"; class MemoryStorage implements Storage { @@ -140,7 +139,6 @@ describe("desktop OAuth transport selection", () => { test("stores the exact provider and target pair in same-tab state", () => { markTransportV2DesktopOAuth(state, 1_000); - expect(readDesktopOAuthTransport()).toBe("v2"); expect(isNativeOAuthRedirect()).toBe(true); expect(readTransportV2DesktopOAuth("github", 1_001)).toEqual({ ...state, @@ -327,44 +325,48 @@ describe("desktop OAuth transport selection", () => { expect(() => buildTransportV2NativeAuthDeepLink(`YQ.Yg.${"a".repeat(4092)}`)).toThrow(); }); - test("keeps unversioned desktop-auth on the pinned V1 bridge", () => { - expect(shouldLoadLegacyDesktopOAuth(location("/desktop-auth", "?provider=github"))).toBe(true); + test("treats unversioned desktop-auth as a retired client entry", () => { + expect(isRetiredDesktopOAuthEntry(location("/desktop-auth", "?provider=github"))).toBe(true); + expect(isRetiredDesktopOAuthEntry(location("/desktop-auth"))).toBe(true); }); - test("never downgrades supplied or malformed transport selectors", () => { - expect( - shouldLoadLegacyDesktopOAuth(location("/desktop-auth", "?provider=github&transport=v2")) - ).toBe(false); - expect( - shouldLoadLegacyDesktopOAuth(location("/desktop-auth", "?provider=github&transport=invalid")) - ).toBe(false); - expect( - shouldLoadLegacyDesktopOAuth(location("/desktop-auth", "?provider=github&transport=")) - ).toBe(false); + test("leaves supplied or malformed transport selectors to the application", () => { + for (const search of [ + "?provider=github&transport=v2", + "?provider=github&transport=invalid", + "?provider=github&transport=" + ]) { + expect(isRetiredDesktopOAuthEntry(location("/desktop-auth", search))).toBe(false); + } }); - test("preserves callbacks from an already-running released-client flow", () => { + test("leaves every callback and other route to the application", () => { + // A marker left by a pre-V2 flow must not capture an ordinary web callback. localStorage.setItem("redirect-to-native", "true"); - expect(shouldLoadLegacyDesktopOAuth(location("/auth/github/callback"))).toBe(true); + localStorage.setItem("maple_desktop_oauth_transport_v1", "v1"); + for (const pathname of ["/auth/github/callback", "/auth/apple/callback", "/login", "/"]) { + expect(isRetiredDesktopOAuthEntry(location(pathname))).toBe(false); + } }); - test("never loads V1 for marked V2 or malformed callbacks", () => { - markDesktopOAuthTransport("v2"); - expect(shouldLoadLegacyDesktopOAuth(location("/auth/google/callback"))).toBe(false); + test("removes markers left by a pre-V2 flow without touching a current one", () => { + localStorage.setItem("redirect-to-native", "true"); + localStorage.setItem("maple_desktop_oauth_transport_v1", "v1"); + markTransportV2DesktopOAuth(state, 1_000); - localStorage.setItem("maple_desktop_oauth_transport_v1", "invalid"); - expect(shouldLoadLegacyDesktopOAuth(location("/auth/google/callback"))).toBe(false); - }); + clearRetiredDesktopOAuthMarkers(); - test("does not load the legacy bridge for ordinary web callbacks", () => { - expect(shouldLoadLegacyDesktopOAuth(location("/auth/apple/callback"))).toBe(false); + expect(localStorage.getItem("redirect-to-native")).toBeNull(); + expect(localStorage.getItem("maple_desktop_oauth_transport_v1")).toBeNull(); + expect(isNativeOAuthRedirect()).toBe(true); + expect(readTransportV2DesktopOAuth("github", 1_001)).toEqual({ ...state, startedAt: 1_000 }); }); test("clears transport and pending target state after handoff", () => { markTransportV2DesktopOAuth(state, 1_000); clearDesktopOAuthTransport(); - expect(readDesktopOAuthTransport()).toBeNull(); + expect(isNativeOAuthRedirect()).toBe(false); expect(readTransportV2DesktopOAuth("github", 1_001)).toBeNull(); expect(localStorage.getItem("redirect-to-native")).toBeNull(); }); diff --git a/apps/maple-research/frontend/src/services/desktopOAuthTransport.ts b/apps/maple-research/frontend/src/services/desktopOAuthTransport.ts index 0d40bcd55..d4b09f4e3 100644 --- a/apps/maple-research/frontend/src/services/desktopOAuthTransport.ts +++ b/apps/maple-research/frontend/src/services/desktopOAuthTransport.ts @@ -6,7 +6,6 @@ import { type MapleAppVariant } from "@/config/mapleAppVariant"; -export type DesktopOAuthTransport = "v1" | "v2"; export type DesktopOAuthProvider = "github" | "google" | "apple"; const DESKTOP_OAUTH_TRANSPORT_KEY = "maple_desktop_oauth_transport_v1"; @@ -102,10 +101,9 @@ export function buildTransportV2DesktopAuthUrl( return url.toString(); } -export function markDesktopOAuthTransport(transport: DesktopOAuthTransport): void { - const storage = transport === "v2" ? sessionStorage : localStorage; - storage.setItem(DESKTOP_OAUTH_TRANSPORT_KEY, transport); - storage.setItem(REDIRECT_TO_NATIVE_KEY, "true"); +function markNativeOAuthRedirect(): void { + sessionStorage.setItem(DESKTOP_OAUTH_TRANSPORT_KEY, "v2"); + sessionStorage.setItem(REDIRECT_TO_NATIVE_KEY, "true"); } export function markTransportV2DesktopOAuth( @@ -136,7 +134,7 @@ export function markTransportV2DesktopOAuth( sessionStorage.removeItem(TRANSPORT_V2_MINT_CLAIM_KEY); } sessionStorage.setItem(TRANSPORT_V2_PENDING_KEY, JSON.stringify(nextState)); - markDesktopOAuthTransport("v2"); + markNativeOAuthRedirect(); } export function readTransportV2DesktopOAuth( @@ -188,16 +186,19 @@ export function claimTransportV2DesktopOAuthInitiation( return true; } -export function readDesktopOAuthTransport(): DesktopOAuthTransport | null { - if (sessionStorage.getItem(DESKTOP_OAUTH_TRANSPORT_KEY) === "v2") return "v2"; - return localStorage.getItem(DESKTOP_OAUTH_TRANSPORT_KEY) === "v1" ? "v1" : null; +/** + * The pre-V2 hosted sign-in kept its markers in localStorage. Nothing reads + * them any more; remove any that an old flow left behind. + */ +export function clearRetiredDesktopOAuthMarkers(): void { + localStorage.removeItem(DESKTOP_OAUTH_TRANSPORT_KEY); + localStorage.removeItem(REDIRECT_TO_NATIVE_KEY); } export function clearDesktopOAuthTransport(): void { - for (const storage of [sessionStorage, localStorage]) { - storage.removeItem(DESKTOP_OAUTH_TRANSPORT_KEY); - storage.removeItem(REDIRECT_TO_NATIVE_KEY); - } + sessionStorage.removeItem(DESKTOP_OAUTH_TRANSPORT_KEY); + sessionStorage.removeItem(REDIRECT_TO_NATIVE_KEY); + clearRetiredDesktopOAuthMarkers(); removeTransportV2PendingState(); } @@ -244,7 +245,7 @@ export function isCurrentDesktopOAuthTarget( return isNativeOAuthRedirect() && current !== null && sameDesktopOAuthTarget(current, expected); } -/** Clear only this flow, including expired state, without disturbing a newer login or V1. */ +/** Clear only this flow, including expired state, without disturbing a newer login. */ export function clearDesktopOAuthTarget(expected: TransportV2DesktopOAuthState): void { const encoded = sessionStorage.getItem(TRANSPORT_V2_PENDING_KEY); if (!encoded) return; @@ -287,29 +288,17 @@ export async function mintTransportV2NativeAuthDeepLink( } } -export function shouldLoadLegacyDesktopOAuth( +/** + * Releases from before Transport V2 opened `/desktop-auth` without a + * transport selector, and nothing can sign them in any more. Any supplied + * selector, including a malformed one, stays with the application, which + * accepts only `v2` and fails closed on everything else. + */ +export function isRetiredDesktopOAuthEntry( location: Pick ): boolean { - if (location.pathname === "/desktop-auth") { - // Released clients did not send a transport selector. Any supplied - // selector, including a malformed one, stays on the fail-closed current - // bundle instead of silently downgrading. - return new URLSearchParams(location.search).getAll("transport").length === 0; - } - - if (!/^\/auth\/(github|google|apple)\/callback$/u.test(location.pathname)) { - return false; - } - if ( - sessionStorage.getItem(REDIRECT_TO_NATIVE_KEY) === "true" && - sessionStorage.getItem(DESKTOP_OAUTH_TRANSPORT_KEY) === "v2" - ) { - return false; - } - if (localStorage.getItem(REDIRECT_TO_NATIVE_KEY) !== "true") return false; - - const marker = localStorage.getItem(DESKTOP_OAUTH_TRANSPORT_KEY); - // A missing marker is an already-running flow started by the previously - // deployed site. Unknown markers fail closed on the current bundle. - return marker === null || marker === "v1"; + return ( + location.pathname === "/desktop-auth" && + new URLSearchParams(location.search).getAll("transport").length === 0 + ); } diff --git a/docs/sdk-publishing.md b/docs/sdk-publishing.md index 6cbc6290a..5b5d9ebd3 100644 --- a/docs/sdk-publishing.md +++ b/docs/sdk-publishing.md @@ -44,12 +44,11 @@ release. Research and Auth resolve transitive `zod` dependencies to `4.6.7` for [GHSA-mrhx-c7xc-m3w5](https://github.com/advisories/GHSA-mrhx-c7xc-m3w5). This removes Zod 3 from their installed dependency graphs, but older published -`@mapleai/sdk` versions and Research's legacy `@opensecret/react-v1` package -also embed Zod 3 in their JavaScript bundles. A consumer resolution cannot -replace that embedded code. A clean Bun audit therefore proves only the -resolved graph; complete remediation requires rebuilding and publishing the -SDK with the patched dependency, then updating Auth's pin. Preserve legacy -authentication compatibility when preparing that separate upgrade. +`@mapleai/sdk` versions also embed Zod 3 in their JavaScript bundles. A +consumer resolution cannot replace that embedded code. A clean Bun audit +therefore proves only the resolved graph; complete remediation requires +rebuilding and publishing the SDK with the patched dependency, then updating +Auth's pin. Before releasing a client, proxy, or CLI, inspect what that consumer will actually ship. For Research's frontend, confirm the `@mapleai/sdk` entry in both