@dexto/tui 1.6.8 → 1.6.9

package/dist/components/overlays/LoginOverlay.cjs

@@ -1,9 +1,7 @@
 "use strict";
-var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -17,14 +15,6 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var LoginOverlay_exports = {};
 __export(LoginOverlay_exports, {
@@ -39,6 +29,7 @@ const LoginOverlay = (0, import_react.forwardRef)(function LoginOverlay2({ isVis
   const [step, setStep] = (0, import_react.useState)("checking");
   const [existingUser, setExistingUser] = (0, import_react.useState)(null);
   const [authUrl, setAuthUrl] = (0, import_react.useState)(null);
+  const [devicePrompt, setDevicePrompt] = (0, import_react.useState)(null);
   const [status, setStatus] = (0, import_react.useState)("Preparing login...");
   const [error, setError] = (0, import_react.useState)(null);
   const abortControllerRef = (0, import_react.useRef)(null);
@@ -57,57 +48,48 @@ const LoginOverlay = (0, import_react.forwardRef)(function LoginOverlay2({ isVis
     abortControllerRef.current?.abort(new Error("Authentication cancelled"));
     abortControllerRef.current = null;
   }, []);
+  const runDeviceLogin = (0, import_react.useCallback)(
+    async (abortController) => {
+      setStep("starting");
+      safeSetStatus("Starting device code login...");
+      setAuthUrl(null);
+      setDevicePrompt(null);
+      return (0, import_host.performDeviceCodeLogin)({
+        signal: abortController.signal,
+        onPrompt: (prompt) => {
+          if (!isActiveRef.current || abortController.signal.aborted) {
+            return;
+          }
+          setDevicePrompt(prompt);
+          setAuthUrl(prompt.verificationUrlComplete ?? prompt.verificationUrl);
+          setStep("waiting");
+          safeSetStatus("Open the URL below and approve login.");
+        }
+      });
+    },
+    [safeSetStatus]
+  );
   const startLogin = (0, import_react.useCallback)(async () => {
     cancelInFlight();
     setError(null);
     setAuthUrl(null);
+    setDevicePrompt(null);
     const abortController = new AbortController();
     abortControllerRef.current = abortController;
     try {
-      setStep("starting");
-      safeSetStatus("Starting local callback server...");
-      const session = await (0, import_host.beginOAuthLogin)((0, import_host.getDefaultOAuthConfig)(), {
-        signal: abortController.signal
-      });
-      if (!isActiveRef.current || abortController.signal.aborted) return;
-      setAuthUrl(session.authUrl);
-      setStep("opening-browser");
-      safeSetStatus("Opening browser for authentication...");
-      let browserOpened = false;
-      try {
-        const { default: open } = await import("open");
-        await open(session.authUrl);
-        browserOpened = true;
-      } catch {
-      }
-      if (!isActiveRef.current || abortController.signal.aborted) return;
-      setStep("waiting");
-      safeSetStatus(
-        browserOpened ? "Waiting for authentication..." : "Browser did not open automatically. Open the URL below to continue."
-      );
-      const result = await session.result;
-      if (!isActiveRef.current || abortController.signal.aborted) return;
+      const result = await runDeviceLogin(abortController);
+      if (!result || !isActiveRef.current || abortController.signal.aborted) return;
       setStep("finalizing");
       safeSetStatus("Finalizing login...");
-      const expiresAt = result.expiresIn ? Date.now() + result.expiresIn * 1e3 : void 0;
-      await (0, import_host.storeAuth)({
-        token: result.accessToken,
-        refreshToken: result.refreshToken,
-        userId: result.user?.id,
-        email: result.user?.email,
-        createdAt: Date.now(),
-        expiresAt
-      });
-      safeSetStatus("Provisioning Dexto API key (DEXTO_API_KEY)...");
-      const ensured = await (0, import_host.ensureDextoApiKeyForAuthToken)(result.accessToken, {
-        onStatus: handleProvisionStatus
+      const persisted = await (0, import_host.persistOAuthLoginResult)(result, {
+        onProvisionStatus: handleProvisionStatus
       });
       if (!isActiveRef.current || abortController.signal.aborted) return;
       onDone({
         outcome: "success",
-        email: result.user?.email,
-        keyId: ensured?.keyId ?? void 0,
-        hasDextoApiKey: Boolean(ensured?.dextoApiKey)
+        email: persisted.email,
+        keyId: persisted.keyId,
+        hasDextoApiKey: persisted.hasDextoApiKey
       });
     } catch (err) {
       if (abortController.signal.aborted) {
@@ -120,13 +102,14 @@ const LoginOverlay = (0, import_react.forwardRef)(function LoginOverlay2({ isVis
     } finally {
       abortControllerRef.current = null;
     }
-  }, [cancelInFlight, handleProvisionStatus, onDone, safeSetStatus]);
+  }, [cancelInFlight, handleProvisionStatus, onDone, runDeviceLogin, safeSetStatus]);
   (0, import_react.useEffect)(() => {
     if (!isVisible) return;
     isActiveRef.current = true;
     setStep("checking");
     setExistingUser(null);
     setAuthUrl(null);
+    setDevicePrompt(null);
     setStatus("Preparing login...");
     setError(null);
     void (async () => {
@@ -195,7 +178,15 @@ const LoginOverlay = (0, import_react.forwardRef)(function LoginOverlay2({ isVis
           /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_ink.Text, { color: "gray", children: "Status: " }),
           /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_ink.Text, { children: status })
         ] }),
-        authUrl && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_ink.Box, { flexDirection: "column", marginBottom: 1, children: [
+        devicePrompt && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_ink.Box, { flexDirection: "column", marginBottom: 1, children: [
+          /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_ink.Text, { color: "gray", children: "Open this URL on any device:" }),
+          /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_ink.Text, { color: "yellowBright", children: devicePrompt.verificationUrlComplete ?? devicePrompt.verificationUrl }),
+          /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_ink.Text, { color: "gray", children: [
+            "Code: ",
+            devicePrompt.userCode
+          ] })
+        ] }),
+        authUrl && !devicePrompt && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_ink.Box, { flexDirection: "column", marginBottom: 1, children: [
           /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_ink.Text, { color: "gray", children: "If your browser didn't open, use this URL:" }),
           /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_ink.Text, { color: "yellowBright", children: authUrl })
         ] }),

package/dist/components/overlays/LoginOverlay.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"LoginOverlay.d.ts","sourceRoot":"","sources":["../../../src/components/overlays/LoginOverlay.tsx"],"names":[],"mappings":"AAAA,OAAO,KAON,MAAM,OAAO,CAAC;AAEf,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,qCAAqC,CAAC;AAU/D,MAAM,MAAM,mBAAmB,GACzB;IACI,OAAO,EAAE,SAAS,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B,cAAc,EAAE,OAAO,CAAC;CAC3B,GACD;IAAE,OAAO,EAAE,WAAW,CAAA;CAAE,GACxB;IAAE,OAAO,EAAE,QAAQ,CAAA;CAAE,CAAC;AAE5B,MAAM,WAAW,iBAAiB;IAC9B,SAAS,EAAE,OAAO,CAAC;IACnB,MAAM,EAAE,CAAC,OAAO,EAAE,mBAAmB,KAAK,IAAI,CAAC;CAClD;AAED,MAAM,WAAW,kBAAkB;IAC/B,WAAW,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,KAAK,OAAO,CAAC;CACrD;AAWD,QAAA,MAAM,YAAY,8FAuOhB,CAAC;AAEH,eAAe,YAAY,CAAC"}
+{"version":3,"file":"LoginOverlay.d.ts","sourceRoot":"","sources":["../../../src/components/overlays/LoginOverlay.tsx"],"names":[],"mappings":"AAAA,OAAO,KAON,MAAM,OAAO,CAAC;AAEf,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,qCAAqC,CAAC;AAU/D,MAAM,MAAM,mBAAmB,GACzB;IACI,OAAO,EAAE,SAAS,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B,cAAc,EAAE,OAAO,CAAC;CAC3B,GACD;IAAE,OAAO,EAAE,WAAW,CAAA;CAAE,GACxB;IAAE,OAAO,EAAE,QAAQ,CAAA;CAAE,CAAC;AAE5B,MAAM,WAAW,iBAAiB;IAC9B,SAAS,EAAE,OAAO,CAAC;IACnB,MAAM,EAAE,CAAC,OAAO,EAAE,mBAAmB,KAAK,IAAI,CAAC;CAClD;AAED,MAAM,WAAW,kBAAkB;IAC/B,WAAW,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,KAAK,OAAO,CAAC;CACrD;AAUD,QAAA,MAAM,YAAY,8FAmOhB,CAAC;AAEH,eAAe,YAAY,CAAC"}

package/dist/components/overlays/LoginOverlay.js

@@ -9,16 +9,15 @@ import {
 } from "react";
 import { Box, Text } from "ink";
 import {
-  beginOAuthLogin,
-  getDefaultOAuthConfig,
-  ensureDextoApiKeyForAuthToken,
   loadAuth,
-  storeAuth
+  performDeviceCodeLogin,
+  persistOAuthLoginResult
 } from "../../host/index.js";
 const LoginOverlay = forwardRef(function LoginOverlay2({ isVisible, onDone }, ref) {
   const [step, setStep] = useState("checking");
   const [existingUser, setExistingUser] = useState(null);
   const [authUrl, setAuthUrl] = useState(null);
+  const [devicePrompt, setDevicePrompt] = useState(null);
   const [status, setStatus] = useState("Preparing login...");
   const [error, setError] = useState(null);
   const abortControllerRef = useRef(null);
@@ -37,57 +36,48 @@ const LoginOverlay = forwardRef(function LoginOverlay2({ isVisible, onDone }, re
     abortControllerRef.current?.abort(new Error("Authentication cancelled"));
     abortControllerRef.current = null;
   }, []);
+  const runDeviceLogin = useCallback(
+    async (abortController) => {
+      setStep("starting");
+      safeSetStatus("Starting device code login...");
+      setAuthUrl(null);
+      setDevicePrompt(null);
+      return performDeviceCodeLogin({
+        signal: abortController.signal,
+        onPrompt: (prompt) => {
+          if (!isActiveRef.current || abortController.signal.aborted) {
+            return;
+          }
+          setDevicePrompt(prompt);
+          setAuthUrl(prompt.verificationUrlComplete ?? prompt.verificationUrl);
+          setStep("waiting");
+          safeSetStatus("Open the URL below and approve login.");
+        }
+      });
+    },
+    [safeSetStatus]
+  );
   const startLogin = useCallback(async () => {
     cancelInFlight();
     setError(null);
     setAuthUrl(null);
+    setDevicePrompt(null);
     const abortController = new AbortController();
     abortControllerRef.current = abortController;
     try {
-      setStep("starting");
-      safeSetStatus("Starting local callback server...");
-      const session = await beginOAuthLogin(getDefaultOAuthConfig(), {
-        signal: abortController.signal
-      });
-      if (!isActiveRef.current || abortController.signal.aborted) return;
-      setAuthUrl(session.authUrl);
-      setStep("opening-browser");
-      safeSetStatus("Opening browser for authentication...");
-      let browserOpened = false;
-      try {
-        const { default: open } = await import("open");
-        await open(session.authUrl);
-        browserOpened = true;
-      } catch {
-      }
-      if (!isActiveRef.current || abortController.signal.aborted) return;
-      setStep("waiting");
-      safeSetStatus(
-        browserOpened ? "Waiting for authentication..." : "Browser did not open automatically. Open the URL below to continue."
-      );
-      const result = await session.result;
-      if (!isActiveRef.current || abortController.signal.aborted) return;
+      const result = await runDeviceLogin(abortController);
+      if (!result || !isActiveRef.current || abortController.signal.aborted) return;
       setStep("finalizing");
       safeSetStatus("Finalizing login...");
-      const expiresAt = result.expiresIn ? Date.now() + result.expiresIn * 1e3 : void 0;
-      await storeAuth({
-        token: result.accessToken,
-        refreshToken: result.refreshToken,
-        userId: result.user?.id,
-        email: result.user?.email,
-        createdAt: Date.now(),
-        expiresAt
-      });
-      safeSetStatus("Provisioning Dexto API key (DEXTO_API_KEY)...");
-      const ensured = await ensureDextoApiKeyForAuthToken(result.accessToken, {
-        onStatus: handleProvisionStatus
+      const persisted = await persistOAuthLoginResult(result, {
+        onProvisionStatus: handleProvisionStatus
       });
       if (!isActiveRef.current || abortController.signal.aborted) return;
       onDone({
         outcome: "success",
-        email: result.user?.email,
-        keyId: ensured?.keyId ?? void 0,
-        hasDextoApiKey: Boolean(ensured?.dextoApiKey)
+        email: persisted.email,
+        keyId: persisted.keyId,
+        hasDextoApiKey: persisted.hasDextoApiKey
       });
     } catch (err) {
       if (abortController.signal.aborted) {
@@ -100,13 +90,14 @@ const LoginOverlay = forwardRef(function LoginOverlay2({ isVisible, onDone }, re
     } finally {
       abortControllerRef.current = null;
     }
-  }, [cancelInFlight, handleProvisionStatus, onDone, safeSetStatus]);
+  }, [cancelInFlight, handleProvisionStatus, onDone, runDeviceLogin, safeSetStatus]);
   useEffect(() => {
     if (!isVisible) return;
     isActiveRef.current = true;
     setStep("checking");
     setExistingUser(null);
     setAuthUrl(null);
+    setDevicePrompt(null);
     setStatus("Preparing login...");
     setError(null);
     void (async () => {
@@ -175,7 +166,15 @@ const LoginOverlay = forwardRef(function LoginOverlay2({ isVisible, onDone }, re
           /* @__PURE__ */ jsx(Text, { color: "gray", children: "Status: " }),
           /* @__PURE__ */ jsx(Text, { children: status })
         ] }),
-        authUrl && /* @__PURE__ */ jsxs(Box, { flexDirection: "column", marginBottom: 1, children: [
+        devicePrompt && /* @__PURE__ */ jsxs(Box, { flexDirection: "column", marginBottom: 1, children: [
+          /* @__PURE__ */ jsx(Text, { color: "gray", children: "Open this URL on any device:" }),
+          /* @__PURE__ */ jsx(Text, { color: "yellowBright", children: devicePrompt.verificationUrlComplete ?? devicePrompt.verificationUrl }),
+          /* @__PURE__ */ jsxs(Text, { color: "gray", children: [
+            "Code: ",
+            devicePrompt.userCode
+          ] })
+        ] }),
+        authUrl && !devicePrompt && /* @__PURE__ */ jsxs(Box, { flexDirection: "column", marginBottom: 1, children: [
           /* @__PURE__ */ jsx(Text, { color: "gray", children: "If your browser didn't open, use this URL:" }),
           /* @__PURE__ */ jsx(Text, { color: "yellowBright", children: authUrl })
         ] }),