Merge remote-tracking branch 'origin/main' into 8072-dev

Author: addaleax

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@mongodb-js/devtools-connect",
-  "version": "3.0.2",
+  "version": "3.0.5",
   "description": "A connection establishment utility for MongoDB developer tools",
   "homepage": "https://github.com/mongodb-js/devtools-shared/tree/main/packages/devtools-connect",
   "repository": {
@@ -47,20 +47,20 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@mongodb-js/oidc-http-server-pages": "1.1.1",
+    "@mongodb-js/oidc-http-server-pages": "1.1.2",
     "lodash.merge": "^4.6.2",
     "mongodb-connection-string-url": "^3.0.0",
     "socks": "^2.7.3",
     "system-ca": "^2.0.0"
   },
   "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": {
     "@mongodb-js/oidc-plugin": "^1.0.0",
-    "@mongodb-js/saslprep": "^1.1.7",
+    "@mongodb-js/saslprep": "^1.1.8",
     "@types/lodash.merge": "^4.6.7",
     "@types/mocha": "^9.0.0",
     "@types/node": "^17.0.35",
@@ -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",
@@ -87,7 +87,7 @@
   },
   "optionalDependencies": {
     "kerberos": "^2.1.0",
-    "mongodb-client-encryption": "^6.0.0",
+    "mongodb-client-encryption": "^6.0.0 || ^6.1.0-alpha.0",
     "os-dns-native": "^1.2.0",
     "resolve-mongodb-srv": "^1.1.1"
   }

packages/devtools-connect/package.json

@@ -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);

packages/devtools-connect/src/connect.spec.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'
     )
   );
 }

packages/devtools-connect/src/connect.ts

@@ -7,6 +7,7 @@
     "moduleResolution": "node",
     "outDir": "./dist",
     "allowJs": true,
+    "strict": true,
     "jsx": "react"
   },
   "include": ["src/**/*"],