From b2724ba64dec69fb1b0d5ef746d9d6a7a2ca10b9 Mon Sep 17 00:00:00 2001
From: Conor Mongey <conor@mongey.net>
Date: Tue, 5 Jan 2021 16:02:59 +0000
Subject: [PATCH] Ensure set headers have lower precedence than basic auth
 headers

---
 api/api.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/api/api.go b/api/api.go
index 0e96043b8..d037d3bc2 100644
--- a/api/api.go
+++ b/api/api.go
@@ -615,6 +615,8 @@ func (r *request) toHTTP() (*http.Request, error) {
 		return nil, err
 	}
 
+	req.Header = r.header
+
 	// Optionally configure HTTP basic authentication
 	if r.url.User != nil {
 		username := r.url.User.Username()
@@ -624,7 +626,6 @@ func (r *request) toHTTP() (*http.Request, error) {
 		req.SetBasicAuth(r.config.HttpAuth.Username, r.config.HttpAuth.Password)
 	}
 
-	req.Header = r.header
 	req.Header.Add("Accept-Encoding", "gzip")
 	if r.token != "" {
 		req.Header.Set("X-Nomad-Token", r.token)