aboutsummaryrefslogtreecommitdiff
path: root/provider.go
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2016-01-07 19:59:13 +0100
committerDimitri Sokolyuk <demon@dim13.org>2016-01-07 19:59:13 +0100
commit487564fb74633cc26f01690b07e37113f0e76191 (patch)
treec71778802f63c5de294e3d8a73f545f22b350fe5 /provider.go
parent1983c08bbb7cae43c17252e4ce28fbf000c5d892 (diff)
Move nonce into parseHeader
Diffstat (limited to 'provider.go')
-rw-r--r--provider.go11
1 files changed, 3 insertions, 8 deletions
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":