Merge remote-tracking branch 'origin/main' into koesie10/deprecate-lgtm-download

extensions/ql-vscode/CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ## [UNRELEASED]
 
+- Add ability for users to download databases directly from GitHub. [#1466](https://github.com/github/vscode-codeql/pull/1466)
 - Remove ability to download databases from LGTM. [#1467](https://github.com/github/vscode-codeql/pull/1467)
 
 ## 1.6.10 - 9 August 2022

extensions/ql-vscode/package.json

@@ -664,7 +664,7 @@
         },
         {
           "command": "codeQLDatabases.chooseDatabaseGithub",
-          "when": "config.codeQL.canary && view == codeQLDatabases",
+          "when": "view == codeQLDatabases",
           "group": "navigation"
         },
         {
@@ -878,10 +878,6 @@
         }
       ],
       "commandPalette": [
-        {
-          "command": "codeQL.authenticateToGitHub",
-          "when": "config.codeQL.canary"
-        },
         {
           "command": "codeQL.runQuery",
           "when": "resourceLangId == ql && resourceExtname == .ql"
@@ -926,10 +922,6 @@
           "command": "codeQL.viewCfg",
           "when": "resourceScheme == codeql-zip-archive && config.codeQL.canary"
         },
-        {
-          "command": "codeQL.chooseDatabaseGithub",
-          "when": "config.codeQL.canary"
-        },
         {
           "command": "codeQL.chooseDatabaseLgtm",
           "when": "config.codeQL.canary"
@@ -1179,7 +1171,7 @@
       },
       {
         "view": "codeQLDatabases",
-        "contents": "Add a CodeQL database:\n[From a folder](command:codeQLDatabases.chooseDatabaseFolder)\n[From an archive](command:codeQLDatabases.chooseDatabaseArchive)\n[From a URL (as a zip file)](command:codeQLDatabases.chooseDatabaseInternet)"
+        "contents": "Add a CodeQL database:\n[From a folder](command:codeQLDatabases.chooseDatabaseFolder)\n[From an archive](command:codeQLDatabases.chooseDatabaseArchive)\n[From a URL (as a zip file)](command:codeQLDatabases.chooseDatabaseInternet)\n[From GitHub](command:codeQLDatabases.chooseDatabaseGithub)"
       },
       {
         "view": "codeQLEvalLogViewer",

extensions/ql-vscode/src/extension.ts

@@ -1018,19 +1018,16 @@ async function activateWithInstalledDistribution(
     }
   };
 
-  // The "authenticateToGitHub" command is internal-only.
   ctx.subscriptions.push(
     commandRunner('codeQL.authenticateToGitHub', async () => {
-      if (isCanary()) {
+      /**
-        /**
+       * Credentials for authenticating to GitHub.
-         * Credentials for authenticating to GitHub.
+       * These are used when making API calls.
-         * These are used when making API calls.
+       */
-         */
+      const credentials = await Credentials.initialize(ctx);
-        const credentials = await Credentials.initialize(ctx);
+      const octokit = await credentials.getOctokit();
-        const octokit = await credentials.getOctokit();
+      const userInfo = await octokit.users.getAuthenticated();
-        const userInfo = await octokit.users.getAuthenticated();
+      void showAndLogInformationMessage(`Authenticated to GitHub as user: ${userInfo.data.login}`);
-        void showAndLogInformationMessage(`Authenticated to GitHub as user: ${userInfo.data.login}`);
-      }
     }));
 
   ctx.subscriptions.push(