fix token issue which results in endless loop on reauth

jianqli · jianqli · commit 32beead056fe · 2017-11-10T15:33:18.000+08:00
diff --git a/provider_client.go b/provider_client.go
@@ -145,10 +145,6 @@ func (client *ProviderClient) Request(method, url string, options *RequestOpts)
 	}
 	req.Header.Set("Accept", applicationJSON)
 
-	for k, v := range client.AuthenticatedHeaders() {
-		req.Header.Add(k, v)
-	}
-
 	// Set the User-Agent header
 	req.Header.Set("User-Agent", client.UserAgent.Join())
 
@@ -162,6 +158,11 @@ func (client *ProviderClient) Request(method, url string, options *RequestOpts)
 		}
 	}
 
+	// get latest token from client
+	for k, v := range client.AuthenticatedHeaders() {
+		req.Header.Set(k, v)
+	}
+
 	// Set connection parameter to close the connection immediately when we've got the response
 	req.Close = true
 

Original file line number	Diff line number	Diff line change
`@@ -145,10 +145,6 @@ func (client ProviderClient) Request(method, url string, options RequestOpts)`
`145`	`145`	`}`
`146`	`146`	`req.Header.Set("Accept", applicationJSON)`
`147`	`147`
`148`		`- for k, v := range client.AuthenticatedHeaders() {`
`149`		`- req.Header.Add(k, v)`
`150`		`- }`
`151`		`-`
`152`	`148`	`// Set the User-Agent header`
`153`	`149`	`req.Header.Set("User-Agent", client.UserAgent.Join())`
`154`	`150`
`@@ -162,6 +158,11 @@ func (client ProviderClient) Request(method, url string, options RequestOpts)`
`162`	`158`	`}`
`163`	`159`	`}`
`164`	`160`
	`161`	`+ // get latest token from client`
	`162`	`+ for k, v := range client.AuthenticatedHeaders() {`
	`163`	`+ req.Header.Set(k, v)`
	`164`	`+ }`
	`165`	`+`
`165`	`166`	`// Set connection parameter to close the connection immediately when we've got the response`
`166`	`167`	`req.Close = true`
`167`	`168`