apiblaze 0.1.0 → 0.1.1

package/README.md

@@ -52,3 +52,4 @@ On Ctrl+C the tunnel is cleanly deregistered.
 ## License
 
 MIT
+# npm-apiblaze

package/dist/index.js

@@ -39,6 +39,7 @@ var ApiError = class extends Error {
 // src/commands/login.ts
 var import_chalk = __toESM(require("chalk"));
 var import_ora = __toESM(require("ora"));
+var crypto = __toESM(require("crypto"));
 
 // src/lib/auth.ts
 var fs = __toESM(require("fs"));
@@ -76,17 +77,28 @@ function getApiblazeDir() {
 // src/commands/login.ts
 var AUTH_BASE = "https://auth.apiblaze.com";
 var CLIENT_ID = "emdE4-Pt9LGOAXL5MA1zEQ";
+var SCOPE = "openid email profile offline_access";
+function generateCodeVerifier() {
+  return crypto.randomBytes(32).toString("base64url");
+}
+function generateCodeChallenge(verifier) {
+  return crypto.createHash("sha256").update(verifier).digest("base64url");
+}
 function openBrowser(url) {
   const { exec } = require("child_process");
-  const cmd = process.platform === "darwin" ? `open "${url}"` : process.platform === "win32" ? `start "${url}"` : `xdg-open "${url}"`;
-  exec(cmd, () => {
-  });
+  const cmd = process.platform === "darwin" ? `open "${url}"` : process.platform === "win32" ? `start "" "${url}"` : `xdg-open "${url}"`;
+  exec(cmd);
 }
-async function requestDeviceCode() {
-  const res = await fetch(`${AUTH_BASE}/oauth/device/code`, {
+async function requestDeviceCode(codeChallenge) {
+  const res = await fetch(`${AUTH_BASE}/device_authorization`, {
     method: "POST",
     headers: { "Content-Type": "application/x-www-form-urlencoded" },
-    body: new URLSearchParams({ client_id: CLIENT_ID, scope: "offline_access" })
+    body: new URLSearchParams({
+      client_id: CLIENT_ID,
+      scope: SCOPE,
+      code_challenge: codeChallenge,
+      code_challenge_method: "S256"
+    })
   });
   if (!res.ok) {
     const body = await res.text();
@@ -94,17 +106,19 @@ async function requestDeviceCode() {
   }
   return res.json();
 }
-async function pollForToken(deviceCode, intervalSecs) {
+async function pollForToken(deviceCode, codeVerifier, intervalSecs) {
+  const DEVICE_GRANT = "urn:ietf:params:oauth:grant-type:device_code";
   let pollInterval = intervalSecs * 1e3;
   while (true) {
     await new Promise((r) => setTimeout(r, pollInterval));
-    const res = await fetch(`${AUTH_BASE}/oauth/token`, {
+    const res = await fetch(`${AUTH_BASE}/token`, {
       method: "POST",
       headers: { "Content-Type": "application/x-www-form-urlencoded" },
       body: new URLSearchParams({
-        grant_type: "urn:ietf:params:oauth:grant-type:device_code",
+        grant_type: DEVICE_GRANT,
         device_code: deviceCode,
-        client_id: CLIENT_ID
+        client_id: CLIENT_ID,
+        code_verifier: codeVerifier
       })
     });
     const body = await res.json();
@@ -126,17 +140,24 @@ async function pollForToken(deviceCode, intervalSecs) {
 }
 async function runLogin() {
   console.log(import_chalk.default.bold("\nLogging in to APIblaze...\n"));
-  const deviceAuth = await requestDeviceCode();
-  console.log(`${import_chalk.default.cyan("\u2192")} Open this URL in your browser:`);
-  console.log(`  ${import_chalk.default.bold.underline(deviceAuth.verification_uri_complete ?? deviceAuth.verification_uri)}
+  const codeVerifier = generateCodeVerifier();
+  const codeChallenge = generateCodeChallenge(codeVerifier);
+  const deviceAuth = await requestDeviceCode(codeChallenge);
+  const verifyUrl = deviceAuth.verification_uri_complete ?? deviceAuth.verification_uri;
+  console.log(`${import_chalk.default.cyan("\u2192")} Open this URL in your browser to confirm login:`);
+  console.log(`  ${import_chalk.default.bold.underline(verifyUrl)}
 `);
-  if (!deviceAuth.verification_uri_complete) {
-    console.log(`${import_chalk.default.cyan("\u2192")} Enter code: ${import_chalk.default.bold(deviceAuth.user_code)}
+  console.log(`${import_chalk.default.cyan("\u2192")} Your code: ${import_chalk.default.bold(deviceAuth.user_code)}
 `);
+  openBrowser(verifyUrl);
+  const spinner = (0, import_ora.default)("Waiting for authorization in browser...").start();
+  let token;
+  try {
+    token = await pollForToken(deviceAuth.device_code, codeVerifier, deviceAuth.interval);
+  } catch (err) {
+    spinner.fail("Login failed.");
+    throw err;
   }
-  openBrowser(deviceAuth.verification_uri_complete ?? deviceAuth.verification_uri);
-  const spinner = (0, import_ora.default)("Waiting for authorization...").start();
-  const token = await pollForToken(deviceAuth.device_code, deviceAuth.interval);
   saveCredentials({
     accessToken: token.access_token,
     refreshToken: token.refresh_token,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apiblaze",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "Dev tunnel CLI for APIblaze — route localhost projects through Cloudflare tunnels",
   "keywords": [
     "apiblaze",