diff --git a/api/rest/basket.go b/api/rest/basket.go index 808fa02..0810c81 100644 --- a/api/rest/basket.go +++ b/api/rest/basket.go @@ -3,8 +3,8 @@ package api import ( "fmt" - basket "git.ego.freeddns.org/egommerce/api-entities/basket/dto" - cnf "git.ego.freeddns.org/egommerce/go-api-pkg/config" + basket "git.pbiernat.space/egommerce/api-entities/basket/dto" + cnf "git.pbiernat.space/egommerce/go-api-pkg/config" ) func NewBasketAPI() *BasketAPI { diff --git a/api/rest/http.go b/api/rest/http.go index a89449d..89b7a2b 100644 --- a/api/rest/http.go +++ b/api/rest/http.go @@ -4,7 +4,6 @@ import ( "bytes" "crypto/tls" "encoding/json" - "fmt" "net/http" ) @@ -18,26 +17,25 @@ func NewHttpClient(baseURL string) *HttpClient { } func (c *HttpClient) SendGet(url string, data, out any) error { - fmt.Printf("Sending req to: %s%s\n", c.baseURL, url) - res, err := c.sendRequest(url, http.MethodGet, data) + resp, err := c.sendRequest(url, http.MethodGet, data) if err != nil { return err } - decoder := json.NewDecoder(res.Body) - defer res.Body.Close() + decoder := json.NewDecoder(resp.Body) + defer resp.Body.Close() return decoder.Decode(&out) } func (c *HttpClient) SendPost(url string, data, out any) error { - res, err := c.sendRequest(url, http.MethodPost, data) + resp, err := c.sendRequest(url, http.MethodPost, data) if err != nil { return err } - decoder := json.NewDecoder(res.Body) - defer res.Body.Close() + decoder := json.NewDecoder(resp.Body) + defer resp.Body.Close() return decoder.Decode(&out) } @@ -49,7 +47,6 @@ func (c *HttpClient) sendRequest(url, method string, data any) (*http.Response, TLSClientConfig: &tls.Config{InsecureSkipVerify: true}, // FIXME dev mode } - // Create an HTTP client with the custom transport client := &http.Client{Transport: tr} // FIXME dev mode json, err := json.Marshal(&data) @@ -64,10 +61,11 @@ func (c *HttpClient) sendRequest(url, method string, data any) (*http.Response, req.Header.Set("Content-Type", "application/json") req.Header.Set("User-Agent", c.userAgent) - res, err := client.Do(req) + req.Header.Set("Authorization", "Bearer DupaToken") + resp, err := client.Do(req) if err != nil { return nil, err } - return res, nil + return resp, nil } diff --git a/api/rest/identity.go b/api/rest/identity.go index eda73e8..267f468 100644 --- a/api/rest/identity.go +++ b/api/rest/identity.go @@ -1,8 +1,8 @@ package api import ( - identity "git.ego.freeddns.org/egommerce/api-entities/identity/dto" - cnf "git.ego.freeddns.org/egommerce/go-api-pkg/config" + identity "git.pbiernat.space/egommerce/api-entities/identity/dto" + cnf "git.pbiernat.space/egommerce/go-api-pkg/config" ) type IdentityAPI struct { diff --git a/api/rest/pricing.go b/api/rest/pricing.go index 73cf8ca..4081b92 100644 --- a/api/rest/pricing.go +++ b/api/rest/pricing.go @@ -3,8 +3,8 @@ package api import ( "fmt" - pricing "git.ego.freeddns.org/egommerce/api-entities/pricing/dto" - cnf "git.ego.freeddns.org/egommerce/go-api-pkg/config" + pricing "git.pbiernat.space/egommerce/api-entities/pricing/dto" + cnf "git.pbiernat.space/egommerce/go-api-pkg/config" ) func NewPricingAPI() *PricingAPI { diff --git a/go.mod b/go.mod index 2eb1c8e..be6f603 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module git.ego.freeddns.org/egommerce/go-api-pkg +module git.pbiernat.space/egommerce/go-api-pkg go 1.24 @@ -10,7 +10,7 @@ require ( ) require ( - git.ego.freeddns.org/egommerce/api-entities v0.3.50 + git.pbiernat.space/egommerce/api-entities v0.3.50 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/jackc/pgx/v5 v5.7.6 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect diff --git a/go.sum b/go.sum index 039ca4a..bd62731 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,5 @@ -git.ego.freeddns.org/egommerce/api-entities v0.3.50 h1:3BYB+0gGSkXf4JlcYQtlLhe3goL5aL8A9M54LlzdlfM= -git.ego.freeddns.org/egommerce/api-entities v0.3.50/go.mod h1:D58YWJz0jvARi/7pNpDMzp00nfk9YLOj9zjcKRDHBhY= +git.pbiernat.space/egommerce/api-entities v0.3.50 h1:3BYB+0gGSkXf4JlcYQtlLhe3goL5aL8A9M54LlzdlfM= +git.pbiernat.space/egommerce/api-entities v0.3.50/go.mod h1:D58YWJz0jvARi/7pNpDMzp00nfk9YLOj9zjcKRDHBhY= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=