@mongodb-js/devtools-connect 2.0.2 → 2.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/lib/connect.d.ts CHANGED
@@ -25,4 +25,4 @@ export declare function connectMongoClient(uri: string, clientOptions: DevtoolsC
25
25
  client: MongoClient;
26
26
  state: DevtoolsConnectionState;
27
27
  }>;
28
- export declare function oidcHasProviderFlow(uri: string, clientOptions: MongoClientOptions): boolean;
28
+ export declare function isHumanOidcFlow(uri: string, clientOptions: MongoClientOptions): boolean;
package/lib/connect.js CHANGED
@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
26
26
  return (mod && mod.__esModule) ? mod : { "default": mod };
27
27
  };
28
28
  Object.defineProperty(exports, "__esModule", { value: true });
29
- exports.oidcHasProviderFlow = exports.connectMongoClient = exports.DevtoolsConnectionState = exports.MongoAutoencryptionUnavailable = void 0;
29
+ exports.isHumanOidcFlow = exports.connectMongoClient = exports.DevtoolsConnectionState = exports.MongoAutoencryptionUnavailable = void 0;
30
30
  const fast_failure_connect_1 = require("./fast-failure-connect");
31
31
  const system_ca_1 = require("system-ca");
32
32
  const oidc_plugin_1 = require("@mongodb-js/oidc-plugin");
@@ -34,6 +34,7 @@ const lodash_merge_1 = __importDefault(require("lodash.merge"));
34
34
  const handler_1 = require("./oidc/handler");
35
35
  const ipc_rpc_state_share_1 = require("./ipc-rpc-state-share");
36
36
  const mongodb_connection_string_url_1 = __importStar(require("mongodb-connection-string-url"));
37
+ const events_1 = __importDefault(require("events"));
37
38
  class MongoAutoencryptionUnavailable extends Error {
38
39
  constructor() {
39
40
  super('Automatic encryption is only available with Atlas and MongoDB Enterprise');
@@ -186,9 +187,14 @@ class DevtoolsConnectionState {
186
187
  this.oidcPlugin = this.stateShareClient.oidcPlugin;
187
188
  }
188
189
  else {
190
+ const proxyingLogger = new events_1.default();
191
+ proxyingLogger.emit = (event, ...args) => {
192
+ logger.emit(event, ...args);
193
+ return events_1.default.prototype.emit.call(this, event, ...args);
194
+ };
189
195
  this.oidcPlugin = (0, oidc_plugin_1.createMongoDBOIDCPlugin)({
190
196
  ...options.oidc,
191
- logger,
197
+ logger: proxyingLogger,
192
198
  redirectServerRequestHandler: handler_1.oidcServerRequestHandler.bind(null, options)
193
199
  });
194
200
  }
@@ -216,10 +222,9 @@ async function connectMongoClient(uri, clientOptions, logger, MongoClientClass)
216
222
  ca: ca.join('\n')
217
223
  };
218
224
  }
219
- const oidcFeatureFlag = !!process.env.ENABLE_DEVTOOLS_OIDC;
220
- const shouldAddOidcCallbacks = !oidcHasProviderFlow(uri, clientOptions);
225
+ const shouldAddOidcCallbacks = isHumanOidcFlow(uri, clientOptions);
221
226
  const state = clientOptions.parentState ?? new DevtoolsConnectionState(clientOptions, logger);
222
- const mongoClientOptions = (0, lodash_merge_1.default)({}, clientOptions, oidcFeatureFlag && shouldAddOidcCallbacks ? state.oidcPlugin.mongoClientOptions : {});
227
+ const mongoClientOptions = (0, lodash_merge_1.default)({}, clientOptions, shouldAddOidcCallbacks ? state.oidcPlugin.mongoClientOptions : {});
223
228
  delete mongoClientOptions.useSystemCA;
224
229
  delete mongoClientOptions.productDocsLink;
225
230
  delete mongoClientOptions.productName;
@@ -252,9 +257,10 @@ async function connectMongoClient(uri, clientOptions, logger, MongoClientClass)
252
257
  return { client, state };
253
258
  }
254
259
  exports.connectMongoClient = connectMongoClient;
