berget 1.1.0 → 1.2.0

package/src/utils/default-api-key.ts

@@ -2,11 +2,14 @@ import * as fs from 'fs'
 import * as path from 'path'
 import * as os from 'os'
 import chalk from 'chalk'
+import { ApiKeyService } from '../services/api-key-service'
+import readline from 'readline'
 
 interface DefaultApiKeyData {
   id: string
   name: string
   prefix: string
+  key: string
 }
 
 /**
@@ -44,7 +47,9 @@ export class DefaultApiKeyManager {
         this.defaultApiKey = JSON.parse(data)
       }
     } catch (error) {
-      console.error(chalk.dim('Failed to load default API key configuration'))
+      if (process.argv.includes('--debug')) {
+        console.error(chalk.dim('Failed to load default API key configuration'))
+      }
       this.defaultApiKey = null
     }
   }
@@ -65,22 +70,31 @@ export class DefaultApiKeyManager {
         }
       }
     } catch (error) {
-      console.error(chalk.dim('Failed to save default API key configuration'))
+      if (process.argv.includes('--debug')) {
+        console.error(chalk.dim('Failed to save default API key configuration'))
+      }
     }
   }
   
   /**
    * Set the default API key
    */
-  public setDefaultApiKey(id: string, name: string, prefix: string): void {
-    this.defaultApiKey = { id, name, prefix }
+  public setDefaultApiKey(id: string, name: string, prefix: string, key: string): void {
+    this.defaultApiKey = { id, name, prefix, key }
     this.saveConfig()
   }
   
   /**
-   * Get the default API key
+   * Get the default API key string
    */
-  public getDefaultApiKey(): DefaultApiKeyData | null {
+  public getDefaultApiKey(): string | null {
+    return this.defaultApiKey?.key || null
+  }
+  
+  /**
+   * Get the default API key data object
+   */
+  public getDefaultApiKeyData(): DefaultApiKeyData | null {
     return this.defaultApiKey
   }
   
@@ -91,4 +105,125 @@ export class DefaultApiKeyManager {
     this.defaultApiKey = null
     this.saveConfig()
   }
+
+  /**
+   * Prompts the user to select a default API key if none is set
+   * @returns The selected API key or null if none was selected
+   */
+  public async promptForDefaultApiKey(): Promise<string | null> {
+    try {
+      const isDebug = process.argv.includes('--debug')
+      
+      if (isDebug) {
+        console.log(chalk.yellow('DEBUG: promptForDefaultApiKey called'))
+      }
+      
+      // If we already have a default API key, return it
+      if (this.defaultApiKey) {
+        if (isDebug) {
+          console.log(chalk.yellow('DEBUG: Using existing default API key'))
+        }
+        return this.defaultApiKey.key
+      }
+
+      if (isDebug) {
+        console.log(chalk.yellow('DEBUG: No default API key found, getting ApiKeyService'))
+      }
+      
+      const apiKeyService = ApiKeyService.getInstance()
+      
+      // Get all API keys
+      let apiKeys;
+      try {
+        if (isDebug) {
+          console.log(chalk.yellow('DEBUG: Calling apiKeyService.list()'))
+        }
+        
+        apiKeys = await apiKeyService.list()
+        
+        if (isDebug) {
+          console.log(chalk.yellow(`DEBUG: Got ${apiKeys ? apiKeys.length : 0} API keys`))
+        }
+        
+        if (!apiKeys || apiKeys.length === 0) {
+          console.log(chalk.yellow('No API keys found. Create one with:'))
+          console.log(chalk.blue('  berget api-keys create --name "My Key"'))
+          return null
+        }
+      } catch (error) {
+        // Check if this is an authentication error
+        const errorMessage = error instanceof Error ? error.message : String(error);
+        const isAuthError = errorMessage.includes('Unauthorized') || 
+                           errorMessage.includes('Authentication failed') ||
+                           errorMessage.includes('AUTH_FAILED');
+        
+        if (isAuthError) {
+          console.log(chalk.yellow('Authentication required. Please run `berget auth login` first.'));
+        } else {
+          console.log(chalk.red('Error fetching API keys:'));
+          if (error instanceof Error) {
+            console.log(chalk.red(error.message));
+            if (isDebug) {
+              console.log(chalk.yellow(`DEBUG: API key list error: ${error.message}`));
+              console.log(chalk.yellow(`DEBUG: Stack: ${error.stack}`));
+            }
+          }
+        }
+        return null;
+      }
+      
+      console.log(chalk.blue('Select an API key to use as default:'))
+      
+      // Display available API keys
+      apiKeys.forEach((key, index) => {
+        console.log(`  ${index + 1}. ${key.name} (${key.prefix}...)`)
+      })
+      
+      // Create readline interface for user input
+      const rl = readline.createInterface({
+        input: process.stdin,
+        output: process.stdout
+      })
+      
+      // Prompt for selection
+      const selection = await new Promise<number>((resolve) => {
+        rl.question('Enter number (or press Enter to cancel): ', (answer) => {
+          rl.close()
+          const num = parseInt(answer.trim(), 10)
+          if (isNaN(num) || num < 1 || num > apiKeys.length) {
+            resolve(-1) // Invalid selection
+          } else {
+            resolve(num - 1) // Convert to zero-based index
+          }
+        })
+      })
+      
+      if (selection === -1) {
+        console.log(chalk.yellow('No API key selected'))
+        return null
+      }
+      
+      const selectedKey = apiKeys[selection]
+      
+      // Create a new API key with the selected name
+      const newKey = await apiKeyService.create({
+        name: `CLI Default (copy of ${selectedKey.name})`,
+        description: 'Created automatically by the Berget CLI for default use'
+      })
+      
+      // Save the new key as default
+      this.setDefaultApiKey(
+        newKey.id.toString(), 
+        newKey.name, 
+        newKey.key.substring(0, 8), // Use first 8 chars as prefix
+        newKey.key
+      )
+      
+      console.log(chalk.green(`✓ Default API key set to: ${newKey.name}`))
+      return newKey.key
+    } catch (error) {
+      console.error(chalk.red('Failed to set default API key:'), error)
+      return null
+    }
+  }
 }

package/src/utils/error-handler.ts

@@ -30,11 +30,11 @@ export function handleError(message: string, error: any): void {
   
   // Check for authentication errors
   if (
-    (typeof error === 'string' && error.includes('Unauthorized')) ||
-    (error && error.message && error.message.includes('Unauthorized')) ||
-    (error && error.code && error.code === 401)
+    (typeof error === 'string' && (error.includes('Unauthorized') || error.includes('Authentication failed'))) ||
+    (error && error.message && (error.message.includes('Unauthorized') || error.message.includes('Authentication failed'))) ||
+    (error && error.code && (error.code === 401 || error.code === 'AUTH_FAILED'))
   ) {
     console.error(chalk.yellow('\nYou need to be logged in to use this command.'));
-    console.error(chalk.yellow('Run `berget login` to authenticate.'));
+    console.error(chalk.yellow('Run `berget auth login` to authenticate.'));
   }
 }

package/tsconfig.json

@@ -39,7 +39,7 @@
     // "resolvePackageJsonExports": true,                /* Use the package.json 'exports' field when resolving package imports. */
     // "resolvePackageJsonImports": true,                /* Use the package.json 'imports' field when resolving imports. */
     // "customConditions": [],                           /* Conditions to set in addition to the resolver-specific defaults when resolving imports. */
-    // "resolveJsonModule": true,                        /* Enable importing .json files. */
+    "resolveJsonModule": true,                        /* Enable importing .json files. */
     // "allowArbitraryExtensions": true,                 /* Enable importing files with any extension, provided a declaration file is present. */
     // "noResolve": true,                                /* Disallow 'import's, 'require's or '<reference>'s from expanding the number of files TypeScript should add to a project. */