berget 2.2.7 → 2.2.9

package/src/services/api-key-service.ts

@@ -1,29 +1,29 @@
-import { createAuthenticatedClient } from "../client";
-import { handleError } from "../utils/error-handler";
-import { COMMAND_GROUPS, SUBCOMMANDS } from "../constants/command-structure";
+import { createAuthenticatedClient } from '../client';
+import { COMMAND_GROUPS, SUBCOMMANDS } from '../constants/command-structure';
+import { handleError } from '../utils/error-handler';
 
 export interface ApiKey {
+  active: boolean;
+  created: string;
+  description: null | string;
   id: number;
+  lastUsed: null | string;
+  modified: string;
   name: string;
-  description: string | null;
-  created: string;
-  lastUsed: string | null;
   prefix: string;
-  active: boolean;
-  modified: string;
 }
 
-export interface CreateApiKeyOptions {
+export interface ApiKeyResponse {
+  created: string;
+  description: null | string;
+  id: number;
+  key: string;
   name: string;
-  description?: string;
 }
 
-export interface ApiKeyResponse {
-  id: number;
+export interface CreateApiKeyOptions {
+  description?: string;
   name: string;
-  description: string | null;
-  key: string;
-  created: string;
 }
 
 /**
@@ -31,15 +31,15 @@ export interface ApiKeyResponse {
  * Command group: api-keys
  */
 export class ApiKeyService {
-  private static instance: ApiKeyService;
-  private client = createAuthenticatedClient();
-
   // Command group name for this service
   public static readonly COMMAND_GROUP = COMMAND_GROUPS.API_KEYS;
-
   // Subcommands for this service
   public static readonly COMMANDS = SUBCOMMANDS.API_KEYS;
 
+  private static instance: ApiKeyService;
+
+  private client = createAuthenticatedClient();
+
   private constructor() {}
 
   public static getInstance(): ApiKeyService {
@@ -49,21 +49,6 @@ export class ApiKeyService {
     return ApiKeyService.instance;
   }
 
-  /**
-   * List all API keys
-   * Command: berget api-keys list
-   */
-  public async list(): Promise<ApiKey[]> {
-    try {
-      const { data, error } = await this.client.GET("/v1/api-keys");
-      if (error) throw error;
-      return data || [];
-    } catch (error) {
-      handleError("Failed to list API keys", error);
-      throw error;
-    }
-  }
-
   /**
    * Create a new API key
    * Command: berget api-keys create
@@ -72,18 +57,18 @@ export class ApiKeyService {
     try {
       // Validate input before sending request
       if (!options.name || options.name.trim().length === 0) {
-        throw new Error("API key name is required and cannot be empty");
+        throw new Error('API key name is required and cannot be empty');
       }
 
       if (options.name.length > 100) {
-        throw new Error("API key name must be 100 characters or less");
+        throw new Error('API key name must be 100 characters or less');
       }
 
       if (options.description && options.description.length > 500) {
-        throw new Error("API key description must be 500 characters or less");
+        throw new Error('API key description must be 500 characters or less');
       }
 
-      const { data, error } = await this.client.POST("/v1/api-keys", {
+      const { data, error } = await this.client.POST('/v1/api-keys', {
         body: options,
       });
 
@@ -91,46 +76,46 @@ export class ApiKeyService {
         // Enhanced error handling with specific troubleshooting
 
         // Handle specific error cases
-        if (typeof error === "object" && error !== null) {
-          const errorObj = error as any;
-
-          if (errorObj.error?.code === "API_KEY_CREATION_FAILED") {
-            let detailedMessage = "Failed to create API key. This could be due to:\n";
-            detailedMessage += "• Account limits or quota restrictions\n";
-            detailedMessage += "• Insufficient permissions for API key creation\n";
-            detailedMessage += "• Temporary server issues\n";
-            detailedMessage += "• Billing or subscription issues\n\n";
-            detailedMessage += "Troubleshooting steps:\n";
-            detailedMessage += "1. Check if you have reached your API key limit\n";
-            detailedMessage += "2. Verify your account has API key creation permissions\n";
-            detailedMessage += "3. Check your billing status and subscription\n";
-            detailedMessage += "4. Try again in a few minutes if this is a temporary issue\n";
-            detailedMessage += "5. Contact support if the problem persists";
+        if (typeof error === 'object' && error !== null) {
+          const errorObject = error as any;
+
+          if (errorObject.error?.code === 'API_KEY_CREATION_FAILED') {
+            let detailedMessage = 'Failed to create API key. This could be due to:\n';
+            detailedMessage += '• Account limits or quota restrictions\n';
+            detailedMessage += '• Insufficient permissions for API key creation\n';
+            detailedMessage += '• Temporary server issues\n';
+            detailedMessage += '• Billing or subscription issues\n\n';
+            detailedMessage += 'Troubleshooting steps:\n';
+            detailedMessage += '1. Check if you have reached your API key limit\n';
+            detailedMessage += '2. Verify your account has API key creation permissions\n';
+            detailedMessage += '3. Check your billing status and subscription\n';
+            detailedMessage += '4. Try again in a few minutes if this is a temporary issue\n';
+            detailedMessage += '5. Contact support if the problem persists';
 
             throw new Error(detailedMessage);
           }
 
-          if (errorObj.error?.code === "USER_NOT_FOUND") {
+          if (errorObject.error?.code === 'USER_NOT_FOUND') {
             throw new Error(
-              "Your account is still being set up. Please wait a moment and try again.\n\nIf this issue persists, please contact support at support@berget.ai"
+              'Your account is still being set up. Please wait a moment and try again.\n\nIf this issue persists, please contact support at support@berget.ai',
             );
           }
 
-          if (errorObj.error?.code === "QUOTA_EXCEEDED") {
+          if (errorObject.error?.code === 'QUOTA_EXCEEDED') {
             throw new Error(
-              "You have reached your API key limit. Please delete existing keys or contact support to increase your quota."
+              'You have reached your API key limit. Please delete existing keys or contact support to increase your quota.',
             );
           }
 
-          if (errorObj.error?.code === "INSUFFICIENT_PERMISSIONS") {
+          if (errorObject.error?.code === 'INSUFFICIENT_PERMISSIONS') {
             throw new Error(
-              "Your account does not have permission to create API keys. Please contact your administrator."
+              'Your account does not have permission to create API keys. Please contact your administrator.',
             );
           }
 
-          if (errorObj.error?.code === "BILLING_REQUIRED") {
+          if (errorObject.error?.code === 'BILLING_REQUIRED') {
             throw new Error(
-              "A valid billing method is required to create API keys. Please add a payment method."
+              'A valid billing method is required to create API keys. Please add a payment method.',
             );
           }
         }
@@ -139,30 +124,30 @@ export class ApiKeyService {
       }
 
       if (!data) {
-        throw new Error("No data received from server");
+        throw new Error('No data received from server');
       }
 
       return data;
     } catch (error) {
-      console.error("Failed to create API key:", error);
+      console.error('Failed to create API key:', error);
 
       // Add additional context for common issues
       if (error instanceof Error) {
-        if (error.message.includes("ECONNREFUSED")) {
-          throw new Error("Cannot connect to Berget API. Please check your internet connection.");
+        if (error.message.includes('ECONNREFUSED')) {
+          throw new Error('Cannot connect to Berget API. Please check your internet connection.');
         }
 
-        if (error.message.includes("ENOTFOUND")) {
-          throw new Error("Cannot resolve Berget API hostname. Please check your DNS settings.");
+        if (error.message.includes('ENOTFOUND')) {
+          throw new Error('Cannot resolve Berget API hostname. Please check your DNS settings.');
         }
 
-        if (error.message.includes("401") || error.message.includes("Unauthorized")) {
-          throw new Error("Authentication failed. Please run `berget auth login` to log in again.");
+        if (error.message.includes('401') || error.message.includes('Unauthorized')) {
+          throw new Error('Authentication failed. Please run `berget auth login` to log in again.');
         }
 
-        if (error.message.includes("403")) {
+        if (error.message.includes('403')) {
           throw new Error(
-            "Access forbidden. Your account may not have permission to create API keys."
+            'Access forbidden. Your account may not have permission to create API keys.',
           );
         }
       }
@@ -177,47 +162,62 @@ export class ApiKeyService {
    */
   public async delete(id: string): Promise<boolean> {
     try {
-      const { error } = await this.client.DELETE("/v1/api-keys/{id}", {
+      const { error } = await this.client.DELETE('/v1/api-keys/{id}', {
         params: { path: { id } },
       });
       if (error) throw new Error(JSON.stringify(error));
       return true;
     } catch (error) {
-      console.error("Failed to delete API key:", error);
+      console.error('Failed to delete API key:', error);
       throw error;
     }
   }
 
   /**
-   * Rotate an API key
-   * Command: berget api-keys rotate
+   * Get usage statistics for an API key
+   * Command: berget api-keys describe
    */
-  public async rotate(id: string): Promise<ApiKeyResponse> {
+  public async describe(id: string): Promise<any> {
     try {
-      const { data, error } = await this.client.PUT("/v1/api-keys/{id}/rotate", {
+      const { data, error } = await this.client.GET('/v1/api-keys/{id}/usage', {
         params: { path: { id } },
       });
       if (error) throw new Error(JSON.stringify(error));
-      return data!;
+      return data;
     } catch (error) {
-      console.error("Failed to rotate API key:", error);
+      console.error('Failed to get API key usage:', error);
       throw error;
     }
   }
 
   /**
-   * Get usage statistics for an API key
-   * Command: berget api-keys describe
+   * List all API keys
+   * Command: berget api-keys list
    */
-  public async describe(id: string): Promise<any> {
+  public async list(): Promise<ApiKey[]> {
     try {
-      const { data, error } = await this.client.GET("/v1/api-keys/{id}/usage", {
+      const { data, error } = await this.client.GET('/v1/api-keys');
+      if (error) throw error;
+      return data || [];
+    } catch (error) {
+      handleError('Failed to list API keys', error);
+      throw error;
+    }
+  }
+
+  /**
+   * Rotate an API key
+   * Command: berget api-keys rotate
+   */
+  public async rotate(id: string): Promise<ApiKeyResponse> {
+    try {
+      const { data, error } = await this.client.PUT('/v1/api-keys/{id}/rotate', {
         params: { path: { id } },
       });
       if (error) throw new Error(JSON.stringify(error));
-      return data;
+      return data!;
     } catch (error) {
-      console.error("Failed to get API key usage:", error);
+      console.error('Failed to rotate API key:', error);
       throw error;
     }
   }

package/src/services/auth-service.ts

@@ -1,41 +1,32 @@
-import { createAuthenticatedClient, saveAuthToken, clearAuthToken } from "../client";
-import chalk from "chalk";
-import { handleError } from "../utils/error-handler";
-import { COMMAND_GROUPS, SUBCOMMANDS } from "../constants/command-structure";
-import { BrowserAuth } from "./browser-auth";
+import chalk from 'chalk';
+
+import { clearAuthToken, createAuthenticatedClient, saveAuthToken } from '../client';
+import { COMMAND_GROUPS, SUBCOMMANDS } from '../constants/command-structure';
+import { handleError } from '../utils/error-handler';
+import { BrowserAuth } from './browser-auth';
 
 // Keycloak configuration based on environment
-const isStageMode = process.argv.includes("--stage");
-const isLocalMode = process.argv.includes("--local");
+const isStageMode = process.argv.includes('--stage');
+const isLocalMode = process.argv.includes('--local');
 const KEYCLOAK_URL =
-  isStageMode || isLocalMode ? "https://keycloak.stage.berget.ai" : "https://keycloak.berget.ai";
-const KEYCLOAK_REALM = "berget";
-const KEYCLOAK_CLIENT_ID = "berget-code";
+  isStageMode || isLocalMode ? 'https://keycloak.stage.berget.ai' : 'https://keycloak.berget.ai';
+const KEYCLOAK_REALM = 'berget';
+const KEYCLOAK_CLIENT_ID = 'berget-code';
 const CALLBACK_PORT = 8787;
 
-function makeBrowserAuth(debug?: boolean): BrowserAuth {
-  return new BrowserAuth({
-    keycloakUrl: KEYCLOAK_URL,
-    realm: KEYCLOAK_REALM,
-    clientId: KEYCLOAK_CLIENT_ID,
-    callbackPort: CALLBACK_PORT,
-    debug,
-  });
-}
-
 /**
  * Service for authentication operations
  * Command group: auth
  */
 export class AuthService {
-  private static instance: AuthService;
-
   // Command group name for this service
   public static readonly COMMAND_GROUP = COMMAND_GROUPS.AUTH;
 
   // Subcommands for this service
   public static readonly COMMANDS = SUBCOMMANDS.AUTH;
 
+  private static instance: AuthService;
+
   private constructor() {}
 
   public static getInstance(): AuthService {
@@ -45,20 +36,6 @@ export class AuthService {
     return AuthService.instance;
   }
 
-  public async whoami(): Promise<any> {
-    try {
-      // Create fresh client to ensure we have the latest token
-      const client = createAuthenticatedClient();
-      const { data: profile, error } = await client.GET("/v1/users/me");
-      if (error) {
-        return null;
-      }
-      return profile;
-    } catch {
-      return null;
-    }
-  }
-
   /**
    * Browser-based PKCE login for interactive CLI use.
    * Prints status to stdout/stderr. Use loginInteractive() when you need
@@ -68,20 +45,20 @@ export class AuthService {
     try {
       clearAuthToken();
 
-      console.log(chalk.blue("Initiating login process..."));
+      console.log(chalk.blue('Initiating login process...'));
 
-      const auth = makeBrowserAuth(process.argv.includes("--debug"));
+      const auth = makeBrowserAuth(process.argv.includes('--debug'));
       const result = await auth.start();
 
       if (!result.success) {
-        console.log(chalk.red(`\nAuthentication failed: ${result.error || "Unknown error"}`));
+        console.log(chalk.red(`\nAuthentication failed: ${result.error || 'Unknown error'}`));
         return false;
       }
 
       saveAuthToken(result.accessToken!, result.refreshToken!, result.expiresIn!);
 
-      if (process.argv.includes("--debug")) {
-        console.log(chalk.yellow("DEBUG: Token data received:"));
+      if (process.argv.includes('--debug')) {
+        console.log(chalk.yellow('DEBUG: Token data received:'));
         console.log(
           chalk.yellow(
             JSON.stringify(
@@ -89,13 +66,13 @@ export class AuthService {
                 expires_in: result.expiresIn,
               },
               null,
-              2
-            )
-          )
+              2,
+            ),
+          ),
         );
       }
 
-      console.log(chalk.green("\n✓ Successfully logged in to Berget"));
+      console.log(chalk.green('\n✓ Successfully logged in to Berget'));
 
       try {
         const profile = await this.whoami();
@@ -106,13 +83,13 @@ export class AuthService {
         // Ignore errors fetching profile
       }
 
-      console.log(chalk.cyan("\nNext steps:"));
-      console.log(chalk.cyan("  • Create an API key: berget api-keys create"));
-      console.log(chalk.cyan("  • Setup OpenCode: berget code init"));
+      console.log(chalk.cyan('\nNext steps:'));
+      console.log(chalk.cyan('  • Create an API key: berget api-keys create'));
+      console.log(chalk.cyan('  • Setup OpenCode: berget code init'));
 
       return true;
     } catch (error) {
-      handleError("Login failed", error);
+      handleError('Login failed', error);
       return false;
     }
   }
@@ -123,16 +100,16 @@ export class AuthService {
    * their own UI (e.g. via clack/prompts).
    */
   public async loginInteractive(): Promise<{
-    success: boolean;
     accessToken?: string;
-    refreshToken?: string;
-    expiresIn?: number;
     error?: string;
+    expiresIn?: number;
+    refreshToken?: string;
+    success: boolean;
   }> {
     try {
       clearAuthToken();
 
-      const auth = makeBrowserAuth(process.argv.includes("--debug"));
+      const auth = makeBrowserAuth(process.argv.includes('--debug'));
       const result = await auth.start();
 
       if (result.success) {
@@ -142,9 +119,33 @@ export class AuthService {
       return result;
     } catch (error) {
       return {
-        success: false,
         error: error instanceof Error ? error.message : String(error),
+        success: false,
       };
     }
   }
+
+  public async whoami(): Promise<any> {
+    try {
+      // Create fresh client to ensure we have the latest token
+      const client = createAuthenticatedClient();
+      const { data: profile, error } = await client.GET('/v1/users/me');
+      if (error) {
+        return null;
+      }
+      return profile;
+    } catch {
+      return null;
+    }
+  }
+}
+
+function makeBrowserAuth(debug?: boolean): BrowserAuth {
+  return new BrowserAuth({
+    callbackPort: CALLBACK_PORT,
+    clientId: KEYCLOAK_CLIENT_ID,
+    debug,
+    keycloakUrl: KEYCLOAK_URL,
+    realm: KEYCLOAK_REALM,
+  });
 }