🧹 Update views for new connection model

Author: imlucas

gulpfile.js

@@ -191,7 +191,9 @@ gulp.task('build:pages', function() {
  * ## electron
  */
 gulp.task('electron:start', function() {
-  var child = spawn(path.resolve(platform.ELECTRON), []);
+  var child = spawn(path.resolve(platform.ELECTRON), [], {
+    env: process.env
+  });
   child.stderr.pipe(process.stderr);
   child.stdout.pipe(process.stdout);
   child.on('exit', function(code) {

src/connect/auth-fields.js

@@ -14,7 +14,7 @@ var inputTemplate = require('./input-default.jade');
 /**
  * Input field for username. Stores its result in `mongodb_username`.
  */
-var username = new InputView({
+var mongodb_username = new InputView({
   template: inputTemplate,
   name: 'mongodb_username',
   label: 'Username',
@@ -25,9 +25,9 @@ var username = new InputView({
 /**
  * Input field for authentication database. Stores its result in `database_name`.
  */
-var database_name = new InputView({
+var mongodb_database_name = new InputView({
   template: inputTemplate,
-  name: 'database_name',
+  name: 'mongodb_database_name',
   label: 'Authentication Database',
   placeholder: 'admin',
   required: false
@@ -37,7 +37,7 @@ var database_name = new InputView({
  * Input field for password. Stores its result in `mongodb_password`. Uses type='password' to
  * hide input.
  */
-var password = new InputView({
+var mongodb_password = new InputView({
   template: inputTemplate,
   type: 'password',
   name: 'mongodb_password',
@@ -49,34 +49,45 @@ var password = new InputView({
 /**
  * Input field for GSSAPI service name (Kerberos). Stores its result in `gssapi_service_name`.
  */
-var service_name = new InputView({
+var kerberos_service_name = new InputView({
   template: inputTemplate,
-  name: 'gssapi_service_name',
+  name: 'kerberos_service_name',
   label: 'Kerberos Service Name',
+  placeholder: 'mongodb',
+  required: false
+});
+
+var kerberos_principal = new InputView({
+  template: inputTemplate,
+  name: 'kerberos_principal',
+  label: 'Kerberos Principal',
   placeholder: '',
   required: true
 });
 
+var kerberos_password = new InputView({
+  template: inputTemplate,
+  type: 'password',
+  name: 'kerberos_password',
+  label: 'Password',
+  placeholder: '',
+  required: false
+});
 
 /**
  * Define fields for each auth method here
  */
 module.exports = {
-  'SCRAM-SHA-1': [
-    username,
-    password,
-    database_name
+  MONGODB: [
+    mongodb_username,
+    mongodb_password,
+    mongodb_database_name
   ],
-  GSSAPI: [
-    username,
-    service_name
+  KERBEROS: [
+    kerberos_service_name,
+    kerberos_principal,
+    kerberos_password
   ],
-
-  'MONGODB-X509': [
-  // @todo what do we need here? nothing?
-  ],
-
-  PLAIN: [
-  // @todo what do we need here? username/pw?
-  ]
+  X509: [],
+  PLAIN: []
 };

src/connect/connect-form-view.js

@@ -31,10 +31,10 @@ var ConnectFormView = FormView.extend({
     // clean up the form values here, e.g. conversion to numbers etc.
 
     // get auth mechanism from parent view
-    obj.auth_mechanism = this.parent.authMethod;
+    obj.authentication = this.parent.authMethod;
 
     // is SSL enabled (options are open)
-    obj.ssl = this.parent.sslOpen;
+    // obj.ssl = this.parent.sslOpen;
 
     // fill in all default fields
     obj.hostname = obj.hostname || 'localhost';
@@ -43,7 +43,7 @@ var ConnectFormView = FormView.extend({
     // port number must be numeric
     obj.port = Number(obj.port);
 
-    if (obj.auth_mechanism) {
+    if (obj.authentication !== 'NONE') {
       // default fields for auth
       obj.database_name = obj.database_name || 'admin';
     }

src/connect/index.js

@@ -154,7 +154,7 @@ var ConnectView = View.extend({
     evt.preventDefault();
     this.toggle('authOpen');
     if (this.authOpen) {
-      this.authMethod = this.previousAuthMethod || 'SCRAM-SHA-1';
+      this.authMethod = this.previousAuthMethod || 'MONGODB';
     } else {
       this.authMethod = null;
     }
@@ -285,7 +285,7 @@ var ConnectView = View.extend({
      * and accoutrement people are actually using IRL.
      *
      *   metrics.trackEvent('connect success', {
-     *     auth_mechanism: model.auth_mechanism,
+     *     authentication: model.authentication,
      *     ssl: model.ssl
      *   });
      */
@@ -309,7 +309,7 @@ var ConnectView = View.extend({
    * @api private
    */
   onError: function(err, model) {
-    // @todo (imlucas): `metrics.trackEvent('connect error', auth_mechanism + ssl boolean)`
+    // @todo (imlucas): `metrics.trackEvent('connect error', authentication + ssl boolean)`
     debug('showing error message', {
       err: err,
       model: model
@@ -362,16 +362,9 @@ var ConnectView = View.extend({
   onConnectionSelected: function(model) {
     // If the new model has auth, expand the auth settings container
     // and select the correct tab.
-    // @note (imlucas): gross, but `this.authMethod` is only used
-    // for managing auth-fields.js so make this pretty when
-    // there's more time.
-    if (model.auth_mechanism === 'MONGODB-CR') {
-      this.authMethod = 'SCRAM-SHA-1';
-    } else {
-      this.authMethod = model.auth_mechanism;
-    }
+    this.authMethod = model.authentication;
 
-    if (model.auth_mechanism !== null) {
+    if (model.authentication !== 'NONE') {
       this.authOpen = true;
     } else {
       this.authOpen = false;
@@ -382,7 +375,7 @@ var ConnectView = View.extend({
     // so we need to get a list of what keys are currently
     // available to set.
     var keys = ['name', 'port', 'hostname'];
-    if (model.auth_mechanism) {
+    if (model.authentication !== 'NONE') {
       keys.push.apply(keys, _.pluck(authFields[this.authMethod], 'name'));
     }
 
@@ -398,22 +391,22 @@ var ConnectView = View.extend({
     // @todo (imlucas): Consolidate w/ `./auth-fields.js`.
     var authMethods = [
       {
-        _id: 'SCRAM-SHA-1',
+        _id: 'MONGODB',
         title: 'User/Password',
         enabled: true
       },
       {
-        _id: 'GSSAPI',
+        _id: 'KERBEROS',
         title: 'Kerberos',
         enabled: app.isFeatureEnabled('Connect with Kerberos')
       },
       {
-        _id: 'PLAIN',
+        _id: 'LDAP',
         title: 'LDAP',
         enabled: app.isFeatureEnabled('Connect with LDAP')
       },
       {
-        _id: 'MONGODB-X509',
+        _id: 'X509',
         title: 'X.509',
         enabled: app.isFeatureEnabled('Connect with X.509')
       }

src/connect/sidebar.js

@@ -38,9 +38,9 @@ var SidebarItemView = View.extend({
   },
   derived: {
     has_auth: {
-      deps: ['model.auth_mechanism'],
+      deps: ['model.authentication'],
       fn: function() {
-        return this.model.auth_mechanism !== null;
+        return this.model.authentication !== 'NONE';
       }
     }
   },

src/models/connection.js

@@ -34,7 +34,7 @@ module.exports = Connection.extend({
 
       debug('test worked!');
       debug('making sure we can get collection list...');
-      client.instance(function(err, res) {
+      client(app.endpoint, this).instance(function(err, res) {
         if (!err) {
           debug('woot.  all gravy!  able to see %s collections', res.collections.length);
           done(null, model);