diff --git a/lemur/authorities/schemas.py b/lemur/authorities/schemas.py index ef6263a8..bead94ba 100644 --- a/lemur/authorities/schemas.py +++ b/lemur/authorities/schemas.py @@ -50,6 +50,8 @@ class AuthorityInputSchema(LemurInputSchema): missing=lambda: current_app.config.get("LEMUR_DEFAULT_COUNTRY") ) state = fields.String(missing=lambda: current_app.config.get("LEMUR_DEFAULT_STATE")) + # Creating a String field instead of Email to allow empty value + email = fields.String() plugin = fields.Nested(PluginInputSchema) diff --git a/lemur/static/app/angular/authorities/authority/authority.js b/lemur/static/app/angular/authorities/authority/authority.js index 9863bf4d..4868709b 100644 --- a/lemur/static/app/angular/authorities/authority/authority.js +++ b/lemur/static/app/angular/authorities/authority/authority.js @@ -124,4 +124,9 @@ angular.module('lemur') opened: false }; + $scope.populateSubjectEmail = function () { + if($scope.authority.plugin.title.toLowerCase() === 'cloudca') + $scope.authority.email = $scope.authority.owner; + }; + }); diff --git a/lemur/static/app/angular/authorities/authority/distinguishedName.tpl.html b/lemur/static/app/angular/authorities/authority/distinguishedName.tpl.html index c6a7d312..ca3e1391 100644 --- a/lemur/static/app/angular/authorities/authority/distinguishedName.tpl.html +++ b/lemur/static/app/angular/authorities/authority/distinguishedName.tpl.html @@ -49,6 +49,15 @@ +
You must enter an Certificate Authority owner