service client: add no auth request and rework PricePlans method

Author: MurashovVen

pkg/v2/client.go

@@ -94,6 +94,49 @@ type RequestHeader struct {
 	Value string
 }
 
+// DoRequestWithoutAuth performs the HTTP request with the current ServiceClient's HTTPClient.
+// Authentication and optional headers will be added automatically.
+//
+//nolint:bodyclose
+func (client *ServiceClient) DoRequestWithoutAuth(
+	ctx context.Context, method, path string, body io.Reader, headers ...*RequestHeader,
+) (*ResponseResult, error) {
+	// Prepare an HTTP request with the provided context.
+	request, err := http.NewRequestWithContext(ctx, method, path, body)
+	if err != nil {
+		return nil, err
+	}
+
+	request.Header.Set("User-Agent", client.userAgent)
+	if body != nil {
+		request.Header.Set("Content-Type", "application/json")
+	}
+
+	for _, header := range headers {
+		request.Header.Set(header.Key, header.Value)
+	}
+
+	// Send the HTTP request and populate the ResponseResult.
+	response, err := client.HTTPClient.Do(request)
+	if err != nil {
+		return nil, err
+	}
+
+	responseResult := &ResponseResult{
+		Response: response,
+	}
+
+	// Check status code and populate custom error body with extended error message if it's possible.
+	if response.StatusCode >= http.StatusBadRequest {
+		err = responseResult.extractErr()
+	}
+	if err != nil {
+		return nil, err
+	}
+
+	return responseResult, nil
+}
+
 // DoRequest performs the HTTP request with the current ServiceClient's HTTPClient.
 // Authentication and optional headers will be added automatically.
 //

pkg/v2/price_plan.go

@@ -25,8 +25,18 @@ func (p PricePlans) FindOneByName(name string) *PricePlan {
 	return nil
 }
 
+func (p PricePlans) FindOneID(id string) *PricePlan {
+	for _, pp := range p {
+		if pp.UUID == id {
+			return pp
+		}
+	}
+
+	return nil
+}
+
 func (client *ServiceClient) PricePlans(ctx context.Context) (PricePlans, *ResponseResult, error) {
-	url := fmt.Sprintf("%s/plan", client.Endpoint)
+	url := fmt.Sprintf("%s/pub/plan", client.Endpoint)
 
 	headers := []*RequestHeader{
 		{
@@ -35,7 +45,7 @@ func (client *ServiceClient) PricePlans(ctx context.Context) (PricePlans, *Respo
 		},
 	}
 
-	responseResult, err := client.DoRequest(ctx, http.MethodGet, url, nil, headers...)
+	responseResult, err := client.DoRequestWithoutAuth(ctx, http.MethodGet, url, nil, headers...)
 	if err != nil {
 		return nil, nil, err
 	}