Fix last branch (#75)

* Fix regression with Databricks Extension Auth

* update dependencies

* Fixes

package.json

@@ -81,7 +81,7 @@
         "@types/mocha": "^10.0.6",
         "@types/node": "^18.19.3",
         "@types/uuid": "^9.0.7",
-        "@types/vscode": "^1.85.0",
+        "@types/vscode": "^1.83.0",
         "@typescript-eslint/eslint-plugin": "^6.13.2",
         "@typescript-eslint/parser": "^6.13.2",
         "@vscode/vsce": "^2.22.0",

src/DatabricksCommands.ts

@@ -3,13 +3,13 @@
  */
 
 import {ILanguageServer} from "@sqltools/types";
-import {Headers as HeaderFields} from "./types";
+import {HeadersInit} from "./types";
 import {IExtension} from "@sqltools/types";
 
 export class DatabricksCommandsClient {
     constructor(private server: ILanguageServer) {}
 
-    async authenticate(headers: HeaderFields) {
+    async authenticate(headers: HeadersInit): Promise<HeadersInit> {
         return await this.server.sendRequest("db/authenticate", headers);
     }
 
@@ -55,15 +55,15 @@ export async function initDatabricksCommands(
 
     await client.onRequest(
         "db/authenticate",
-        async (headerFields: HeaderFields) => {
+        async (headerFields: HeadersInit) => {
             const apiClient = await getApiClient();
             const headers = new Headers(headerFields);
             await apiClient.config.authenticate(headers);
 
             return [...headers.entries()].reduce((obj, [key, value]) => {
                 obj[key] = value;
                 return obj;
-            }, {} as HeaderFields);
+            }, {} as HeadersInit);
         }
     );
 

src/ls/ExtensionAuthProvider.ts

@@ -1,11 +1,10 @@
 import IAuthentication from "@databricks/sql/dist/connection/contracts/IAuthentication";
-import ITransport from "@databricks/sql/dist/connection/contracts/ITransport";
 import {buildUserAgentString} from "@databricks/sql/dist/utils";
 import {DatabricksCommandsClient} from "../DatabricksCommands";
-import {Headers} from "../types";
+import {HeadersInit} from "../types";
 
 export class ExtensionAuthProvider implements IAuthentication {
-    private headers: Headers;
+    private headers: HeadersInit;
 
     constructor(
         private dbCommands: DatabricksCommandsClient,
@@ -15,10 +14,8 @@ export class ExtensionAuthProvider implements IAuthentication {
         this.headers["User-Agent"] = buildUserAgentString(clientId);
     }
 
-    async authenticate(transport: ITransport): Promise<ITransport> {
+    async authenticate(): Promise<HeadersInit> {
         const headers = await this.dbCommands.authenticate(this.headers);
-        transport.setOptions("headers", headers);
-
-        return transport;
+        return headers;
     }
 }

src/types.ts

@@ -1 +1 @@
-export type Headers = Record<string, string>;
+export type HeadersInit = Record<string, string>;

yarn.lock

@@ -518,7 +518,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/vscode@npm:^1.85.0":
+"@types/vscode@npm:^1.83.0":
   version: 1.85.0
   resolution: "@types/vscode@npm:1.85.0"
   checksum: d7934e55b8606d0df0ac60e6ce0877d3edd513b5bc150e06fababd888f328a6ba87e3eef71930fc8eae1bcce60ec6106dae89d149905cdad613e84f48a6d003e
@@ -4442,7 +4442,7 @@ __metadata:
     "@types/mocha": ^10.0.6
     "@types/node": ^18.19.3
     "@types/uuid": ^9.0.7
-    "@types/vscode": ^1.85.0
+    "@types/vscode": ^1.83.0
     "@typescript-eslint/eslint-plugin": ^6.13.2
     "@typescript-eslint/parser": ^6.13.2
     "@vscode/vsce": ^2.22.0