Add support for external auth providers in code search #6919
+131
−62
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
pkukielka
force-pushed
the
pkukielka/ext-auth-fix-search
branch
from
dfc3ef0 to
aa904c1
Compare
pkukielka
changed the title
pkukielka
force-pushed
the
pkukielka/ext-auth-fix-search
branch
from
aa904c1 to
4a47767
Compare
mkondratek
approved these changes
Feb 7, 2025
| @@ -343,7 +343,9 @@ tasks { | |||
| return destinationDir | |||
| } | |||
|
|
|||
| val sourcegraphDir = unzipCodeSearch() | |||
| val codeSearchDirOverride = System.getenv("CODE_SEARCH_DIR_OVERRIDE") | |||
| } | ||
| } | ||
| return {} |
There was a problem hiding this comment.
previously we had a console.error. do we need it? or is {} a valid option?
| @@ -19,8 +19,6 @@ class CodySettingChangeListener(project: Project) : ChangeListener(project) { | |||
| CodySettingChangeActionNotifier.TOPIC, | |||
| object : CodySettingChangeActionNotifier { | |||
| override fun afterAction(context: CodySettingChangeContext) { | |||
| // Notify JCEF about the config changes | |||
There was a problem hiding this comment.
don't we need to refreshConfiguration now?
There was a problem hiding this comment.
That config was already not containing any info useful for sourcegraph search.
We care about endpoint and headers.
Endpoint change is signalled in CodyAuthService.
Headers are fetched every time so we do not need to notify about any change in their case.
Comment on lines
32
to
34
| } catch (Exception ignored) { | ||
| return false; | ||
| } |
There was a problem hiding this comment.
is it safe to ignore it and return false? does it make sense to log/warn here?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes
This PR adds agent endpoint which allow us to fetch auth headers, which in turn we need to deliver to the sourcegraph search webview.
Webview changes are on a separate PR: pkukielka/sourcegraph-public-snapshot#1
Test plan
Setup:
pkukielka/add-external-auth-providers-supportbranch.export CODE_SEARCH_DIR_OVERRIDE=/path/to/pkukielka/sourcegraph-public-snapshotpkukielka/ext-auth-fix-searchbranch) in Cody projec dircd jetbrains./gradlew customRunIde -PforceCodeSearchBuild=true -PforceAgentBuild=trueTest
Option + Sto open sourcegraph searchOpen in Browser"cody.override.serverEndpoint"line and then switch to other account, e.g. on https://sg02.sourcegraphcloud.com/ (this one will authenticate using token), save settingsOpen in BrowserReproducing failing fetches:
commandLineline to:"commandLine": ["echo '{ \"headers\": { \"X-Forwarded-User\": \"SomeUser\" } }'"],ide.browser.jcef.debug.port9222)Option + Sto open sourcegraph searchSourcegraphlink to inspect the failures in the devtools