Skip to content

Commit dacdd0c

Browse files
authored
fix SignRequest bug (#53)
Repeated definition of httpclient.options results in the first definition being overwritten
1 parent 4310960 commit dacdd0c

File tree

1 file changed

+15
-17
lines changed

1 file changed

+15
-17
lines changed

client.go

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -135,24 +135,22 @@ func (c *Client) buildClientOptions(opt Options) *httpclient.Options {
135135
opt.TokenExpiration = DefaultTokenExpiration
136136
}
137137
tokenCache := cache.New(opt.TokenExpiration, 1*time.Hour)
138-
options = &httpclient.Options{
139-
SignRequest: func(req *http.Request) error {
140-
if req.URL.Path == TokenPath {
141-
return nil
142-
}
143-
cachedToken, isFound := tokenCache.Get("token")
144-
if isFound {
145-
req.Header.Set(HeaderAuth, "Bearer "+cachedToken.(string))
146-
} else {
147-
token, err := c.GetToken(opt.AuthUser)
148-
if err != nil {
149-
return err
150-
}
151-
req.Header.Set(HeaderAuth, "Bearer "+token)
152-
tokenCache.Set("token", token, cache.DefaultExpiration)
153-
}
138+
options.SignRequest = func(req *http.Request) error {
139+
if req.URL.Path == TokenPath {
154140
return nil
155-
},
141+
}
142+
cachedToken, isFound := tokenCache.Get("token")
143+
if isFound {
144+
req.Header.Set(HeaderAuth, "Bearer "+cachedToken.(string))
145+
} else {
146+
token, err := c.GetToken(opt.AuthUser)
147+
if err != nil {
148+
return err
149+
}
150+
req.Header.Set(HeaderAuth, "Bearer "+token)
151+
tokenCache.Set("token", token, cache.DefaultExpiration)
152+
}
153+
return nil
156154
}
157155
return options
158156
}

0 commit comments

Comments
 (0)