Switch to webview-based sign-in flow #2382
+405
−4,118
There are no files selected for viewing
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
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
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
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
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -15,12 +15,19 @@ import com.sourcegraph.cody.agent.protocol.WebviewCreateWebviewPanelParams | |
| import com.sourcegraph.cody.agent.protocol_generated.DebugMessage | ||
| import com.sourcegraph.cody.agent.protocol_generated.DisplayCodeLensParams | ||
| import com.sourcegraph.cody.agent.protocol_generated.Env_OpenExternalParams | ||
| import com.sourcegraph.cody.agent.protocol_generated.GlobalStorage_DidChangeParams | ||
| import com.sourcegraph.cody.agent.protocol_generated.Null | ||
| import com.sourcegraph.cody.agent.protocol_generated.SaveDialogOptionsParams | ||
| import com.sourcegraph.cody.agent.protocol_generated.Secrets_DeleteParams | ||
| import com.sourcegraph.cody.agent.protocol_generated.Secrets_GetParams | ||
| import com.sourcegraph.cody.agent.protocol_generated.Secrets_StoreParams | ||
| import com.sourcegraph.cody.agent.protocol_generated.TextDocumentEditParams | ||
| import com.sourcegraph.cody.agent.protocol_generated.TextDocument_ShowParams | ||
| import com.sourcegraph.cody.agent.protocol_generated.UntitledTextDocument | ||
| import com.sourcegraph.cody.agent.protocol_generated.Window_DidChangeContextParams | ||
| import com.sourcegraph.cody.agent.protocol_generated.WorkspaceEditParams | ||
| import com.sourcegraph.cody.auth.CodyAccount | ||
| import com.sourcegraph.cody.auth.SourcegraphServerPath | ||
| import com.sourcegraph.cody.edit.EditService | ||
| import com.sourcegraph.cody.edit.lenses.LensesService | ||
| import com.sourcegraph.cody.error.CodyConsole | ||
|
|
@@ -123,6 +130,24 @@ class CodyAgentClient(private val project: Project, private val webview: NativeW | |
| } | ||
| } | ||
|
|
||
| @JsonRequest("secrets/get") | ||
| fun secrets_get(params: Secrets_GetParams): CompletableFuture<String?> { | ||
| return CompletableFuture.completedFuture( | ||
| CodyAccount(SourcegraphServerPath(params.key)).getToken()) | ||
| } | ||
|
|
||
| @JsonRequest("secrets/store") | ||
| fun secrets_store(params: Secrets_StoreParams): CompletableFuture<Null?> { | ||
|
There was a problem hiding this comment. A nullable null... Why not a nullable nullable null 🤔 |
||
| CodyAccount(SourcegraphServerPath(params.key)).storeToken(params.value) | ||
| return CompletableFuture.completedFuture(null) | ||
| } | ||
|
|
||
| @JsonRequest("secrets/delete") | ||
| fun secrets_delete(params: Secrets_DeleteParams): CompletableFuture<Null?> { | ||
| CodyAccount(SourcegraphServerPath(params.key)).storeToken(null) | ||
| return CompletableFuture.completedFuture(null) | ||
| } | ||
|
|
||
|
Comment on lines
+133
to
+150
There was a problem hiding this comment. maybe a stupid question but... is it safe? are there any security issues? would the secrets be present in the trace logs? There was a problem hiding this comment. We log the secrets in the agent trace, not the log. You have to set an extra environment variable to turn on that level of logging... I think it should be fine. We already log tokens in that file today... the ExtensionConfiguration message from JetBrains to Agent has the token in it... see build/sourcegraph/cody-agent-trace.json after a debugging session. There was a problem hiding this comment. It is a s Dominic said :) |
||
| // ============= | ||
| // Notifications | ||
| // ============= | ||
|
|
@@ -226,4 +251,16 @@ class CodyAgentClient(private val project: Project, private val webview: NativeW | |
|
|
||
| return saveFileFuture | ||
| } | ||
|
|
||
| @JsonNotification("window/didChangeContext") | ||
| fun window_didChangeContext(params: Window_DidChangeContextParams) { | ||
| println(params) | ||
|
There was a problem hiding this comment. Let's not spam the console. Info logging it might be fine. Is this, in fact, important for refreshing the status bar icon? There was a problem hiding this comment. Yeah, refreshing status icon bar is part I/ know I missed but I forget to add it at the end. |
||
| } | ||
|
|
||
| @JsonNotification("globalStorage/didChange") | ||
|
There was a problem hiding this comment. Let's not sniff global storage for this. We should be listening to the configuration observable and pushing a semantic, application-level message to the IDE. |
||
| fun globalStorage_didChange(params: GlobalStorage_DidChangeParams) { | ||
| if (params.key == "SOURCEGRAPH_CODY_ENDPOINT") { | ||
| CodyAccount.setActiveAccount(CodyAccount(SourcegraphServerPath(params.value.trim('"')))) | ||
| } | ||
| } | ||
| } | ||
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
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
btw, I wonder... what if the token expires (or is removed)? 🤔 what will happen (with chat, with autocomplete)?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I will test this scenario today. In general I think we should then (if user try to call some action explicitly) show cody panel, and it should be showing login panel.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
By the way, VSCode has various APIs for showing views, we don't implement them. If we need to show the view, we should see if the extension is trying to do it anyway. Maybe we just need to implement a couple of those methods/properties in the VSCode shim.