chore: more clean up

Author: kmruiz

src/common/connectionManager.ts

@@ -6,7 +6,6 @@ import { packageInfo } from "./packageInfo.js";
 import ConnectionString from "mongodb-connection-string-url";
 import { MongoClientOptions } from "mongodb";
 import { ErrorCodes, MongoDBError } from "./errors.js";
-import type { MongoshBus } from "@mongosh/types";
 import { CompositeLogger, LogId } from "./logger.js";
 import { ConnectionInfo, generateConnectionInfoFromCliArgs } from "@mongosh/arg-parser";
 
@@ -206,10 +205,10 @@ export class ConnectionManager extends EventEmitter<ConnectionManagerEvents> {
         return newState;
     }
 
-    private async onOidcAuthFailed(error: unknown): Promise<void> {
+    private onOidcAuthFailed(error: unknown): void {
         if (this.state.tag === "connecting" && this.state.connectionStringAuthType?.startsWith("oidc")) {
-            await this.disconnect();
             this.changeState("connection-errored", { tag: "errored", errorReason: String(error) });
+            void this.disconnect();
         }
     }
 
@@ -291,7 +290,7 @@ export class ConnectionManager extends EventEmitter<ConnectionManagerEvents> {
             let count = 1;
             ts = setInterval(() => {
                 if (signal.aborted) {
-                    return reject(`Aborted: ${signal.reason}`);
+                    return reject(new Error(`Aborted: ${signal.reason}`));
                 }
 
                 const status = cm.currentConnectionState;

tests/integration/common/connectionManager.oidc.test.ts

@@ -1,4 +1,4 @@
-import { describe, beforeEach, afterEach, afterAll, it, expect, TestContext } from "vitest";
+import { describe, beforeEach, afterAll, it, expect, TestContext } from "vitest";
 import semver from "semver";
 import process from "process";
 import {
@@ -18,7 +18,6 @@ import fs from "fs";
 import path from "path";
 import type { OIDCMockProviderConfig } from "@mongodb-js/oidc-mock-provider";
 import { OIDCMockProvider } from "@mongodb-js/oidc-mock-provider";
-import EventEmitter from "events";
 
 const DEFAULT_TIMEOUT = 10000;
 
@@ -37,24 +36,23 @@ describe("ConnectionManager OIDC Tests", async () => {
     } as const;
 
     const fetchBrowserFixture = `"${path.resolve(__dirname, "../fixtures/curl.mjs")}"`;
-    const httpsServerKeyCertBundle = fs.readFileSync(path.resolve(__dirname, "../fixtures/oidc.server.bundle.pem"));
 
     let tokenFetches: number = 0;
     let getTokenPayload: OIDCMockProviderConfig["getTokenPayload"];
-    let oidcMockProviderConfig: OIDCMockProviderConfig = {
+    const oidcMockProviderConfig: OIDCMockProviderConfig = {
         getTokenPayload(metadata) {
             return getTokenPayload(metadata);
         },
     };
-    let oidcMockProvider: OIDCMockProvider = await OIDCMockProvider.create(oidcMockProviderConfig);
+    const oidcMockProvider: OIDCMockProvider = await OIDCMockProvider.create(oidcMockProviderConfig);
 
     afterAll(async () => {
         await oidcMockProvider.close();
     }, DEFAULT_TIMEOUT);
 
     beforeEach(() => {
         tokenFetches = 0;
-        getTokenPayload = (metadata) => {
+        getTokenPayload = ((metadata) => {
             tokenFetches++;
             return {
                 expires_in: 3600,
@@ -65,7 +63,7 @@ describe("ConnectionManager OIDC Tests", async () => {
                     aud: "resource-server-audience-value",
                 },
             };
-        };
+        }) as OIDCMockProviderConfig["getTokenPayload"];
     });
 
     /**
@@ -111,6 +109,7 @@ describe("ConnectionManager OIDC Tests", async () => {
             `${mongodbVersion} Enterprise  :: ${context}`,
             (integration) => {
                 function oidcIt(name: string, cb: Parameters<OidcIt>[1]): void {
+                    /* eslint-disable @vitest/expect-expect */
                     it(name, { timeout: DEFAULT_TIMEOUT }, async (context) => {
                         context.skip(process.platform !== "linux", "OIDC is only supported on Linux");
                         context.skip(
@@ -124,6 +123,7 @@ describe("ConnectionManager OIDC Tests", async () => {
 
                         await cb?.(context, integration);
                     });
+                    /* eslint-disable @vitest/expect-expect */
                 }
 
                 beforeEach(async () => {
@@ -167,7 +167,13 @@ describe("ConnectionManager OIDC Tests", async () => {
                     integration.mcpServer().session.connectionManager,
                     signal
                 );
-                const status = await state.serviceProvider.runCommand("admin", { connectionStatus: 1 });
+
+                const status: {
+                    authInfo: {
+                        authenticatedUsers: { user: string; db: string }[];
+                        authenticatedUserRoles: { role: string; db: string }[];
+                    };
+                } = (await state.serviceProvider.runCommand("admin", { connectionStatus: 1 })) as any;
 
                 expect(status.authInfo.authenticatedUsers[0]).toEqual({ user: "dev/testuser", db: "$external" });
                 expect(status.authInfo.authenticatedUserRoles[0]).toEqual({