mirror of
https://github.com/heygen-com/hyperframes.git
synced 2026-11-19 11:26:02 +00:00
* fix(cli): prefer OAuth session over HEYGEN_API_KEY A signed-in `hyperframes auth login` session now wins over an API key in the environment, so a paid plan on the login is used even when the shell also exports HEYGEN_API_KEY. New order: HEYGEN_ACCESS_TOKEN (host app), the stored login (refreshed when expired), HEYGEN_API_KEY, HYPERFRAMES_API_KEY, the saved API key. The env key still comes first when HEYGEN_API_URL or HEYGEN_API_BASE names a host app's gateway, and takes over for the rest of the process when the login cannot be refreshed. The media-use audio helper follows the same order. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com> * fix(cli): fall back to the env key only when HeyGen refuses the refresh A 503, a network error or an overlapping refresh no longer switches the process to HEYGEN_API_KEY. The fallback now needs a refused grant or an expired login with no refresh token. A login another process stored since is re-read first, and refreshes that overlap in one process share one request. The media-use helper no longer treats HeyGen's own API base as a gateway. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com> * fix(cli): keep the login when the refresh reply can't be read Only a 400/401 from the token endpoint marks the grant as refused and switches to the env key. A 200 whose body can't be parsed now throws and leaves the login in place, so the next call refreshes again. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
66 lines
1.9 KiB
TypeScript
66 lines
1.9 KiB
TypeScript
/**
|
|
* Shared fixtures for auth-module tests. Centralises the env-snapshot
|
|
* + tmp-config-dir pattern so resolver.test.ts and oauth.test.ts don't
|
|
* each maintain a copy of the same beforeEach/afterEach plumbing.
|
|
*
|
|
* Only loaded by `*.test.ts` — runtime code doesn't depend on it.
|
|
*/
|
|
|
|
import { promises as fs } from "node:fs";
|
|
import { tmpdir } from "node:os";
|
|
import { join } from "node:path";
|
|
import { _resetLoginRefreshFailureForTests } from "./resolver.js";
|
|
|
|
const ENV_KEYS = [
|
|
"HEYGEN_API_KEY",
|
|
"HEYGEN_ACCESS_TOKEN",
|
|
"HYPERFRAMES_API_KEY",
|
|
"HYPERFRAMES_CONFIG_DIR",
|
|
"HEYGEN_CONFIG_DIR",
|
|
"HEYGEN_API_BASE",
|
|
"HEYGEN_API_URL",
|
|
"HYPERFRAMES_OAUTH_CLIENT_ID",
|
|
"HYPERFRAMES_ENV",
|
|
"HYPERFRAMES_OAUTH_TOKEN_URL",
|
|
"HYPERFRAMES_OAUTH_AUTHORIZE_URL",
|
|
"HYPERFRAMES_OAUTH_REVOKE_URL",
|
|
"HYPERFRAMES_OAUTH_DEVICE_URL",
|
|
] as const;
|
|
|
|
type EnvKey = (typeof ENV_KEYS)[number];
|
|
|
|
export interface EnvFixture {
|
|
/** Tmp config dir; deleted on `restore()`. */
|
|
dir: string;
|
|
/** Restore env + delete tmp dir. Idempotent. */
|
|
restore: () => Promise<void>;
|
|
}
|
|
|
|
/**
|
|
* Take a snapshot of the auth-related env, clear them, make a tmp
|
|
* `HYPERFRAMES_CONFIG_DIR`, and return a `restore()` that undoes all of
|
|
* the above.
|
|
*/
|
|
export async function setupTempAuthEnv(prefix = "hf-auth-test-"): Promise<EnvFixture> {
|
|
const dir = await fs.mkdtemp(join(tmpdir(), prefix));
|
|
const saved: Partial<Record<EnvKey, string | undefined>> = {};
|
|
for (const k of ENV_KEYS) {
|
|
saved[k] = process.env[k];
|
|
delete process.env[k];
|
|
}
|
|
process.env["HYPERFRAMES_CONFIG_DIR"] = dir;
|
|
_resetLoginRefreshFailureForTests();
|
|
|
|
const restore = async (): Promise<void> => {
|
|
_resetLoginRefreshFailureForTests();
|
|
for (const k of ENV_KEYS) {
|
|
const v = saved[k];
|
|
if (v === undefined) delete process.env[k];
|
|
else process.env[k] = v;
|
|
}
|
|
await fs.rm(dir, { recursive: true, force: true });
|
|
};
|
|
|
|
return { dir, restore };
|
|
}
|