From c1657535cc9576d6c842ed1673cd9e5b13477caf Mon Sep 17 00:00:00 2001 From: John Tiesselune Date: Sat, 2 Nov 2024 17:15:37 +0000 Subject: [PATCH] feat(integration-shiori): updated shiori API to new endpoint for login/bookmark --- internal/integration/shiori/shiori.go | 38 ++++++++++++++++++--------- 1 file changed, 26 insertions(+), 12 deletions(-) diff --git a/internal/integration/shiori/shiori.go b/internal/integration/shiori/shiori.go index 22ec9f314ee..e8b4dff7395 100644 --- a/internal/integration/shiori/shiori.go +++ b/internal/integration/shiori/shiori.go @@ -31,7 +31,7 @@ func (c *Client) CreateBookmark(entryURL, entryTitle string) error { return fmt.Errorf("shiori: missing base URL, username or password") } - sessionID, err := c.authenticate() + token, err := c.authenticate() if err != nil { return fmt.Errorf("shiori: unable to authenticate: %v", err) } @@ -44,7 +44,11 @@ func (c *Client) CreateBookmark(entryURL, entryTitle string) error { requestBody, err := json.Marshal(&addBookmarkRequest{ URL: entryURL, Title: entryTitle, + Excerpt: "", CreateArchive: true, + CreateEbook: false, + Public: 0, + Tags: make([]string, 0), }) if err != nil { @@ -58,7 +62,7 @@ func (c *Client) CreateBookmark(entryURL, entryTitle string) error { request.Header.Set("Content-Type", "application/json") request.Header.Set("User-Agent", "Miniflux/"+version.Version) - request.Header.Set("X-Session-Id", sessionID) + request.Header.Set("Authorization", "Bearer "+token) httpClient := &http.Client{Timeout: defaultClientTimeout} @@ -75,13 +79,13 @@ func (c *Client) CreateBookmark(entryURL, entryTitle string) error { return nil } -func (c *Client) authenticate() (sessionID string, err error) { - apiEndpoint, err := urllib.JoinBaseURLAndPath(c.baseURL, "/api/login") +func (c *Client) authenticate() (token string, err error) { + apiEndpoint, err := urllib.JoinBaseURLAndPath(c.baseURL, "/api/v1/auth/login") if err != nil { return "", fmt.Errorf("shiori: invalid API endpoint: %v", err) } - requestBody, err := json.Marshal(&authRequest{Username: c.username, Password: c.password}) + requestBody, err := json.Marshal(&authRequest{Username: c.username, Password: c.password, RememberMe: false}) if err != nil { return "", fmt.Errorf("shiori: unable to encode request body: %v", err) } @@ -111,21 +115,31 @@ func (c *Client) authenticate() (sessionID string, err error) { if err := json.NewDecoder(response.Body).Decode(&authResponse); err != nil { return "", fmt.Errorf("shiori: unable to decode response: %v", err) } - - return authResponse.SessionID, nil + return authResponse.Message.Token, nil } type authRequest struct { - Username string `json:"username"` - Password string `json:"password"` + Username string `json:"username"` + Password string `json:"password"` + RememberMe bool `json:"remember_me"` } type authResponse struct { + OK bool `json:"ok"` + Message authResponseMessage `json:"message"` +} + +type authResponseMessage struct { SessionID string `json:"session"` + Token string `json:"token"` } type addBookmarkRequest struct { - URL string `json:"url"` - Title string `json:"title"` - CreateArchive bool `json:"createArchive"` + URL string `json:"url"` + Title string `json:"title"` + CreateArchive bool `json:"create_archive"` + CreateEbook bool `json:"create_ebook"` + Public int `json:"public"` + Excerpt string `json:"excerpt"` + Tags []string `json:"tags"` }