fix(devtools-connect): bump mongodb to latest and fix OIDC option c…

…heck MONGOSH-1831 (#407)
mongodb-js · Jul 11, 2024 · 96f1173 · 96f1173
1 parent e1c598a
commit 96f1173
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 30 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/devtools-connect/package.json b/packages/devtools-connect/package.json
@@ -55,7 +55,7 @@
   },
   "peerDependencies": {
     "@mongodb-js/oidc-plugin": "^1.0.0",
-    "mongodb": "^5.8.1 || ^6.0.0",
+    "mongodb": "^6.8.0",
     "mongodb-log-writer": "^1.4.2"
   },
   "devDependencies": {
@@ -75,7 +75,7 @@
     "eslint-plugin-promise": "^6.1.1",
     "gen-esm-wrapper": "^1.1.0",
     "mocha": "^8.4.0",
-    "mongodb": "^5.8.1 || ^6.0.0",
+    "mongodb": "^6.8.0",
     "mongodb-log-writer": "^1.4.2",
     "nyc": "^15.1.0",
     "os-dns-native": "^1.2.0",

diff --git a/packages/devtools-connect/src/connect.spec.ts b/packages/devtools-connect/src/connect.spec.ts
@@ -429,20 +429,20 @@ describe('devtools connect', function () {
       ).to.equal(true);
     });
 
-    it('returns false if the PROVIDER_NAME JS option is set', function () {
+    it('returns false if the ENVIRONMENT JS option is set', function () {
       expect(
         isHumanOidcFlow('mongodb://example/?authMechanism=MONGODB-OIDC', {
           authMechanismProperties: {
-            PROVIDER_NAME: 'aws',
+            ENVIRONMENT: 'azure',
           },
         })
       ).to.equal(false);
     });
 
-    it('returns false if the PROVIDER_NAME url option is set', function () {
+    it('returns false if the ENVIRONMENT url option is set', function () {
       expect(
         isHumanOidcFlow(
-          'mongodb://example/?authMechanism=MONGODB-OIDC&authMechanismProperties=PROVIDER_NAME:aws',
+          'mongodb://example/?authMechanism=MONGODB-OIDC&authMechanismProperties=ENVIRONMENT:azure',
           {}
         )
       ).to.equal(false);

diff --git a/packages/devtools-connect/src/connect.ts b/packages/devtools-connect/src/connect.ts
@@ -471,7 +471,8 @@ export function isHumanOidcFlow(
   if (
     (clientOptions.authMechanism &&
       clientOptions.authMechanism !== 'MONGODB-OIDC') ||
-    clientOptions.authMechanismProperties?.PROVIDER_NAME
+    clientOptions.authMechanismProperties?.ENVIRONMENT ||
+    clientOptions.authMechanismProperties?.OIDC_CALLBACK
   ) {
     return false;
   }
@@ -487,7 +488,7 @@ export function isHumanOidcFlow(
   return (
     authMechanism === 'MONGODB-OIDC' &&
     !new CommaAndColonSeparatedRecord(sp.get('authMechanismProperties')).get(
-      'PROVIDER_NAME'
+      'ENVIRONMENT'
     )
   );
 }

diff --git a/packages/mongodb-runner/package.json b/packages/mongodb-runner/package.json
@@ -52,7 +52,7 @@
   "dependencies": {
     "@mongodb-js/mongodb-downloader": "^0.3.2",
     "debug": "^4.3.4",
-    "mongodb": "^6.3.0",
+    "mongodb": "^6.8.0",
     "@mongodb-js/saslprep": "^1.1.7",
     "mongodb-connection-string-url": "^3.0.0",
     "yargs": "^17.7.2"