Skip to content

Commit 67ff271

Browse files
committed
fix: auth scheme and token from client level #959
1 parent 7ad1178 commit 67ff271

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

Diff for: middleware.go

+8-1
Original file line numberDiff line numberDiff line change
@@ -298,9 +298,16 @@ func addCredentials(c *Client, r *Request) error {
298298
}
299299
}
300300

301+
authScheme := c.AuthScheme
302+
if !IsStringEmpty(r.AuthScheme) {
303+
authScheme = r.AuthScheme
304+
}
305+
301306
// Build the token Auth header
302307
if !IsStringEmpty(r.Token) {
303-
r.RawRequest.Header.Set(c.HeaderAuthorizationKey, strings.TrimSpace(r.AuthScheme+" "+r.Token))
308+
r.RawRequest.Header.Set(c.HeaderAuthorizationKey, strings.TrimSpace(authScheme+" "+r.Token))
309+
} else if !IsStringEmpty(c.Token) {
310+
r.RawRequest.Header.Set(c.HeaderAuthorizationKey, strings.TrimSpace(authScheme+" "+c.Token))
304311
}
305312

306313
return nil

0 commit comments

Comments
 (0)