diff options
author | Frédéric Guillot <fred@miniflux.net> | 2018-04-29 16:35:04 -0700 |
---|---|---|
committer | Frédéric Guillot <fred@miniflux.net> | 2018-04-29 16:35:04 -0700 |
commit | f49b42f70f902d4da1e0fa4080e99164b331b716 (patch) | |
tree | c6bdd19f11d100c44b0d30344ec37038f649e988 /api/feed.go | |
parent | 1eba1730d1af50ed545f4fde78b22d6fb62ca11e (diff) |
Use vanilla HTTP handlers (refactoring)
Diffstat (limited to 'api/feed.go')
-rw-r--r-- | api/feed.go | 119 |
1 files changed, 64 insertions, 55 deletions
diff --git a/api/feed.go b/api/feed.go index 16e3d7d..72eaa41 100644 --- a/api/feed.go +++ b/api/feed.go @@ -6,44 +6,49 @@ package api import ( "errors" + "net/http" + "github.com/miniflux/miniflux/http/context" + "github.com/miniflux/miniflux/http/request" + "github.com/miniflux/miniflux/http/response/json" + "github.com/miniflux/miniflux/http/response/xml" "github.com/miniflux/miniflux/reader/opml" - - "github.com/miniflux/miniflux/http/handler" ) // CreateFeed is the API handler to create a new feed. -func (c *Controller) CreateFeed(ctx *handler.Context, request *handler.Request, response *handler.Response) { - userID := ctx.UserID() - feedURL, categoryID, err := decodeFeedCreationPayload(request.Body()) +func (c *Controller) CreateFeed(w http.ResponseWriter, r *http.Request) { + feedURL, categoryID, err := decodeFeedCreationPayload(r.Body) if err != nil { - response.JSON().BadRequest(err) + json.BadRequest(w, err) return } if feedURL == "" { - response.JSON().BadRequest(errors.New("The feed_url is required")) + json.BadRequest(w, errors.New("The feed_url is required")) return } if categoryID <= 0 { - response.JSON().BadRequest(errors.New("The category_id is required")) + json.BadRequest(w, errors.New("The category_id is required")) return } + ctx := context.New(r) + userID := ctx.UserID() + if c.store.FeedURLExists(userID, feedURL) { - response.JSON().BadRequest(errors.New("This feed_url already exists")) + json.BadRequest(w, errors.New("This feed_url already exists")) return } if !c.store.CategoryExists(userID, categoryID) { - response.JSON().BadRequest(errors.New("This category_id doesn't exists or doesn't belongs to this user")) + json.BadRequest(w, errors.New("This category_id doesn't exists or doesn't belongs to this user")) return } feed, err := c.feedHandler.CreateFeed(userID, categoryID, feedURL, false) if err != nil { - response.JSON().ServerError(errors.New("Unable to create this feed")) + json.ServerError(w, errors.New("Unable to create this feed")) return } @@ -51,142 +56,146 @@ func (c *Controller) CreateFeed(ctx *handler.Context, request *handler.Request, FeedID int64 `json:"feed_id"` } - response.JSON().Created(&result{FeedID: feed.ID}) + json.Created(w, &result{FeedID: feed.ID}) } // RefreshFeed is the API handler to refresh a feed. -func (c *Controller) RefreshFeed(ctx *handler.Context, request *handler.Request, response *handler.Response) { - userID := ctx.UserID() - feedID, err := request.IntegerParam("feedID") +func (c *Controller) RefreshFeed(w http.ResponseWriter, r *http.Request) { + feedID, err := request.IntParam(r, "feedID") if err != nil { - response.JSON().BadRequest(err) + json.BadRequest(w, err) return } + ctx := context.New(r) + userID := ctx.UserID() + if !c.store.FeedExists(userID, feedID) { - response.JSON().NotFound(errors.New("Unable to find this feed")) + json.NotFound(w, errors.New("Unable to find this feed")) return } err = c.feedHandler.RefreshFeed(userID, feedID) if err != nil { - response.JSON().ServerError(errors.New("Unable to refresh this feed")) + json.ServerError(w, errors.New("Unable to refresh this feed")) return } - response.JSON().NoContent() + json.NoContent(w) } // UpdateFeed is the API handler that is used to update a feed. -func (c *Controller) UpdateFeed(ctx *handler.Context, request *handler.Request, response *handler.Response) { - userID := ctx.UserID() - feedID, err := request.IntegerParam("feedID") +func (c *Controller) UpdateFeed(w http.ResponseWriter, r *http.Request) { + feedID, err := request.IntParam(r, "feedID") if err != nil { - response.JSON().BadRequest(err) + json.BadRequest(w, err) return } - newFeed, err := decodeFeedModificationPayload(request.Body()) + newFeed, err := decodeFeedModificationPayload(r.Body) if err != nil { - response.JSON().BadRequest(err) + json.BadRequest(w, err) return } + ctx := context.New(r) + userID := ctx.UserID() + if newFeed.Category != nil && newFeed.Category.ID != 0 && !c.store.CategoryExists(userID, newFeed.Category.ID) { - response.JSON().BadRequest(errors.New("This category_id doesn't exists or doesn't belongs to this user")) + json.BadRequest(w, errors.New("This category_id doesn't exists or doesn't belongs to this user")) return } originalFeed, err := c.store.FeedByID(userID, feedID) if err != nil { - response.JSON().NotFound(errors.New("Unable to find this feed")) + json.NotFound(w, errors.New("Unable to find this feed")) return } if originalFeed == nil { - response.JSON().NotFound(errors.New("Feed not found")) + json.NotFound(w, errors.New("Feed not found")) return } originalFeed.Merge(newFeed) if err := c.store.UpdateFeed(originalFeed); err != nil { - response.JSON().ServerError(errors.New("Unable to update this feed")) + json.ServerError(w, errors.New("Unable to update this feed")) return } originalFeed, err = c.store.FeedByID(userID, feedID) if err != nil { - response.JSON().ServerError(errors.New("Unable to fetch this feed")) + json.ServerError(w, errors.New("Unable to fetch this feed")) return } - response.JSON().Created(originalFeed) + json.Created(w, originalFeed) } // GetFeeds is the API handler that get all feeds that belongs to the given user. -func (c *Controller) GetFeeds(ctx *handler.Context, request *handler.Request, response *handler.Response) { - feeds, err := c.store.Feeds(ctx.UserID()) +func (c *Controller) GetFeeds(w http.ResponseWriter, r *http.Request) { + feeds, err := c.store.Feeds(context.New(r).UserID()) if err != nil { - response.JSON().ServerError(errors.New("Unable to fetch feeds from the database")) + json.ServerError(w, errors.New("Unable to fetch feeds from the database")) return } - response.JSON().Standard(feeds) + json.OK(w, feeds) } // Export is the API handler that incoves an OPML export. -func (c *Controller) Export(ctx *handler.Context, request *handler.Request, response *handler.Response) { +func (c *Controller) Export(w http.ResponseWriter, r *http.Request) { opmlHandler := opml.NewHandler(c.store) - - opml, err := opmlHandler.Export(ctx.LoggedUser().ID) + opml, err := opmlHandler.Export(context.New(r).UserID()) if err != nil { - response.JSON().ServerError(errors.New("unable to export feeds to OPML")) + json.ServerError(w, errors.New("unable to export feeds to OPML")) } - response.XML().Serve(opml) + xml.OK(w, opml) } // GetFeed is the API handler to get a feed. -func (c *Controller) GetFeed(ctx *handler.Context, request *handler.Request, response *handler.Response) { - userID := ctx.UserID() - feedID, err := request.IntegerParam("feedID") +func (c *Controller) GetFeed(w http.ResponseWriter, r *http.Request) { + feedID, err := request.IntParam(r, "feedID") if err != nil { - response.JSON().BadRequest(err) + json.BadRequest(w, err) return } - feed, err := c.store.FeedByID(userID, feedID) + feed, err := c.store.FeedByID(context.New(r).UserID(), feedID) if err != nil { - response.JSON().ServerError(errors.New("Unable to fetch this feed")) + json.ServerError(w, errors.New("Unable to fetch this feed")) return } if feed == nil { - response.JSON().NotFound(errors.New("Feed not found")) + json.NotFound(w, errors.New("Feed not found")) return } - response.JSON().Standard(feed) + json.OK(w, feed) } // RemoveFeed is the API handler to remove a feed. -func (c *Controller) RemoveFeed(ctx *handler.Context, request *handler.Request, response *handler.Response) { - userID := ctx.UserID() - feedID, err := request.IntegerParam("feedID") +func (c *Controller) RemoveFeed(w http.ResponseWriter, r *http.Request) { + feedID, err := request.IntParam(r, "feedID") if err != nil { - response.JSON().BadRequest(err) + json.BadRequest(w, err) return } + ctx := context.New(r) + userID := ctx.UserID() + if !c.store.FeedExists(userID, feedID) { - response.JSON().NotFound(errors.New("Feed not found")) + json.NotFound(w, errors.New("Feed not found")) return } if err := c.store.RemoveFeed(userID, feedID); err != nil { - response.JSON().ServerError(errors.New("Unable to remove this feed")) + json.ServerError(w, errors.New("Unable to remove this feed")) return } - response.JSON().NoContent() + json.NoContent(w) } |