diff --git a/api/rest/basket.go b/api/rest/basket.go index 336efa1..808fa02 100644 --- a/api/rest/basket.go +++ b/api/rest/basket.go @@ -18,7 +18,7 @@ type BasketAPI struct { func (a *BasketAPI) GetBasket(basketID string) (*basket.GetBasketResponseDTO, error) { req := &basket.GetBasketRequestDTO{BasketID: basketID} res := new(basket.GetBasketResponseDTO) - if err := a.httpClient.SendGet("basket-svc", "/api/v1/basket", req, res); err != nil { + if err := a.httpClient.SendGet("/api/v1/basket", req, res); err != nil { return nil, err } @@ -30,7 +30,7 @@ func (a *BasketAPI) GetBasketItems(basketID string) ([]*basket.GetBasketItemsRes req := basket.GetBasketItemsRequestDTO{BasketID: basketID} var res []*basket.GetBasketItemsResponseDTO - if err := a.httpClient.SendGet("basket-svc", url, req, &res); err != nil { + if err := a.httpClient.SendGet(url, req, &res); err != nil { return nil, err } diff --git a/api/rest/http.go b/api/rest/http.go index 7feabe9..d5c802f 100644 --- a/api/rest/http.go +++ b/api/rest/http.go @@ -4,6 +4,7 @@ import ( "bytes" "crypto/tls" "encoding/json" + "fmt" "net/http" ) @@ -12,12 +13,13 @@ type HttpClient struct { userAgent string } -func NewHttpClient(apiURL string) *HttpClient { - return &HttpClient{baseURL: apiURL, userAgent: "internal-http-client"} +func NewHttpClient(baseURL string) *HttpClient { + return &HttpClient{baseURL: baseURL, userAgent: "internal-http-client"} } -func (c *HttpClient) SendGet(api, url string, data, out any) error { - res, err := c.sendRequest(api, url, http.MethodGet, data) +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(c.baseURL, url, http.MethodGet, data) if err != nil { return err } @@ -31,8 +33,8 @@ func (c *HttpClient) SendGet(api, url string, data, out any) error { return nil } -func (c *HttpClient) SendPost(api, url string, data, out any) (any, error) { - res, err := c.sendRequest(api, url, http.MethodPost, data) +func (c *HttpClient) SendPost(url string, data, out any) (any, error) { + res, err := c.sendRequest(c.baseURL, url, http.MethodPost, data) if err != nil { return nil, err } @@ -46,15 +48,15 @@ func (c *HttpClient) SendPost(api, url string, data, out any) (any, error) { return out, nil } -func (c *HttpClient) sendRequest(api, url, method string, data any) (*http.Response, error) { - apiUrl := api + url // FIXME +func (c *HttpClient) sendRequest(baseURL, actionURL, method string, data any) (*http.Response, error) { + apiUrl := baseURL + actionURL tr := &http.Transport{ - TLSClientConfig: &tls.Config{InsecureSkipVerify: true}, // FIXME + TLSClientConfig: &tls.Config{InsecureSkipVerify: true}, // FIXME dev mode } // Create an HTTP client with the custom transport - client := &http.Client{Transport: tr} // FIXME + client := &http.Client{Transport: tr} // FIXME dev mode json, err := json.Marshal(&data) if err != nil { diff --git a/api/rest/identity.go b/api/rest/identity.go index 76670fa..7bc21c5 100644 --- a/api/rest/identity.go +++ b/api/rest/identity.go @@ -18,7 +18,7 @@ func (a *IdentityAPI) CheckAccess(url, srv string) (*identity.CheckAccessRespons res := new(identity.CheckAccessResponseDTO) // targetURL := fmt.Sprintf("/v1/access?url=%s&srv=%s", url, srv) - if err := a.httpClient.SendGet("identity-svc", "/v1/access", req, res); err != nil { + if err := a.httpClient.SendGet("/v1/access", req, res); err != nil { return nil, err } diff --git a/api/rest/pricing.go b/api/rest/pricing.go index 1ae4c23..73cf8ca 100644 --- a/api/rest/pricing.go +++ b/api/rest/pricing.go @@ -18,7 +18,7 @@ type PricingAPI struct { func (a *PricingAPI) GetProductPrice(productID int) (*pricing.ProductPriceResponseDTO, error) { url := fmt.Sprintf("/api/v1/product/%d", productID) res := new(pricing.ProductPriceResponseDTO) - if err := a.httpClient.SendGet("pricing-svc", url, nil, res); err != nil { + if err := a.httpClient.SendGet(url, nil, res); err != nil { return nil, err }