Refactor API key header handling and update status codes.

Replaced `httputilsserver.XApiKey` with `api_context.XApiKey` for consistency across modules. Adjusted expected HTTP status in `cmd/stream/main.go` to `http.StatusOK`. Cleaned up redundant module entries in `go.mod` and `go.sum`.

Author: eliasmeireles

cmd/cli/connect/get_peer.go

@@ -1,8 +1,8 @@
 package connect
 
 import (
+	"github.com/softwareplace/http-utils/api_context"
 	"github.com/softwareplace/http-utils/request"
-	httputilsserver "github.com/softwareplace/http-utils/server"
 	"github.com/softwareplace/wireguard-api/cmd/cli/spec"
 	"github.com/softwareplace/wireguard-api/pkg/models"
 	"log"
@@ -14,7 +14,7 @@ func GetPeer(profile *spec.Profile, server *spec.Server) models.Peer {
 
 	apiConfig := request.Build(server.Host).
 		WithPath("/peers").
-		WithHeader(httputilsserver.XApiKey, server.ApiKey).
+		WithHeader(api_context.XApiKey, server.ApiKey).
 		WithHeader("Authorization", profile.AuthorizationKey).
 		WithExpectedStatusCode(http.StatusOK)
 

cmd/cli/connect/login.go

@@ -2,8 +2,8 @@ package connect
 
 import (
 	"fmt"
+	"github.com/softwareplace/http-utils/api_context"
 	"github.com/softwareplace/http-utils/request"
-	httputilsserver "github.com/softwareplace/http-utils/server"
 	"github.com/softwareplace/wireguard-api/cmd/cli/shared"
 	"github.com/softwareplace/wireguard-api/cmd/cli/spec"
 	"github.com/softwareplace/wireguard-api/pkg/utils/sec"
@@ -76,7 +76,7 @@ func Login(args *shared.Args, profile *spec.Profile, server spec.Server) {
 	config := request.Build(server.Host).
 		WithPath("/login").
 		WithBody(reqBody).
-		WithHeader(httputilsserver.XApiKey, server.ApiKey).
+		WithHeader(api_context.XApiKey, server.ApiKey).
 		WithExpectedStatusCode(http.StatusOK)
 
 	loginResp, err := api.Post(config)

cmd/stream/main.go

@@ -53,7 +53,7 @@ func main() {
 		WithHeader("Authorization", streamEnv.Authorization).
 		WithHeader(api_context.XApiKey, streamEnv.ApiKey).
 		WithBody(dump).
-		WithExpectedStatusCode(http.StatusCreated)
+		WithExpectedStatusCode(http.StatusOK)
 
 	_, err = api.Post(config)
 	if err != nil {

go.mod

@@ -5,9 +5,9 @@ go 1.23
 toolchain go1.23.4
 
 require (
-	github.com/softwareplace/http-utils v0.0.0-20250118003817-f2b4ec9b8676
 	github.com/atotto/clipboard v0.1.4
 	github.com/google/uuid v1.6.0
+	github.com/softwareplace/http-utils v0.0.0-20250118003817-f2b4ec9b8676
 	go.mongodb.org/mongo-driver v1.17.2
 	golang.org/x/crypto v0.32.0
 	gopkg.in/yaml.v3 v3.0.1

go.sum

@@ -16,16 +16,6 @@ github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IX
 github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0=
 github.com/montanaflynn/stats v0.7.1 h1:etflOAAHORrCC44V+aR6Ftzort912ZU+YLiSTuV8eaE=
 github.com/montanaflynn/stats v0.7.1/go.mod h1:etXPPgVO6n31NxCd9KQUMvCM+ve0ruNzt6R8Bnaayow=
-github.com/softwareplace/http-utils v0.0.0-20250116230044-ed510c97fc93 h1:ozum1P9qUdOMrItHokPNVHbOHZNObM2s2fYBWo3bxe0=
-github.com/softwareplace/http-utils v0.0.0-20250116230044-ed510c97fc93/go.mod h1:GhSRH3bwg1iK6CZl3IwjPol9t+QctcPrVPc3mvZmQ7Q=
-github.com/softwareplace/http-utils v0.0.0-20250116232827-e496aa73762e h1:PngEYXx329HwewdTbn/g0iKcozTlvR0Y61a+1Q2fYtE=
-github.com/softwareplace/http-utils v0.0.0-20250116232827-e496aa73762e/go.mod h1:GhSRH3bwg1iK6CZl3IwjPol9t+QctcPrVPc3mvZmQ7Q=
-github.com/softwareplace/http-utils v0.0.0-20250117012334-addd8fbd1220 h1:4CYLGGScSzkWEnV5rxbgGmEWpYcPwgpXb958LnXp3+g=
-github.com/softwareplace/http-utils v0.0.0-20250117012334-addd8fbd1220/go.mod h1:GhSRH3bwg1iK6CZl3IwjPol9t+QctcPrVPc3mvZmQ7Q=
-github.com/softwareplace/http-utils v0.0.0-20250117224835-13ee112340a6 h1:uxMnbpDzjwnTeJNT9W5NZzkbITRG1CzS5BbkLMD39k0=
-github.com/softwareplace/http-utils v0.0.0-20250117224835-13ee112340a6/go.mod h1:5o/vgMsC67X2DChcdR76qm8yyjkIKmSFHudNeaK060U=
-github.com/softwareplace/http-utils v0.0.0-20250117231145-c67f294855cd h1:NTHsh5xr4DlIGwaNrEuq7vREYryGPZol7qFYsQgPl8s=
-github.com/softwareplace/http-utils v0.0.0-20250117231145-c67f294855cd/go.mod h1:5o/vgMsC67X2DChcdR76qm8yyjkIKmSFHudNeaK060U=
 github.com/softwareplace/http-utils v0.0.0-20250118003817-f2b4ec9b8676 h1:pTZv6az0E/CQBbVXUROyWQjdaFyamMMkz2YYvRf9CmI=
 github.com/softwareplace/http-utils v0.0.0-20250118003817-f2b4ec9b8676/go.mod h1:5o/vgMsC67X2DChcdR76qm8yyjkIKmSFHudNeaK060U=
 github.com/xdg-go/pbkdf2 v1.0.0 h1:Su7DPu48wXMwC3bs7MCNG+z4FhcyEuz5dlvchbq0B0c=