Fixes #372

Author: isc-bsaviano

CHANGELOG.md

@@ -5,6 +5,7 @@
 - Fix issue [#367](https://github.com/intersystems/language-server/issues/367): Support `objectscript.multilineMethodArgs` being set per workspace folder
 - Fix issue [#370](https://github.com/intersystems/language-server/issues/370): Infinite recursion when a variable is set to the result of one of its instance methods
 - Fix issue [#371](https://github.com/intersystems/language-server/issues/371): Don't report problems for code enclosed in `#if 0` blocks
+- Fix issue [#372](https://github.com/intersystems/language-server/issues/372): Log out of web sessions when VS Code exits
 - Parser changes:
   - DP-438845, DP-440271: Support new keywords for deferred filing of indices and computed fields
 

client/src/extension.ts

@@ -20,7 +20,7 @@ import {
 	TransportKind
 } from 'vscode-languageclient/node';
 
-import { gt, lte } from "semver";
+import { gt, lte, lt } from "semver";
 import * as serverManager from "@intersystems-community/intersystems-servermanager";
 
 import { ObjectScriptEvaluatableExpressionProvider } from './evaluatableExpressionProvider';
@@ -40,8 +40,29 @@ export let client: LanguageClient;
 /**
  * Cache for cookies from REST requests to InterSystems servers.
  */
-export let cookiesCache: Cache;
+let cookiesCache: Cache;
 
+export async function updateCookies(newCookies: string[], server: ServerSpec): Promise<string[]> {
+	const key = `${server.username}@${server.host}:${server.port}${server.pathPrefix}`;
+	const cookies = cookiesCache.get(key, []);
+	newCookies.forEach((cookie) => {
+	  const [cookieName] = cookie.split("=");
+	  const index = cookies.findIndex((el) => el.startsWith(cookieName));
+	  if (index >= 0) {
+		cookies[index] = cookie;
+	  } else {
+		cookies.push(cookie);
+	  }
+	});
+	await cookiesCache.put(key, cookies);
+	return cookies;
+}
+
+export function getCookies(server: ServerSpec): string[] {
+	return cookiesCache.get(`${server.username}@${server.host}:${server.port}${server.pathPrefix}`, []);
+}
+
+let objectScriptApi;
 let serverManagerApi: serverManager.ServerManagerAPI;
 
 type MakeRESTRequestParams = {
@@ -57,7 +78,7 @@ type MakeRESTRequestParams = {
 export async function activate(context: ExtensionContext) {
 	// Get the main extension exported API
 	const objectScriptExt = extensions.getExtension("intersystems-community.vscode-objectscript");
-	const objectScriptApi = objectScriptExt.isActive ? objectScriptExt.exports : await objectScriptExt.activate();
+	objectScriptApi = objectScriptExt.isActive ? objectScriptExt.exports : await objectScriptExt.activate();
 
 	cookiesCache = new Cache(context, "cookies");
 	// The server is implemented in node
@@ -346,9 +367,28 @@ export async function activate(context: ExtensionContext) {
 	}
 }
 
-export function deactivate(): Thenable<void> | undefined {
-	if (!client) {
-		return undefined;
+export async function deactivate(): Promise<void> {
+	// Stop the server and log out of all CSP sessions
+	const loggedOut: Set<string> = new Set();
+	const promises: Promise<any>[] = client ? [client.stop()] : [];
+	for (const f of workspace.workspaceFolders ?? []) {
+		const serverSpec: ServerSpec = objectScriptApi.serverForUri(f.uri);
+		if (!serverSpec?.active) continue;
+		const sessionCookie = getCookies(serverSpec).find((c) => c.startsWith("CSPSESSIONID-"));
+		if (!sessionCookie || loggedOut.has(sessionCookie)) continue;
+		loggedOut.add(sessionCookie);
+		promises.push(
+			makeRESTRequest(
+				"HEAD",
+				0,
+				undefined,
+				serverSpec,
+				undefined,
+				undefined,
+				// Prefer IRISLogout for servers that support it
+				lt(serverSpec.serverVersion, "2018.2.0") ? { CacheLogout: "end" } : { IRISLogout: "end" }
+			)
+		);
 	}
-	return client.stop();
+	await Promise.allSettled(promises);
 }

client/src/makeRESTRequest.ts

@@ -3,7 +3,7 @@ import { workspace } from 'vscode';
 import axios, { AxiosResponse } from 'axios';
 import * as https from 'https';
 
-import { client, cookiesCache } from './extension';
+import { client, getCookies, updateCookies } from './extension';
 
 export type ServerSpec = {
 	scheme: string,
@@ -15,29 +15,10 @@ export type ServerSpec = {
 	username: string,
 	serverName: string,
 	password: string,
+	serverVersion: string,
 	active: boolean
 };
 
-async function updateCookies(newCookies: string[], server: ServerSpec): Promise<string[]> {
-	const key = `${server.username}@${server.host}:${server.port}${server.pathPrefix}`;
-	const cookies = cookiesCache.get(key, []);
-    newCookies.forEach((cookie) => {
-      const [cookieName] = cookie.split("=");
-      const index = cookies.findIndex((el) => el.startsWith(cookieName));
-      if (index >= 0) {
-        cookies[index] = cookie;
-      } else {
-        cookies.push(cookie);
-      }
-    });
-    await cookiesCache.put(key, cookies);
-	return cookies;
-}
-
-function getCookies(server: ServerSpec): string[] {
-	return cookiesCache.get(`${server.username}@${server.host}:${server.port}${server.pathPrefix}`, []);
-}
-
 /**
  * Send a REST request to an InterSystems server.
  * 
@@ -49,7 +30,7 @@ function getCookies(server: ServerSpec): string[] {
  * @param checksum Optional checksum. Only passed for SASchema requests.
  * @param params Optional URL parameters. Only passed for GET /doc/ requests.
  */
-export async function makeRESTRequest(method: "GET"|"POST", api: number, path: string, server: ServerSpec, data?: any, checksum?: string, params?: any): Promise<AxiosResponse<any> | undefined> {
+export async function makeRESTRequest(method: "GET"|"POST"|"HEAD", api: number, path: string, server: ServerSpec, data?: any, checksum?: string, params?: any): Promise<AxiosResponse<any> | undefined> {
 	if (server.host === "") {
 		// No server connection is configured
 		client.warn("Cannot make required REST request because no server connection is configured.");
@@ -75,7 +56,7 @@ export async function makeRESTRequest(method: "GET"|"POST", api: number, path: s
 	}
 
 	// Build the URL
-	let url = encodeURI(`${server.scheme}://${server.host}:${server.port}${server.pathPrefix}/api/atelier/v${server.apiVersion}/${server.namespace}${path}`);
+	let url = encodeURI(`${server.scheme}://${server.host}:${server.port}${server.pathPrefix}/api/atelier/${api ? `v${server.apiVersion}/${server.namespace}${path}` : "" }`);
 
 	// Create the HTTPS agent
 	const httpsAgent = new https.Agent({ rejectUnauthorized: workspace.getConfiguration("http").get("proxyStrictSSL") });
@@ -234,7 +215,7 @@ export async function makeRESTRequest(method: "GET"|"POST", api: number, path: s
 						}
 					}
 				);
-				if (respdata.status === 401) {
+				if (respdata.status === 401 && api) { // api is only 0 when calling HEAD / to log out of the session
 					// Either we had no cookies or they expired, so resend the request with basic auth
 
 					respdata = await axios.request(