chore(service-provider-core): parse authMechProps rather than applyin…

…g regex (#1051) This is a slightly cleaner way of accessing authMechanismProperties.
mongodb-js · Aug 6, 2021 · 9bf876d · 9bf876d
1 parent f95591d
commit 9bf876d
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 13 deletions.
diff --git a/packages/browser-repl/config/empty.js b/packages/browser-repl/config/empty.js
diff --git a/packages/browser-repl/config/plain-url.js b/packages/browser-repl/config/plain-url.js
@@ -0,0 +1 @@
+module.exports = { URL: window.URL, URLSearchParams: window.URLSearchParams, __from: __filename };
diff --git a/packages/browser-repl/config/webpack.config.base.js b/packages/browser-repl/config/webpack.config.base.js
@@ -6,7 +6,7 @@ module.exports = {
     extensions: ['.tsx', '.ts', '.jsx', '.js', '.less'],
     alias: {
       // imports in service-provider-core that can break the browser build
-      'whatwg-url': path.resolve(__dirname, 'empty.js'),
+      'whatwg-url': path.resolve(__dirname, 'plain-url.js'),
     }
   },
   module: {

diff --git a/packages/service-provider-core/package-lock.json b/packages/service-provider-core/package-lock.json
diff --git a/packages/service-provider-core/package.json b/packages/service-provider-core/package.json
@@ -35,7 +35,7 @@
     "bson": "^4.4.1",
     "mongodb": "^4.1.0",
     "mongodb-build-info": "^1.2.0",
-    "mongodb-connection-string-url": "^1.0.0"
+    "mongodb-connection-string-url": "^1.1.2"
   },
   "optionalDependencies": {
     "mongodb-client-encryption": "^1.2.6"

diff --git a/packages/service-provider-core/src/uri-generator.ts b/packages/service-provider-core/src/uri-generator.ts
@@ -3,7 +3,7 @@
 import { CommonErrors, MongoshInvalidInputError } from '@mongosh/errors';
 import i18n from '@mongosh/i18n';
 import CliOptions from './cli-options';
-import ConnectionString from 'mongodb-connection-string-url';
+import ConnectionString, { CommaAndColonSeparatedRecord } from 'mongodb-connection-string-url';
 import { DEFAULT_DB } from './index';
 
 /**
@@ -58,8 +58,9 @@ function validateConflicts(options: CliOptions, connectionString?: ConnectionStr
   }
 
   if (options.gssapiServiceName && connectionString?.searchParams.has('authMechanismProperties')) {
-    const authProperties = connectionString.searchParams.get('authMechanismProperties') ?? '';
-    const serviceName = /,?SERVICE_NAME:([^,]+)/.exec(authProperties)?.[1];
+    const authProperties = new CommaAndColonSeparatedRecord(
+      connectionString.searchParams.get('authMechanismProperties'));
+    const serviceName = authProperties.get('SERVICE_NAME');
     if (serviceName !== undefined && options.gssapiServiceName !== serviceName) {
       throw new MongoshInvalidInputError(i18n.__(DIVERGING_SERVICE_NAME), CommonErrors.InvalidArgument);
     }

diff --git a/packages/service-provider-server/package-lock.json b/packages/service-provider-server/package-lock.json
diff --git a/packages/service-provider-server/package.json b/packages/service-provider-server/package.json
@@ -44,7 +44,7 @@
     "@types/sinon-chai": "^3.2.3",
     "mongodb": "^4.1.0",
     "saslprep": "mongodb-js/saslprep#v1.0.4",
-    "mongodb-connection-string-url": "^1.0.0"
+    "mongodb-connection-string-url": "^1.1.2"
   },
   "optionalDependencies": {
     "mongodb-client-encryption": "^1.2.6",