@project-ajax/cli 0.0.14 → 0.0.15

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;AAC/C,OAAO,EAAgB,KAAK,cAAc,EAAE,MAAM,eAAe,CAAC;AAiIlE,wBAAsB,QAAQ,CAAC,OAAO,EAAE,cAAc,EAAE,KAAK,CAAC,EAAE,MAAM,iBA8GrE;AAED,eAAO,MAAM,KAAK,+GAMhB,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;AAC/C,OAAO,EAAgB,KAAK,cAAc,EAAE,MAAM,eAAe,CAAC;AAwElE,wBAAsB,QAAQ,CAAC,OAAO,EAAE,cAAc,EAAE,KAAK,CAAC,EAAE,MAAM,iBAyFrE;AAED,eAAO,MAAM,KAAK,+GAMhB,CAAC;AAEH,eAAO,MAAM,IAAI,mFAEf,CAAC;AAEH,eAAO,MAAM,MAAM,mFAIjB,CAAC"}

package/dist/commands/auth.impl.js

@@ -30,44 +30,6 @@ async function pollLoginRedeem(baseUrl, sessionId, timeoutMs = 3e5, intervalMs =
   }
   return { status: "expired" };
 }
-async function waitForEnterOrRedeem(context, browserUrl, redeemOutcomePromise) {
-  if (!process.stdin.isTTY) {
-    context.io.writeErr(
-      `Please visit this URL to authenticate:
-  ${browserUrl}`
-    );
-    process.exit(1);
-  }
-  context.io.writeErr(
-    `Press Enter to open the browser, or visit: ${browserUrl}`
-  );
-  return new Promise((resolve) => {
-    let settled = false;
-    const cleanup = () => {
-      process.stdin.off("data", onData);
-      process.stdin.pause();
-    };
-    const settle = (value) => {
-      if (settled) {
-        return;
-      }
-      settled = true;
-      cleanup();
-      resolve(value);
-    };
-    const onData = (data) => {
-      const hasNewline = typeof data === "string" ? data.includes("\n") || data.includes("\r") : data.includes(10) || data.includes(13);
-      if (hasNewline) {
-        settle("enter");
-      }
-    };
-    process.stdin.resume();
-    process.stdin.on("data", onData);
-    void redeemOutcomePromise.then(() => {
-      settle("redeem");
-    });
-  });
-}
 async function runLogin(context, token) {
   const environment = context.config.environment;
   const baseUrl = context.config.baseUrl;
@@ -97,45 +59,28 @@ async function runLogin(context, token) {
     );
     process.exit(1);
   }
-  const { sessionId, verificationCode, browserUrl } = initResponse;
-  context.io.writeErr(
-    "Copy this verification code and paste it in your browser:\n"
-  );
-  context.io.writeErr(`  ${verificationCode}
-`);
-  const redeemPromise = pollLoginRedeem(baseUrl, sessionId);
-  const redeemOutcomePromise = redeemPromise.then(
-    (value) => ({ ok: true, value }),
-    (error) => ({ ok: false, error })
-  );
-  const nextStep = await waitForEnterOrRedeem(
-    context,
-    browserUrl,
-    redeemOutcomePromise
-  );
-  if (nextStep === "enter") {
-    try {
-      await openNotionUrl(environment, browserUrl);
-    } catch (_error) {
-      context.io.writeErr(
-        `Could not open browser automatically. Please visit:
+  const { sessionId, browserUrl } = initResponse;
+  context.io.writeErr(`Opening ${browserUrl} ...`);
+  try {
+    await openNotionUrl(environment, browserUrl);
+  } catch (_error) {
+    context.io.writeErr(
+      `Could not open browser automatically. Please visit:
   ${browserUrl}`
-      );
-    }
-  }
-  if (nextStep !== "redeem") {
-    context.io.writeErr("");
-    context.io.writeErr("Waiting for browser confirmation...");
-    context.io.writeErr("(Press Ctrl+C to cancel)\n");
+    );
   }
-  const redeemOutcome = await redeemOutcomePromise;
-  if (!redeemOutcome.ok) {
+  context.io.writeErr("");
+  context.io.writeErr("Waiting for browser confirmation...");
+  context.io.writeErr("(Press Ctrl+C to cancel)\n");
+  let redeemResponse;
+  try {
+    redeemResponse = await pollLoginRedeem(baseUrl, sessionId);
+  } catch (error) {
     context.io.writeErr(
-      `Login failed: ${redeemOutcome.error instanceof Error ? redeemOutcome.error.message : String(redeemOutcome.error)}`
+      `Login failed: ${error instanceof Error ? error.message : String(error)}`
     );
     process.exit(1);
   }
-  const redeemResponse = redeemOutcome.value;
   if (redeemResponse.status === "expired") {
     context.io.writeErr("Login session expired. Please try again.");
     process.exit(1);

package/dist/config.js

@@ -178,7 +178,7 @@ function baseUrlForEnvironment(environment) {
     case "local":
       return "http://localhost:3000";
     case "staging":
-      return "https://staging.notion.so";
+      return "https://stg.notion.so";
     case "dev":
       return "https://dev.notion.so";
     case "prod":

package/package.json

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