More stuff. Will prioritize this more next week

lemur/static/app/angular/app.js

@@ -109,11 +109,11 @@
     };
   });
 
-  lemur.service('DnsService', function (LemurRestangular) {
-    var DnsService = this;
-    DnsService.get = function () {
-      return LemurRestangular.all('dns_service').customGET().then(function (dns_service) {
-        return dns_service;
+  lemur.service('DnsProviders', function (LemurRestangular) {
+    var DnsProviders = this;
+    DnsProviders.get = function () {
+      return LemurRestangular.all('dns_providers').customGET().then(function (dnsProviders) {
+        return dnsProviders;
       });
     };
   });

lemur/static/app/angular/certificates/certificate/certificate.js

@@ -134,6 +134,11 @@ angular.module('lemur')
       $scope.certificate.validityYears = null;
     };
 
+    CertificateService.getDnsProviders().then(function (providers) {
+            $scope.dnsProviders = providers;
+        }
+    );
+
     $scope.create = function (certificate) {
       WizardHandler.wizard().context.loading = true;
       CertificateService.create(certificate).then(

lemur/static/app/angular/certificates/certificate/options.tpl.html

@@ -235,19 +235,7 @@
           </div>
         </div>
        <div class="col-sm-10">
-           <!-- two -->
-           <div class="form-group">
-        <label class="control-label col-sm-2">
-          DNS Provider
-        </label>
-        <div class="col-sm-10">
-          <select class="form-control" ng-model="certificate.dns_provider" ng-options="item as item.name for item in dns_providers">
-              <option value="">-- choose an entry. Needed for LetsEncrypt --</option>
-          </select>
-        </div>
-      </div>
-
-      </div>
+       </div></div>
       </div>
       </div>
     </div>

lemur/static/app/angular/certificates/certificate/tracking.tpl.html

@@ -107,6 +107,17 @@
         </ui-select>
       </div>
     </div>
+       <div class="form-group" ng-show="certificate.authority.plugin.slug == 'acme-issuer'">
+        <label class="control-label col-sm-2">
+          DNS Provider:
+        </label>
+
+        <div class="col-sm-10">
+          <select class="form-control" ng-model="certificate.dnsProvider" ng-options="item as item.name for item in dnsProviders.items track by item.id">
+              <option value="">- choose an entry. Neded for ACME Providers -</option>
+          </select>
+        </div>
+      </div>
     <div class="form-group">
       <label class="control-label col-sm-2"
              uib-tooltip="If no date is selected Lemur attempts to issue a 2 year certificate">

lemur/static/app/angular/certificates/services.js

@@ -149,7 +149,7 @@ angular.module('lemur')
     });
     return LemurRestangular.all('certificates');
   })
-  .service('CertificateService', function ($location, CertificateApi, AuthorityService, AuthorityApi, LemurRestangular, DefaultService) {
+  .service('CertificateService', function ($location, CertificateApi, AuthorityService, AuthorityApi, LemurRestangular, DefaultService, DnsProviders) {
     var CertificateService = this;
     CertificateService.findCertificatesByName = function (filterValue) {
       return CertificateApi.getList({'filter[name]': filterValue})
@@ -243,10 +243,13 @@ angular.module('lemur')
             certificate.authority = defaults.authority;
           }
         }
-        certificate.dns_providers = defaults.dnsProviders;
       });
     };
 
+    CertificateService.getDnsProviders = function () {
+      return DnsProviders.get();
+    }
+
     CertificateService.loadPrivateKey = function (certificate) {
       return certificate.customGET('key');
     };

lemur/static/app/angular/dns_providers/dns_provider/dns_provider.js

@@ -0,0 +1,98 @@
+'use strict';
+
+angular.module('lemur')
+
+  .controller('DnsProviderCreateController', function ($scope, $uibModalInstance, PluginService, DnsProviderService, LemurRestangular, toaster) {
+    $scope.dns_provider = LemurRestangular.restangularizeElement(null, {}, 'dns_providers');
+
+    PluginService.getByType('dns_provider').then(function (plugins) {
+      $scope.plugins = plugins;
+    });
+
+    PluginService.getByType('export').then(function (plugins) {
+      $scope.exportPlugins = plugins;
+    });
+
+    $scope.save = function (dns_provider) {
+      DnsProvider.create(dns_provider.then(
+        function () {
+          toaster.pop({
+            type: 'success',
+            title: dns_provider.label,
+            body: 'Successfully Created!'
+          });
+          $uibModalInstance.close();
+        }, function (response) {
+          toaster.pop({
+            type: 'error',
+            title: dns_provider.label,
+            body: 'lemur-bad-request',
+            bodyOutputType: 'directive',
+            directiveData: response.data,
+            timeout: 100000
+          });
+        });
+    };
+
+    $scope.cancel = function () {
+      $uibModalInstance.dismiss('cancel');
+    };
+  })
+
+  .controller('DnsProviderEditController', function ($scope, $uibModalInstance, DnsProviderService, DnsProviderApi, PluginService, toaster, editId) {
+
+
+    DnsProviderApi.get(editId).then(function (dns_provider) {
+      $scope.dns_provider = dns_provider;
+
+      PluginService.getByType('dns_provider').then(function (plugins) {
+        $scope.plugins = plugins;
+
+        _.each($scope.plugins, function (plugin) {
+          if (plugin.slug === $scope.dns_provider.plugin.slug) {
+            plugin.pluginOptions = $scope.dns_provider.plugin.pluginOptions;
+            $scope.dns_provider.plugin = plugin;
+            _.each($scope.dns_provider.plugin.pluginOptions, function (option) {
+              if (option.type === 'export-plugin') {
+                PluginService.getByType('export').then(function (plugins) {
+                  $scope.exportPlugins = plugins;
+
+                  _.each($scope.exportPlugins, function (plugin) {
+                    if (plugin.slug === option.value.slug) {
+                      plugin.pluginOptions = option.value.pluginOptions;
+                      option.value = plugin;
+                    }
+                  });
+                });
+              }
+            });
+          }
+        });
+      });
+    });
+
+    $scope.save = function (dns_provider) {
+      DnsProviderService.update(dns_provider).then(
+        function () {
+          toaster.pop({
+            type: 'success',
+            title: dns_provider.label,
+            body: 'Successfully Updated!'
+          });
+          $uibModalInstance.close();
+        }, function (response) {
+          toaster.pop({
+            type: 'error',
+            title: dns_provider.label,
+            body: 'lemur-bad-request',
+            bodyOutputType: 'directive',
+            directiveData: response.data,
+            timeout: 100000
+          });
+        });
+    };
+
+    $scope.cancel = function () {
+      $uibModalInstance.dismiss('cancel');
+    };
+  });

lemur/static/app/angular/dns_providers/dns_provider/dns_provider.tpl.html

@@ -0,0 +1,93 @@
+<div class="modal-header">
+  <button type="button" class="close" ng-click="cancel()" aria-label="Close"><span aria-hidden="true">&times;</span>
+  </button>
+  <h3><span ng-show="!dns_provider.fromServer">Create</span><span ng-show="dns_provider.fromServer">Edit</span>
+    DnsProvider <span class="text-muted"><small>oh the places you will go!</small></span></h3>
+</div>
+<div class="modal-body">
+  <form name="createForm" class="form-horizontal" role="form" novalidate>
+    <div class="form-group"
+         ng-class="{'has-error': createForm.label.$invalid, 'has-success': !createForm.label.$invalid&&createForm.label.$dirty}">
+      <label class="control-label col-sm-2">
+        Label
+      </label>
+      <div class="col-sm-10">
+        <input name="label" ng-model="dns_provider.label" placeholder="Label" class="form-control" required/>
+        <p ng-show="createForm.label.$invalid && !createForm.label.$pristine" class="help-block">You must enter an
+          dns_provider label</p>
+      </div>
+    </div>
+    <div class="form-group">
+      <label class="control-label col-sm-2">
+        Description
+      </label>
+      <div class="col-sm-10">
+        <textarea name="comments" ng-model="dns_provider.description" placeholder="Something elegant"
+                  class="form-control"></textarea>
+      </div>
+    </div>
+    <div class="form-group">
+      <label class="control-label col-sm-2">
+        Plugin
+      </label>
+      <div class="col-sm-10">
+        <select class="form-control" ng-model="dns_provider.plugin" ng-options="plugin.title for plugin in plugins"
+                required></select>
+      </div>
+    </div>
+    <div class="form-group" ng-repeat="item in dns_provider.plugin.pluginOptions">
+      <ng-form name="subForm" class="form-horizontal" role="form" novalidate>
+        <div ng-class="{'has-error': subForm.sub.$invalid, 'has-success': !subForm.sub.$invalid&&subForm.sub.$dirty}">
+          <label class="control-label col-sm-2">
+            {{ item.name | titleCase }}
+          </label>
+          <div class="col-sm-10">
+            <input name="sub" ng-if="item.type == 'int'" type="number" ng-pattern="item.validation?item.validation:'^[0-9]+$'" 
+                   class="form-control" ng-model="item.value"/>
+            <select name="sub" ng-if="item.type == 'select'" class="form-control" ng-options="i for i in item.available"
+                    ng-model="item.value"></select>
+            <input name="sub" ng-if="item.type == 'bool'" class="form-control" type="checkbox" ng-model="item.value">
+            <input name="sub" ng-if="item.type == 'str'" type="text" class="form-control" ng-model="item.value"/>
+            <div ng-if="item.type == 'export-plugin'">
+              <form name="exportForm" class="form-horizontal" role="form" novalidate>
+                <select class="form-control" ng-model="item.value"
+                        ng-options="plugin.title for plugin in exportPlugins" required></select>
+                <div class="col-sm-10">
+                  <div class="form-group" ng-repeat="item in item.value.pluginOptions">
+                    <ng-form name="subForm" class="form-horizontal" role="form" novalidate>
+                      <div
+                        ng-class="{'has-error': subForm.sub.$invalid, 'has-success': !subForm.sub.$invalid&&subForm.sub.$dirty}">
+                        <label class="control-label col-sm-2">
+                          {{ item.name | titleCase }}
+                        </label>
+                        <div class="col-sm-10">
+                          <input name="sub" ng-if="item.type == 'int'" type="number" ng-pattern="item.validation?item.validation:'^[0-9]+$'"
+                                 class="form-control" ng-model="item.value"/>
+                          <select name="sub" ng-if="item.type == 'select'" class="form-control"
+                                  ng-options="i for i in item.available" ng-model="item.value"></select>
+                          <input name="sub" ng-if="item.type == 'bool'" class="form-control" type="checkbox"
+                                 ng-model="item.value">
+                          <input name="sub" ng-if="item.type == 'str'" type="text" class="form-control"
+                                 ng-model="item.value" ng-pattern="item.validation"/>
+                          <p ng-show="subForm.sub.$invalid && !subForm.sub.$pristine"
+                             class="help-block">{{ item.helpMessage }}</p>
+                        </div>
+                      </div>
+                    </ng-form>
+                  </div>
+                </div>
+              </form>
+            </div>
+            <p ng-show="subForm.sub.$invalid && !subForm.sub.$pristine" class="help-block">{{ item.helpMessage }}</p>
+          </div>
+        </div>
+      </ng-form>
+    </div>
+  </form>
+</div>
+<div class="modal-footer">
+  <button ng-click="save(dns_provider)" type="submit" ng-disabled="createForm.$invalid" class="btn btn-primary">Save
+  </button>
+  <button ng-click="cancel()" class="btn btn-danger">Cancel</button>
+</div>
+

lemur/static/app/angular/dns_providers/services.js

@@ -0,0 +1,38 @@
+'use strict';
+angular.module('lemur')
+  .service('DnsProviderApi', function (LemurRestangular) {
+    return LemurRestangular.all('dns_providers');
+  })
+  .service('DnsProviderService', function ($location,  DnsProviderApi, PluginService, DnsProviders) {
+    var DnsProviderService = this;
+    DnsProviderService.findDnsProvidersByName = function (filterValue) {
+      return DnsProviderApi.getList({'filter[label]': filterValue})
+        .then(function (dns_providers) {
+          return dns_providers;
+        });
+    };
+
+    DnsProviderService.getDnsProviders = function () {
+      return DnsProviders.get();
+    }
+
+    DnsProviderService.create = function (dns_provider) {
+      return DnsProviderApi.post(dns_provider);
+    };
+
+    DnsProviderService.get = function () {
+      return DnsProviderApi.get();
+    };
+
+
+    DnsProviderService.update = function (dns_provider) {
+      return dns_provider.put();
+    };
+
+    DnsProviderService.getPlugin = function (dns_provider) {
+      return PluginService.getByName(dns_provider.pluginName).then(function (plugin) {
+        dns_provider.plugin = plugin;
+      });
+    };
+    return DnsProviderService;
+  });

lemur/static/app/angular/dns_providers/view/view.js

@@ -0,0 +1,84 @@
+'use strict';
+
+angular.module('lemur')
+
+  .config(function config($stateProvider) {
+    $stateProvider.state('dns_providers', {
+      url: '/dns_providers',
+      templateUrl: '/angular/dns_providers/view/view.tpl.html',
+      controller: 'DnsProvidersViewController'
+    });
+  })
+
+  .controller('DnsProvidersViewController', function ($scope, $uibModal, DnsProviderApi, DnsProviderService, ngTableParams, toaster) {
+    $scope.filter = {};
+    $scope.dnsProvidersTable = new ngTableParams({
+      page: 1,            // show first page
+      count: 10,          // count per page
+      sorting: {
+        id: 'desc'     // initial sorting
+      },
+      filter: $scope.filter
+    }, {
+      total: 0,           // length of data
+      getData: function ($defer, params) {
+        DnsProviderApi.getList(params.url()).then(
+          function (data) {
+            params.total(data.total);
+            $defer.resolve(data);
+          }
+        );
+      }
+    });
+
+    $scope.remove = function (dns_provider) {
+      dns_provider.remove().then(
+        function () {
+            $scope.dnsProvidersTable.reload();
+          },
+          function (response) {
+            toaster.pop({
+              type: 'error',
+              title: 'Opps',
+              body: 'I see what you did there: ' + response.data.message
+            });
+          }
+      );
+    };
+
+    $scope.edit = function (dns_providerId) {
+      var uibModalInstance = $uibModal.open({
+        animation: true,
+        templateUrl: '/angular/dns_providers/dns_provider/dns_provider.tpl.html',
+        controller: 'DnsProvidersEditController',
+        size: 'lg',
+        backdrop: 'static',
+        resolve: {
+            editId: function () {
+              return dns_providerId;
+            }
+        }
+      });
+
+      uibModalInstance.result.then(function () {
+        $scope.dnsProvidersTable.reload();
+      });
+
+    };
+
+    $scope.create = function () {
+      var uibModalInstance = $uibModal.open({
+        animation: true,
+        controller: 'DnsProvidersCreateController',
+        templateUrl: '/angular/dns_providers/dns_provider/dns_provider.tpl.html',
+        size: 'lg',
+        backdrop: 'static'
+      });
+
+      uibModalInstance.result.then(function () {
+        $scope.dnsProvidersTable.reload();
+      });
+
+    };
+
+  });

lemur/static/app/angular/dns_providers/view/view.tpl.html

@@ -0,0 +1,54 @@
+<div class="row">
+  <div class="col-md-12">
+    <h2 class="featurette-heading">DNS Providers
+      <span class="text-muted"><small>the root of all problems</small></span></h2>
+    <div class="panel panel-default">
+      <div class="panel-heading">
+        <div class="btn-group pull-right">
+          <button ng-click="create()" class="btn btn-primary">Create</button>
+        </div>
+        <div class="btn-group">
+            <button ng-model="showFilter" class="btn btn-default" uib-btn-checkbox
+                    btn-checkbox-true="1"
+                    btn-checkbox-false="0">Filter</button>
+        </div>
+        <div class="clearfix"></div>
+      </div>
+      <div class="table-responsive">
+        <table ng-table="dnsProvidersTable" class="table table-striped" show-filter="showFilter" template-pagination="angular/pager.html" >
+          <tbody>
+          <tr ng-repeat="dns_provider in $data track by $index">
+            <td data-title="'Name'" sortable="'name'" filter="{ 'name': 'text' }">
+              <ul class="list-unstyled">
+                <li>{{ dns_provider.name }}</li>
+                <li><span class="text-muted">{{ dns_provider.description }}</span></li>
+              </ul>
+            </td>
+              <td data-title="'Type'" sortable="'type'" filter="{ 'type': 'text' }">
+                  <ul class="list-unstyled">
+                      <li>{{ dns_provider.providerType }}</li>
+                  </ul>
+              </td>
+            <td data-title="'Domains'" sortable="'domains'" filter="{ 'domains': 'text' }">
+              <ul class="list-unstyled">
+                <li>{{ dns_provider.domains }}</li>
+                <li><span class="text-muted">{{ dns_provider.description }}</span></li>
+              </ul>
+            </td>
+            <td data-title="''">
+              <div class="btn-group-vertical pull-right">
+                <button uib-tooltip="Edit DNS Provider" ng-click="edit(dns_provider.id)" class="btn btn-sm btn-info">
+                  Edit
+                </button>
+                <button uib-tooltip="Delete DNS Provider" ng-click="remove(dns_provider)" type="button" class="btn btn-sm btn-danger pull-left">
+                  Remove
+                </button>
+              </div>
+            </td>
+          </tr>
+          </tbody>
+        </table>
+      </div>
+    </div>
+  </div>
+</div>

lemur/static/app/angular/pending_certificates/services.js

@@ -230,7 +230,6 @@ angular.module('lemur')
             certificate.authority = defaults.authority;
           }
         }
-        certificate.dns_providers = defaults.dnsProviders;
       });
     };
 

lemur/static/app/index.html

@@ -65,6 +65,7 @@
                             <li><a ui-sref="domains">Domains</a></li>
                             <li><a ui-sref="logs">Logs</a></li>
                             <li><a ui-sref="keys">Api Keys</a></li>
+                            <li><a ui-sref="dns_providers">DNS Providers</a></li>
                         </ul>
                     </li>
                 </ul>