Clean up constants

Author: savannahostrowski

src/cloud/api.ts

@@ -1,17 +1,17 @@
 import * as vscode from "vscode"
+import { EXTENSION_ID } from "../extension"
+import { AUTH_PROVIDER_ID } from "./auth"
 import type { App, Deployment, ListResponse, Team } from "./types"
 
-const AUTH_PROVIDER_ID = "fastapi-vscode"
-
 export interface UploadInfo {
   url: string
   fields: Record<string, string>
 }
 
 function getExtensionVersion(): string {
   return (
-    vscode.extensions.getExtension("FastAPILabs.fastapi-vscode")?.packageJSON
-      ?.version ?? "unknown"
+    vscode.extensions.getExtension(EXTENSION_ID)?.packageJSON?.version ??
+    "unknown"
   )
 }
 

src/cloud/auth.ts

@@ -18,7 +18,7 @@ import { log } from "../utils/logger"
 import { trackCloudSignIn } from "../utils/telemetry"
 import { ApiService } from "./api"
 
-const CLIENT_ID = "fastapi-vscode"
+export const AUTH_PROVIDER_ID = "fastapi-vscode"
 const NAME = "FastAPI Cloud"
 const AUTH_POLL_INTERVAL_MS = 3000
 
@@ -63,9 +63,14 @@ export class CloudAuthenticationProvider
 
   constructor(private readonly context: ExtensionContext) {
     this._disposable = Disposable.from(
-      authentication.registerAuthenticationProvider(CLIENT_ID, NAME, this, {
-        supportsMultipleAccounts: false,
-      }),
+      authentication.registerAuthenticationProvider(
+        AUTH_PROVIDER_ID,
+        NAME,
+        this,
+        {
+          supportsMultipleAccounts: false,
+        },
+      ),
     )
   }
 
@@ -244,7 +249,7 @@ export class CloudAuthenticationProvider
       ReturnType<typeof ApiService.requestDeviceCode>
     >
     try {
-      deviceCodeResponse = await ApiService.requestDeviceCode(CLIENT_ID)
+      deviceCodeResponse = await ApiService.requestDeviceCode(AUTH_PROVIDER_ID)
     } catch (error) {
       if (
         error instanceof TypeError &&
@@ -275,7 +280,7 @@ export class CloudAuthenticationProvider
         cancellationToken.onCancellationRequested(() => abortController.abort())
 
         return await ApiService.pollDeviceToken(
-          CLIENT_ID,
+          AUTH_PROVIDER_ID,
           deviceCodeResponse.device_code,
           intervalMs,
           abortController.signal,

src/cloud/cloudController.ts

@@ -7,12 +7,11 @@ import {
   trackCloudSignOut,
 } from "../utils/telemetry"
 import { ApiService } from "./api"
+import { AUTH_PROVIDER_ID } from "./auth"
 import type { ConfigService } from "./config"
 import { createNewApp, pickExistingApp, pickTeam } from "./pickers"
 import type { App, Team } from "./types"
 
-const AUTH_PROVIDER_ID = "fastapi-vscode"
-
 interface AuthProvider {
   signOut(): Promise<void>
 }

src/extension.ts

@@ -5,7 +5,7 @@
 import * as vscode from "vscode"
 import { discoverFastAPIApps } from "./appDiscovery"
 import { ApiService } from "./cloud/api"
-import { CloudAuthenticationProvider } from "./cloud/auth"
+import { AUTH_PROVIDER_ID, CloudAuthenticationProvider } from "./cloud/auth"
 import { CloudController } from "./cloud/cloudController"
 import { ConfigService } from "./cloud/config"
 import { clearImportCache } from "./core/importResolver"
@@ -37,6 +37,8 @@ import {
   trackTreeViewVisible,
 } from "./utils/telemetry"
 
+export const EXTENSION_ID = "FastAPILabs.fastapi-vscode"
+
 let parserService: Parser | null = null
 
 function navigateToLocation(location: SourceLocation): void {
@@ -50,8 +52,8 @@ function navigateToLocation(location: SourceLocation): void {
 export async function activate(context: vscode.ExtensionContext) {
   const elapsed = createTimer()
   const extensionVersion =
-    vscode.extensions.getExtension("FastAPILabs.fastapi-vscode")?.packageJSON
-      ?.version ?? "unknown"
+    vscode.extensions.getExtension(EXTENSION_ID)?.packageJSON?.version ??
+    "unknown"
   log(
     `FastAPI extension ${extensionVersion} activated (VS Code ${vscode.version})`,
   )
@@ -202,7 +204,7 @@ export async function activate(context: vscode.ExtensionContext) {
     context.subscriptions.push(
       { dispose: () => authProvider.dispose() },
       vscode.commands.registerCommand("fastapi-vscode.signIn", async () => {
-        await vscode.authentication.getSession("fastapi-vscode", [], {
+        await vscode.authentication.getSession(AUTH_PROVIDER_ID, [], {
           createIfNone: true,
         })
       }),

src/test/extension.test.ts

@@ -1,13 +1,14 @@
 import * as assert from "node:assert"
 import * as vscode from "vscode"
+import { EXTENSION_ID } from "../extension"
 
 suite("Extension Test Suite", () => {
   test("Extension should be present", () => {
-    assert.ok(vscode.extensions.getExtension("FastAPILabs.fastapi-vscode"))
+    assert.ok(vscode.extensions.getExtension(EXTENSION_ID))
   })
 
   test("Extension should activate", async () => {
-    const ext = vscode.extensions.getExtension("FastAPILabs.fastapi-vscode")
+    const ext = vscode.extensions.getExtension(EXTENSION_ID)
     assert.ok(ext)
     await ext.activate()
     assert.strictEqual(ext.isActive, true)

src/utils/telemetry/vscode.ts

@@ -4,6 +4,7 @@
  */
 
 import * as vscode from "vscode"
+import { EXTENSION_ID } from "../../extension"
 import { client } from "./client"
 import type { ClientInfo } from "./types"
 
@@ -88,8 +89,8 @@ export async function initVSCodeTelemetry(
 
   const userId = await getOrCreateUserId(context)
   const extensionVersion =
-    vscode.extensions.getExtension("FastAPILabs.fastapi-vscode")?.packageJSON
-      ?.version ?? "unknown"
+    vscode.extensions.getExtension(EXTENSION_ID)?.packageJSON?.version ??
+    "unknown"
 
   await client.init({
     userId,