Merge pull request #144 from gjsjohnmurray/pre-sync-2.0.10

Sync prerelease with 2.0.10

Author: gjsjohnmurray

CHANGELOG.md

@@ -1,3 +1,6 @@
+## 3.1.2022062901 (29-Jun-2022 pre-release)
+* Add 2.0.10 changes.
+
 ## 3.1.2022042001 (20-Apr-2022 pre-release)
 * Add 2.0.8 and 2.0.9 changes.
 
@@ -14,6 +17,11 @@
 ## 3.0.0 (27-Nov-2021 pre-release)
 * Implement `intersystems-server-credentials` authentication provider.
 * 
+## 2.0.10 (29-Jun-2022)
+* Accept self-signed certificates if `http.proxyStrictSSL` is set to `false` (#137).
+* Notify when SQL GRANT will be necessary in order to display list of server-side projects (#140).
+* Reuse session-cached username if server definition lacks one (#141).
+
 ## 2.0.9 (20-Apr-2022)
 * Add support for server-side projects (#131). 
 

src/api/getServerSpec.ts

@@ -53,7 +53,12 @@ export async function getServerSpec(
         server.password = undefined;
     } else {
 
-        // Obtain a username (including blank to try connecting anonymously)
+        // Use cached username if appropriate
+        if (!server.username && !useOurAuthProvider && credentialCache[name]) {
+          server.username = credentialCache[name].username;
+        }
+
+        // Prompt for a username if necessary (including blank to try connecting anonymously)
         if (!server.username && !useOurAuthProvider) {
             await vscode.window
             .showInputBox({

src/makeRESTRequest.ts

@@ -3,6 +3,7 @@
 
 import axios, { AxiosResponse } from "axios";
 import axiosCookieJarSupport from "axios-cookiejar-support";
+import * as https from "https";
 import tough = require("tough-cookie");
 import * as vscode from "vscode";
 import { AUTHENTICATION_PROVIDER } from "./authenticationProvider";
@@ -36,8 +37,11 @@ export async function makeRESTRequest(
     data?: any,
     ): Promise<AxiosResponse | undefined> {
 
-    // Build the URL
-    let url = server.webServer.scheme + "://" + server.webServer.host + ":" + String(server.webServer.port);
+	// Create the HTTPS agent
+	const httpsAgent = new https.Agent({ rejectUnauthorized: vscode.workspace.getConfiguration("http").get("proxyStrictSSL") });
+
+	// Build the URL
+	let url = server.webServer.scheme + "://" + server.webServer.host + ":" + String(server.webServer.port);
     const pathPrefix = server.webServer.pathPrefix;
     if (pathPrefix && pathPrefix !== "") {
         url += pathPrefix;
@@ -54,6 +58,7 @@ export async function makeRESTRequest(
             // There is a data payload
             respdata = await axios.request(
                 {
+                    httpsAgent,
                     data,
                     headers: {
                         "Content-Type": "application/json",
@@ -74,6 +79,7 @@ export async function makeRESTRequest(
                     // Either we had no cookies or they expired, so resend the request with basic auth
                     respdata = await axios.request(
                         {
+                            httpsAgent,
                             auth: {
                                 password: server.password,
                                 username: server.username,
@@ -94,6 +100,7 @@ export async function makeRESTRequest(
             // No data payload
             respdata = await axios.request(
                 {
+                    httpsAgent,
                     jar: cookieJar,
                     method,
                     url: encodeURI(url),
@@ -110,6 +117,7 @@ export async function makeRESTRequest(
                     // Either we had no cookies or they expired, so resend the request with basic auth
                     respdata = await axios.request(
                         {
+                            httpsAgent,
                             auth: {
                                 password: server.password,
                                 username: server.username,

src/ui/serverManagerView.ts

@@ -545,6 +545,16 @@ async function namespaceProjects(element: ProjectsTreeItem, params?: any): Promi
             { query: "SELECT Name, Description FROM %Studio.Project", parameters: [] }
         );
         if (response !== undefined) {
+            if (response.data.result.content === undefined) {
+                let message;
+                if (response.data.status?.errors[0]?.code === 5540) {
+                    message = `To allow user '${serverSpec.username}' to list projects in namespace '${params.ns}', run this SQL statement there using an account with sufficient privilege: GRANT SELECT ON %Studio.Project TO ${serverSpec.username}`;
+                } else {
+                    message = response.data.status.summary;
+                }
+                vscode.window.showErrorMessage(message);
+                return undefined;
+            }
             response.data.result.content.map((project) => {
                 children.push(new ProjectTreeItem({ parent: element, label: name, id: name }, project.Name, project.Description));
             });