mirror of
https://github.com/diegosouzapw/OmniRoute.git
synced 2026-08-23 15:42:12 +03:00
Cherry-picked onto the current tip (authorship preserved), noise stripped. Focused: oauth-device-flow-11164 green + 9474-claude-code-oauth-mismap neighbor suite green. Device-code endpoint is tried first, camelCase/snake_case fallbacks normalized, no more blank code / 'Visit: undefined'. Fixes #11164. Thank you @rqzbeh!
This commit is contained in:
@@ -228,20 +228,38 @@ async function runSocialFlow(def, opts) {
|
||||
|
||||
async function runDeviceFlow(def, opts) {
|
||||
const providerKey = resolveBackendKey(def.id);
|
||||
const startRes = await apiFetch(`/api/providers/${providerKey}/auth/start`, {
|
||||
...targetApiOptions(opts),
|
||||
method: "POST",
|
||||
});
|
||||
let startRes = await apiFetch(`/api/oauth/${providerKey}/device-code`, targetApiOptions(opts));
|
||||
if (!startRes.ok) {
|
||||
startRes = await apiFetch(`/api/providers/${providerKey}/auth/start`, {
|
||||
...targetApiOptions(opts),
|
||||
method: "POST",
|
||||
});
|
||||
}
|
||||
if (!startRes.ok) {
|
||||
process.stderr.write(`Failed to start device flow: ${startRes.status}\n`);
|
||||
process.exit(1);
|
||||
}
|
||||
const start = await startRes.json();
|
||||
process.stdout.write(
|
||||
`\nDevice code: ${start.userCode ?? start.user_code ?? ""}\nVisit: ${start.verificationUri ?? start.verification_uri}\n\n`
|
||||
);
|
||||
if (opts.browser !== false)
|
||||
await openBrowser(start.verificationUri ?? start.verification_uri ?? "");
|
||||
const userCode = start.userCode ?? start.user_code ?? "";
|
||||
const verificationUri =
|
||||
start.verificationUriComplete ??
|
||||
start.verification_uri_complete ??
|
||||
start.verificationUri ??
|
||||
start.verification_uri ??
|
||||
start.authUrl ??
|
||||
start.url ??
|
||||
"";
|
||||
|
||||
if (userCode) {
|
||||
process.stdout.write(`\nDevice code: ${userCode}\nVisit: ${verificationUri}\n\n`);
|
||||
} else if (verificationUri) {
|
||||
process.stdout.write(`\nVisit: ${verificationUri}\n\n`);
|
||||
} else {
|
||||
process.stdout.write(`\nAuthorization URL not available\n\n`);
|
||||
}
|
||||
|
||||
if (opts.browser !== false && verificationUri)
|
||||
await openBrowser(verificationUri);
|
||||
process.stderr.write("Waiting for device authorization...\n");
|
||||
const deadline = Date.now() + (opts.timeout ?? 300000);
|
||||
const intervalMs = (start.intervalMs ?? start.interval ?? 5) * 1000;
|
||||
|
||||
38
tests/unit/oauth-device-flow-11164.test.ts
Normal file
38
tests/unit/oauth-device-flow-11164.test.ts
Normal file
@@ -0,0 +1,38 @@
|
||||
import assert from "node:assert/strict";
|
||||
import { test } from "node:test";
|
||||
|
||||
test("device code normalization handles camelCase, snake_case, and authUrl without returning undefined", () => {
|
||||
const cases = [
|
||||
{
|
||||
input: { userCode: "ABCD-1234", verificationUri: "https://auth.example.com" },
|
||||
expectedCode: "ABCD-1234",
|
||||
expectedUri: "https://auth.example.com",
|
||||
},
|
||||
{
|
||||
input: { user_code: "EFGH-5678", verification_uri: "https://auth.example.com/device" },
|
||||
expectedCode: "EFGH-5678",
|
||||
expectedUri: "https://auth.example.com/device",
|
||||
},
|
||||
{
|
||||
input: { authUrl: "https://studio.example.com/auth" },
|
||||
expectedCode: "",
|
||||
expectedUri: "https://studio.example.com/auth",
|
||||
},
|
||||
];
|
||||
|
||||
for (const c of cases) {
|
||||
const userCode = c.input.userCode ?? c.input.user_code ?? "";
|
||||
const verificationUri =
|
||||
c.input.verificationUriComplete ??
|
||||
c.input.verification_uri_complete ??
|
||||
c.input.verificationUri ??
|
||||
c.input.verification_uri ??
|
||||
c.input.authUrl ??
|
||||
c.input.url ??
|
||||
"";
|
||||
|
||||
assert.equal(userCode, c.expectedCode);
|
||||
assert.equal(verificationUri, c.expectedUri);
|
||||
assert.notEqual(verificationUri, "undefined");
|
||||
}
|
||||
});
|
||||
Reference in New Issue
Block a user