cleanup

Author: yesoreyeram

clientcredentials/clientcredentials.go

@@ -126,9 +126,7 @@ func (c *tokenSource) Token() (*oauth2.Token, error) {
 		RefreshToken: tk.RefreshToken,
 		Expiry:       tk.Expiry,
 	}
-	if c.conf != nil {
-		t.CustomTokenHeaderKey = c.conf.CustomTokenHeaderKey
-		t.CustomTokenPrefix = c.conf.CustomTokenPrefix
-	}
+	t.CustomTokenHeaderKey = c.conf.CustomTokenHeaderKey
+	t.CustomTokenPrefix = c.conf.CustomTokenPrefix
 	return t.WithExtra(tk.Raw), nil
 }

jwt/jwt.go

@@ -187,9 +187,7 @@ func (js jwtSource) Token() (*oauth2.Token, error) {
 		}
 		token.AccessToken = tokenRes.IDToken
 	}
-	if js.conf != nil {
-		token.CustomTokenHeaderKey = js.conf.CustomTokenHeaderKey
-		token.CustomTokenPrefix = js.conf.CustomTokenPrefix
-	}
+	token.CustomTokenHeaderKey = js.conf.CustomTokenHeaderKey
+	token.CustomTokenPrefix = js.conf.CustomTokenPrefix
 	return token, nil
 }

token.go

@@ -102,11 +102,11 @@ func (t *Token) SetAuthHeader(r *http.Request) {
 	if strings.TrimSpace(t.CustomTokenHeaderKey) != "" {
 		headerKey = t.CustomTokenHeaderKey
 	}
-	headerValue := strings.TrimSpace(strings.Join([]string{t.Type(), t.AccessToken}, " "))
+	headerValue := t.Type() + " " + t.AccessToken
 	if t.CustomTokenPrefix != "" {
-		headerValue = strings.TrimSpace(strings.Join([]string{t.CustomTokenPrefix, headerValue}, ""))
+		headerValue = t.CustomTokenPrefix + t.AccessToken
 	}
-	r.Header.Set(headerKey, headerValue)
+	r.Header.Set(headerKey, strings.TrimSpace(headerValue))
 }
 
 // WithExtra returns a new Token that's a clone of t, but using the