Merge pull request #152 from 10gen/connect-updates

🚧 Connect updates

Author: kangas

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) {

package.json

@@ -71,80 +71,77 @@
     "ampersand-input-view": "^5.0.0",
     "ampersand-rest-collection": "^5.0.0",
     "debug": "^2.2.0",
-    "electron-squirrel-startup": "^0.1.2",
+    "electron-squirrel-startup": "^0.1.4",
     "mongodb-collection-model": "^0.1.0",
-    "mongodb-connection-model": "^0.0.3",
-    "mongodb-instance-model": "^0.2.0",
+    "mongodb-connection-model": "^1.0.2",
+    "mongodb-instance-model": "^0.2.3",
     "mongodb-ns": "^1.0.0",
-    "scout-server": "http://bin.mongodb.org/js/scout-server/v0.2.4/scout-server-0.2.4.tar.gz"
+    "scout-server": "http://bin.mongodb.org/js/scout-server/v0.3.1/scout-server-0.3.1.tar.gz"
   },
   "devDependencies": {
     "ampersand-app": "^1.0.4",
-    "ampersand-collection": "^1.4.5",
+    "ampersand-collection": "^1.5.0",
     "ampersand-collection-filterable": "^0.2.1",
     "ampersand-collection-lodash-mixin": "^2.0.1",
-    "ampersand-collection-rest-mixin": "^4.2.0",
-    "ampersand-model": "^5.0.3",
+    "ampersand-collection-rest-mixin": "^5.0.0",
+    "ampersand-model": "^6.0.2",
     "ampersand-router": "^3.0.2",
     "ampersand-sync-localforage": "^0.1.1",
-    "ampersand-view": "^8.0.0",
+    "ampersand-view": "^8.0.1",
     "ampersand-view-switcher": "^2.0.0",
     "backoff": "^2.4.1",
     "bootstrap": "https://github.com/twbs/bootstrap/archive/v3.3.5.tar.gz",
-    "browserify": "^10.2.4",
+    "browserify": "^11.2.0",
     "bugsnag-js": "^2.4.8",
     "chalk": "^1.1.1",
-    "d3": "^3.5.5",
-    "del": "^1.2.0",
+    "d3": "^3.5.6",
+    "del": "^2.0.2",
     "domready": "^1.0.8",
     "electron-installer-dmg": "^0.1.0",
     "electron-installer-squirrel-windows": "^0.4.0",
-    "electron-packager": "^5.0.0",
-    "eslint": "^0.24.1",
-    "eslint-config-mongodb-js": "^0.1.4",
+    "electron-packager": "^5.1.0",
+    "eslint": "^1.6.0",
+    "eslint-config-mongodb-js": "^0.1.6",
     "event-stream": "^3.3.1",
     "figures": "^1.4.0",
-    "font-awesome": "https://github.com/FortAwesome/Font-Awesome/archive/v4.3.0.tar.gz",
-    "glob": "^5.0.14",
+    "font-awesome": "https://github.com/FortAwesome/Font-Awesome/archive/v4.4.0.tar.gz",
+    "glob": "^5.0.15",
     "gulp": "^3.9.0",
-    "gulp-jade": "^1.0.1",
+    "gulp-jade": "^1.1.0",
     "gulp-less": "^3.0.3",
-    "gulp-shell": "^0.4.2",
-    "gulp-sourcemaps": "^1.5.2",
+    "gulp-shell": "^0.5.0",
+    "gulp-sourcemaps": "^1.6.0",
     "gulp-util": "^3.0.6",
     "gulp-watch": "^4.3.5",
     "gulp-webserver": "^0.9.1",
     "jade": "^1.11.0",
-    "jadeify": "^4.3.0",
+    "jadeify": "^4.4.0",
     "jquery": "^2.1.4",
     "local-links": "^1.4.0",
-    "lodash": "^3.9.3",
-    "merge-stream": "^0.1.7",
-    "mocha": "^2.2.5",
-    "moment": "^2.10.3",
-    "mongodb-extended-json": "^1.3.1",
+    "lodash": "^3.10.1",
+    "merge-stream": "^1.0.0",
+    "mocha": "^2.3.3",
+    "moment": "^2.10.6",
+    "mongodb-extended-json": "^1.5.2",
     "mongodb-js-fmt": "^0.0.3",
     "mongodb-js-precommit": "^0.2.2",
-    "mongodb-language-model": "^0.2.1",
+    "mongodb-language-model": "^0.2.3",
     "mongodb-schema": "^3.3.0",
     "mousetrap": "^1.5.3",
-    "nightmare": "^1.8.2",
-    "node-notifier": "^4.2.3",
+    "node-notifier": "^4.3.1",
     "numeral": "^1.5.3",
-    "octicons": "https://github.com/github/octicons/archive/v2.2.0.tar.gz",
-    "phantomjs": "^1.9.17",
-    "phantomjs-polyfill": "0.0.1",
-    "pluralize": "^1.1.2",
-    "pre-commit": "^1.0.10",
-    "qs": "^3.1.0",
-    "raf": "^3.0.0",
-    "run-sequence": "^1.1.2",
-    "run-series": "^1.1.2",
-    "scout-client": "http://bin.mongodb.org/js/scout-client/v0.1.8/scout-client-0.1.8.tar.gz",
+    "octicons": "https://github.com/github/octicons/archive/v3.1.0.tar.gz",
+    "pluralize": "^1.2.1",
+    "pre-commit": "^1.1.1",
+    "qs": "^5.2.0",
+    "raf": "^3.1.0",
+    "run-sequence": "^1.1.4",
+    "run-series": "^1.1.4",
+    "scout-client": "http://bin.mongodb.org/js/scout-client/v0.2.0/scout-client-0.2.0.tar.gz",
     "stream-combiner2": "^1.0.2",
     "uuid": "^2.0.1",
     "vinyl-buffer": "^1.0.0",
     "vinyl-source-stream": "^1.1.0",
-    "watchify": "^3.2.3"
+    "watchify": "^3.4.0"
   }
 }

src/bugsnag.js

@@ -39,10 +39,6 @@ module.exports = bugsnag;
  *   https://github.com/bugsnag/bugsnag-js#user
  */
 module.exports.listen = function listen() {
-  if (!process.env.NODE_ENV) {
-    process.env.NODE_ENV = 'development';
-  }
-
   _.assign(bugsnag, {
     apiKey: TOKEN,
     autoNotify: true,

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,46 @@ 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
+  NONE: [],
+  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: [],
+  LDAP: []
 };

src/connect/connect-form-view.js

@@ -31,22 +31,11 @@ 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;
-
-    // is SSL enabled (options are open)
-    obj.ssl = this.parent.sslOpen;
+    obj.authentication = this.parent.authMethod;
 
     // fill in all default fields
     obj.hostname = obj.hostname || 'localhost';
-    obj.port = obj.port || 27017;
-
-    // port number must be numeric
-    obj.port = Number(obj.port);
-
-    if (obj.auth_mechanism) {
-      // default fields for auth
-      obj.database_name = obj.database_name || 'admin';
-    }
+    obj.port = parseInt(obj.port || 27017, 10);
 
     return obj;
   },