Merging 1.6-dev version

.drone.yml

@@ -1,31 +1,19 @@
 ---
-pipeline:
-  build:
-    privileged: true
-    image: rancher/dind:v0.3.0
-    commands:
-      - ENABLE_DOCKER=true UPLOAD_LATEST=true ./scripts/ci
-    when:
-      branch: "master"
-      event:
-        exclude: [pull_request]
+kind: pipeline
+name: default
 
-  build:
-    privileged: true
-    image: rancher/dind:v0.3.0
-    commands:
-      - ENABLE_DOCKER=true ./scripts/ci
-    when:
-      branch:
-       exclude: ["master"]
+platform:
+  os: linux
+  arch: amd64
 
-  # Needs envvar SLACK_TOKEN
-  #  slack_blame:
-  #    image: plugins/slack-blame
-  #    channel: ui
-  #    success_template: |
-  #      {{repo.owner}}/{{repo.name}} branch: {{build.branch}} commit: {{build.commit}} by {{build.author}} <{{build.email}}> - {{commit.message}} - {{build.link}}
-  #    failure_template: |
-  #      {{repo.owner}}/{{repo.name}} branch: {{build.branch}} commit: {{build.commit}} by {{build.author}} <{{build.email}}> - {{commit.message}} - {{build.link}}
-  #    when:
-  #      status: [ success, failure ]
+steps:
+- name: build
+  pull: default
+  image: rancher/dind:v0.3.0
+  commands:
+  - ENABLE_DOCKER=true ./scripts/ci
+  privileged: true
+  when:
+    branch:
+      exclude:
+      - master

.gitignore

