oss/miniflux-v2
oss/miniflux-v2
1
0
Fork 0
mirror of https://github.com/miniflux/v2.git synced 2025-09-15 18:57:04 +00:00
Code Wiki Activity

Consider base path when generating third-party services API endpoint

Browse source
This commit is contained in:
Frédéric Guillot 2023-08-12 19:01:22 -07:00
parent fb8737e330
commit 13d9d86acd
9 changed files with 87 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

9
internal/integration/wallabag/wallabag.go
View file

@ -10,6 +10,7 @@ import (
"net/url"
"miniflux.app/v2/internal/http/client"
internal_url "miniflux.app/v2/internal/url"
)
// Client represents a Wallabag client.
@ -43,9 +44,9 @@ func (c *Client) AddEntry(link, title, content string) error {
}
func (c *Client) createEntry(accessToken, link, title, content string) error {
endpoint, err := url.JoinPath(c.baseURL, "/api/entries.json")
endpoint, err := internal_url.JoinBaseURLAndPath(c.baseURL, "/api/entries.json")
if err != nil {
return fmt.Errorf("wallbag: unable to generate entries endpoint using %q: %v", c.baseURL, err)
return fmt.Errorf("wallbag: unable to generate entries endpoint: %v", err)
}
data := map[string]string{"url": link, "title": title}
@ -75,9 +76,9 @@ func (c *Client) getAccessToken() (string, error) {
values.Add("username", c.username)
values.Add("password", c.password)
endpoint, err := url.JoinPath(c.baseURL, "/oauth/v2/token")
endpoint, err := internal_url.JoinBaseURLAndPath(c.baseURL, "/oauth/v2/token")
if err != nil {
return "", fmt.Errorf("wallbag: unable to generate token endpoint using %q: %v", c.baseURL, err)
return "", fmt.Errorf("wallbag: unable to generate token endpoint: %v", err)
}
clt := client.New(endpoint)