[Backport jb-v7.12.x] Revert commits 9719dc4, 1c16f35, 1ed8392, 03c93f9…

… (#6811) ## Description See [#inc-365-jetbrains-and-vscode-auth-errors](https://sourcegraph.slack.com/archives/C089N0XTC0P) - [Revert "Refactor external auth providers to re-generate headers on de…](76f7d78) - [Revert "feat(auth): Allow workspace to pre-populate URL for quick sig…](3b4c48c) - [Revert "Improve reporting auth errors"](89d26c5) - [Revert "External Authentication Providers Support for Cody"](41e4ec6) ## Test plan Initial behaviour is restored. See [#inc-365-jetbrains-and-vscode-auth-errors](https://sourcegraph.slack.com/archives/C089N0XTC0P) <br> Backport 3fca0f6 from #6788 --------- Co-authored-by: Tom Ross <tom@umpox.com>
sourcegraph · Jan 27, 2025 · f5b9449 · f5b9449
1 parent 7ef37d4
commit f5b9449
Show file tree

Hide file tree

Showing 53 changed files with 200 additions and 966 deletions.
diff --git a/.../lib/src/main/kotlin/com/sourcegraph/cody/agent/protocol_generated/AuthenticationError.kt b/.../lib/src/main/kotlin/com/sourcegraph/cody/agent/protocol_generated/AuthenticationError.kt
@@ -16,8 +16,6 @@ sealed class AuthenticationError {
           "network-error" -> context.deserialize<NetworkAuthError>(element, NetworkAuthError::class.java)
           "invalid-access-token" -> context.deserialize<InvalidAccessTokenError>(element, InvalidAccessTokenError::class.java)
           "enterprise-user-logged-into-dotcom" -> context.deserialize<EnterpriseUserDotComError>(element, EnterpriseUserDotComError::class.java)
-          "auth-config-error" -> context.deserialize<AuthConfigError>(element, AuthConfigError::class.java)
-          "external-auth-provider-error" -> context.deserialize<ExternalAuthProviderError>(element, ExternalAuthProviderError::class.java)
           else -> throw Exception("Unknown discriminator ${element}")
         }
       }
@@ -52,23 +50,3 @@ data class EnterpriseUserDotComError(
   }
 }
 
-data class AuthConfigError(
-  val type: TypeEnum, // Oneof: auth-config-error
-  val message: String,
-) : AuthenticationError() {
-
-  enum class TypeEnum {
-    @SerializedName("auth-config-error") `Auth-config-error`,
-  }
-}
-
-data class ExternalAuthProviderError(
-  val type: TypeEnum, // Oneof: external-auth-provider-error
-  val message: String,
-) : AuthenticationError() {
-
-  enum class TypeEnum {
-    @SerializedName("external-auth-provider-error") `External-auth-provider-error`,
-  }
-}
-
diff --git a/...ib/src/main/kotlin/com/sourcegraph/cody/agent/protocol_generated/CodyContextFilterItem.kt b/...ib/src/main/kotlin/com/sourcegraph/cody/agent/protocol_generated/CodyContextFilterItem.kt
@@ -1,15 +1,8 @@
 @file:Suppress("FunctionName", "ClassName", "unused", "EnumEntryName", "UnusedImport")
 package com.sourcegraph.cody.agent.protocol_generated;
 
-import com.google.gson.annotations.SerializedName;
-
 data class CodyContextFilterItem(
-  val repoNamePattern: RepoNamePatternEnum, // Oneof: .*
+  val repoNamePattern: String,
   val filePathPatterns: List<String>? = null,
-) {
-
-  enum class RepoNamePatternEnum {
-    @SerializedName(".*") Wildcard,
-  }
-}
+)
 
