feat: provide driver url with ssh injected (#279)

Author: alenakhineika

README.md

@@ -387,8 +387,9 @@ const derivedProps = c.getAttributes({ derived: true });
 | ----- | ---- | ---------- |  ----  |
 | `instanceId` | String | The mongoscope | `localhost:27017` |
 | `driverAuthMechanism` | String | Converts the value of `authStrategy` for humans into the `authMechanism` value for the driver | `undefined` |
-| `driverUrl` | String | The first argument `mongoscope-server` passes to `mongodb.connect` | `mongodb://localhost:27017/?readPreference=primary&ssl=false` |
-| `safeUrl` | String | The url where a password is replaced with stars | `mongodb://localhost:27017/?readPreference=primary&ssl=false` |
+| `safeUrl` | String | The URL where a password is replaced with stars | `mongodb://localhost:27017/?readPreference=primary&ssl=false` |
+| `driverUrl` | String | Use this URL in order to connect via DataService | `mongodb://localhost:27017/?readPreference=primary&ssl=false` |
+| `driverUrlWithSsh` | String | Use this URL in order to connect via connection model itself | `mongodb://localhost:29201/?readPreference=primary&ssl=false` |
 | `driverOptions` | String | The second argument `mongoscope-server` passes to `mongodb.connect` | `{}` |
 
 ## Events

lib/connect.js

@@ -4,7 +4,6 @@ const async = require('async');
 const {
   includes,
   clone,
-  cloneDeep,
   assign,
   isString,
   isFunction,
@@ -211,17 +210,7 @@ const getTasks = (model, setupListeners) => {
       validOptions.useNewUrlParser = true;
       validOptions.useUnifiedTopology = true;
 
-      const modelClone = cloneDeep(model, true);
-
-      if (model.sshTunnel !== 'NONE') {
-        // Populate the SSH Tunnel options correctly
-        modelClone.set({
-          hostname: model.sshTunnelOptions.localAddr,
-          port: model.sshTunnelOptions.localPort
-        });
-      }
-
-      const mongoClient = new MongoClient(modelClone.driverUrl, validOptions);
+      const mongoClient = new MongoClient(model.driverUrlWithSsh, validOptions);
 
       if (setupListeners) {
         setupListeners(mongoClient);

lib/connection-collection.js

@@ -13,10 +13,9 @@ let basepath;
 
 try {
   const electron = require('electron');
+
   appName = electron.remote ? electron.remote.app.getName() : undefined;
-  basepath = electron.remote
-    ? electron.remote.app.getPath('userData')
-    : undefined;
+  basepath = electron.remote ? electron.remote.app.getPath('userData') : undefined;
 } catch (e) {
   /* eslint no-console: 0 */
   console.log('Could not load electron', e.message);

lib/extended-model.js

@@ -1,6 +1,6 @@
 const Connection = require('./model');
 const storageMixin = require('storage-mixin');
-const uuid = require('uuid');
+const { v4: uuidv4 } = require('uuid');
 
 /**
  * The name of a remote electon application that
@@ -33,10 +33,8 @@ const ExtendedConnection = Connection.extend(storageMixin, {
     secureCondition: (val, key) => key.match(/(password|passphrase)/i)
   },
   props: {
-    _id: { type: 'string', default: () => uuid.v4() },
-    /**
-     * Updated on each successful connection to the Deployment.
-     */
+    _id: { type: 'string', default: () => uuidv4() },
+    // Updated on each successful connection to the Deployment.
     lastUsed: { type: 'date', default: null },
     isFavorite: { type: 'boolean', default: false },
     name: { type: 'string', default: 'Local' },