feat(deps): bump oidc-plugin to 2.0.0 MONGOSH-2194

Author: addaleax

package-lock.json

@@ -78,9 +78,9 @@
     "@mongodb-js/compass-user-data": "^0.7.4",
     "@mongodb-js/compass-utils": "^0.9.3",
     "@mongodb-js/connection-info": "^0.15.4",
-    "@mongodb-js/devtools-connect": "^3.7.2",
-    "@mongodb-js/devtools-proxy-support": "^0.4.4",
-    "@mongodb-js/oidc-plugin": "^1.1.8",
+    "@mongodb-js/devtools-connect": "^3.9.0",
+    "@mongodb-js/devtools-proxy-support": "^0.5.1",
+    "@mongodb-js/oidc-plugin": "^2.0.0",
     "compass-preferences-model": "^2.43.0",
     "electron": "^36.5.0",
     "hadron-ipc": "^3.5.3",

packages/atlas-service/package.json

@@ -1,6 +1,10 @@
 import { shell, app } from 'electron';
 import { URL, URLSearchParams } from 'url';
-import type { AuthFlowType, MongoDBOIDCPlugin } from '@mongodb-js/oidc-plugin';
+import type {
+  AuthFlowType,
+  MongoDBOIDCPlugin,
+  MongoDBOIDCPluginOptions,
+} from '@mongodb-js/oidc-plugin';
 import {
   throwIfNotOk,
   throwIfNetworkTrafficDisabled,
@@ -153,9 +157,8 @@ export class CompassAuthService {
       allowedFlows: this.getAllowedAuthFlows.bind(this),
       logger: this.oidcPluginLogger,
       serializedState,
-      customHttpOptions: {
-        agent: this.httpClient.agent,
-      },
+      customFetch: this.httpClient
+        .fetch as unknown as MongoDBOIDCPluginOptions['customFetch'],
     });
     oidcPluginHookLoggerToMongoLogWriter(
       this.oidcPluginLogger,

packages/atlas-service/src/main.ts

@@ -51,7 +51,7 @@
   "dependencies": {
     "@mongodb-js/compass-logging": "^1.7.4",
     "@mongodb-js/compass-user-data": "^0.7.4",
-    "@mongodb-js/devtools-proxy-support": "^0.4.4",
+    "@mongodb-js/devtools-proxy-support": "^0.5.1",
     "@mongodb-js/compass-components": "^1.41.0",
     "bson": "^6.10.3",
     "@mongodb-js/compass-app-registry": "^9.4.13",

packages/compass-preferences-model/package.json

@@ -87,7 +87,7 @@
     "@mongodb-js/compass-welcome": "^0.61.0",
     "@mongodb-js/compass-workspaces": "^0.44.0",
     "@mongodb-js/connection-storage": "^0.38.0",
-    "@mongodb-js/devtools-proxy-support": "^0.4.4",
+    "@mongodb-js/devtools-proxy-support": "^0.5.1",
     "@mongodb-js/eslint-config-compass": "^1.4.0",
     "@mongodb-js/mocha-config-compass": "^1.6.8",
     "@mongodb-js/prettier-config-compass": "^1.2.8",

packages/compass-web/package.json

@@ -228,7 +228,7 @@
     "@mongodb-js/compass-workspaces": "^0.44.0",
     "@mongodb-js/connection-info": "^0.15.4",
     "@mongodb-js/connection-storage": "^0.38.0",
-    "@mongodb-js/devtools-proxy-support": "^0.4.4",
+    "@mongodb-js/devtools-proxy-support": "^0.5.1",
     "@mongodb-js/eslint-config-compass": "^1.4.0",
     "@mongodb-js/get-os-info": "^0.4.0",
     "@mongodb-js/mocha-config-compass": "^1.6.8",

packages/compass/package.json

@@ -53,8 +53,8 @@
   "dependencies": {
     "@mongodb-js/compass-logging": "^1.7.4",
     "@mongodb-js/compass-utils": "^0.9.3",
-    "@mongodb-js/devtools-connect": "^3.7.2",
-    "@mongodb-js/devtools-proxy-support": "^0.4.4",
+    "@mongodb-js/devtools-connect": "^3.9.0",
+    "@mongodb-js/devtools-proxy-support": "^0.5.1",
     "bson": "^6.10.3",
     "lodash": "^4.17.21",
     "mongodb": "^6.16.0",
@@ -67,7 +67,7 @@
     "@mongodb-js/devtools-docker-test-envs": "^1.3.3",
     "@mongodb-js/eslint-config-compass": "^1.4.0",
     "@mongodb-js/mocha-config-compass": "^1.6.8",
-    "@mongodb-js/oidc-plugin": "^1.1.8",
+    "@mongodb-js/oidc-plugin": "^2.0.0",
     "@mongodb-js/prettier-config-compass": "^1.2.8",
     "@mongodb-js/tsconfig-compass": "^1.2.8",
     "@types/lodash": "^4.14.188",

packages/data-service/package.json

@@ -112,9 +112,7 @@ export function prepareOIDCOptions({
   if (connectionOptions.oidc?.shareProxyWithConnection) {
     options.applyProxyToOIDC = true;
   } else {
-    options.oidc.customHttpOptions = {
-      agent: createAgent(proxyOptions),
-    };
+    options.applyProxyToOIDC = proxyOptions;
   }
 
   options.oidc.signal = signal;

packages/data-service/src/connect-mongo-client.ts

@@ -1097,7 +1097,8 @@ class DataServiceImpl extends WithLogContext implements DataService {
       'options.oidc.notifyDeviceFlow',
       'options.oidc.signal',
       'options.oidc.allowedFlows',
-      'options.oidc.customHttpOptions.agent'
+      'options.oidc.customFetch',
+      'options.oidc.customHttpOptions'
     );
   }