diff --git a/...ngs/kotlin/lib/src/main/kotlin/com/sourcegraph/cody/agent/protocol_generated/Constants.kt b/...ngs/kotlin/lib/src/main/kotlin/com/sourcegraph/cody/agent/protocol_generated/Constants.kt
@@ -2,7 +2,6 @@
 package com.sourcegraph.cody.agent.protocol_generated;
 
 object Constants {
-  const val Wildcard = ".*"
   const val Applied = "Applied"
   const val Applying = "Applying"
   const val Automatic = "Automatic"
@@ -16,7 +15,6 @@ object Constants {
   const val agentic = "agentic"
   const val ask = "ask"
   const val assistant = "assistant"
-  const val `auth-config-error` = "auth-config-error"
   const val authenticated = "authenticated"
   const val autocomplete = "autocomplete"
   const val balanced = "balanced"
@@ -41,7 +39,6 @@ object Constants {
   const val `enterprise-user-logged-into-dotcom` = "enterprise-user-logged-into-dotcom"
   const val error = "error"
   const val experimental = "experimental"
-  const val `external-auth-provider-error` = "external-auth-provider-error"
   const val file = "file"
   const val free = "free"
   const val function = "function"

diff --git a/agent/scripts/reverse-proxy.py b/agent/scripts/reverse-proxy.py
diff --git a/agent/scripts/simple-external-auth-provider.py b/agent/scripts/simple-external-auth-provider.py
diff --git a/agent/src/AgentWorkspaceConfiguration.ts b/agent/src/AgentWorkspaceConfiguration.ts
@@ -116,7 +116,7 @@ export class AgentWorkspaceConfiguration implements vscode.WorkspaceConfiguratio
 
         function mergeWithBaseConfig(config: any) {
             for (const [key, value] of Object.entries(config)) {
-                if (typeof value === 'object' && !Array.isArray(value)) {
+                if (typeof value === 'object') {
                     const existing = _.get(baseConfig, key) ?? {}
                     const merged = _.merge(existing, value)
                     _.set(baseConfig, key, merged)

diff --git a/agent/src/agent.ts b/agent/src/agent.ts
@@ -1486,10 +1486,11 @@ export class Agent extends MessageHandler implements ExtensionClient {
         config: ExtensionConfiguration,
         params?: { forceAuthentication: boolean }
     ): Promise<AuthStatus> {
-        const isAuthChange = vscode_shim.isTokenOrEndpointChange(config)
+        const isAuthChange = vscode_shim.isAuthenticationChange(config)
         vscode_shim.setExtensionConfiguration(config)
 
-        // If this is an token or endpoint change we need to save them prior to firing events that update the clients
+        // If this is an authentication change we need to reauthenticate prior to firing events
+        // that update the clients
         try {
             if ((isAuthChange || params?.forceAuthentication) && config.serverEndpoint) {
                 await authProvider.validateAndStoreCredentials(
@@ -1499,9 +1500,7 @@ export class Agent extends MessageHandler implements ExtensionClient {
                         },
                         auth: {
                             serverEndpoint: config.serverEndpoint,
-                            credentials: config.accessToken
-                                ? { token: config.accessToken, source: 'paste' }
-                                : undefined,
+                            accessToken: config.accessToken ?? null,
                         },
                         clientState: {
                             anonymousUserID: config.anonymousUserID ?? null,

diff --git a/agent/src/cli/command-auth/AuthenticatedAccount.ts b/agent/src/cli/command-auth/AuthenticatedAccount.ts
@@ -42,10 +42,7 @@ export class AuthenticatedAccount {
     ): Promise<AuthenticatedAccount | Error> {
         const graphqlClient = SourcegraphGraphQLAPIClient.withStaticConfig({
             configuration: { telemetryLevel: 'agent' },
-            auth: {
-                credentials: { token: options.accessToken },
-                serverEndpoint: options.endpoint,
-            },
+            auth: { accessToken: options.accessToken, serverEndpoint: options.endpoint },
             clientState: { anonymousUserID: null },
         })
         const userInfo = await graphqlClient.getCurrentUserInfo()

diff --git a/agent/src/cli/command-auth/command-login.ts b/agent/src/cli/command-auth/command-login.ts
@@ -123,7 +123,7 @@ async function loginAction(
             : await captureAccessTokenViaBrowserRedirect(serverEndpoint, spinner)
     const client = SourcegraphGraphQLAPIClient.withStaticConfig({
         configuration: { telemetryLevel: 'agent' },
-        auth: { credentials: { token: options.accessToken }, serverEndpoint: serverEndpoint },
+        auth: { accessToken: token, serverEndpoint: serverEndpoint },
         clientState: { anonymousUserID: null },
     })
     const userInfo = await client.getCurrentUserInfo()
@@ -256,7 +256,7 @@ async function promptUserAboutLoginMethod(spinner: Ora, options: LoginOptions):
     try {
         const client = SourcegraphGraphQLAPIClient.withStaticConfig({
             configuration: { telemetryLevel: 'agent' },
-            auth: { credentials: { token: options.accessToken }, serverEndpoint: options.endpoint },
+            auth: { accessToken: options.accessToken, serverEndpoint: options.endpoint },
             clientState: { anonymousUserID: null },
         })
         const userInfo = await client.getCurrentUserInfo()

diff --git a/agent/src/cli/command-bench/command-bench.ts b/agent/src/cli/command-bench/command-bench.ts
@@ -331,7 +331,7 @@ export const benchCommand = new commander.Command('bench')
         setStaticResolvedConfigurationWithAuthCredentials({
             configuration: { customHeaders: {} },
             auth: {
-                credentials: { token: options.srcAccessToken },
+                accessToken: options.srcAccessToken,
                 serverEndpoint: options.srcEndpoint,
             },
         })

diff --git a/agent/src/cli/command-bench/llm-judge.ts b/agent/src/cli/command-bench/llm-judge.ts
@@ -16,10 +16,7 @@ export class LlmJudge {
         localStorage.setStorage('noop')
         setStaticResolvedConfigurationWithAuthCredentials({
             configuration: { customHeaders: undefined },
-            auth: {
-                credentials: { token: options.srcAccessToken },
-                serverEndpoint: options.srcEndpoint,
-            },
+            auth: { accessToken: options.srcAccessToken, serverEndpoint: options.srcEndpoint },
         })
         setClientCapabilities({ configuration: {}, agentCapabilities: undefined })
         this.client = new SourcegraphNodeCompletionsClient()

diff --git a/agent/src/local-e2e/helpers.ts b/agent/src/local-e2e/helpers.ts
@@ -96,10 +96,7 @@ export class LocalSGInstance {
         // for checking the LLM configuration section.
         this.gqlclient = SourcegraphGraphQLAPIClient.withStaticConfig({
             configuration: { customHeaders: headers, telemetryLevel: 'agent' },
-            auth: {
-                credentials: { token: this.params.accessToken },
-                serverEndpoint: this.params.serverEndpoint,
-            },
+            auth: { accessToken: this.params.accessToken, serverEndpoint: this.params.serverEndpoint },
             clientState: { anonymousUserID: null },
         })
     }

diff --git a/agent/src/vscode-shim.ts b/agent/src/vscode-shim.ts
@@ -136,8 +136,7 @@ export let extensionConfiguration: ExtensionConfiguration | undefined
 export function setExtensionConfiguration(newConfig: ExtensionConfiguration): void {
     extensionConfiguration = newConfig
 }
-
-export function isTokenOrEndpointChange(newConfig: ExtensionConfiguration): boolean {
+export function isAuthenticationChange(newConfig: ExtensionConfiguration): boolean {
     if (!extensionConfiguration) {
         return true
     }

diff --git a/lib/shared/src/auth/types.ts b/lib/shared/src/auth/types.ts
@@ -62,22 +62,7 @@ export interface EnterpriseUserDotComError {
     enterprise: string
 }
 
-export interface AuthConfigError {
-    type: 'auth-config-error'
-    message: string
-}
-
-export interface ExternalAuthProviderError {
-    type: 'external-auth-provider-error'
-    message: string
-}
-
-export type AuthenticationError =
-    | NetworkAuthError
-    | InvalidAccessTokenError
-    | EnterpriseUserDotComError
-    | AuthConfigError
-    | ExternalAuthProviderError
+export type AuthenticationError = NetworkAuthError | InvalidAccessTokenError | EnterpriseUserDotComError
 
 export interface AuthenticationErrorMessage {
     title?: string
@@ -105,16 +90,6 @@ export function getAuthErrorMessage(error: AuthenticationError): AuthenticationE
                     "in through your organization's enterprise instance instead. If you need assistance " +
                     'please contact your Sourcegraph admin.',
             }
-        case 'auth-config-error':
-            return {
-                title: 'Auth Config Error',
-                message: error.message,
-            }
-        case 'external-auth-provider-error':
-            return {
-                title: 'External Auth Provider Error',
-                message: error.message,
-            }
     }
 }
 

diff --git a/lib/shared/src/configuration.ts b/lib/shared/src/configuration.ts
@@ -17,18 +17,8 @@ export type TokenSource = 'redirect' | 'paste'
  */
 export interface AuthCredentials {
     serverEndpoint: string
-    credentials: HeaderCredential | TokenCredential | undefined
-    error?: any
-}
-
-export interface HeaderCredential {
-    // We use function instead of property to prevent accidential top level serialization - we never want to store this data
-    getHeaders(): Promise<Record<string, string>>
-}
-
-export interface TokenCredential {
-    token: string
-    source?: TokenSource
+    accessToken: string | null
+    tokenSource?: TokenSource | undefined
 }
 
 export interface AutoEditsTokenLimit {
@@ -81,19 +71,6 @@ export interface AgenticContextConfiguration {
     }
 }
 
-export interface ExternalAuthCommand {
-    commandLine: readonly string[]
-    environment?: Record<string, string>
-    shell?: string
-    timeout?: number
-    windowsHide?: boolean
-}
-
-export interface ExternalAuthProvider {
-    endpoint: string
-    executable: ExternalAuthCommand
-}
-
 interface RawClientConfiguration {
     net: NetConfiguration
     codebase?: string
@@ -188,8 +165,6 @@ interface RawClientConfiguration {
      */
     overrideServerEndpoint?: string | undefined
     overrideAuthToken?: string | undefined
-
-    authExternalProviders: ExternalAuthProvider[]
 }
 
 /**