berget 1.0.0 → 1.1.0

package/src/client.ts

@@ -4,10 +4,7 @@ import * as fs from 'fs'
 import * as path from 'path'
 import * as os from 'os'
 import chalk from 'chalk'
-
-// Configuration directory
-const CONFIG_DIR = path.join(os.homedir(), '.berget')
-const TOKEN_FILE = path.join(CONFIG_DIR, 'token.json')
+import { TokenManager } from './utils/token-manager'
 
 // API Base URL
 // Use --local flag to test against local API
@@ -16,7 +13,7 @@ const API_BASE_URL =
   process.env.BERGET_API_URL ||
   (isLocalMode ? 'http://localhost:3000' : 'https://api.berget.ai')
 
-if (isLocalMode && !process.env.BERGET_API_URL) {
+if (isLocalMode && !process.env.BERGET_API_URL && process.argv.includes('--debug')) {
   console.log(chalk.yellow('Using local API endpoint: http://localhost:3000'))
 }
 
@@ -31,97 +28,42 @@ export const apiClient = createClient<paths>({
 
 // Authentication functions
 export const getAuthToken = (): string | null => {
-  try {
-    if (fs.existsSync(TOKEN_FILE)) {
-      const tokenData = JSON.parse(fs.readFileSync(TOKEN_FILE, 'utf8'))
-      return tokenData.accessToken
-    }
-  } catch (error) {
-    console.error('Error reading auth token:', error)
-  }
-  return null
+  const tokenManager = TokenManager.getInstance()
+  return tokenManager.getAccessToken()
 }
 
-// Check if token is expired (JWT tokens have an exp claim)
-export const isTokenExpired = (token: string): boolean => {
-  try {
-    const base64Url = token.split('.')[1]
-    const base64 = base64Url.replace(/-/g, '+').replace(/_/g, '/')
-    const jsonPayload = decodeURIComponent(
-      atob(base64)
-        .split('')
-        .map((c) => '%' + ('00' + c.charCodeAt(0).toString(16)).slice(-2))
-        .join('')
-    )
-    const payload = JSON.parse(jsonPayload)
-
-    // Check if token has expired
-    if (payload.exp) {
-      return payload.exp * 1000 < Date.now()
-    }
-  } catch (error) {
-    // If we can't decode the token, assume it's expired
-    return true
-  }
-
-  // If there's no exp claim, assume it's valid
-  return false
-}
-
-export const saveAuthToken = (token: string): void => {
-  try {
-    if (!fs.existsSync(CONFIG_DIR)) {
-      fs.mkdirSync(CONFIG_DIR, { recursive: true })
-    }
-    fs.writeFileSync(TOKEN_FILE, JSON.stringify({ accessToken: token }), 'utf8')
-    // Set file permissions to be readable only by the owner
-    fs.chmodSync(TOKEN_FILE, 0o600)
-  } catch (error) {
-    console.error('Error saving auth token:', error)
-  }
+export const saveAuthToken = (
+  accessToken: string,
+  refreshToken: string,
+  expiresIn: number = 3600
+): void => {
+  const tokenManager = TokenManager.getInstance()
+  tokenManager.setTokens(accessToken, refreshToken, expiresIn)
 }
 
 export const clearAuthToken = (): void => {
-  try {
-    if (fs.existsSync(TOKEN_FILE)) {
-      fs.unlinkSync(TOKEN_FILE)
-    }
-  } catch (error) {
-    console.error('Error clearing auth token:', error)
-  }
+  const tokenManager = TokenManager.getInstance()
+  tokenManager.clearTokens()
 }
 
-// Create an authenticated client
+// Create an authenticated client with refresh token support
 export const createAuthenticatedClient = () => {
-  const token = getAuthToken()
-  if (!token) {
-    console.warn(
-      chalk.yellow(
-        'No authentication token found. Please run `berget login` first.'
-      )
-    )
-  } else if (isTokenExpired(token)) {
+  const tokenManager = TokenManager.getInstance()
+
+  if (!tokenManager.getAccessToken() && process.argv.includes('--debug')) {
     console.warn(
       chalk.yellow(
-        'Your authentication token has expired. Please run `berget login` to get a new token.'
+        'No authentication token found. Please run `berget auth login` first.'
       )
     )
-    // Optionally clear the expired token
-    clearAuthToken()
-    return createClient<paths>({
-      baseUrl: API_BASE_URL,
-      headers: {
-        'Content-Type': 'application/json',
-        Accept: 'application/json',
-      },
-    })
   }
 
-  return createClient<paths>({
+  // Create the base client
+  const client = createClient<paths>({
     baseUrl: API_BASE_URL,
-    headers: token
+    headers: tokenManager.getAccessToken()
       ? {
-          Authorization: `Bearer ${token}`,
+          Authorization: `Bearer ${tokenManager.getAccessToken()}`,
           'Content-Type': 'application/json',
           Accept: 'application/json',
         }
@@ -130,4 +72,244 @@ export const createAuthenticatedClient = () => {
           Accept: 'application/json',
         },
   })
+
+  // Wrap the client to handle token refresh
+  return new Proxy(client, {
+    get(target, prop: string | symbol) {
+      // For HTTP methods (GET, POST, etc.), add token refresh logic
+      if (
+        typeof target[prop as keyof typeof target] === 'function' &&
+        ['GET', 'POST', 'PUT', 'DELETE', 'PATCH'].includes(String(prop))
+      ) {
+        return async (...args: any[]) => {
+          // Check if token is expired before making the request
+          if (tokenManager.isTokenExpired() && tokenManager.getRefreshToken()) {
+            await refreshAccessToken(tokenManager)
+          }
+
+          // Update the Authorization header with the current token
+          if (tokenManager.getAccessToken()) {
+            if (!args[1]) args[1] = {}
+            if (!args[1].headers) args[1].headers = {}
+            args[1].headers.Authorization = `Bearer ${tokenManager.getAccessToken()}`
+          }
+
+          // Make the original request
+          let result
+          try {
+            result = await (target[prop as keyof typeof target] as Function)(
+              ...args
+            )
+          } catch (requestError) {
+            if (process.argv.includes('--debug')) {
+              console.log(
+                chalk.red(
+                  `DEBUG: Request error: ${
+                    requestError instanceof Error
+                      ? requestError.message
+                      : String(requestError)
+                  }`
+                )
+              )
+            }
+            return {
+              error: {
+                message: `Request failed: ${
+                  requestError instanceof Error
+                    ? requestError.message
+                    : String(requestError)
+                }`,
+              },
+            }
+          }
+
+          // If we get an auth error, try to refresh the token and retry
+          if (result.error) {
+            // Detect various forms of authentication errors
+            const isAuthError =
+              // Standard 401 Unauthorized
+              (typeof result.error === 'object' && result.error.status === 401) ||
+              // OAuth specific errors
+              (result.error.error &&
+                (result.error.error.code === 'invalid_token' ||
+                 result.error.error.code === 'token_expired' ||
+                 result.error.error.message === 'Invalid API key' ||
+                 result.error.error.message?.toLowerCase().includes('token') ||
+                 result.error.error.message?.toLowerCase().includes('unauthorized'))) ||
+              // Message-based detection as fallback
+              (typeof result.error === 'string' && 
+                (result.error.toLowerCase().includes('unauthorized') ||
+                 result.error.toLowerCase().includes('token') ||
+                 result.error.toLowerCase().includes('auth')))
+
+            if (isAuthError && tokenManager.getRefreshToken()) {
+              if (process.argv.includes('--debug')) {
+                console.log(
+                  chalk.yellow(
+                    'DEBUG: Auth error detected, attempting token refresh'
+                  )
+                )
+                console.log(
+                  chalk.yellow(
+                    `DEBUG: Error details: ${JSON.stringify(
+                      result.error,
+                      null,
+                      2
+                    )}`
+                  )
+                )
+              }
+
+              const refreshed = await refreshAccessToken(tokenManager)
+              if (refreshed) {
+                if (process.argv.includes('--debug')) {
+                  console.log(
+                    chalk.green(
+                      'DEBUG: Token refreshed successfully, retrying request'
+                    )
+                  )
+                }
+
+                // Update the Authorization header with the new token
+                if (!args[1]) args[1] = {}
+                if (!args[1].headers) args[1].headers = {}
+                args[1].headers.Authorization = `Bearer ${tokenManager.getAccessToken()}`
+
+                // Retry the request
+                return await (target[prop as keyof typeof target] as Function)(
+                  ...args
+                )
+              } else {
+                if (process.argv.includes('--debug')) {
+                  console.log(chalk.red('DEBUG: Token refresh failed'))
+                }
+                
+                // Add a more helpful error message for users
+                if (typeof result.error === 'object') {
+                  result.error.userMessage = 'Your session has expired. Please run `berget auth login` to log in again.'
+                }
+              }
+            }
+          }
+
+          return result
+        }
+      }
+
+      // For other properties, just return the original
+      return target[prop as keyof typeof target]
+    },
+  })
+}
+
+// Helper function to refresh the access token
+async function refreshAccessToken(
+  tokenManager: TokenManager
+): Promise<boolean> {
+  try {
+    const refreshToken = tokenManager.getRefreshToken()
+    if (!refreshToken) return false
+
+    if (process.argv.includes('--debug')) {
+      console.log(chalk.yellow('DEBUG: Attempting to refresh access token'))
+    }
+
+    // Use fetch directly since this endpoint might not be in the OpenAPI spec
+    try {
+      const response = await fetch(`${API_BASE_URL}/v1/auth/refresh`, {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json',
+          Accept: 'application/json',
+        },
+        body: JSON.stringify({ refresh_token: refreshToken }),
+      });
+
+      // Handle HTTP errors
+      if (!response.ok) {
+        if (process.argv.includes('--debug')) {
+          console.log(
+            chalk.yellow(`DEBUG: Token refresh error: HTTP ${response.status} ${response.statusText}`)
+          )
+        }
+
+        // Check if the refresh token itself is expired or invalid
+        if (response.status === 401 || response.status === 403) {
+          console.warn(
+            chalk.yellow(
+              'Your refresh token has expired. Please run `berget auth login` again.'
+            )
+          )
+          // Clear tokens if unauthorized - they're invalid
+          tokenManager.clearTokens()
+        } else {
+          console.warn(
+            chalk.yellow(
+              `Failed to refresh token: ${response.status} ${response.statusText}`
+            )
+          )
+        }
+        return false
+      }
+
+      // Parse the response
+      const contentType = response.headers.get('content-type')
+      if (!contentType || !contentType.includes('application/json')) {
+        console.warn(
+          chalk.yellow(`Unexpected content type in response: ${contentType}`)
+        )
+        return false
+      }
+
+      const data = await response.json()
+
+      // Validate the response data
+      if (!data || !data.token) {
+        console.warn(
+          chalk.yellow(
+            'Invalid token response. Please run `berget auth login` again.'
+          )
+        )
+        return false
+      }
+
+      if (process.argv.includes('--debug')) {
+        console.log(chalk.green('DEBUG: Token refreshed successfully'))
+      }
+
+      // Update the token
+      tokenManager.updateAccessToken(
+        data.token,
+        data.expires_in || 3600
+      )
+      
+      // If a new refresh token was provided, update that too
+      if (data.refresh_token) {
+        tokenManager.setTokens(data.token, data.refresh_token, data.expires_in || 3600)
+        if (process.argv.includes('--debug')) {
+          console.log(chalk.green('DEBUG: Refresh token also updated'))
+        }
+      }
+    } catch (fetchError) {
+      console.warn(
+        chalk.yellow(
+          `Failed to refresh token: ${
+            fetchError instanceof Error ? fetchError.message : String(fetchError)
+          }`
+        )
+      )
+      return false
+    }
+    
+    return true
+  } catch (error) {
+    console.warn(
+      chalk.yellow(
+        `Failed to refresh authentication token: ${
+          error instanceof Error ? error.message : String(error)
+        }`
+      )
+    )
+    return false
+  }
 }