From 8d51356c1fafb05dde958104354214d2a06bdc36 Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Thu, 10 Mar 2016 00:01:04 +0100 Subject: Cleanup --- authorize.go | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/authorize.go b/authorize.go index 55e8edf..32c5d57 100644 --- a/authorize.go +++ b/authorize.go @@ -44,7 +44,7 @@ func (a Authorization) Supported(sol map[ChalType]Solver) []Challenge { return nil } -func (p *Provider) authorize(s Signer, domain string, sol map[ChalType]Solver) ([]Challenge, error) { +func (p *Provider) authorize(s Signer, domain string, sol map[ChalType]Solver) error { req := &Authorization{ Resource: ResNewAuthz, Identifier: Identifier{ @@ -54,27 +54,25 @@ func (p *Provider) authorize(s Signer, domain string, sol map[ChalType]Solver) ( } resp, err := p.post(p.NewAuthz, s, req) if err != nil { - return nil, err + return err } err = parseJson(resp, req) if err != nil { - return nil, err + return err } - return req.Supported(sol), nil + for _, ch := range req.Supported(sol) { + if err := p.Solve(s, ch, sol[ch.Type]); err != nil { + return err + } + } + return nil } func (p *Provider) Authorize(s Signer, d *Desire) error { for _, domain := range d.altnames { - chal, err := p.authorize(s, domain, d.solver) - if err != nil { + if err := p.authorize(s, domain, d.solver); err != nil { return err } - for _, ch := range chal { - sol := d.solver[ch.Type] - if err := p.Solve(s, ch, sol); err != nil { - return err - } - } } return nil } -- cgit v1.2.3