Add agent test

sourcegraph · Jan 10, 2025 · fc591a2 · fc591a2
1 parent 50049be
commit fc591a2
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 6 deletions.
diff --git a/...b/src/main/kotlin/com/sourcegraph/cody/agent/protocol_generated/ExtensionConfiguration.kt b/...b/src/main/kotlin/com/sourcegraph/cody/agent/protocol_generated/ExtensionConfiguration.kt
@@ -2,7 +2,7 @@
 package com.sourcegraph.cody.agent.protocol_generated;
 
 data class ExtensionConfiguration(
-  val serverEndpoint: String,
+  val serverEndpoint: String? = null,
   val proxy: String? = null,
   val accessToken: String? = null,
   val customHeaders: Map<String, String>,

diff --git a/agent/src/TestClient.ts b/agent/src/TestClient.ts
@@ -116,7 +116,6 @@ export function setupRecording(): void {
 }
 
 export class TestClient extends MessageHandler {
-    private secrets = new AgentStatelessSecretStorage()
     private extensionConfigurationDuringInitialization: ExtensionConfiguration | undefined
     public static create({ bin = 'node', ...params }: TestClientParams): TestClient {
         setupRecording()
@@ -180,6 +179,7 @@ export class TestClient extends MessageHandler {
     public workspaceEditParams: WorkspaceEditParams[] = []
     public textDocumentEditParams: TextDocumentEditParams[] = []
     public expectedEvents: string[] = []
+    public secrets = new AgentStatelessSecretStorage()
 
     get serverEndpoint(): string {
         return this.params.credentials.serverEndpoint

diff --git a/agent/src/agent.ts b/agent/src/agent.ts
@@ -1492,7 +1492,7 @@ export class Agent extends MessageHandler implements ExtensionClient {
         // If this is an authentication change we need to reauthenticate prior to firing events
         // that update the clients
         try {
-            if (isAuthChange || params?.forceAuthentication) {
+            if ((isAuthChange || params?.forceAuthentication) && config.serverEndpoint) {
                 await authProvider.validateAndStoreCredentials(
                     {
                         configuration: {

diff --git a/agent/src/unauthed.test.ts b/agent/src/unauthed.test.ts
@@ -35,6 +35,25 @@ describe.skip(
             expect(authStatus?.endpoint).toBe(TESTING_CREDENTIALS.dotcomUnauthed.serverEndpoint)
         })
 
+        it('starts up with default andpoint and credentials if they are present in the secure store', async () => {
+            const newClient = TestClient.create({
+                workspaceRootUri: workspace.rootUri,
+                name: 'unauthed',
+                credentials: TESTING_CREDENTIALS.dotcomUnauthed,
+            })
+
+            newClient.secrets.store(
+                TESTING_CREDENTIALS.dotcom.serverEndpoint,
+                TESTING_CREDENTIALS.dotcom.token ?? 'invalid'
+            )
+
+            await newClient.beforeAll({ serverEndpoint: undefined }, { expectAuthenticated: true })
+            const authStatus = await newClient.request('extensionConfiguration/status', null)
+            expect(authStatus?.authenticated).toBe(true)
+            expect(authStatus?.endpoint).toBe(TESTING_CREDENTIALS.dotcom.serverEndpoint)
+            newClient.afterAll()
+        })
+
         it('authenticates to same endpoint using valid credentials', async () => {
             const authStatus = await client.request('extensionConfiguration/change', {
                 ...client.info.extensionConfiguration,

diff --git a/jetbrains/src/main/kotlin/com/sourcegraph/cody/agent/CodyAgentClient.kt b/jetbrains/src/main/kotlin/com/sourcegraph/cody/agent/CodyAgentClient.kt
@@ -157,7 +157,7 @@ class CodyAgentClient(private val project: Project, private val webview: NativeW
     return CompletableFuture.completedFuture(null)
   }
 
-    @JsonRequest("window/showSaveDialog")
+  @JsonRequest("window/showSaveDialog")
   fun window_showSaveDialog(params: SaveDialogOptionsParams): CompletableFuture<String> {
     // Let's use the first possible extension as default.
     val ext = params.filters?.firstOrNull()?.value?.firstOrNull() ?: ""

diff --git a/jetbrains/src/main/kotlin/com/sourcegraph/config/ConfigUtil.kt b/jetbrains/src/main/kotlin/com/sourcegraph/config/ConfigUtil.kt
@@ -97,7 +97,7 @@ object ConfigUtil {
 
     return ExtensionConfiguration(
         anonymousUserID = CodyApplicationSettings.instance.anonymousUserId,
-        serverEndpoint = endpoint?.url ?: "",
+        serverEndpoint = endpoint?.url,
         accessToken = token,
         customHeaders = emptyMap(),
         proxy = UserLevelConfig.getProxy(),

diff --git a/vscode/src/jsonrpc/agent-protocol.ts b/vscode/src/jsonrpc/agent-protocol.ts
@@ -558,7 +558,7 @@ export interface ServerInfo {
 }
 
 export interface ExtensionConfiguration {
-    serverEndpoint: string
+    serverEndpoint?: string | undefined | null
     proxy?: string | undefined | null
     accessToken?: string | undefined | null
     customHeaders: Record<string, string>