Skip to content

fix(cli-auth): ensure fallback token renders before redirect on Windows/Chrome #1486

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Th3Ya0vi wants to merge 1 commit into
base: main
Choose a base branch
from
+22 −4
Open

fix(cli-auth): ensure fallback token renders before redirect on Windows/Chrome #1486

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 22 additions & 4 deletions src/routes/cli/auth.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { useAuthActions } from "@convex-dev/auth/react";
import { createFileRoute } from "@tanstack/react-router";
import { useMutation } from "convex/react";
import { useEffect, useMemo, useRef, useState } from "react";
import { flushSync } from "react-dom";
import { api } from "../../../convex/_generated/api";
import { getUserFacingConvexError } from "../../lib/convexError";
import { getClawHubSiteUrl, normalizeClawHubSiteOrigin } from "../../lib/site";
Expand All @@ -26,6 +27,7 @@ function CliAuth() {
};
const [status, setStatus] = useState<string>("Preparing…");
const [token, setToken] = useState<string | null>(null);
const [callbackUrl, setCallbackUrl] = useState<string | null>(null);
const hasRun = useRef(false);

const redirectUri = search.redirect_uri ?? "";
Expand All @@ -52,13 +54,21 @@ function CliAuth() {
const run = async () => {
setStatus("Creating token…");
const result = await createToken({ label });
setToken(result.token);
setStatus("Redirecting to CLI…");
const hash = new URLSearchParams();
hash.set("token", result.token);
hash.set("registry", registry);
hash.set("state", state);
window.location.assign(`${redirectUri}#${hash.toString()}`);
const callbackUrl = `${redirectUri}#${hash.toString()}`;
// Render the fallback token before attempting navigation so it is
// always visible if the browser blocks or fails the http:// redirect
// (e.g. ERR_CONNECTION_REFUSED when the CLI server has already shut
// down, or Chrome's HTTPS-first mode interfering with localhost).
flushSync(() => {
setToken(result.token);
setCallbackUrl(callbackUrl);
setStatus("Redirecting to CLI…");
});
window.location.assign(callbackUrl);
};

void run().catch((error) => {
Expand Down Expand Up @@ -157,8 +167,16 @@ function CliAuth() {
<p className="section-subtitle">{status}</p>
{token ? (
<div className="stat" style={{ overflowX: "auto" }}>
<div style={{ marginBottom: 8 }}>If redirect fails, copy this token:</div>
<div style={{ marginBottom: 8 }}>
If the redirect did not complete, copy this token and run{" "}
<code>clawhub login --token &lt;token&gt;</code>:
</div>
<code>{token}</code>
{callbackUrl ? (
<div style={{ marginTop: 8 }}>
<a href={callbackUrl}>Retry redirect to CLI</a>
</div>
) : null}
</div>
) : null}
</div>
Expand Down