Refactor HTTP context handling

1 files changed, 5 insertions, 7 deletions

diff --git a/ui/session_list.go b/ui/session_list.go
index 3cb8d94..3f5bf9e 100644
--- a/ui/session_list.go
+++ b/ui/session_list.go
@@ -7,20 +7,18 @@ package ui  // import "miniflux.app/ui"
 import (
 	"net/http"
 
+	"miniflux.app/http/request"
 	"miniflux.app/ui/session"
 	"miniflux.app/ui/view"
-
-	"miniflux.app/http/context"
 	"miniflux.app/http/response/html"
 )
 
 // ShowSessions shows the list of active user sessions.
 func (c *Controller) ShowSessions(w http.ResponseWriter, r *http.Request) {
-	ctx := context.New(r)
-	sess := session.New(c.store, ctx)
-	view := view.New(c.tpl, ctx, sess)
+	sess := session.New(c.store, request.SessionID(r))
+	view := view.New(c.tpl, r, sess)
 
-	user, err := c.store.UserByID(ctx.UserID())
+	user, err := c.store.UserByID(request.UserID(r))
 	if err != nil {
 		html.ServerError(w, err)
 		return
@@ -34,7 +32,7 @@ func (c *Controller) ShowSessions(w http.ResponseWriter, r *http.Request) {
 
 	sessions.UseTimezone(user.Timezone)
 
-	view.Set("currentSessionToken", ctx.UserSessionToken())
+	view.Set("currentSessionToken", request.UserSessionToken(r))
 	view.Set("sessions", sessions)
 	view.Set("menu", "settings")
 	view.Set("user", user)