Also use credentials in non-canary mode

We want users to be able to download databases from private/internal
repositories without using canary mode. This will change the prompt to
ask for credentials in non-canary mode as well.

Author: koesie10

extensions/ql-vscode/src/databases/github-database-module.ts

@@ -1,21 +1,19 @@
+import { window } from "vscode";
 import { DisposableObject } from "../common/disposable-object";
 import { App } from "../common/app";
 import { findGitHubRepositoryForWorkspace } from "./github-repository-finder";
 import { redactableError } from "../common/errors";
 import { asError, getErrorMessage } from "../common/helpers-pure";
 import {
+  askForGitHubDatabaseDownload,
   CodeqlDatabase,
   findGitHubDatabasesForRepository,
-  promptGitHubDatabaseDownload,
+  downloadDatabaseFromGitHub,
 } from "./github-database-prompt";
-import {
-  GitHubDatabaseConfig,
-  GitHubDatabaseConfigListener,
-  isCanary,
-} from "../config";
-import { AppOctokit } from "../common/octokit";
+import { GitHubDatabaseConfig, GitHubDatabaseConfigListener } from "../config";
 import { DatabaseManager } from "./local-databases";
 import { CodeQLCliServer } from "../codeql-cli/cli";
+import { showNeverAskAgainDialog } from "../common/vscode/dialog";
 
 export class GithubDatabaseModule extends DisposableObject {
   private readonly config: GitHubDatabaseConfig;
@@ -93,11 +91,31 @@ export class GithubDatabaseModule extends DisposableObject {
       return;
     }
 
-    const credentials = isCanary() ? this.app.credentials : undefined;
+    const credentials = this.app.credentials;
+
+    const hasAccessToken = !!(await credentials.getExistingAccessToken());
+
+    // If the user does not have an access token, ask whether they want to connect.
+    if (!hasAccessToken) {
+      const answer = await showNeverAskAgainDialog(
+        "This repository has an origin (GitHub) that may have one or more CodeQL databases. Connect to GitHub and download any existing databases?",
+        false,
+        "Connect",
+        "Not now",
+        "Never",
+      );
+
+      if (answer === "Not now" || answer === undefined) {
+        return;
+      }
 
-    const octokit = credentials
-      ? await credentials.getOctokit()
-      : new AppOctokit();
+      if (answer === "Never") {
+        await this.config.setDownload("never");
+        return;
+      }
+    }
+
+    const octokit = await credentials.getOctokit();
 
     let databases: CodeqlDatabase[];
     try {
@@ -121,15 +139,29 @@ export class GithubDatabaseModule extends DisposableObject {
     }
 
     if (databases.length === 0) {
+      // If the user didn't have an access token, they have already been prompted,
+      // so we should give feedback.
+      if (!hasAccessToken) {
+        void window.showInformationMessage(
+          "The GitHub repository does not have any CodeQL databases.",
+        );
+      }
+
       return;
     }
 
-    void promptGitHubDatabaseDownload(
+    // If the user already had an access token, first ask if they even want to download the DB.
+    if (hasAccessToken) {
+      if (!(await askForGitHubDatabaseDownload(databases, this.config))) {
+        return;
+      }
+    }
+
+    await downloadDatabaseFromGitHub(
       octokit,
       githubRepository.owner,
       githubRepository.name,
       databases,
-      this.config,
       this.databaseManager,
       this.databaseStoragePath,
       this.cliServer,

extensions/ql-vscode/src/databases/github-database-prompt.ts

@@ -30,20 +30,13 @@ export async function findGitHubDatabasesForRepository(
 }
 
 /**
- * Prompt the user to download a database from GitHub. This is a blocking method, so this should
- * almost never be called with `await`.
+ * Ask whether the user wants to download a database from GitHub.
+ * @return true if the user wants to download a database, false otherwise.
  */
-export async function promptGitHubDatabaseDownload(
-  octokit: Octokit,
-  owner: string,
-  repo: string,
+export async function askForGitHubDatabaseDownload(
   databases: CodeqlDatabase[],
   config: GitHubDatabaseConfig,
-  databaseManager: DatabaseManager,
-  storagePath: string,
-  cliServer: CodeQLCliServer,
-  commandManager: AppCommandManager,
-): Promise<void> {
+): Promise<boolean> {
   const languages = databases.map((database) => database.language);
 
   const databasesMessage =
@@ -57,26 +50,45 @@ export async function promptGitHubDatabaseDownload(
 
   const connectMessage =
     databases.length === 1
-      ? `Connect to GitHub and download the existing database?`
-      : `Connect to GitHub and download any existing databases?`;
+      ? `Download the existing database from GitHub?`
+      : `Download any existing databases from GitHub?`;
 
   const answer = await showNeverAskAgainDialog(
     `${databasesMessage} ${connectMessage}`,
     false,
-    "Connect",
+    "Download",
     "Not now",
     "Never",
   );
 
   if (answer === "Not now" || answer === undefined) {
-    return;
+    return false;
   }
 
   if (answer === "Never") {
     await config.setDownload("never");
-    return;
+    return false;
   }
 
+  return true;
+}
+
+/**
+ * Download a database from GitHub by asking the user for a language and then
+ * downloading the database for that language.
+ */
+export async function downloadDatabaseFromGitHub(
+  octokit: Octokit,
+  owner: string,
+  repo: string,
+  databases: CodeqlDatabase[],
+  databaseManager: DatabaseManager,
+  storagePath: string,
+  cliServer: CodeQLCliServer,
+  commandManager: AppCommandManager,
+): Promise<void> {
+  const languages = databases.map((database) => database.language);
+
   const language = await promptForLanguage(languages, undefined);
   if (!language) {
     return;