255
- function oidcHasProviderFlow(uri, clientOptions) {
256
- if (clientOptions.authMechanismProperties?.PROVIDER_NAME) {
257
- return true;
260
+ function isHumanOidcFlow(uri, clientOptions) {
261
+ if ((clientOptions.authMechanism && clientOptions.authMechanism !== 'MONGODB-OIDC') ||
262
+ clientOptions.authMechanismProperties?.PROVIDER_NAME) {
263
+ return false;
258
264
  }
259
265
  let cs;
260
266
  try {
@@ -263,7 +269,9 @@ function oidcHasProviderFlow(uri, clientOptions) {
263
269
  catch {
264
270
  return false;
265
271
  }
266
- return !!new mongodb_connection_string_url_1.CommaAndColonSeparatedRecord(cs.typedSearchParams().get('authMechanismProperties')).get('PROVIDER_NAME');
272
+ const sp = cs.typedSearchParams();
273
+ const authMechanism = clientOptions.authMechanism ?? sp.get('authMechanism');
274
+ return authMechanism === 'MONGODB-OIDC' && !new mongodb_connection_string_url_1.CommaAndColonSeparatedRecord(sp.get('authMechanismProperties')).get('PROVIDER_NAME');
267
275
  }
268
- exports.oidcHasProviderFlow = oidcHasProviderFlow;
276
+ exports.isHumanOidcFlow = isHumanOidcFlow;
269
277
  //# sourceMappingURL=connect.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"connect.js","sourceRoot":"","sources":["../src/connect.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"connect.js","sourceRoot":"","sources":["../src/connect.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,9 @@
1
+ import { MongoDBOIDCPlugin } from "@mongodb-js/oidc-plugin";
2
+ import { DevtoolsConnectionState } from "./connect";
3
+ export declare class StateShareServer {
4
+ private constructor();
5
+ static create(state: DevtoolsConnectionState): Promise<StateShareServer>;
6
+ }
7
+ export declare class StateShareClient {
8
+ oidcPlugin: MongoDBOIDCPlugin;
9
+ }
@@ -0,0 +1,15 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.StateShareClient = exports.StateShareServer = void 0;
4
+ class StateShareServer {
5
+ constructor(state) {
6
+ }
7
+ static create(state) {
8
+ const result = new StateShareServer(state);
9
+ }
10
+ }
11
+ exports.StateShareServer = StateShareServer;
12
+ class StateShareClient {
13
+ }
14
+ exports.StateShareClient = StateShareClient;
15
+ //# sourceMappingURL=state-share-socket.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"state-share-socket.js","sourceRoot":"","sources":["../src/state-share-socket.ts"],"names":[],"mappings":";;;AAGA,MAAa,gBAAgB;IAC3B,YAAoB,KAA8B;IAElD,CAAC;IAED,MAAM,CAAC,MAAM,CAAC,KAA8B;QAC1C,MAAM,MAAM,GAAG,IAAI,gBAAgB,CAAC,KAAK,CAAC,CAAC;IAC7C,CAAC;CACF;AARD,4CAQC;AAED,MAAa,gBAAgB;CAE5B;AAFD,4CAEC"}
package/lib/types.d.ts CHANGED
@@ -59,8 +59,9 @@ export interface ConnectEventMap extends MongoDBOIDCLogEventsMap {
59
59
  'devtools-connect:missing-optional-dependency': (ev: ConnectMissingOptionalDependencyEvent) => void;
60
60
  'devtools-connect:used-system-ca': (ev: ConnectUsedSystemCAEvent) => void;
61
61
  }
62
+ export type ConnectEventArgs<K extends keyof ConnectEventMap> = ConnectEventMap[K] extends (...args: infer P) => any ? P : never;
62
63
  export interface ConnectLogEmitter {
63
64
  on<K extends keyof ConnectEventMap>(event: K, listener: ConnectEventMap[K]): this;
64
65
  once<K extends keyof ConnectEventMap>(event: K, listener: ConnectEventMap[K]): this;
65
- emit<K extends keyof ConnectEventMap>(event: K, ...args: ConnectEventMap[K] extends (...args: infer P) => any ? P : never): unknown;
66
+ emit<K extends keyof ConnectEventMap>(event: K, ...args: ConnectEventArgs<K>): unknown;
66
67
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@mongodb-js/devtools-connect",
3
- "version": "2.0.2",
3
+ "version": "2.1.0",
4
4
  "description": "A connection establishment utility for MongoDB developer tools",
5
5
  "homepage": "https://github.com/mongodb-js/devtools-connect",
6
6
  "repository": {
@@ -42,11 +42,11 @@
42
42
  "peerDependencies": {
43
43
  "mongodb": "^5.4.0",
44
44
  "mongodb-log-writer": "^1.2.0",
45
- "@mongodb-js/oidc-plugin": "^0.1.0"
45
+ "@mongodb-js/oidc-plugin": "^0.1.3"
46
46
  },
47
47
  "devDependencies": {
48
48
  "@mongodb-js/compass-components": "^1.6.0",
49
- "@mongodb-js/oidc-plugin": "^0.1.0",
49
+ "@mongodb-js/oidc-plugin": "^0.1.3",
50
50
  "@types/lodash.merge": "^4.6.7",
51
51
  "@types/mocha": "^9.0.0",
52
52
  "@types/node": "^16.4.10",