VSCODE-117: Fix file pathing for windows connect (#110)

Author: Anemy

src/test/suite/views/webviewController.test.ts

@@ -361,7 +361,7 @@ suite('Connect Form View Test Suite', () => {
       html: '',
       postMessage: (message: any): void => {
         assert(message.action === 'file_action');
-        assert(message.files[0] === './somefilepath/test.text');
+        assert(message.files[0] === 'somefilepath/test.text');
 
         testConnectionController.disconnect();
         done();
@@ -382,7 +382,7 @@ suite('Connect Form View Test Suite', () => {
 
     const fakeVSCodeOpenDialog = sinon.fake.resolves([
       {
-        path: './somefilepath/test.text'
+        path: '/somefilepath/test.text'
       }
     ]);
 
@@ -451,7 +451,9 @@ suite('Connect Form View Test Suite', () => {
 
     setTimeout(() => {
       assert(fakeVSCodeExecuteCommand.called);
-      assert(fakeVSCodeExecuteCommand.firstCall.args[0] === 'mdb.connectWithURI');
+      assert(
+        fakeVSCodeExecuteCommand.firstCall.args[0] === 'mdb.connectWithURI'
+      );
 
       done();
     }, 50);

src/views/webview-app/connection-model/connection-model.ts

@@ -1,6 +1,3 @@
-import { format as toURL } from 'url';
-
-import AUTHENICATION_TO_AUTH_MECHANISM from './constants/auth-strategy-to-auth-mechanism';
 import AUTH_STRATEGIES from './constants/auth-strategies';
 import READ_PREFERENCES from './constants/read-preferences';
 import SSL_METHODS from './constants/ssl-methods';
@@ -9,8 +6,6 @@ import SSH_TUNNEL_TYPES from './constants/ssh-tunnel-types';
 // Defaults.
 const AUTH_STRATEGY_DEFAULT = AUTH_STRATEGIES.NONE;
 const READ_PREFERENCE_DEFAULT = READ_PREFERENCES.PRIMARY;
-const MONGODB_DATABASE_NAME_DEFAULT = 'admin';
-const KERBEROS_SERVICE_NAME_DEFAULT = 'mongodb';
 const SSL_DEFAULT = SSL_METHODS.NONE;
 const SSH_TUNNEL_DEFAULT = SSH_TUNNEL_TYPES.NONE;
 
@@ -91,148 +86,6 @@ class ConnectionModel {
   sshTunnelPassphrase?: string;
 }
 
-const getDriverAuthMechanism = (
-  connectionModel: ConnectionModel
-): string | undefined => {
-  return AUTHENICATION_TO_AUTH_MECHANISM[connectionModel.authStrategy];
-};
-
-// eslint-disable-next-line complexity
-const getBaseUrlFromConnectionModel = (
-  connectionModel: ConnectionModel
-): string => {
-  const req: any = {
-    protocol: 'mongodb',
-    port: null,
-    slashes: true,
-    pathname: '/',
-    query: {}
-  };
-
-  // In the `mongodb+srv` protocol the comma separated list of host names is
-  // replaced with a single hostname.
-  // The format is: `mongodb+srv://{hostname}.{domainname}/{options}`
-  if (connectionModel.isSrvRecord) {
-    req.protocol = 'mongodb+srv';
-    req.hostname = connectionModel.hostname;
-  } else if (connectionModel.hosts.length === 1) {
-    // Driver adds sharding info to the original hostname.
-    // And returnes a list of all coresponding hosts.
-    // If driver returns a list of hosts which size is equal one,
-    // we can use hostname attribute that stores unmodified value.
-    req.hostname = connectionModel.hostname;
-    req.port = connectionModel.port;
-  } else {
-    req.host = connectionModel.hosts
-      .map((item) => `${item.host}:${item.port}`)
-      .join(',');
-  }
-
-  if (connectionModel.ns) {
-    req.pathname = `/${connectionModel.ns}`;
-  }
-
-  // Encode auth for url format
-  if (connectionModel.authStrategy === AUTH_STRATEGIES.MONGODB) {
-    req.auth = 'AUTH_TOKEN';
-    req.query.authSource =
-      connectionModel.mongodbDatabaseName || MONGODB_DATABASE_NAME_DEFAULT;
-  } else if (connectionModel.authStrategy === 'SCRAM-SHA-256') {
-    req.auth = 'AUTH_TOKEN';
-    req.query.authSource =
-      connectionModel.mongodbDatabaseName || MONGODB_DATABASE_NAME_DEFAULT;
-    req.query.authMechanism = getDriverAuthMechanism(connectionModel);
-  } else if (connectionModel.authStrategy === AUTH_STRATEGIES.KERBEROS) {
-    req.auth = 'AUTH_TOKEN';
-    req.query.gssapiServiceName =
-      connectionModel.kerberosServiceName || KERBEROS_SERVICE_NAME_DEFAULT;
-    req.query.authMechanism = getDriverAuthMechanism(connectionModel);
-  } else if (connectionModel.authStrategy === AUTH_STRATEGIES.X509) {
-    req.auth = 'AUTH_TOKEN';
-    req.query.authMechanism = getDriverAuthMechanism(connectionModel);
-  } else if (connectionModel.authStrategy === AUTH_STRATEGIES.LDAP) {
-    req.auth = 'AUTH_TOKEN';
-    req.query.authMechanism = getDriverAuthMechanism(connectionModel);
-  }
-
-  if (req.query.readPreference !== undefined) {
-    req.query.readPreference = connectionModel.readPreference;
-  }
-  if (req.query.replicaSet !== undefined) {
-    req.query.replicaSet = connectionModel.replicaSet;
-  }
-
-  if (connectionModel.sslMethod === SSL_METHODS.NONE) {
-    req.query.ssl = 'false';
-  } else {
-    req.query.ssl = 'true';
-  }
-
-  const reqClone = {
-    ...req
-  };
-
-  return toURL(reqClone);
-};
-
-// eslint-disable-next-line complexity
-export const getDriverUrlFromConnectionModel = (
-  connectionModel: ConnectionModel
-): string => {
-  let username = '';
-  let password = '';
-  let authField = '';
-  let result = getBaseUrlFromConnectionModel(connectionModel);
-
-  // Post url.format() workaround for
-  // https://github.com/nodejs/node/issues/1802
-  if (
-    connectionModel.authStrategy === 'MONGODB' ||
-    connectionModel.authStrategy === 'SCRAM-SHA-256'
-  ) {
-    username = encodeURIComponent(connectionModel.mongodbUsername || '');
-    password = encodeURIComponent(connectionModel.mongodbPassword || '');
-    authField = `${username}:${password}`;
-  } else if (connectionModel.authStrategy === 'LDAP') {
-    username = encodeURIComponent(connectionModel.ldapUsername || '');
-    password = encodeURIComponent(connectionModel.ldapPassword || '');
-    authField = `${username}:${password}`;
-  } else if (connectionModel.authStrategy === 'X509') {
-    username = encodeURIComponent(connectionModel.x509Username || '');
-    authField = username;
-  } else if (
-    connectionModel.authStrategy === 'KERBEROS' &&
-    connectionModel.kerberosPassword
-  ) {
-    username = encodeURIComponent(connectionModel.kerberosPrincipal || '');
-    password = encodeURIComponent(connectionModel.kerberosPassword);
-    authField = `${username}:${password}`;
-  } else if (connectionModel.authStrategy === 'KERBEROS') {
-    username = encodeURIComponent(connectionModel.kerberosPrincipal || '');
-    authField = `${username}:`;
-  }
-
-  // The auth component comes straight after `the mongodb://`
-  // so a single string replace should always work.
-  result = result.replace('AUTH_TOKEN', authField);
-
-  if (
-    connectionModel.authStrategy === AUTH_STRATEGIES.KERBEROS ||
-    connectionModel.authStrategy === AUTH_STRATEGIES.LDAP
-  ) {
-    result = `${result}&authSource=$external`;
-  }
-
-  if (
-    connectionModel.authStrategy === AUTH_STRATEGIES.KERBEROS &&
-    connectionModel.kerberosCanonicalizeHostname
-  ) {
-    result = `${result}&authMechanismProperties=CANONICALIZE_HOST_NAME:true`;
-  }
-
-  return result;
-};
-
 /**
  * Enforce constraints for SSL.
  * @param {Object} attrs - Incoming attributes.

src/views/webviewController.ts

@@ -100,7 +100,7 @@ export default class WebviewController {
               action: message.action,
               files:
                 files && files.length > 0
-                  ? files.map((file) => file.path)
+                  ? files.map((file) => file.path.substr(1))
                   : undefined
             });
           });