clean

api/rest/http.go

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

api/rest/identity.go

@@ -17,7 +17,6 @@ func (a *IdentityAPI) CheckAccess(url, srv string) (*identity.CheckAccessRespons
 	req := &identity.CheckAccessRequestDTO{URL: url, Service: srv}
 	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 {
 		return nil, err
 	}