Merge pull request #225 from 10gen/INT-849-ssl-field-touchup

INT-849 label renames, order of fields, principal regex

Author: Waley Chen

src/connect/authentication.js

@@ -51,19 +51,19 @@ var KERBEROS = {
   // enabled: app.isFeatureEnabled('Connect with Kerberos'),
   enabled: true,
   fields: [
-    new InputView({
-      template: inputTemplate,
-      name: 'kerberos_service_name',
-      label: 'Kerberos Service Name',
-      placeholder: 'mongodb',
-      required: false
-    }),
     new InputView({
       template: inputTemplate,
       name: 'kerberos_principal',
-      label: 'Kerberos Principal',
+      label: 'Principal',
       placeholder: '',
-      required: true
+      required: true,
+      tests: [
+        function(value) {
+          if (!value.match(/\S+@\S+/)) {
+            return 'Principal must contain a realm, e.g. user@REALM';
+          }
+        }
+      ]
     }),
     new InputView({
       template: inputTemplate,
@@ -72,6 +72,13 @@ var KERBEROS = {
       label: 'Password',
       placeholder: '',
       required: false
+    }),
+    new InputView({
+      template: inputTemplate,
+      name: 'kerberos_service_name',
+      label: 'Service Name',
+      placeholder: 'mongodb',
+      required: false
     })
   ]
 };

src/connect/ssl.js

@@ -63,7 +63,7 @@ var ALL = {
     }),
     new FileReaderView({
       name: 'ssl_private_key',
-      label: 'Client Certificate Key',
+      label: 'Client Private Key',
       required: true
     }),
     new FileReaderView({
@@ -74,7 +74,7 @@ var ALL = {
     new InputView({
       template: inputTemplate,
       name: 'ssl_private_key_password',
-      label: 'Client Key Password',
+      label: 'Private Key Password',
       required: false
     })
   ]