Compare commits

..

1 Commits

Author SHA1 Message Date
5e3b6cc332 Added baseURL prefix 2025-11-16 14:23:49 +01:00
2 changed files with 6 additions and 8 deletions

View File

@@ -19,14 +19,12 @@ func NewHttpClient(baseURL string) *HttpClient {
func (c *HttpClient) SendGet(url string, data, out any) error { func (c *HttpClient) SendGet(url string, data, out any) error {
fmt.Printf("Sending req to: %s%s\n", c.baseURL, url) fmt.Printf("Sending req to: %s%s\n", c.baseURL, url)
res, err := c.sendRequest(url, http.MethodGet, data) res, err := c.sendRequest(c.baseURL, url, http.MethodGet, data)
if err != nil { if err != nil {
return err return err
} }
decoder := json.NewDecoder(res.Body) decoder := json.NewDecoder(res.Body)
defer res.Body.Close()
err = decoder.Decode(&out) err = decoder.Decode(&out)
if err != nil { if err != nil {
return err return err
@@ -36,14 +34,12 @@ func (c *HttpClient) SendGet(url string, data, out any) error {
} }
func (c *HttpClient) SendPost(url string, data, out any) (any, error) { func (c *HttpClient) SendPost(url string, data, out any) (any, error) {
res, err := c.sendRequest(url, http.MethodPost, data) res, err := c.sendRequest(c.baseURL, url, http.MethodPost, data)
if err != nil { if err != nil {
return nil, err return nil, err
} }
decoder := json.NewDecoder(res.Body) decoder := json.NewDecoder(res.Body)
defer res.Body.Close()
err = decoder.Decode(out) err = decoder.Decode(out)
if err != nil { if err != nil {
return nil, err return nil, err
@@ -52,8 +48,8 @@ func (c *HttpClient) SendPost(url string, data, out any) (any, error) {
return out, nil return out, nil
} }
func (c *HttpClient) sendRequest(url, method string, data any) (*http.Response, error) { func (c *HttpClient) sendRequest(baseURL, actionURL, method string, data any) (*http.Response, error) {
apiUrl := c.baseURL + url apiUrl := baseURL + actionURL
tr := &http.Transport{ tr := &http.Transport{
TLSClientConfig: &tls.Config{InsecureSkipVerify: true}, // FIXME dev mode TLSClientConfig: &tls.Config{InsecureSkipVerify: true}, // FIXME dev mode
@@ -78,6 +74,7 @@ func (c *HttpClient) sendRequest(url, method string, data any) (*http.Response,
if err != nil { if err != nil {
return nil, err return nil, err
} }
defer res.Body.Close()
return res, nil return res, nil
} }

View File

@@ -17,6 +17,7 @@ func (a *IdentityAPI) CheckAccess(url, srv string) (*identity.CheckAccessRespons
req := &identity.CheckAccessRequestDTO{URL: url, Service: srv} req := &identity.CheckAccessRequestDTO{URL: url, Service: srv}
res := new(identity.CheckAccessResponseDTO) res := new(identity.CheckAccessResponseDTO)
// targetURL := fmt.Sprintf("/v1/access?url=%s&srv=%s", url, srv)
if err := a.httpClient.SendGet("/v1/access", req, res); err != nil { if err := a.httpClient.SendGet("/v1/access", req, res); err != nil {
return nil, err return nil, err
} }