Fixes various issues. (#316)

This commit is contained in:
kevgliss
2016-05-13 14:35:38 -07:00
parent a0c8765588
commit 58e8fe0bd0
26 changed files with 72 additions and 86 deletions

View File

@ -11,7 +11,7 @@ from marshmallow import fields, validates_schema
from marshmallow import validate
from marshmallow.exceptions import ValidationError
from lemur.schemas import PluginInputSchema, ExtensionSchema, AssociatedAuthoritySchema, AssociatedRoleSchema
from lemur.schemas import PluginInputSchema, PluginOutputSchema, ExtensionSchema, AssociatedAuthoritySchema, AssociatedRoleSchema
from lemur.common.schema import LemurInputSchema, LemurOutputSchema
from lemur.common import validators
@ -66,7 +66,7 @@ class AuthorityOutputSchema(LemurOutputSchema):
owner = fields.Email()
not_before = fields.DateTime()
not_after = fields.DateTime()
plugin_name = fields.String()
plugin = fields.Nested(PluginOutputSchema)
body = fields.String()
chain = fields.String()
active = fields.Boolean()

View File

@ -47,7 +47,7 @@ def create(kwargs):
:return:
"""
issuer = kwargs['plugin']
issuer = kwargs['plugin']['plugin_object']
kwargs['creator'] = g.current_user.email
cert_body, intermediate, issuer_roles = issuer.create_authority(kwargs)
@ -77,7 +77,7 @@ def create(kwargs):
role = role_service.create(
r['name'],
password=r['password'],
description="{0} auto generated role".format(kwargs['plugin'].title),
description="{0} auto generated role".format(issuer.title),
username=r['username'])
# the user creating the authority should be able to administer it
@ -89,7 +89,7 @@ def create(kwargs):
authority = Authority(
kwargs.get('name'),
kwargs['owner'],
kwargs['plugin'].slug,
issuer.slug,
cert_body,
description=kwargs['description'],
chain=intermediate,