@project-ajax/cli 0.0.6 → 0.0.7

package/dist/commands/auth.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../src/commands/auth.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,YAAY,wEA2DvB,CAAC"}
+{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../src/commands/auth.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,YAAY,wEAkEvB,CAAC"}

package/dist/commands/auth.impl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"auth.impl.d.ts","sourceRoot":"","sources":["../../src/commands/auth.impl.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAI/C,eAAO,MAAM,KAAK,+GAsChB,CAAC;AAEH,eAAO,MAAM,IAAI,mFAEf,CAAC;AAEH,eAAO,MAAM,MAAM,mFAIjB,CAAC"}
+{"version":3,"file":"auth.impl.d.ts","sourceRoot":"","sources":["../../src/commands/auth.impl.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AA0E/C,eAAO,MAAM,KAAK,+GA8FhB,CAAC;AAEH,eAAO,MAAM,IAAI,mFAEf,CAAC;AAEH,eAAO,MAAM,MAAM,mFAIjB,CAAC"}

package/dist/commands/auth.impl.js

@@ -1,33 +1,104 @@
 import { buildHandler } from "../handler.js";
 import { openNotionUrl } from "../utils/openUrl.js";
+async function loginFetch(baseUrl, endpoint, body) {
+  const url = `${baseUrl}/api/v3${endpoint}`;
+  const response = await fetch(url, {
+    method: "POST",
+    headers: {
+      "Content-Type": "application/json"
+    },
+    body: JSON.stringify(body)
+  });
+  if (!response.ok) {
+    const text = await response.text();
+    throw new Error(`Login request failed: ${response.status} ${text}`);
+  }
+  return await response.json();
+}
+async function pollLoginRedeem(baseUrl, sessionId, timeoutMs = 3e5, intervalMs = 2e3) {
+  const startTime = Date.now();
+  while (Date.now() - startTime < timeoutMs) {
+    const result = await loginFetch(
+      baseUrl,
+      "/workersCliLoginRedeem",
+      { sessionId }
+    );
+    if (result.status === "confirmed" || result.status === "expired") {
+      return result;
+    }
+    await new Promise((resolve) => setTimeout(resolve, intervalMs));
+  }
+  return { status: "expired" };
+}
 const login = buildHandler(async function(_, token) {
   const environment = this.config.environment;
-  if (!token) {
-    const url = `${this.config.baseUrl}/__workers__?createToken=true`;
-    this.io.writeErr(`Opening browser to create a token...
-${url}
-`);
-    this.io.writeErr("After creating a token, run:");
-    this.io.writeErr("	npx workers auth login <token>");
-    try {
-      await openNotionUrl(environment, url);
-    } catch (_error) {
-      this.io.writeErr(
-        `Failed to open browser automatically. Please visit:
-  ${url}`
-      );
+  const baseUrl = this.config.baseUrl;
+  if (token) {
+    const update2 = {
+      token,
+      workerId: null
+    };
+    if (environment !== "prod") {
+      update2.environment = environment;
     }
+    await this.config.update(update2);
+    this.io.writeErr("Successfully logged in!");
     return;
   }
+  this.io.writeErr("Starting browser login...\n");
+  let initResponse;
+  try {
+    initResponse = await loginFetch(
+      baseUrl,
+      "/workersCliLoginInit",
+      {}
+    );
+  } catch (error) {
+    this.io.writeErr(
+      `Failed to start login: ${error instanceof Error ? error.message : String(error)}`
+    );
+    process.exit(1);
+  }
+  const { sessionId, verificationCode, browserUrl } = initResponse;
+  this.io.writeErr(
+    "Copy this verification code and paste it in your browser:\n"
+  );
+  this.io.writeErr(`  ${verificationCode}
+`);
+  await this.io.input({
+    message: "Press Enter to open browser...",
+    noTTY: `Please visit this URL to authenticate:
+  ${browserUrl}`
+  });
+  try {
+    await openNotionUrl(environment, browserUrl);
+  } catch (_error) {
+    this.io.writeErr(
+      `Could not open browser automatically. Please visit:
+  ${browserUrl}`
+    );
+  }
+  this.io.writeErr("");
+  this.io.writeErr("Waiting for browser confirmation...");
+  this.io.writeErr("(Press Ctrl+C to cancel)\n");
+  const redeemResponse = await pollLoginRedeem(baseUrl, sessionId);
+  if (redeemResponse.status === "expired") {
+    this.io.writeErr("Login session expired. Please try again.");
+    process.exit(1);
+  }
+  if (redeemResponse.status !== "confirmed") {
+    this.io.writeErr("Login failed. Please try again.");
+    process.exit(1);
+  }
   const update = {
-    token,
+    token: redeemResponse.token,
     workerId: null
   };
   if (environment !== "prod") {
     update.environment = environment;
   }
   await this.config.update(update);
-  this.io.writeErr("Successfully logged in!");
+  this.io.writeErr("\u2713 Successfully logged in!");
 });
 const show = buildHandler(function() {
   this.io.writeOut(`${this.config.token ?? ""}`);

package/dist/commands/auth.js

@@ -7,14 +7,22 @@ const authCommands = buildRouteMap({
   routes: {
     login: buildCommand({
       docs: {
-        brief: "Login to the Project Ajax platform using a Workers API token; will clear existing token, environment, and worker ID"
+        brief: "Login to the Project Ajax platform via browser authentication",
+        fullDescription: `
+Opens a browser window for you to authenticate and select a workspace.
+A verification code will be displayed in the terminal - make sure it matches
+what you see in your browser before confirming.
+
+Alternatively, you can pass a token directly (for automation or CI environments):
+  workers auth login <token>
+`.trim()
       },
       parameters: {
         positional: {
           kind: "tuple",
           parameters: [
             {
-              brief: "A Workers API token",
+              brief: "A Workers API token (optional, for CI/automation)",
               parse: String,
               placeholder: "api-token",
               optional: true

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@project-ajax/cli",
-	"version": "0.0.6",
+	"version": "0.0.7",
 	"description": "A CLI for the Project Ajax platform",
 	"license": "UNLICENSED",
 	"type": "module",