From 487564fb74633cc26f01690b07e37113f0e76191 Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Thu, 7 Jan 2016 19:59:13 +0100 Subject: Move nonce into parseHeader --- provider.go | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'provider.go') diff --git a/provider.go b/provider.go index 006d19c..a666204 100644 --- a/provider.go +++ b/provider.go @@ -92,12 +92,6 @@ type nextStep struct { var linksRe = regexp.MustCompile(`^<(.*)>;rel="(.*)"`) -func (p *Provider) parseNonce(resp *http.Response) { - if rn := resp.Header.Get("Replay-Nonce"); rn != "" { - p.nonces <- rn - } -} - func (p *Provider) parseHeader(resp *http.Response) nextStep { var ns nextStep if lo, _ := resp.Location(); lo != nil { @@ -110,12 +104,14 @@ func (p *Provider) parseHeader(resp *http.Response) nextStep { ns.Link[re[2]] = re[1] } } + if rn := resp.Header.Get("Replay-Nonce"); rn != "" { + p.nonces <- rn + } return ns } func (p *Provider) parseJson(resp *http.Response, v interface{}) (nextStep, error) { ns := p.parseHeader(resp) - p.parseNonce(resp) defer resp.Body.Close() switch resp.Header.Get("Content-Type") { case "application/problem+json": @@ -128,7 +124,6 @@ func (p *Provider) parseJson(resp *http.Response, v interface{}) (nextStep, erro func (p *Provider) parseCert(resp *http.Response) (*x509.Certificate, nextStep, error) { ns := p.parseHeader(resp) - p.parseNonce(resp) defer resp.Body.Close() switch resp.Header.Get("Content-Type") { case "application/problem+json": -- cgit v1.2.3