Use transport.SetHeader() for the static JWT token

Author: VojtechVitek

s2s.go

@@ -16,7 +16,7 @@ import (
 type S2SClientConfig struct {
 	// JWTToken is the JWT token to use for authentication.
 	JWTToken string
-	// JWTSecret is the secret key used to create the JWT token.
+	// JWTSecret is the secret key used to dynamically create JWT token.
 	JWTSecret string
 	// Service is used in the service claim of the JWT token.
 	Service string
@@ -36,15 +36,14 @@ func S2SClient(cfg *S2SClientConfig) *http.Client {
 		Transport: transport.Chain(http.DefaultTransport,
 			traceid.Transport,
 			transport.SetHeader("User-Agent", fmt.Sprintf("sequence/%s", serviceName)),
-			transport.If(cfg.JWTSecret != "" || cfg.JWTToken != "",
+			transport.If(cfg.JWTSecret != "",
 				transport.SetHeaderFunc("Authorization", func(req *http.Request) string {
-					token := cfg.JWTToken
-					if token == "" {
-						token = S2SToken(cfg.JWTSecret, map[string]any{"service": serviceName})
-					}
-					return "BEARER " + token
+					return "BEARER " + S2SToken(cfg.JWTSecret, map[string]any{"service": serviceName})
 				}),
 			),
+			transport.If(cfg.JWTToken != "",
+				transport.SetHeader("Authorization", "BEARER "+cfg.JWTToken),
+			),
 			transport.If(cfg.AccessKey != "",
 				transport.SetHeader("X-Access-Key", cfg.AccessKey),
 			),