@runtypelabs/cli 0.2.2 → 0.2.4

package/dist/index.js

@@ -186,19 +186,20 @@ var CallbackServer = class {
       this.codeReject = reject;
     });
     this.app.get("/callback", (req, res) => {
-      const { code, error } = req.query;
+      const { token, code, error } = req.query;
       if (error) {
         res.send(this.errorHTML(error));
         this.codeReject(new Error(error));
         return;
       }
-      if (!code) {
-        res.send(this.errorHTML("No authorization code received"));
-        this.codeReject(new Error("No authorization code received"));
+      const authToken = token || code;
+      if (!authToken) {
+        res.send(this.errorHTML("No authentication token received"));
+        this.codeReject(new Error("No authentication token received"));
         return;
       }
       res.send(this.successHTML());
-      this.codeResolve(code);
+      this.codeResolve(authToken);
       setTimeout(() => this.stop(), 1e3);
     });
     this.app.get("/health", (_req, res) => {
@@ -547,7 +548,7 @@ function getDefaultTemperature() {
 }
 
 // src/auth/api-key-manager.ts
-var isDashboardAuthResponse = (value) => {
+var isCliTokenResponse = (value) => {
   if (!value || typeof value !== "object") {
     return false;
   }
@@ -562,29 +563,36 @@ var isAuthMeResponse = (value) => {
   return typeof record.user_id === "string";
 };
 var ApiKeyManager = class {
-  async exchangeSessionForApiKey(authCode, apiUrl, dashboardUrl) {
-    void apiUrl;
-    const base = dashboardUrl ?? getDashboardUrl();
-    const authResponse = await fetch(`${base.replace(/\/$/, "")}/api/cli/auth?code=${encodeURIComponent(authCode)}`, {
-      method: "GET",
+  /**
+   * Exchange a Clerk session JWT for a persistent API key.
+   *
+   * Calls POST /v1/auth/cli-token on the Runtype API directly,
+   * passing the Clerk JWT as a Bearer token. The API verifies the JWT
+   * with Clerk and creates an API key for the CLI.
+   */
+  async exchangeSessionForApiKey(clerkJwt, apiUrl) {
+    const baseUrl = apiUrl || getApiUrl();
+    const response = await fetch(`${baseUrl}/${getApiVersion()}/auth/cli-token`, {
+      method: "POST",
       headers: {
-        "Content-Type": "application/json"
+        "Content-Type": "application/json",
+        Authorization: `Bearer ${clerkJwt}`
       }
     });
-    if (!authResponse.ok) {
-      const error = await authResponse.text();
+    if (!response.ok) {
+      const error = await response.text();
       throw new Error(`Authentication failed: ${error}`);
     }
-    const authData = await authResponse.json();
-    if (!isDashboardAuthResponse(authData)) {
+    const data = await response.json();
+    if (!isCliTokenResponse(data)) {
       throw new Error("Invalid authentication response format");
     }
     const result = {
-      key: authData.apiKey,
-      userId: authData.userId
+      key: data.apiKey,
+      userId: data.userId
     };
-    if (authData.orgId) {
-      result.orgId = authData.orgId;
+    if (data.orgId) {
+      result.orgId = data.orgId;
     }
     return result;
   }
@@ -637,8 +645,7 @@ authCommand.command("signup").description("Create a new Runtype account").option
     const apiKeyManager = new ApiKeyManager();
     const { key, userId, orgId } = await apiKeyManager.exchangeSessionForApiKey(
       sessionToken,
-      options.apiUrl || getApiUrl(),
-      options.dashboardUrl || getDashboardUrl()
+      options.apiUrl || getApiUrl()
     );
     spinner.text = "Storing credentials securely...";
     const store = new CredentialStore();
@@ -704,8 +711,7 @@ authCommand.command("login").description("Login to existing account").option("--
     const apiKeyManager = new ApiKeyManager();
     const { key, userId, orgId } = await apiKeyManager.exchangeSessionForApiKey(
       sessionToken,
-      options.apiUrl || getApiUrl(),
-      options.dashboardUrl || getDashboardUrl()
+      options.apiUrl || getApiUrl()
     );
     spinner.text = "Storing credentials...";
     await store.saveCredentials({
@@ -981,8 +987,7 @@ async function handleBrowserLogin(store, apiUrl) {
     const apiKeyManager = new ApiKeyManager();
     const { key, userId, orgId } = await apiKeyManager.exchangeSessionForApiKey(
       sessionToken,
-      apiUrl || getApiUrl(),
-      getDashboardUrl()
+      apiUrl || getApiUrl()
     );
     spinner.text = "Storing credentials...";
     await store.saveCredentials({
@@ -2596,8 +2601,7 @@ async function handleBrowserAuth(store, mode, apiUrl) {
     const apiKeyManager = new ApiKeyManager();
     const { key, userId, orgId } = await apiKeyManager.exchangeSessionForApiKey(
       sessionToken,
-      apiUrl || getApiUrl(),
-      getDashboardUrl()
+      apiUrl || getApiUrl()
     );
     await store.saveCredentials({
       apiKey: key,