Refactor HTTP context handling

1 files changed, 9 insertions, 12 deletions

diff --git a/ui/integration_pocket.go b/ui/integration_pocket.go
index 62d3ddc..cce83b3 100644
--- a/ui/integration_pocket.go
+++ b/ui/integration_pocket.go
@@ -7,8 +7,8 @@ package ui  // import "miniflux.app/ui"
 import (
 	"net/http"
 
-	"miniflux.app/http/context"
 	"miniflux.app/http/response"
+	"miniflux.app/http/request"
 	"miniflux.app/http/response/html"
 	"miniflux.app/http/route"
 	"miniflux.app/integration/pocket"
@@ -18,9 +18,7 @@ import (
 
 // PocketAuthorize redirects the end-user to Pocket website to authorize the application.
 func (c *Controller) PocketAuthorize(w http.ResponseWriter, r *http.Request) {
-	ctx := context.New(r)
-
-	user, err := c.store.UserByID(ctx.UserID())
+	user, err := c.store.UserByID(request.UserID(r))
 	if err != nil {
 		html.ServerError(w, err)
 		return
@@ -32,13 +30,13 @@ func (c *Controller) PocketAuthorize(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	sess := session.New(c.store, ctx)
+	sess := session.New(c.store, request.SessionID(r))
 	connector := pocket.NewConnector(c.cfg.PocketConsumerKey(integration.PocketConsumerKey))
 	redirectURL := c.cfg.BaseURL() + route.Path(c.router, "pocketCallback")
 	requestToken, err := connector.RequestToken(redirectURL)
 	if err != nil {
 		logger.Error("[Pocket:Authorize] %v", err)
-		sess.NewFlashErrorMessage(c.translator.GetLanguage(ctx.UserLanguage()).Get("Unable to fetch request token from Pocket!"))
+		sess.NewFlashErrorMessage(c.translator.GetLanguage(request.UserLanguage(r)).Get("Unable to fetch request token from Pocket!"))
 		response.Redirect(w, r, route.Path(c.router, "integrations"))
 		return
 	}
@@ -49,10 +47,9 @@ func (c *Controller) PocketAuthorize(w http.ResponseWriter, r *http.Request) {
 
 // PocketCallback saves the personal access token after the authorization step.
 func (c *Controller) PocketCallback(w http.ResponseWriter, r *http.Request) {
-	ctx := context.New(r)
-	sess := session.New(c.store, ctx)
+	sess := session.New(c.store, request.SessionID(r))
 
-	user, err := c.store.UserByID(ctx.UserID())
+	user, err := c.store.UserByID(request.UserID(r))
 	if err != nil {
 		html.ServerError(w, err)
 		return
@@ -65,10 +62,10 @@ func (c *Controller) PocketCallback(w http.ResponseWriter, r *http.Request) {
 	}
 
 	connector := pocket.NewConnector(c.cfg.PocketConsumerKey(integration.PocketConsumerKey))
-	accessToken, err := connector.AccessToken(ctx.PocketRequestToken())
+	accessToken, err := connector.AccessToken(request.PocketRequestToken(r))
 	if err != nil {
 		logger.Error("[Pocket:Callback] %v", err)
-		sess.NewFlashErrorMessage(c.translator.GetLanguage(ctx.UserLanguage()).Get("Unable to fetch access token from Pocket!"))
+		sess.NewFlashErrorMessage(c.translator.GetLanguage(request.UserLanguage(r)).Get("Unable to fetch access token from Pocket!"))
 		response.Redirect(w, r, route.Path(c.router, "integrations"))
 		return
 	}
@@ -82,6 +79,6 @@ func (c *Controller) PocketCallback(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	sess.NewFlashMessage(c.translator.GetLanguage(ctx.UserLanguage()).Get("Your Pocket account is now linked!"))
+	sess.NewFlashMessage(c.translator.GetLanguage(request.UserLanguage(r)).Get("Your Pocket account is now linked!"))
 	response.Redirect(w, r, route.Path(c.router, "integrations"))
 }