@@ -14,6 +14,7 @@
 /coverage/*
 /libpeerconnection.log
 npm-debug.log
+package-lock.json
 testem.log
 .DS_Store
 .tern-port

app/admin-tab/auth/activedirectory/controller.js

@@ -3,81 +3,154 @@ import Errors from 'ui/utils/errors';
 import C from 'ui/utils/constants';
 
 var PLAIN_PORT = 389;
-var TLS_PORT = 636;
+var TLS_PORT   = 636;
 
 export default Ember.Controller.extend({
-  access: Ember.inject.service(),
-  settings: Ember.inject.service(),
+  access:         Ember.inject.service(),
+  settings:       Ember.inject.service(),
 
   confirmDisable: false,
-  errors: null,
-  testing: false,
+  errors:         null,
+  testing:        false,
 
-  providerName: 'ldap.providerName.ad',
-  userType: C.PROJECT.TYPE_LDAP_USER,
-  groupType: C.PROJECT.TYPE_LDAP_GROUP,
+  providerName:   'ldap.providerName.ad',
+  userType:       C.PROJECT.TYPE_LDAP_USER,
+  groupType:      C.PROJECT.TYPE_LDAP_GROUP,
+  ldapConfig:     Ember.computed.alias('model.ldapConfig'),
 
-  addUserInput: '',
-  addOrgInput: '',
+  addUserInput:   '',
+  addOrgInput:    '',
 
-  username: '',
-  password: '',
+  username:       '',
+  password:       '',
+  editing:        false,
+  advancedOpen:   false,
 
-  createDisabled: function() {
+  createDisabled: Ember.computed('username.length','password.length', function() {
     return !this.get('username.length') || !this.get('password.length');
-  }.property('username.length','password.length'),
+  }),
 
-  numUsers: function() {
+  numUsers: Ember.computed('[email protected]','userType','groupType', function() {
     return (this.get('model.allowedIdentities')||[]).filterBy('externalIdType', this.get('userType')).get('length');
-  }.property('[email protected]','userType','groupType'),
+  }),
 
-  numGroups: function() {
+  numGroups: Ember.computed('[email protected]','userType','groupType', function() {
     return (this.get('model.allowedIdentities')||[]).filterBy('externalIdType', this.get('groupType')).get('length');
-  }.property('[email protected]','userType','groupType'),
+  }),
 
-  tlsChanged: function() {
-    var on = this.get('model.tls');
-    var port = parseInt(this.get('model.port'),10);
+  canEdit: Ember.computed('access.enabled', 'editing', function() {
+    var isEnabled = this.get('access.enabled');
+    var editing   = this.get('editing');
+
+    if (( isEnabled && editing ) || !isEnabled) {
+      return true;
+    } else if (isEnabled && !editing) {
+      return false;
+    }
+
+  }),
+
+  tlsChanged: Ember.observer('ldapConfig.tls', function() {
+    var on   = this.get('ldapConfig.tls');
+    var port = parseInt(this.get('ldapConfig.port'),10);
 
     if ( on && port === PLAIN_PORT )
     {
-      this.set('model.port', TLS_PORT);
+      this.set('ldapConfig.port', TLS_PORT);
     }
     else if ( !on && port === TLS_PORT )
     {
-      this.set('model.port', PLAIN_PORT);
+      this.set('ldapConfig.port', PLAIN_PORT);
     }
-  }.observes('model.tls'),
+  }),
+
+  testConfig: function(data) {
+    return this.get('authStore').request({
+      url:    'testlogin',
+      method: 'POST',
+      data:   data,
+    });
+  },
+
 
   actions: {
+    showAdvanced: function() {
+      let open = this.get('advancedOpen');
+
+      if (open) {
+        Ember.$('.custom-schema').hide();
+        this.set('advancedOpen', false);
+      } else {
+        Ember.$('.custom-schema').show();
+        this.set('advancedOpen', true);
+      }
+
+    },
+    edit: function() {
+      this.toggleProperty('editing');
+      this.set('originalModel', this.get('model').clone());
+      this.set('username', this.get('model.identity.login'));
+    },
+    cancel: function() {
+      this.send('clearError');
+      this.set('editing', false);
+      this.set('model', this.get('originalModel'));
+    },
     test: function() {
       this.send('clearError');
 
-      var model = this.get('model');
-      model.setProperties({
-        enabled: false,
-        'accessMode': 'unrestricted',
-      });
+      let model   = this.get('model');
+      let editing = this.get('editing');
+
+      if (!editing) {
+        model.setProperties({
+          'provider'          : 'ldapconfig',
+          'enabled'           : false, // It should already be, but just in case..
+          'accessMode'        : 'unrestricted',
+          'allowedIdentities' : [],
+        });
+      }
 
       var errors = model.validationErrors();
-      if ( errors.get('length') )
-      {
+
+
+      let data  = {
+        type:       'testAuthConfig',
+        authConfig: model,
+        code:       `:${this.get('password')}`,
+      };
+
+      if ( errors.get('length') ) {
         this.set('errors', errors);
-      }
-      else
-      {
+      } else {
         this.set('testing', true);
-        model.save().then(() => {
-          this.send('authenticate');
-        }).catch(err => {
-          this.send('gotError', err);
-        });
+
+        if (editing) {
+          this.testConfig(data).then(() => {
+            model.save().then(() => {
+              this.send('waitAndRefresh');
+            }).catch((err) => {
+              this.send('gotError', err);
+            });
+          }).catch((err) => {
+            this.send('gotError', err);
+          });
+        } else {
+          this.set('testing', true);
+          model.save().then(() => {
+            this.send('authenticate');
+          }).catch(err => {
+            this.send('gotError', err);
+          });
+        }
       }
     },
 
     authenticate: function() {
       this.send('clearError');
-      var code = this.get('username')+':'+this.get('password');
+
+      var code = `${this.get('username')}:${this.get('password')}`;
+
       this.get('access').login(code).then(res => {
         this.send('authenticationSucceeded', res.body);
       }).catch(err => {
@@ -93,9 +166,10 @@ export default Ember.Controller.extend({
       this.set('access.enabled', true);
 
       var model = this.get('model');
+
       model.setProperties({
-        'enabled': true,
-        'accessMode': 'unrestricted',
+        'enabled':           true,
+        'accessMode':        'unrestricted',
         'allowedIdentities': [auth.userIdentity],
       });
 
@@ -109,6 +183,7 @@ export default Ember.Controller.extend({
 
     waitAndRefresh: function(url) {
       $('#loading-underlay, #loading-overlay').removeClass('hide').show();
+
       setTimeout(function() {
         window.location.href = url || window.location.href;
       }, 1000);

app/admin-tab/auth/activedirectory/route.js

@@ -2,33 +2,39 @@ import Ember from 'ember';
 
 export default Ember.Route.extend({
   resourceType: 'ldapconfig',
+  access: Ember.inject.service(),
 
-  model: function() {
+  model: function () {
+    return this.get('authStore').find('config', null, {
+      forceReload: true
+    }).then((collection) => {
 
-    return this.get('userStore').find(this.get('resourceType'), null, {forceReload: true}).then((collection) => {
-      var existing = collection.get('firstObject');
+      if (!collection.enabled) {
+        let existing = this.get('authStore').createRecord(collection.ldapConfig, {type: 'ldapconfig'});
+        let defaults = this.get('authStore').getById('schema', this.get('resourceType')).get('resourceFields');
 
-      // On install the initial ldapconfig is empty.  For any fields that are empty, fill in the default from the schema.
-      var defaults = this.get('userStore').getById('schema',this.get('resourceType')).get('resourceFields');
-      Object.keys(defaults).forEach((key) => {
-        var field = defaults[key];
-        if ( field && field.default && !existing.get(key) )
-        {
-          existing.set(key, field.default);
-        }
-      });
+        Object.keys(defaults).forEach((key) => {
+          var field = defaults[key];
+          if (field && field.default && !existing.get(key)) {
+            existing.set(key, field.default);
+          }
+        });
 
-      return existing;
+        collection.ldapConfig = existing;
+      } else {
+        collection.identity = this.get('access.identity');
+      }
+      return collection;
     });
   },
 
-  setupController: function(controller, model) {
+  setupController: function (controller, model) {
     controller.setProperties({
-      model: model,
+      model:          model,
       confirmDisable: false,
-      testing: false,
-      organizations: this.get('session.orgs')||[],
-      errors: null,
+      testing:        false,
+      organizations:  this.get('session.orgs') || [],
+      errors:         null,
     });
   }
 });

app/admin-tab/auth/azuread/template.hbs

@@ -57,22 +57,6 @@
         </div>
       </div>
     </div>
-
-    <div class="row">
-      <div class="col-md-6">
-        <div class="form-group">
-          <label>{{t 'authPage.azuread.configure.adminAccountUsername.label'}}*</label>
-          {{input type="text" value=model.adminAccountUsername placeholder=(t 'authPage.azuread.configure.adminAccountUsername.placeholder') classNames="form-control"}}
-          <p class="help-block">{{t 'authPage.azuread.configure.adminAccountUsername.help'}}</p>
-        </div>
-      </div>
-      <div class="col-md-6">
-        <div class="form-group">
-          <label>{{t 'authPage.azuread.configure.adminAccountPassword.label'}}*</label>
-          {{input type="password" value=model.adminAccountPassword classNames="form-control"}}
-        </div>
-      </div>
-    </div>
   </section>
 
   <section class="well">

app/admin-tab/auth/github/route.js

@@ -14,7 +14,8 @@ export default Ember.Route.extend({
       testing: false,
       organizations: this.get('session.orgs')||[],
       errors: null,
-      isEnterprise: (model.get('hostname') ? true : false),
+      isEnterprise: (model.get('githubConfig.hostname') ? true : false),
+      secure: model.get('githubConfig.scheme') === 'https://'
     });
 
     controller.set('saved',true);