Simplify jetbrains account management

jetbrains/src/integrationTest/kotlin/com/sourcegraph/cody/util/CodyIntegrationTextFixture.kt

@@ -22,7 +22,6 @@ import com.intellij.testFramework.runInEdtAndWait
 import com.sourcegraph.cody.agent.CodyAgentService
 import com.sourcegraph.cody.agent.protocol_generated.ProtocolAuthenticatedAuthStatus
 import com.sourcegraph.cody.agent.protocol_generated.ProtocolCodeLens
-import com.sourcegraph.cody.auth.CodyAccount
 import com.sourcegraph.cody.auth.SourcegraphServerPath
 import com.sourcegraph.cody.edit.lenses.LensListener
 import com.sourcegraph.cody.edit.lenses.LensesService
@@ -102,16 +101,13 @@ open class CodyIntegrationTextFixture : BasePlatformTestCase(), LensListener {
   // change anything.
   private fun initCredentialsAndAgent() {
     val credentials = TestingCredentials.dotcom
-    val account = CodyAccount(SourcegraphServerPath.from(credentials.serverEndpoint, ""))
-    account.storeToken(
-        credentials.token ?: credentials.redactedToken,
-    )
-    CodyAccount.setActiveAccount(account)
+    val endpoint = SourcegraphServerPath.from(credentials.serverEndpoint, "")
+    val token = credentials.token ?: credentials.redactedToken
 
     assertNotNull(
         "Unable to start agent in a timely fashion!",
         CodyAgentService.getInstance(project)
-            .startAgent(project)
+            .startAgent(project, endpoint, token)
             .completeOnTimeout(null, ASYNC_WAIT_TIMEOUT_SECONDS, TimeUnit.SECONDS)
             .get())
   }

jetbrains/src/main/java/com/sourcegraph/cody/CodyActionGroup.java

@@ -3,7 +3,8 @@
 import com.intellij.openapi.actionSystem.ActionUpdateThread;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.DefaultActionGroup;
-import com.sourcegraph.cody.auth.CodyAccount;
+import com.intellij.openapi.project.Project;
+import com.sourcegraph.cody.auth.CodyAuthService;
 import com.sourcegraph.config.ConfigUtil;
 import org.jetbrains.annotations.NotNull;
 
@@ -22,7 +23,12 @@ public boolean isDumbAware() {
   @Override
   public void update(@NotNull AnActionEvent e) {
     super.update(e);
+
+    Project project = e.getProject();
     e.getPresentation()
-        .setVisible(ConfigUtil.isCodyEnabled() && CodyAccount.Companion.hasActiveAccount());
+        .setVisible(
+            ConfigUtil.isCodyEnabled()
+                && project != null
+                && CodyAuthService.getInstance(project).isActivated());
   }
 }

jetbrains/src/main/java/com/sourcegraph/config/CodyAuthNotificationActivity.java

@@ -10,7 +10,7 @@
 import com.intellij.openapi.wm.ToolWindowManager;
 import com.sourcegraph.Icons;
 import com.sourcegraph.cody.CodyToolWindowFactory;
-import com.sourcegraph.cody.auth.CodyAccount;
+import com.sourcegraph.cody.auth.CodyAuthService;
 import com.sourcegraph.cody.config.CodyApplicationSettings;
 import com.sourcegraph.cody.initialization.Activity;
 import com.sourcegraph.common.NotificationGroups;
@@ -22,7 +22,7 @@ public class CodyAuthNotificationActivity implements Activity {
   @Override
   public void runActivity(@NotNull Project project) {
     if (!CodyApplicationSettings.getInstance().isGetStartedNotificationDismissed()
-        && !CodyAccount.Companion.hasActiveAccount()) {
+        && !CodyAuthService.getInstance(project).isActivated()) {
       showOpenCodySidebarNotification(project);
     }
   }

jetbrains/src/main/java/com/sourcegraph/find/browser/JSToJavaBridgeRequestHandler.java

@@ -42,7 +42,7 @@ public JBCefJSQuery.Response handle(@NotNull JsonObject request) {
     try {
       switch (action) {
         case "getConfig":
-          return createSuccessResponse(ConfigUtil.getConfigAsJson());
+          return createSuccessResponse(ConfigUtil.getConfigAsJson(project));
         case "getTheme":
           JsonObject currentThemeAsJson = ThemeUtil.getCurrentThemeAsJson();
           return createSuccessResponse(currentThemeAsJson);

jetbrains/src/main/java/com/sourcegraph/website/FileActionBase.java

@@ -40,11 +40,13 @@ public void actionPerformed(@NotNull AnActionEvent event) {
     LogicalPosition selectionStartPosition = getSelectionStartPosition(editor);
     LogicalPosition selectionEndPosition = getSelectionEndPosition(editor);
 
+    URLBuilder urlBuilder = new URLBuilder(project);
+
     if (currentFile instanceof SourcegraphVirtualFile) {
       SourcegraphVirtualFile sourcegraphFile = (SourcegraphVirtualFile) currentFile;
       handleFileUri(
           project,
-          URLBuilder.buildSourcegraphBlobUrl(
+          urlBuilder.buildSourcegraphBlobUrl(
               sourcegraphFile.getRepoUrl(),
               sourcegraphFile.getCommit(),
               sourcegraphFile.getRelativePath(),
@@ -68,15 +70,15 @@ public void actionPerformed(@NotNull AnActionEvent event) {
                   // Our "editor" backend doesn't support Perforce, but we have all the info we
                   // need, so we'll go to the final URL directly.
                   url =
-                      URLBuilder.buildSourcegraphBlobUrl(
+                      urlBuilder.buildSourcegraphBlobUrl(
                           repoInfo.getCodeHostUrl() + "/" + repoInfo.getRepoName(),
                           null,
                           repoInfo.relativePath,
                           selectionStartPosition,
                           selectionEndPosition);
                 } else {
                   url =
-                      URLBuilder.buildEditorFileUrl(
+                      urlBuilder.buildEditorFileUrl(
                           repoInfo.remoteUrl,
                           repoInfo.remoteBranchName,
                           repoInfo.relativePath,
@@ -102,12 +104,13 @@ public void actionPerformedFromPreviewContent(
 
     handleFileUri(
         project,
-        URLBuilder.buildSourcegraphBlobUrl(
-            previewContent.getRepoUrl(),
-            previewContent.getCommit(),
-            previewContent.getPath(),
-            start,
-            end));
+        new URLBuilder(project)
+            .buildSourcegraphBlobUrl(
+                previewContent.getRepoUrl(),
+                previewContent.getCommit(),
+                previewContent.getPath(),
+                start,
+                end));
   }
 
   @Nullable

jetbrains/src/main/java/com/sourcegraph/website/OpenRevisionAction.java

@@ -12,10 +12,10 @@
 import com.intellij.vcs.log.VcsLogCommitSelection;
 import com.intellij.vcs.log.VcsLogDataKeys;
 import com.intellij.vcsUtil.VcsUtil;
+import com.sourcegraph.cody.auth.CodyAuthService;
 import com.sourcegraph.common.BrowserOpener;
 import com.sourcegraph.common.ErrorNotification;
 import com.sourcegraph.common.ui.DumbAwareEDTAction;
-import com.sourcegraph.config.ConfigUtil;
 import com.sourcegraph.vcs.RepoUtil;
 import com.sourcegraph.vcs.RevisionContext;
 import com.sourcegraph.vcs.VCSType;
@@ -89,15 +89,15 @@ public void actionPerformed(@NotNull AnActionEvent event) {
               try {
                 url =
                     URLBuilder.buildCommitUrl(
-                        ConfigUtil.getServerPath().getUrl(),
+                        CodyAuthService.getInstance(project).getEndpoint().getUrl(),
                         context.getRevisionNumber(),
                         remoteUrl,
                         productName,
                         productVersion);
               } catch (IllegalArgumentException e) {
                 logger.warn(
                     "Unable to build commit view URI for url "
-                        + ConfigUtil.getServerPath().getUrl()
+                        + CodyAuthService.getInstance(project).getEndpoint().getUrl()
                         + ", revision "
                         + context.getRevisionNumber()
                         + ", product "

jetbrains/src/main/java/com/sourcegraph/website/SearchActionBase.java

@@ -40,11 +40,12 @@ public void actionPerformedMode(@NotNull AnActionEvent event, @NotNull Scope sco
     VirtualFile currentFile = FileDocumentManager.getInstance().getFile(editor.getDocument());
     assert currentFile != null; // selectedText != null, so this can't be null.
 
+    URLBuilder urlBuilder = new URLBuilder(project);
     if (currentFile instanceof SourcegraphVirtualFile) {
       String url;
       SourcegraphVirtualFile sourcegraphFile = (SourcegraphVirtualFile) currentFile;
       String repoUrl = (scope == Scope.REPOSITORY) ? sourcegraphFile.getRepoUrl() : null;
-      url = URLBuilder.buildEditorSearchUrl(selectedText, repoUrl, null);
+      url = urlBuilder.buildEditorSearchUrl(selectedText, repoUrl, null);
       BrowserOpener.INSTANCE.openInBrowser(project, url);
     } else {
       // This cannot run on EDT (Event Dispatch Thread) because it may block for a long time.
@@ -62,9 +63,9 @@ public void actionPerformedMode(@NotNull AnActionEvent event, @NotNull Scope sco
                   String codeHostUrl =
                       (scope == Scope.REPOSITORY) ? repoInfo.getCodeHostUrl() : null;
                   String repoName = (scope == Scope.REPOSITORY) ? repoInfo.getRepoName() : null;
-                  url = URLBuilder.buildDirectSearchUrl(selectedText, codeHostUrl, repoName);
+                  url = urlBuilder.buildDirectSearchUrl(selectedText, codeHostUrl, repoName);
                 } else {
-                  url = URLBuilder.buildEditorSearchUrl(selectedText, remoteUrl, remoteBranchName);
+                  url = urlBuilder.buildEditorSearchUrl(selectedText, remoteUrl, remoteBranchName);
                 }
                 BrowserOpener.INSTANCE.openInBrowser(project, url);
               });

jetbrains/src/main/java/com/sourcegraph/website/URLBuilder.java

@@ -1,6 +1,8 @@
 package com.sourcegraph.website;
 
 import com.intellij.openapi.editor.LogicalPosition;
+import com.intellij.openapi.project.Project;
+import com.sourcegraph.cody.auth.CodyAuthService;
 import com.sourcegraph.common.RegexEscaper;
 import com.sourcegraph.config.ConfigUtil;
 import java.net.URI;
@@ -10,14 +12,20 @@
 import org.jetbrains.annotations.Nullable;
 
 public class URLBuilder {
+  Project project;
+
+  public URLBuilder(Project project) {
+    this.project = project;
+  }
+
   @NotNull
-  public static String buildEditorFileUrl(
+  public String buildEditorFileUrl(
       @NotNull String remoteUrl,
       @NotNull String branchName,
       @NotNull String relativePath,
       @Nullable LogicalPosition start,
       @Nullable LogicalPosition end) {
-    return ConfigUtil.getServerPath().getUrl()
+    return CodyAuthService.getInstance(project).getEndpoint().getUrl()
         + "-/editor"
         + "?remote_url="
         + URLEncoder.encode(remoteUrl, StandardCharsets.UTF_8)
@@ -42,10 +50,10 @@ public static String buildEditorFileUrl(
   }
 
   @NotNull
-  public static String buildEditorSearchUrl(
+  public String buildEditorSearchUrl(
       @NotNull String search, @Nullable String remoteUrl, @Nullable String remoteBranchName) {
     String url =
-        ConfigUtil.getServerPath().getUrl()
+        CodyAuthService.getInstance(project).getEndpoint().getUrl()
             + "-/editor"
             + "?"
             + buildVersionParams()
@@ -63,13 +71,13 @@ public static String buildEditorSearchUrl(
   }
 
   @NotNull
-  public static String buildDirectSearchUrl(
+  public String buildDirectSearchUrl(
       @NotNull String search, @Nullable String codeHost, @Nullable String repoName) {
     String repoFilter =
         (codeHost != null && repoName != null)
             ? "repo:^" + RegexEscaper.INSTANCE.escapeRegexChars(codeHost + "/" + repoName) + "$"
             : null;
-    return ConfigUtil.getServerPath().getUrl()
+    return CodyAuthService.getInstance(project).getEndpoint().getUrl()
         + "/search"
         + "?patternType=literal"
         + "&q="
@@ -117,13 +125,13 @@ public static String buildCommitUrl(
 
   @NotNull
   // repoUrl should be like "github.com/sourcegraph/sourcegraph"
-  public static String buildSourcegraphBlobUrl(
+  public String buildSourcegraphBlobUrl(
       @NotNull String repoUrl,
       @Nullable String commit,
       @NotNull String path,
       @Nullable LogicalPosition start,
       @Nullable LogicalPosition end) {
-    return ConfigUtil.getServerPath().getUrl()
+    return CodyAuthService.getInstance(project).getEndpoint().getUrl()
         + repoUrl
         + (commit != null ? "@" + commit : "")
         + "/-/blob/"

jetbrains/src/main/kotlin/com/sourcegraph/cody/agent/CodyAgent.kt

@@ -15,6 +15,7 @@ import com.sourcegraph.cody.agent.protocol_generated.ClientInfo
 import com.sourcegraph.cody.agent.protocol_generated.CodyAgentServer
 import com.sourcegraph.cody.agent.protocol_generated.ProtocolTypeAdapters
 import com.sourcegraph.cody.agent.protocol_generated.WebviewNativeConfig
+import com.sourcegraph.cody.auth.SourcegraphServerPath
 import com.sourcegraph.cody.ui.web.WebUIServiceWebviewProvider
 import com.sourcegraph.cody.vscode.CancellationToken
 import com.sourcegraph.config.ConfigUtil
@@ -114,7 +115,11 @@ private constructor(
           else -> Debuggability.NotDebuggable
         }
 
-    fun create(project: Project): CompletableFuture<CodyAgent> {
+    fun create(
+        project: Project,
+        endpoint: SourcegraphServerPath?,
+        token: String?,
+    ): CompletableFuture<CodyAgent> {
       try {
         val conn = startAgentProcess()
         val client = CodyAgentClient(project, WebUIServiceWebviewProvider(project))
@@ -131,7 +136,8 @@ private constructor(
                       workspaceRootUri =
                           ProtocolTextDocumentExt.normalizeUriOrPath(
                               ConfigUtil.getWorkspaceRootPath(project).toUri().toString()),
-                      extensionConfiguration = ConfigUtil.getAgentConfiguration(project),
+                      extensionConfiguration =
+                          ConfigUtil.getAgentConfiguration(project, endpoint, token),
                       capabilities =
                           ClientCapabilities(
                               authentication = ClientCapabilities.AuthenticationEnum.Enabled,
@@ -312,15 +318,13 @@ private constructor(
                   // undefined fields.
                   .serializeNulls()
                   // TODO: Once all protocols have migrated we can remove these
-                  // legacy enum
-                  // conversions
+                  // legacy enum conversions
                   .registerTypeAdapter(URI::class.java, uriDeserializer)
                   .registerTypeAdapter(URI::class.java, uriSerializer)
 
               ProtocolTypeAdapters.register(gsonBuilder)
               // This ensures that by default all enums are always serialized to their
-              // string
-              // equivalents
+              // string equivalents string equivalents
               gsonBuilder.registerTypeAdapterFactory(EnumTypeAdapterFactory())
             }
           }
@@ -383,10 +387,9 @@ private constructor(
       return try {
         binaryTarget?.toFile()?.deleteOnExit()
         token.onFinished {
-          // Important: delete the file from disk after the process exists
-          // Ideally, we should eventually replace this temporary file with a permanent
-          // location
-          // in the plugin directory.
+          // Important: delete the file from disk after the process exists Ideally, we
+          // should eventually replace this temporary file with a permanent location in
+          // the plugin directory.
           Files.deleteIfExists(binaryTarget)
         }
         logger.info("Extracting Node binary to " + binaryTarget.toAbsolutePath())

jetbrains/src/main/kotlin/com/sourcegraph/cody/agent/CodyAgentClient.kt

@@ -26,13 +26,13 @@ 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.CodyAuthService
+import com.sourcegraph.cody.auth.CodySecureStore
 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
 import com.sourcegraph.cody.ignore.IgnoreOracle
-import com.sourcegraph.cody.statusbar.CodyStatus
 import com.sourcegraph.cody.statusbar.CodyStatusService
 import com.sourcegraph.cody.ui.web.NativeWebviewProvider
 import com.sourcegraph.common.BrowserOpener
@@ -136,19 +136,18 @@ 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())
+    return CompletableFuture.completedFuture(CodySecureStore.getFromSecureStore(params.key))
   }
 
   @JsonRequest("secrets/store")
   fun secrets_store(params: Secrets_StoreParams): CompletableFuture<Null?> {
-    CodyAccount(SourcegraphServerPath(params.key)).storeToken(params.value)
+    CodySecureStore.writeToSecureStore(params.key, params.value)
     return CompletableFuture.completedFuture(null)
   }
 
   @JsonRequest("secrets/delete")
   fun secrets_delete(params: Secrets_DeleteParams): CompletableFuture<Null?> {
-    CodyAccount(SourcegraphServerPath(params.key)).storeToken(null)
+    CodySecureStore.writeToSecureStore(params.key, null)
     return CompletableFuture.completedFuture(null)
   }
 
@@ -259,12 +258,13 @@ class CodyAgentClient(private val project: Project, private val webview: NativeW
   @JsonNotification("window/didChangeContext")
   fun window_didChangeContext(params: Window_DidChangeContextParams) {
     if (params.key == "cody.activated") {
-      CodyAccount.setActivated(params.value?.toBoolean() ?: false)
-      CodyStatusService.notifyApplication(project, CodyStatus.CodyNotSignedIn)
+      CodyAuthService.getInstance(project).setActivated(params.value?.toBoolean() ?: false)
+      // CodyStatusService.notifyApplication(project, CodyStatus.CodyNotSignedIn)
+      CodyStatusService.resetApplication(project)
     }
     if (params.key == "cody.serverEndpoint") {
       val endpoint = params.value ?: return
-      CodyAccount.setActiveAccount(CodyAccount(SourcegraphServerPath(endpoint)))
+      CodyAuthService.getInstance(project).setEndpoint(SourcegraphServerPath(endpoint))
       CodyStatusService.resetApplication(project)
     }
   }