Set auth token at app startup

Author: jahooma

cli/src/hooks/use-subscription-query.ts

@@ -1,6 +1,6 @@
 import { useActivityQuery } from './use-activity-query'
 import { getAuthToken } from '../utils/auth'
-import { getApiClient, setApiClientAuthToken } from '../utils/codebuff-api'
+import { getApiClient } from '../utils/codebuff-api'
 import { logger as defaultLogger } from '../utils/logger'
 
 import type { Logger } from '@codebuff/common/types/contracts/logger'
@@ -48,8 +48,6 @@ export interface SubscriptionData {
 export async function fetchSubscriptionData(
   logger: Logger = defaultLogger,
 ): Promise<SubscriptionData> {
-  const authToken = getAuthToken()
-  setApiClientAuthToken(authToken)
   const client = getApiClient()
   const response = await client.get<SubscriptionData>(
     '/api/user/subscription',

cli/src/hooks/use-user-details-query.ts

@@ -1,7 +1,7 @@
 import { useQuery } from '@tanstack/react-query'
 
 import { getAuthToken } from '../utils/auth'
-import { getApiClient, setApiClientAuthToken } from '../utils/codebuff-api'
+import { getApiClient } from '../utils/codebuff-api'
 import { logger as defaultLogger } from '../utils/logger'
 
 import type {
@@ -38,11 +38,7 @@ export async function fetchUserDetails<T extends UserField>({
   apiClient: providedApiClient,
 }: FetchUserDetailsParams<T>): Promise<UserDetails<T> | null> {
   const apiClient =
-    providedApiClient ??
-    (() => {
-      setApiClientAuthToken(authToken)
-      return getApiClient()
-    })()
+    providedApiClient ?? getApiClient()
 
   const response = await apiClient.me(fields)
 

cli/src/index.tsx

@@ -24,8 +24,9 @@ import { runPlainLogin } from './login/plain-login'
 import { initializeApp } from './init/init-app'
 import { getProjectRoot, setProjectRoot } from './project-files'
 import { initAnalytics, trackEvent } from './utils/analytics'
-import { getAuthTokenDetails } from './utils/auth'
+import { getAuthToken, getAuthTokenDetails } from './utils/auth'
 import { resetCodebuffClient } from './utils/codebuff-client'
+import { setApiClientAuthToken } from './utils/codebuff-api'
 import { getCliEnv } from './utils/env'
 import { initializeAgentRegistry } from './utils/local-agent-registry'
 import { clearLogFile, logger } from './utils/logger'
@@ -181,6 +182,9 @@ async function main(): Promise<void> {
 
   await initializeApp({ cwd })
 
+  // Set the auth token for the API client
+  setApiClientAuthToken(getAuthToken())
+
   // Handle login command before rendering the app
   if (isLoginCommand) {
     await runPlainLogin()

cli/src/utils/fetch-usage.ts

@@ -1,5 +1,5 @@
 import { getAuthToken } from './auth'
-import { getApiClient, setApiClientAuthToken } from './codebuff-api'
+import { getApiClient } from './codebuff-api'
 import { logger } from './logger'
 import { useChatStore } from '../state/chat-store'
 
@@ -42,11 +42,7 @@ export async function fetchAndUpdateUsage(
   }
 
   const apiClient =
-    providedApiClient ??
-    (() => {
-      setApiClientAuthToken(authToken)
-      return getApiClient()
-    })()
+    providedApiClient ?? getApiClient()
 
   try {
     const response = await apiClient.usage()