From 6fb030e9106adac0e9b901287cdff5f5cedc35e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Guillot?= Date: Thu, 17 Oct 2024 21:04:35 -0700 Subject: [PATCH] feat(api): rename integrations status endpoint --- client/client.go | 6 +++--- internal/api/api.go | 2 +- internal/api/api_integration_test.go | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/client/client.go b/client/client.go index a463b2d725a..a07c05525a1 100644 --- a/client/client.go +++ b/client/client.go @@ -185,9 +185,9 @@ func (c *Client) MarkAllAsRead(userID int64) error { return err } -// FetchIntegrationsStatus fetches the integrations status for a user. -func (c *Client) FetchIntegrationsStatus() (bool, error) { - body, err := c.request.Get("/v1/users/integrations/status") +// IntegrationsStatus fetches the integrations status for the logged user. +func (c *Client) IntegrationsStatus() (bool, error) { + body, err := c.request.Get("/v1/integrations/status") if err != nil { return false, err } diff --git a/internal/api/api.go b/internal/api/api.go index 19d5ba62d0c..c717e6cbeaa 100644 --- a/internal/api/api.go +++ b/internal/api/api.go @@ -37,7 +37,6 @@ func Serve(router *mux.Router, store *storage.Storage, pool *worker.Pool) { sr.HandleFunc("/users/{userID:[0-9]+}", handler.updateUser).Methods(http.MethodPut) sr.HandleFunc("/users/{userID:[0-9]+}", handler.removeUser).Methods(http.MethodDelete) sr.HandleFunc("/users/{userID:[0-9]+}/mark-all-as-read", handler.markUserAsRead).Methods(http.MethodPut) - sr.HandleFunc("/users/integrations/status", handler.getIntegrationsStatus).Methods(http.MethodGet) sr.HandleFunc("/users/{username}", handler.userByUsername).Methods(http.MethodGet) sr.HandleFunc("/me", handler.currentUser).Methods(http.MethodGet) sr.HandleFunc("/categories", handler.createCategory).Methods(http.MethodPost) @@ -75,6 +74,7 @@ func Serve(router *mux.Router, store *storage.Storage, pool *worker.Pool) { sr.HandleFunc("/icons/{iconID}", handler.getIconByIconID).Methods(http.MethodGet) sr.HandleFunc("/enclosures/{enclosureID}", handler.getEnclosureByID).Methods(http.MethodGet) sr.HandleFunc("/enclosures/{enclosureID}", handler.updateEnclosureByID).Methods(http.MethodPut) + sr.HandleFunc("/integrations/status", handler.getIntegrationsStatus).Methods(http.MethodGet) sr.HandleFunc("/version", handler.versionHandler).Methods(http.MethodGet) } diff --git a/internal/api/api_integration_test.go b/internal/api/api_integration_test.go index 8bbb777a495..3e0d56be377 100644 --- a/internal/api/api_integration_test.go +++ b/internal/api/api_integration_test.go @@ -2499,7 +2499,7 @@ func TestFetchIntegrationsStatusEndpoint(t *testing.T) { regularUserClient := miniflux.NewClient(testConfig.testBaseURL, regularTestUser.Username, testConfig.testRegularPassword) - hasIntegrations, err := regularUserClient.FetchIntegrationsStatus() + hasIntegrations, err := regularUserClient.IntegrationsStatus() if err != nil { t.Fatalf("Failed to fetch integrations status: %v", err) }