From 5a69a61d4841a35d7ddcb761a688db8c688314d6 Mon Sep 17 00:00:00 2001 From: Frédéric Guillot Date: Sun, 11 Nov 2018 11:28:29 -0800 Subject: Move UI middlewares and routes to ui package --- ui/logout.go | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'ui/logout.go') diff --git a/ui/logout.go b/ui/logout.go index 59f8af2..ecb08b9 100644 --- a/ui/logout.go +++ b/ui/logout.go @@ -15,10 +15,9 @@ import ( "miniflux.app/ui/session" ) -// Logout destroy the session and redirects the user to the login page. -func (c *Controller) Logout(w http.ResponseWriter, r *http.Request) { - sess := session.New(c.store, request.SessionID(r)) - user, err := c.store.UserByID(request.UserID(r)) +func (h *handler) logout(w http.ResponseWriter, r *http.Request) { + sess := session.New(h.store, request.SessionID(r)) + user, err := h.store.UserByID(request.UserID(r)) if err != nil { html.ServerError(w, r, err) return @@ -27,15 +26,15 @@ func (c *Controller) Logout(w http.ResponseWriter, r *http.Request) { sess.SetLanguage(user.Language) sess.SetTheme(user.Theme) - if err := c.store.RemoveUserSessionByToken(user.ID, request.UserSessionToken(r)); err != nil { + if err := h.store.RemoveUserSessionByToken(user.ID, request.UserSessionToken(r)); err != nil { logger.Error("[Controller:Logout] %v", err) } http.SetCookie(w, cookie.Expired( cookie.CookieUserSessionID, - c.cfg.IsHTTPS, - c.cfg.BasePath(), + h.cfg.IsHTTPS, + h.cfg.BasePath(), )) - html.Redirect(w, r, route.Path(c.router, "login")) + html.Redirect(w, r, route.Path(h.router, "login")) } -- cgit v1.2.3