Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 5745d7b

Browse files
committed
chore: more clean up
1 parent a40cccc commit 5745d7b

File tree

3 files changed

+17
-173
lines changed

3 files changed

+17
-173
lines changed

‎src/common/connectionManager.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import { packageInfo } from "./packageInfo.js";
66
import ConnectionString from "mongodb-connection-string-url";
77
import { MongoClientOptions } from "mongodb";
88
import { ErrorCodes, MongoDBError } from "./errors.js";
9-
import type { MongoshBus } from "@mongosh/types";
109
import { CompositeLogger, LogId } from "./logger.js";
1110
import { ConnectionInfo, generateConnectionInfoFromCliArgs } from "@mongosh/arg-parser";
1211

@@ -206,10 +205,10 @@ export class ConnectionManager extends EventEmitter<ConnectionManagerEvents> {
206205
return newState;
207206
}
208207

209-
private asynconOidcAuthFailed(error: unknown): Promise<void> {
208+
private onOidcAuthFailed(error: unknown): void {
210209
if (this.state.tag === "connecting" && this.state.connectionStringAuthType?.startsWith("oidc")) {
211-
await this.disconnect();
212210
this.changeState("connection-errored", { tag: "errored", errorReason: String(error) });
211+
void this.disconnect();
213212
}
214213
}
215214

@@ -291,7 +290,7 @@ export class ConnectionManager extends EventEmitter<ConnectionManagerEvents> {
291290
let count = 1;
292291
ts = setInterval(() => {
293292
if (signal.aborted) {
294-
return reject(`Aborted: ${signal.reason}`);
293+
return reject(newError(`Aborted: ${signal.reason}`));
295294
}
296295

297296
const status = cm.currentConnectionState;

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

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { describe, beforeEach, afterEach,afterAll, it, expect, TestContext } from "vitest";
1+
import { describe, beforeEach, afterAll, it, expect, TestContext } from "vitest";
22
import semver from "semver";
33
import process from "process";
44
import {
@@ -18,7 +18,6 @@ import fs from "fs";
1818
import path from "path";
1919
import type { OIDCMockProviderConfig } from "@mongodb-js/oidc-mock-provider";
2020
import { OIDCMockProvider } from "@mongodb-js/oidc-mock-provider";
21-
import EventEmitter from "events";
2221

2322
const DEFAULT_TIMEOUT = 10000;
2423

@@ -37,24 +36,23 @@ describe("ConnectionManager OIDC Tests", async () => {
3736
} as const;
3837

3938
const fetchBrowserFixture = `"${path.resolve(__dirname, "../fixtures/curl.mjs")}"`;
40-
const httpsServerKeyCertBundle = fs.readFileSync(path.resolve(__dirname, "../fixtures/oidc.server.bundle.pem"));
4139

4240
let tokenFetches: number = 0;
4341
let getTokenPayload: OIDCMockProviderConfig["getTokenPayload"];
44-
let oidcMockProviderConfig: OIDCMockProviderConfig = {
42+
const oidcMockProviderConfig: OIDCMockProviderConfig = {
4543
getTokenPayload(metadata) {
4644
return getTokenPayload(metadata);
4745
},
4846
};
49-
let oidcMockProvider: OIDCMockProvider = await OIDCMockProvider.create(oidcMockProviderConfig);
47+
const oidcMockProvider: OIDCMockProvider = await OIDCMockProvider.create(oidcMockProviderConfig);
5048

5149
afterAll(async () => {
5250
await oidcMockProvider.close();
5351
}, DEFAULT_TIMEOUT);
5452

5553
beforeEach(() => {
5654
tokenFetches = 0;
57-
getTokenPayload = (metadata) => {
55+
getTokenPayload = ((metadata) => {
5856
tokenFetches++;
5957
return {
6058
expires_in: 3600,
@@ -65,7 +63,7 @@ describe("ConnectionManager OIDC Tests", async () => {
6563
aud: "resource-server-audience-value",
6664
},
6765
};
68-
};
66+
})asOIDCMockProviderConfig["getTokenPayload"];
6967
});
7068

7169
/**
@@ -111,6 +109,7 @@ describe("ConnectionManager OIDC Tests", async () => {
111109
`${mongodbVersion} Enterprise :: ${context}`,
112110
(integration) => {
113111
function oidcIt(name: string, cb: Parameters<OidcIt>[1]): void {
112+
/* eslint-disable @vitest/expect-expect */
114113
it(name, { timeout: DEFAULT_TIMEOUT }, async (context) => {
115114
context.skip(process.platform !== "linux", "OIDC is only supported on Linux");
116115
context.skip(
@@ -124,6 +123,7 @@ describe("ConnectionManager OIDC Tests", async () => {
124123

125124
await cb?.(context, integration);
126125
});
126+
/* eslint-disable @vitest/expect-expect */
127127
}
128128

129129
beforeEach(async () => {
@@ -167,7 +167,13 @@ describe("ConnectionManager OIDC Tests", async () => {
167167
integration.mcpServer().session.connectionManager,
168168
signal
169169
);
170-
const status = await state.serviceProvider.runCommand("admin", { connectionStatus: 1 });
170+
171+
const status: {
172+
authInfo: {
173+
authenticatedUsers: { user: string; db: string }[];
174+
authenticatedUserRoles: { role: string; db: string }[];
175+
};
176+
} = (await state.serviceProvider.runCommand("admin", { connectionStatus: 1 })) as any;
171177

172178
expect(status.authInfo.authenticatedUsers[0]).toEqual({ user: "dev/testuser", db: "$external" });
173179
expect(status.authInfo.authenticatedUserRoles[0]).toEqual({

‎tests/integration/fixtures/oidc.server.bundle.pem

Lines changed: 0 additions & 161 deletions
This file was deleted.

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /