Use stdlib HTTP client for third-party integrations

internal/integration/nunuxkeeper/nunuxkeeper.go

@@ -4,42 +4,30 @@
 package nunuxkeeper // import "miniflux.app/v2/internal/integration/nunuxkeeper"
 
 import (
+	"bytes"
+	"encoding/json"
 	"fmt"
+	"net/http"
+	"time"
 
-	"miniflux.app/v2/internal/http/client"
 	"miniflux.app/v2/internal/urllib"
+	"miniflux.app/v2/internal/version"
 )
 
-// Document structure of a Nununx Keeper document
-type Document struct {
-	Title       string `json:"title,omitempty"`
-	Origin      string `json:"origin,omitempty"`
-	Content     string `json:"content,omitempty"`
-	ContentType string `json:"contentType,omitempty"`
-}
+const defaultClientTimeout = 10 * time.Second
 
-// Client represents an Nunux Keeper client.
 type Client struct {
 	baseURL string
 	apiKey  string
 }
 
-// NewClient returns a new Nunux Keeepr client.
 func NewClient(baseURL, apiKey string) *Client {
 	return &Client{baseURL: baseURL, apiKey: apiKey}
 }
 
-// AddEntry sends an entry to Nunux Keeper.
-func (c *Client) AddEntry(link, title, content string) error {
+func (c *Client) AddEntry(entryURL, entryTitle, entryContent string) error {
 	if c.baseURL == "" || c.apiKey == "" {
-		return fmt.Errorf("nunux-keeper: missing credentials")
-	}
-
-	doc := &Document{
-		Title:       title,
-		Origin:      link,
-		Content:     content,
-		ContentType: "text/html",
+		return fmt.Errorf("nunux-keeper: missing base URL or API key")
 	}
 
 	apiEndpoint, err := urllib.JoinBaseURLAndPath(c.baseURL, "/v2/documents")
@@ -47,16 +35,42 @@ func (c *Client) AddEntry(link, title, content string) error {
 		return fmt.Errorf(`nunux-keeper: invalid API endpoint: %v`, err)
 	}
 
-	clt := client.New(apiEndpoint)
-	clt.WithCredentials("api", c.apiKey)
-	response, err := clt.PostJSON(doc)
+	requestBody, err := json.Marshal(&nunuxKeeperDocument{
+		Title:       entryTitle,
+		Origin:      entryURL,
+		Content:     entryContent,
+		ContentType: "text/html",
+	})
 	if err != nil {
-		return fmt.Errorf("nunux-keeper: unable to send entry: %v", err)
+		return fmt.Errorf("notion: unable to encode request body: %v", err)
 	}
 
-	if response.HasServerFailure() {
-		return fmt.Errorf("nunux-keeper: unable to send entry, status=%d", response.StatusCode)
+	request, err := http.NewRequest(http.MethodPost, apiEndpoint, bytes.NewReader(requestBody))
+	if err != nil {
+		return fmt.Errorf("nunux-keeper: unable to create request: %v", err)
+	}
+
+	request.SetBasicAuth("api", c.apiKey)
+	request.Header.Set("Content-Type", "application/json")
+	request.Header.Set("User-Agent", "Miniflux/"+version.Version)
+
+	httpClient := &http.Client{Timeout: defaultClientTimeout}
+	response, err := httpClient.Do(request)
+	if err != nil {
+		return fmt.Errorf("nunux-keeper: unable to send request: %v", err)
+	}
+	defer response.Body.Close()
+
+	if response.StatusCode != http.StatusOK {
+		return fmt.Errorf("nunux-keeper: unable to create document: url=%s status=%d", apiEndpoint, response.StatusCode)
 	}
 
 	return nil
 }
+
+type nunuxKeeperDocument struct {
+	Title       string `json:"title,omitempty"`
+	Origin      string `json:"origin,omitempty"`
+	Content     string `json:"content,omitempty"`
+	ContentType string `json:"contentType,omitempty"`
+}