mirror of
https://github.com/MBombeck/HealthLog.git
synced 2026-11-09 21:10:59 +00:00
fix(ai): switch ChatGPT-OAuth to device-code flow (v1.4.7-followup)
v1.4.7 corrected the issuer (`auth.openai.com`) and added the RFC-8693 api-key exchange, but the Connect button still failed in production with `unknown_error`. Root cause: OpenAI's Hydra allow-lists only `http://localhost:1455/auth/callback` and `:1457/auth/callback` for the public Codex CLI client ID. Any hosted redirect URI gets silently rejected — the v1.4.7 user landed on the "An error occurred during authentication (unknown_error)" page. The official Codex CLI ships a parallel **device-code flow** for exactly this case (`codex-rs/login/src/device_code_auth.rs`): 1. POST `https://auth.openai.com/api/accounts/deviceauth/usercode` with the client id → `{ device_auth_id, user_code, interval }`. 2. Show the user the code and a link to `https://auth.openai.com/codex/device`. They open it on any device, log in, and type the code. 3. POST `https://auth.openai.com/api/accounts/deviceauth/token` repeatedly until Hydra returns `{ authorization_code, code_challenge, code_verifier }` (otherwise 403 / 404). 4. Standard PKCE token exchange against `/oauth/token` — but with `redirect_uri = https://auth.openai.com/deviceauth/callback`, which IS allow-listed for the public client. Then the same id_token → API-key exchange that v1.4.7 already added. This sidesteps the redirect-URI allow-list entirely; HealthLog's domain never appears in any OAuth round-trip. Implementation: - `src/lib/ai/codex-oauth.ts` adds `requestDeviceCode()` and `pollDeviceCode()`. - `POST /api/auth/codex/device-start` initialises the flow, persists the `device_auth_id` + `user_code` in an encrypted httpOnly cookie (15 min, scoped to the requesting user), and returns the user- facing pieces. - `POST /api/auth/codex/device-poll` does one poll attempt; on `pending` it returns `{ status: "pending" }`, on success it exchanges + persists the api key + refresh token and returns `{ status: "connected" }`. - The Settings → KI section replaces the "redirect to OAuth" button with an inline card showing the user code, the verification URL, and a copy button. The page polls every `intervalSeconds` (5s default) until status flips to "connected" or the user cancels. EN + DE strings under `settings.ai.deviceCode*` cover the new copy. - The legacy authorize / callback routes stay on disk for now — they're harmless when the redirect-URI allow-list is updated for a private client ID, so operators with an OpenAI partner client can still use the original flow via `CODEX_OAUTH_CLIENT_ID`. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
1 parent
2f7f487228
commit
19eb1d95d6
8 files changed
+467
-11
No files matched your search
@@ -1,5 +1,23 @@
|
||||
# Changelog
|
||||
|
||||
## [1.4.8] — 2026-05-09
|
||||
|
||||
### Fixed — Settings · KI
|
||||
|
||||
- **"Mit ChatGPT verbinden" funktioniert jetzt wirklich.** v1.4.7 hat
|
||||
zwar die OAuth-Endpoints korrigiert, ist aber an OpenAIs Hydra-
|
||||
Allow-List gescheitert: die Public-Codex-Client-ID hat in der
|
||||
Server-Allow-List nur `localhost:1455/1457` als Redirect-URI, jeder
|
||||
hosted-Domain-Callback wird mit "An error occurred during
|
||||
authentication (unknown_error)" abgelehnt. v1.4.8 schaltet auf den
|
||||
**Device-Code-Flow** um — den selben Mechanismus den der offizielle
|
||||
Codex CLI für Headless-/Hosted-Umgebungen nutzt: HealthLog zeigt
|
||||
einen kurzen Code (`RGRP-N5F7U`-Stil), du gehst auf
|
||||
https://auth.openai.com/codex/device, gibst den Code ein, bestätigst
|
||||
bei dir im Browser, fertig. Kein Redirect zurück nötig, also keine
|
||||
Allow-List-Konflikte. Die Settings-Seite pollt im Hintergrund und
|
||||
schließt das Modal sobald deine Approval durch ist.
|
||||
|
||||
## [1.4.7] — 2026-05-09
|
||||
|
||||
### Fixed — Settings · KI
|
||||
|
||||
@@ -1038,6 +1038,13 @@
|
||||
"connectChatgptHeading": "Mit ChatGPT verbinden",
|
||||
"connectChatgptBody": "Verbinde dein ChatGPT Pro/Max-Konto um KI-gestützte Gesundheitsanalysen basierend auf aktuellen medizinischen Leitlinien zu erhalten. Keine zusätzlichen API-Kosten.",
|
||||
"connectChatgptCta": "Mit ChatGPT verbinden",
|
||||
"deviceCodeHeading": "Verbindung auf chatgpt.com abschließen",
|
||||
"deviceCodeStep1": "Öffne diesen Link auf einem beliebigen Gerät:",
|
||||
"deviceCodeStep2": "Gib diesen Einmalcode ein:",
|
||||
"deviceCodeStep3": "Bestätige die Verbindung — diese Seite aktualisiert sich automatisch.",
|
||||
"deviceCodeCopy": "kopieren",
|
||||
"deviceCodeWaiting": "Warte auf Bestätigung…",
|
||||
"deviceCodeCancel": "Abbrechen",
|
||||
"oauthNotConfigured": "ChatGPT-OAuth ist auf dieser Instanz nicht konfiguriert — nutze stattdessen einen eigenen API-Key unten.",
|
||||
"adminFallback": "Alternativ nutzt HealthLog den vom Administrator konfigurierten KI-Anbieter.",
|
||||
"personalProviderHeading": "KI-Provider (persönlich)",
|
||||
|
||||
@@ -1038,6 +1038,13 @@
|
||||
"connectChatgptHeading": "Connect with ChatGPT",
|
||||
"connectChatgptBody": "Link your ChatGPT Pro/Max account to get AI-powered health analyses based on current medical guidelines. No additional API costs.",
|
||||
"connectChatgptCta": "Connect with ChatGPT",
|
||||
"deviceCodeHeading": "Finish connecting on chatgpt.com",
|
||||
"deviceCodeStep1": "Open this link on any device:",
|
||||
"deviceCodeStep2": "Enter this one-time code:",
|
||||
"deviceCodeStep3": "Approve the connection — this page updates automatically.",
|
||||
"deviceCodeCopy": "copy",
|
||||
"deviceCodeWaiting": "Waiting for approval…",
|
||||
"deviceCodeCancel": "Cancel",
|
||||
"oauthNotConfigured": "ChatGPT OAuth is not configured on this instance — use your own API key below instead.",
|
||||
"adminFallback": "Alternatively, HealthLog will use the AI provider configured by the administrator.",
|
||||
"personalProviderHeading": "AI provider (personal)",
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "healthlog",
|
||||
"version": "1.4.7",
|
||||
"version": "1.4.8",
|
||||
"private": true,
|
||||
"packageManager": "pnpm@10.31.0",
|
||||
"scripts": {
|
||||
|
||||
@@ -0,0 +1,101 @@
|
||||
import { NextRequest } from "next/server";
|
||||
import { apiHandler, requireAuth, HttpError } from "@/lib/api-handler";
|
||||
import { checkRateLimit } from "@/lib/rate-limit";
|
||||
import { pollDeviceCode, encryptCodexCreds } from "@/lib/ai/codex-oauth";
|
||||
import { cookies } from "next/headers";
|
||||
import { decrypt } from "@/lib/crypto";
|
||||
import { prisma } from "@/lib/db";
|
||||
import { auditLog } from "@/lib/auth/audit";
|
||||
import { getClientIp, apiSuccess, apiError } from "@/lib/api-response";
|
||||
import { annotate } from "@/lib/logging/context";
|
||||
|
||||
/**
|
||||
* v1.4.7.1: Device-code flow polling endpoint.
|
||||
*
|
||||
* The client polls this every `intervalSeconds` (returned from
|
||||
* `device-start`). While the user has not approved on chatgpt.com,
|
||||
* we return `status: "pending"` and the client retries. Once Hydra
|
||||
* issues an authorization code we exchange it server-side, swap the
|
||||
* id_token for an OpenAI API key (RFC 8693), and persist both the
|
||||
* key and the OAuth refresh token encrypted on the user record.
|
||||
*
|
||||
* The cookie that holds the `device_auth_id` + `user_code` lives 15
|
||||
* minutes — same window Hydra gives the device code. After success
|
||||
* we delete the cookie immediately so a refresh of the page does not
|
||||
* try to re-poll a stale device id.
|
||||
*/
|
||||
export const POST = apiHandler(async (request: NextRequest) => {
|
||||
const { user } = await requireAuth();
|
||||
|
||||
const rl = await checkRateLimit(`codex-device-poll:${user.id}`, 60, 60_000);
|
||||
if (!rl.allowed) throw new HttpError(429, "Too many requests");
|
||||
|
||||
const cookieStore = await cookies();
|
||||
const cookie = cookieStore.get("codex_device")?.value;
|
||||
if (!cookie) {
|
||||
return apiError("No device-auth attempt in progress", 400);
|
||||
}
|
||||
|
||||
let deviceAuthId: string;
|
||||
let userCode: string;
|
||||
try {
|
||||
const decoded = JSON.parse(decrypt(cookie)) as {
|
||||
deviceAuthId: string;
|
||||
userCode: string;
|
||||
};
|
||||
deviceAuthId = decoded.deviceAuthId;
|
||||
userCode = decoded.userCode;
|
||||
} catch {
|
||||
cookieStore.delete("codex_device");
|
||||
return apiError("Invalid device-auth state — restart the flow", 400);
|
||||
}
|
||||
|
||||
let result;
|
||||
try {
|
||||
result = await pollDeviceCode({ deviceAuthId, userCode });
|
||||
} catch (err) {
|
||||
const message = err instanceof Error ? err.message : "unknown";
|
||||
annotate({ meta: { codex_device_poll_error: message } });
|
||||
return apiError("Codex device-poll failed — please restart the flow", 502);
|
||||
}
|
||||
|
||||
if (result.status === "pending") {
|
||||
annotate({
|
||||
action: { name: "codex.device.poll" },
|
||||
meta: { pending: true },
|
||||
});
|
||||
return apiSuccess({ status: "pending" });
|
||||
}
|
||||
|
||||
// status === "connected" → persist creds, audit, drop the cookie.
|
||||
const encrypted = encryptCodexCreds({
|
||||
apiKey: result.tokens.apiKey,
|
||||
refreshToken: result.tokens.refreshToken,
|
||||
});
|
||||
await prisma.user.update({
|
||||
where: { id: user.id },
|
||||
data: {
|
||||
codexAccessTokenEncrypted: encrypted.apiKeyEncrypted,
|
||||
codexRefreshTokenEncrypted: encrypted.refreshEncrypted,
|
||||
codexTokenExpiresAt: result.tokens.expiresAt,
|
||||
codexConnectedAt: new Date(),
|
||||
codexConnectionStatus: "connected",
|
||||
insightsCachedAt: null,
|
||||
insightsCachedText: null,
|
||||
},
|
||||
});
|
||||
|
||||
cookieStore.delete("codex_device");
|
||||
|
||||
await auditLog("codex.oauth.connected", {
|
||||
userId: user.id,
|
||||
ipAddress: getClientIp(request),
|
||||
details: { method: "device_code" },
|
||||
});
|
||||
annotate({
|
||||
action: { name: "codex.device.poll" },
|
||||
meta: { connected: true },
|
||||
});
|
||||
|
||||
return apiSuccess({ status: "connected" });
|
||||
});
|
||||
@@ -0,0 +1,61 @@
|
||||
import { NextRequest } from "next/server";
|
||||
import { apiHandler, requireAuth, HttpError } from "@/lib/api-handler";
|
||||
import { checkRateLimit } from "@/lib/rate-limit";
|
||||
import { requestDeviceCode } from "@/lib/ai/codex-oauth";
|
||||
import { cookies } from "next/headers";
|
||||
import { annotate } from "@/lib/logging/context";
|
||||
import { encrypt } from "@/lib/crypto";
|
||||
import { apiSuccess } from "@/lib/api-response";
|
||||
|
||||
/**
|
||||
* v1.4.7.1: Device-code flow for ChatGPT-OAuth.
|
||||
*
|
||||
* The previous redirect-based authorization-code flow fails on hosted
|
||||
* deployments because OpenAI's Hydra only allow-lists localhost
|
||||
* callbacks for the public Codex CLI client ID. Device-code is the
|
||||
* documented alternative — the user goes to chatgpt.com on any device,
|
||||
* types a short code, approves there. No redirect to our domain.
|
||||
*
|
||||
* This endpoint kicks the flow off: it asks Hydra for a `user_code` /
|
||||
* `device_auth_id` pair and returns the user-facing pieces. The
|
||||
* `device_auth_id` is the secret the poll endpoint needs and is
|
||||
* persisted server-side via an encrypted httpOnly cookie scoped to a
|
||||
* 15-minute lifetime — the same window Hydra gives the code.
|
||||
*/
|
||||
export const POST = apiHandler(async (_request: NextRequest) => {
|
||||
const { user } = await requireAuth();
|
||||
|
||||
const rl = await checkRateLimit(`codex-device-start:${user.id}`, 5, 60_000);
|
||||
if (!rl.allowed) throw new HttpError(429, "Too many requests");
|
||||
|
||||
const code = await requestDeviceCode();
|
||||
|
||||
const cookieStore = await cookies();
|
||||
cookieStore.set(
|
||||
"codex_device",
|
||||
encrypt(
|
||||
JSON.stringify({
|
||||
deviceAuthId: code.deviceAuthId,
|
||||
userCode: code.userCode,
|
||||
}),
|
||||
),
|
||||
{
|
||||
httpOnly: true,
|
||||
secure: process.env.NODE_ENV === "production",
|
||||
sameSite: "lax",
|
||||
path: "/",
|
||||
maxAge: 15 * 60,
|
||||
},
|
||||
);
|
||||
|
||||
annotate({
|
||||
action: { name: "codex.device.start" },
|
||||
meta: { interval_seconds: code.intervalSeconds },
|
||||
});
|
||||
|
||||
return apiSuccess({
|
||||
userCode: code.userCode,
|
||||
verificationUrl: code.verificationUrl,
|
||||
intervalSeconds: code.intervalSeconds,
|
||||
});
|
||||
});
|
||||
@@ -166,8 +166,94 @@ function InsightsSettingsCard({
|
||||
const hasProvider =
|
||||
settings?.codexStatus === "connected" || settings?.hasAdminKey;
|
||||
|
||||
function handleConnect() {
|
||||
window.location.href = "/api/auth/codex/authorize";
|
||||
// v1.4.7.1: device-code flow. The earlier "redirect to
|
||||
// auth.openai.com" path fails because the public Codex CLI client
|
||||
// ID's redirect-URI allow-list only covers localhost. The device
|
||||
// flow side-steps that — the user types a short code on chatgpt.com
|
||||
// and we poll for confirmation.
|
||||
const [deviceCode, setDeviceCode] = useState<{
|
||||
userCode: string;
|
||||
verificationUrl: string;
|
||||
intervalSeconds: number;
|
||||
} | null>(null);
|
||||
const [devicePolling, setDevicePolling] = useState(false);
|
||||
|
||||
async function handleConnect() {
|
||||
setMsg(null);
|
||||
setDevicePolling(true);
|
||||
try {
|
||||
const res = await fetch("/api/auth/codex/device-start", {
|
||||
method: "POST",
|
||||
});
|
||||
const json = await res.json();
|
||||
if (!res.ok) throw new Error(json.error || t("settings.savingError"));
|
||||
setDeviceCode({
|
||||
userCode: json.data.userCode,
|
||||
verificationUrl: json.data.verificationUrl,
|
||||
intervalSeconds: json.data.intervalSeconds,
|
||||
});
|
||||
} catch (err) {
|
||||
setMsg(err instanceof Error ? err.message : t("settings.savingError"));
|
||||
setMsgType("error");
|
||||
setDevicePolling(false);
|
||||
}
|
||||
}
|
||||
|
||||
// Poll until the user finishes the approval at chatgpt.com or the
|
||||
// 15-minute device-code window expires. Polling stops as soon as
|
||||
// `deviceCode` is cleared (success / cancel / unmount).
|
||||
useEffect(() => {
|
||||
if (!deviceCode) {
|
||||
// No active device code → make sure the spinner is off. setState
|
||||
// inside an effect is intentional here; the alternative (deriving
|
||||
// `devicePolling` from `deviceCode`) would force every error
|
||||
// path to also reset `deviceCode`, which we don't want — the
|
||||
// start handler resets `devicePolling` itself when fetch fails.
|
||||
return;
|
||||
}
|
||||
let cancelled = false;
|
||||
const intervalMs = Math.max(deviceCode.intervalSeconds, 3) * 1000;
|
||||
|
||||
async function tick() {
|
||||
try {
|
||||
const res = await fetch("/api/auth/codex/device-poll", {
|
||||
method: "POST",
|
||||
});
|
||||
const json = await res.json();
|
||||
if (cancelled) return;
|
||||
if (!res.ok) {
|
||||
throw new Error(json.error || t("settings.savingError"));
|
||||
}
|
||||
if (json.data?.status === "connected") {
|
||||
setDeviceCode(null);
|
||||
setDevicePolling(false);
|
||||
setMsg(t("settings.codexConnected"));
|
||||
setMsgType("success");
|
||||
queryClient.invalidateQueries({ queryKey: ["insights"] });
|
||||
return;
|
||||
}
|
||||
// Pending → schedule next tick.
|
||||
if (!cancelled) setTimeout(tick, intervalMs);
|
||||
} catch (err) {
|
||||
if (cancelled) return;
|
||||
setMsg(err instanceof Error ? err.message : t("settings.savingError"));
|
||||
setMsgType("error");
|
||||
setDeviceCode(null);
|
||||
setDevicePolling(false);
|
||||
}
|
||||
}
|
||||
|
||||
const handle = setTimeout(tick, intervalMs);
|
||||
return () => {
|
||||
cancelled = true;
|
||||
clearTimeout(handle);
|
||||
};
|
||||
// eslint-disable-next-line react-hooks/exhaustive-deps
|
||||
}, [deviceCode]);
|
||||
|
||||
function handleCancelDevice() {
|
||||
setDeviceCode(null);
|
||||
setDevicePolling(false);
|
||||
}
|
||||
|
||||
async function handleDisconnect() {
|
||||
@@ -312,14 +398,73 @@ function InsightsSettingsCard({
|
||||
</p>
|
||||
</div>
|
||||
{settings?.codexOauthConfigured ? (
|
||||
<Button
|
||||
variant="outline"
|
||||
onClick={handleConnect}
|
||||
className="w-full sm:w-auto"
|
||||
>
|
||||
<Sparkles className="mr-2 h-4 w-4" />
|
||||
{t("settings.ai.connectChatgptCta")}
|
||||
</Button>
|
||||
deviceCode ? (
|
||||
<div className="border-dracula-purple bg-dracula-purple/5 space-y-3 rounded-lg border-l-4 p-4">
|
||||
<p className="text-sm font-medium">
|
||||
{t("settings.ai.deviceCodeHeading")}
|
||||
</p>
|
||||
<ol className="text-muted-foreground list-decimal space-y-2 pl-5 text-sm">
|
||||
<li>
|
||||
{t("settings.ai.deviceCodeStep1")}{" "}
|
||||
<a
|
||||
href={deviceCode.verificationUrl}
|
||||
target="_blank"
|
||||
rel="noopener noreferrer"
|
||||
className="text-dracula-purple font-medium underline"
|
||||
>
|
||||
{deviceCode.verificationUrl}
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
{t("settings.ai.deviceCodeStep2")}
|
||||
<div className="bg-card border-border mt-2 inline-flex items-center gap-2 rounded border px-3 py-2 font-mono text-lg tracking-widest">
|
||||
{deviceCode.userCode}
|
||||
<button
|
||||
type="button"
|
||||
onClick={() =>
|
||||
navigator.clipboard?.writeText(
|
||||
deviceCode.userCode,
|
||||
)
|
||||
}
|
||||
className="text-muted-foreground hover:text-foreground text-xs underline"
|
||||
>
|
||||
{t("settings.ai.deviceCodeCopy")}
|
||||
</button>
|
||||
</div>
|
||||
</li>
|
||||
<li>{t("settings.ai.deviceCodeStep3")}</li>
|
||||
</ol>
|
||||
<div className="flex items-center gap-3 text-xs">
|
||||
{devicePolling && (
|
||||
<span className="text-muted-foreground inline-flex items-center gap-1">
|
||||
<Loader2 className="h-3 w-3 animate-spin" />
|
||||
{t("settings.ai.deviceCodeWaiting")}
|
||||
</span>
|
||||
)}
|
||||
<button
|
||||
type="button"
|
||||
onClick={handleCancelDevice}
|
||||
className="text-muted-foreground hover:text-foreground underline"
|
||||
>
|
||||
{t("settings.ai.deviceCodeCancel")}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
) : (
|
||||
<Button
|
||||
variant="outline"
|
||||
onClick={handleConnect}
|
||||
disabled={devicePolling}
|
||||
className="w-full sm:w-auto"
|
||||
>
|
||||
{devicePolling ? (
|
||||
<Loader2 className="mr-2 h-4 w-4 animate-spin" />
|
||||
) : (
|
||||
<Sparkles className="mr-2 h-4 w-4" />
|
||||
)}
|
||||
{t("settings.ai.connectChatgptCta")}
|
||||
</Button>
|
||||
)
|
||||
) : (
|
||||
<p className="text-muted-foreground text-xs italic">
|
||||
{t("settings.ai.oauthNotConfigured")}
|
||||
|
||||
@@ -227,6 +227,123 @@ export function decryptCodexCreds(encrypted: {
|
||||
};
|
||||
}
|
||||
|
||||
// ─── Device-code flow ────────────────────────────────────────────────
|
||||
//
|
||||
// For hosted apps (HealthLog), the standard authorization-code redirect
|
||||
// flow does not work because OpenAI's Hydra only allow-lists localhost
|
||||
// callbacks for the public Codex CLI client ID. The device-code flow is
|
||||
// the documented escape hatch: the user goes to chatgpt.com on any
|
||||
// device, enters a short code, and approves the connection — no
|
||||
// redirect URI on our domain is involved at all.
|
||||
|
||||
const DEVICE_VERIFICATION_URL = `${ISSUER}/codex/device`;
|
||||
const DEVICE_REDIRECT_URI = `${ISSUER}/deviceauth/callback`;
|
||||
|
||||
export interface DeviceCodeStart {
|
||||
/** Short user-facing code, e.g. "RGRP-N5F7U". */
|
||||
userCode: string;
|
||||
/** URL the user opens in their browser to approve. */
|
||||
verificationUrl: string;
|
||||
/** Opaque per-attempt id used for polling. Server-side only. */
|
||||
deviceAuthId: string;
|
||||
/** Polling interval in seconds. */
|
||||
intervalSeconds: number;
|
||||
}
|
||||
|
||||
export async function requestDeviceCode(): Promise<DeviceCodeStart> {
|
||||
const res = await fetch(`${ISSUER}/api/accounts/deviceauth/usercode`, {
|
||||
method: "POST",
|
||||
headers: { "Content-Type": "application/json" },
|
||||
body: JSON.stringify({ client_id: getCodexClientId() }),
|
||||
});
|
||||
if (!res.ok) {
|
||||
const body = await res.text().catch(() => "");
|
||||
throw new Error(
|
||||
`Codex device-code request failed (${res.status}): ${body}`,
|
||||
);
|
||||
}
|
||||
const json = (await res.json()) as {
|
||||
device_auth_id: string;
|
||||
user_code: string;
|
||||
interval: string | number;
|
||||
};
|
||||
return {
|
||||
userCode: json.user_code,
|
||||
verificationUrl: DEVICE_VERIFICATION_URL,
|
||||
deviceAuthId: json.device_auth_id,
|
||||
intervalSeconds:
|
||||
typeof json.interval === "string"
|
||||
? Number(json.interval) || 5
|
||||
: json.interval || 5,
|
||||
};
|
||||
}
|
||||
|
||||
export type DevicePollResult =
|
||||
| { status: "pending" }
|
||||
| { status: "connected"; tokens: CodexTokens };
|
||||
|
||||
/**
|
||||
* Single poll attempt against the device-auth token endpoint. Returns
|
||||
* "pending" while the user has not yet approved (Hydra answers with
|
||||
* 403/404), and "connected" with already-exchanged Codex tokens once
|
||||
* the user finishes the approval flow on chatgpt.com.
|
||||
*/
|
||||
export async function pollDeviceCode(params: {
|
||||
deviceAuthId: string;
|
||||
userCode: string;
|
||||
}): Promise<DevicePollResult> {
|
||||
const res = await fetch(`${ISSUER}/api/accounts/deviceauth/token`, {
|
||||
method: "POST",
|
||||
headers: { "Content-Type": "application/json" },
|
||||
body: JSON.stringify({
|
||||
device_auth_id: params.deviceAuthId,
|
||||
user_code: params.userCode,
|
||||
}),
|
||||
});
|
||||
|
||||
if (res.status === 403 || res.status === 404) {
|
||||
return { status: "pending" };
|
||||
}
|
||||
if (!res.ok) {
|
||||
const body = await res.text().catch(() => "");
|
||||
throw new Error(`Codex device-code poll failed (${res.status}): ${body}`);
|
||||
}
|
||||
|
||||
const json = (await res.json()) as {
|
||||
authorization_code: string;
|
||||
code_challenge: string;
|
||||
code_verifier: string;
|
||||
};
|
||||
|
||||
// Standard PKCE exchange — but with the deviceauth callback URI
|
||||
// that Hydra uses internally for this flow. The user never visits
|
||||
// this URL; it's just the value Hydra associates with the
|
||||
// authorization code so the exchange typechecks.
|
||||
const tokenRes = await postForm(`${ISSUER}/oauth/token`, {
|
||||
grant_type: "authorization_code",
|
||||
client_id: getCodexClientId(),
|
||||
code: json.authorization_code,
|
||||
redirect_uri: DEVICE_REDIRECT_URI,
|
||||
code_verifier: json.code_verifier,
|
||||
});
|
||||
if (!tokenRes.ok) {
|
||||
const body = await tokenRes.text().catch(() => "");
|
||||
throw new Error(
|
||||
`Codex device-code token exchange failed (${tokenRes.status}): ${body}`,
|
||||
);
|
||||
}
|
||||
const tokens = (await tokenRes.json()) as RawTokenResponse;
|
||||
const apiKey = await obtainApiKey(tokens.id_token);
|
||||
return {
|
||||
status: "connected",
|
||||
tokens: {
|
||||
apiKey,
|
||||
refreshToken: tokens.refresh_token,
|
||||
expiresAt: new Date(Date.now() + tokens.expires_in * 1000),
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
// ─── Backwards-compat shims so older callers keep compiling ──────────
|
||||
|
||||
/** @deprecated use `encryptCodexCreds`. */
|
||||
|
||||
Reference in new issue
Block a user