Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
36 changes: 27 additions & 9 deletions bin/cli/commands/oauth.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
38 changes: 38 additions & 0 deletions tests/unit/oauth-device-flow-11164.test.ts
Original file line number Diff line number Diff line change
@@ -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");
}
});
Loading