@wraps.dev/cli 2.21.18 → 2.21.19

package/dist/cli.js

@@ -10367,13 +10367,16 @@ init_events();
 init_config();
 init_json_output();
 import * as clack2 from "@clack/prompts";
+import open from "open";
+import pc3 from "picocolors";
+
+// src/utils/shared/auth-client.ts
+init_esm_shims();
 import { createAuthClient } from "better-auth/client";
 import {
   deviceAuthorizationClient,
   organizationClient
 } from "better-auth/client/plugins";
-import open from "open";
-import pc3 from "picocolors";
 function createCliAuthClient(baseURL) {
   return createAuthClient({
     baseURL,
@@ -10388,9 +10391,7 @@ async function fetchOrganizations(baseURL, token) {
         headers: { Authorization: `Bearer ${token}` }
       }
     });
-    if (!data) {
-      return [];
-    }
+    if (!data) return [];
     return data.map((org) => ({
       id: org.id,
       name: org.name,
@@ -10400,6 +10401,8 @@ async function fetchOrganizations(baseURL, token) {
     return [];
   }
 }
+
+// src/commands/auth/login.ts
 async function login(options) {
   const startTime = Date.now();
   if (options.token) {
@@ -34018,37 +34021,8 @@ init_metadata();
 init_region_resolver();
 init_aws();
 import * as clack45 from "@clack/prompts";
-import { createAuthClient as createAuthClient2 } from "better-auth/client";
-import {
-  deviceAuthorizationClient as deviceAuthorizationClient2,
-  organizationClient as organizationClient2
-} from "better-auth/client/plugins";
 import open2 from "open";
 import pc48 from "picocolors";
-function createCliAuthClient2(baseURL) {
-  return createAuthClient2({
-    baseURL,
-    plugins: [deviceAuthorizationClient2(), organizationClient2()]
-  });
-}
-async function fetchOrganizations2(baseURL, token) {
-  try {
-    const client = createCliAuthClient2(baseURL);
-    const { data } = await client.organization.list({
-      fetchOptions: {
-        headers: { Authorization: `Bearer ${token}` }
-      }
-    });
-    if (!data) return [];
-    return data.map((org) => ({
-      id: org.id,
-      name: org.name,
-      slug: org.slug
-    }));
-  } catch {
-    return [];
-  }
-}
 async function selfhostLogin(options) {
   const startTime = Date.now();
   if (!isJsonMode()) {
@@ -34072,15 +34046,19 @@ Run ${pc48.cyan("wraps selfhost deploy")} to deploy the self-hosted control plan
     process.exit(1);
     return;
   }
-  const { appUrl } = metadata.services.selfhost.config;
-  const baseURL = appUrl;
+  const { appUrl: baseURL } = metadata.services.selfhost.config;
   clack45.log.info(`Connecting to: ${pc48.cyan(baseURL)}`);
-  const authClient = createCliAuthClient2(baseURL);
+  const authClient = createCliAuthClient(baseURL);
   const spinner11 = clack45.spinner();
   const { data: codeData, error: codeError } = await authClient.device.code({
     client_id: "wraps-cli"
   });
   if (codeError || !codeData) {
+    trackCommand("selfhost:login", {
+      success: false,
+      duration_ms: Date.now() - startTime,
+      method: "device"
+    });
     trackError("DEVICE_AUTH_FAILED", "selfhost:login", {
       step: "request_code"
     });
@@ -34110,7 +34088,7 @@ Run ${pc48.cyan("wraps selfhost deploy")} to deploy the self-hosted control plan
     });
     if (tokenData?.access_token) {
       spinner11.stop("Approved!");
-      const organizations = await fetchOrganizations2(
+      const organizations = await fetchOrganizations(
         baseURL,
         tokenData.access_token
       );
@@ -34126,7 +34104,8 @@ Run ${pc48.cyan("wraps selfhost deploy")} to deploy the self-hosted control plan
       });
       trackCommand("selfhost:login", {
         success: true,
-        duration_ms: Date.now() - startTime
+        duration_ms: Date.now() - startTime,
+        method: "device"
       });
       clack45.log.success("Signed in to your self-hosted Wraps instance.");
       if (organizations.length === 1) {
@@ -34154,6 +34133,11 @@ Run ${pc48.cyan("wraps selfhost deploy")} to deploy the self-hosted control plan
         continue;
       }
       if (errorCode === "access_denied") {
+        trackCommand("selfhost:login", {
+          success: false,
+          duration_ms: Date.now() - startTime,
+          method: "device"
+        });
         trackError("ACCESS_DENIED", "selfhost:login", { step: "poll_token" });
         spinner11.stop("Denied.");
         clack45.log.error("Authorization was denied.");
@@ -34162,6 +34146,11 @@ Run ${pc48.cyan("wraps selfhost deploy")} to deploy the self-hosted control plan
       if (errorCode === "expired_token") break;
     }
   }
+  trackCommand("selfhost:login", {
+    success: false,
+    duration_ms: Date.now() - startTime,
+    method: "device"
+  });
   trackError("DEVICE_CODE_EXPIRED", "selfhost:login", { step: "poll_token" });
   spinner11.stop("Expired.");
   clack45.log.error(