oss/miniflux-v2
oss/miniflux-v2
1
0
Fork 0
mirror of https://github.com/miniflux/v2.git synced 2025-08-11 17:51:01 +00:00
Code Wiki Activity

Rename sessions table to user_sessions

Browse source
This commit is contained in:
Frédéric Guillot 2017-12-16 12:15:33 -08:00
parent 27196589fb
commit 58acd1d5e3
10 changed files with 153 additions and 147 deletions
Download patch file Download diff file Expand all files Collapse all files

4
server/middleware/session.go
View file

@ -55,13 +55,13 @@ func (s *SessionMiddleware) isPublicRoute(r *http.Request) bool {
}
}
func (s *SessionMiddleware) getSessionFromCookie(r *http.Request) *model.Session {
func (s *SessionMiddleware) getSessionFromCookie(r *http.Request) *model.UserSession {
sessionCookie, err := r.Cookie("sessionID")
if err == http.ErrNoCookie {
return nil
}
session, err := s.store.SessionByToken(sessionCookie.Value)
session, err := s.store.UserSessionByToken(sessionCookie.Value)
if err != nil {
logger.Error("[SessionMiddleware] %v", err)
return nil

4
server/ui/controller/login.go
View file

@ -47,7 +47,7 @@ func (c *Controller) CheckLogin(ctx *core.Context, request *core.Request, respon
return
}
sessionToken, err := c.store.CreateSession(
sessionToken, err := c.store.CreateUserSession(
authForm.Username,
request.Request().UserAgent(),
realip.RealIP(request.Request()),
@ -77,7 +77,7 @@ func (c *Controller) Logout(ctx *core.Context, request *core.Request, response *
user := ctx.LoggedUser()
sessionCookie := request.Cookie("sessionID")
if err := c.store.RemoveSessionByToken(user.ID, sessionCookie); err != nil {
if err := c.store.RemoveUserSessionByToken(user.ID, sessionCookie); err != nil {
logger.Error("[Controller:Logout] %v", err)
}

2
server/ui/controller/oauth2.go
View file

@ -105,7 +105,7 @@ func (c *Controller) OAuth2Callback(ctx *core.Context, request *core.Request, re
}
}
sessionToken, err := c.store.CreateSession(
sessionToken, err := c.store.CreateUserSession(
user.Username,
request.Request().UserAgent(),
realip.RealIP(request.Request()),

4
server/ui/controller/session.go
View file

@ -18,7 +18,7 @@ func (c *Controller) ShowSessions(ctx *core.Context, request *core.Request, resp
return
}
sessions, err := c.store.Sessions(user.ID)
sessions, err := c.store.UserSessions(user.ID)
if err != nil {
response.HTML().ServerError(err)
return
@ -42,7 +42,7 @@ func (c *Controller) RemoveSession(ctx *core.Context, request *core.Request, res
return
}
err = c.store.RemoveSessionByID(user.ID, sessionID)
err = c.store.RemoveUserSessionByID(user.ID, sessionID)
if err != nil {
logger.Error("[Controller:RemoveSession] %v", err)
}