fix: auth scheme and token from client level #959

go-resty · Jan 22, 2025 · 43db49c · 43db49c
1 parent 7ad1178
commit 43db49c
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 3 deletions.
diff --git a/client.go b/client.go
@@ -450,8 +450,6 @@ func (c *Client) R() *Request {
 		PathParams:    map[string]string{},
 		RawPathParams: map[string]string{},
 		Debug:         c.Debug,
-		AuthScheme:    c.AuthScheme,
-		Token:         c.Token,
 
 		client:              c,
 		multipartFiles:      []*File{},

diff --git a/middleware.go b/middleware.go
@@ -298,9 +298,16 @@ func addCredentials(c *Client, r *Request) error {
 		}
 	}
 
+	authScheme := c.AuthScheme
+	if !IsStringEmpty(r.AuthScheme) {
+		authScheme = r.AuthScheme
+	}
+
 	// Build the token Auth header
 	if !IsStringEmpty(r.Token) {
-		r.RawRequest.Header.Set(c.HeaderAuthorizationKey, strings.TrimSpace(r.AuthScheme+" "+r.Token))
+		r.RawRequest.Header.Set(c.HeaderAuthorizationKey, strings.TrimSpace(authScheme+" "+r.Token))
+	} else if !IsStringEmpty(c.Token) {
+		r.RawRequest.Header.Set(c.HeaderAuthorizationKey, strings.TrimSpace(authScheme+" "+c.Token))
 	}
 
 	return nil

diff --git a/request_test.go b/request_test.go
@@ -706,6 +706,21 @@ func TestRequestAuthScheme(t *testing.T) {
 		assertEqual(t, tokenValue, resp.Request.Header.Get(hdrAuthorizationKey))
 	})
 
+	t.Run("only client level auth token GH959", func(t *testing.T) {
+		tokenValue := "004DDB79-6801-4587-B976-F093E6AC44FF"
+
+		c := dc().
+			SetTLSClientConfig(&tls.Config{InsecureSkipVerify: true}).
+			SetAuthToken(tokenValue)
+
+		resp, err := c.R().
+			Get(ts.URL + "/profile")
+
+		assertError(t, err)
+		assertEqual(t, http.StatusOK, resp.StatusCode())
+		assertEqual(t, "Bearer "+tokenValue, resp.Request.Header.Get(hdrAuthorizationKey))
+	})
+
 }
 
 func TestRequestDigestAuth(t *testing.T) {