Bugfix: client/auth_info unchecked errors

Updates each function to return the error from the called ClientRequest method.
seanprince · Aug 31, 2017 · f035c05 · f035c05
1 parent d6605b7
commit f035c05
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/authinfo_test.go b/authinfo_test.go
@@ -23,11 +23,11 @@ import (
 
 func TestAuthInfoWriter(t *testing.T) {
 	hand := ClientAuthInfoWriterFunc(func(r ClientRequest, _ strfmt.Registry) error {
-		r.SetHeaderParam("authorization", "Bearer the-token-goes-here")
-		return nil
+		return r.SetHeaderParam("authorization", "Bearer the-token-goes-here")
 	})
 
 	tr := new(trw)
-	hand.AuthenticateRequest(tr, nil)
+	err := hand.AuthenticateRequest(tr, nil)
+	assert.NoError(t, err)
 	assert.Equal(t, "Bearer the-token-goes-here", tr.Headers.Get("Authorization"))
 }
diff --git a/client/auth_info.go b/client/auth_info.go
@@ -32,24 +32,21 @@ func init() {
 func BasicAuth(username, password string) runtime.ClientAuthInfoWriter {
 	return runtime.ClientAuthInfoWriterFunc(func(r runtime.ClientRequest, _ strfmt.Registry) error {
 		encoded := base64.StdEncoding.EncodeToString([]byte(username + ":" + password))
-		r.SetHeaderParam("Authorization", "Basic "+encoded)
-		return nil
+		return r.SetHeaderParam("Authorization", "Basic "+encoded)
 	})
 }
 
 // APIKeyAuth provides an API key auth info writer
 func APIKeyAuth(name, in, value string) runtime.ClientAuthInfoWriter {
 	if in == "query" {
 		return runtime.ClientAuthInfoWriterFunc(func(r runtime.ClientRequest, _ strfmt.Registry) error {
-			r.SetQueryParam(name, value)
-			return nil
+			return r.SetQueryParam(name, value)
 		})
 	}
 
 	if in == "header" {
 		return runtime.ClientAuthInfoWriterFunc(func(r runtime.ClientRequest, _ strfmt.Registry) error {
-			r.SetHeaderParam(name, value)
-			return nil
+			return r.SetHeaderParam(name, value)
 		})
 	}
 	return nil
@@ -58,7 +55,6 @@ func APIKeyAuth(name, in, value string) runtime.ClientAuthInfoWriter {
 // BearerToken provides a header based oauth2 bearer access token auth info writer
 func BearerToken(token string) runtime.ClientAuthInfoWriter {
 	return runtime.ClientAuthInfoWriterFunc(func(r runtime.ClientRequest, _ strfmt.Registry) error {
-		r.SetHeaderParam("Authorization", "Bearer "+token)
-		return nil
+		return r.SetHeaderParam("Authorization", "Bearer "+token)
 	})
 }
diff --git a/client/auth_info_test.go b/client/auth_info_test.go
@@ -25,7 +25,8 @@ func TestBasicAuth(t *testing.T) {
 	r, _ := newRequest("GET", "/", nil)
 
 	writer := BasicAuth("someone", "with a password")
-	writer.AuthenticateRequest(r, nil)
+	err := writer.AuthenticateRequest(r, nil)
+	assert.NoError(t, err)
 
 	req := new(http.Request)
 	req.Header = make(http.Header)
@@ -41,7 +42,8 @@ func TestAPIKeyAuth_Query(t *testing.T) {
 	r, _ := newRequest("GET", "/", nil)
 
 	writer := APIKeyAuth("api_key", "query", "the-shared-key")
-	writer.AuthenticateRequest(r, nil)
+	err := writer.AuthenticateRequest(r, nil)
+	assert.NoError(t, err)
 
 	assert.Equal(t, "the-shared-key", r.query.Get("api_key"))
 }
@@ -50,7 +52,8 @@ func TestAPIKeyAuth_Header(t *testing.T) {
 	r, _ := newRequest("GET", "/", nil)
 
 	writer := APIKeyAuth("x-api-token", "header", "the-shared-key")
-	writer.AuthenticateRequest(r, nil)
+	err := writer.AuthenticateRequest(r, nil)
+	assert.NoError(t, err)
 
 	assert.Equal(t, "the-shared-key", r.header.Get("x-api-token"))
 }
@@ -59,7 +62,8 @@ func TestBearerTokenAuth(t *testing.T) {
 	r, _ := newRequest("GET", "/", nil)
 
 	writer := BearerToken("the-shared-token")
-	writer.AuthenticateRequest(r, nil)
+	err := writer.AuthenticateRequest(r, nil)
+	assert.NoError(t, err)
 
 	assert.Equal(t, "Bearer the-shared-token", r.header.Get("Authorization"))
 }