oss/miniflux-v2
oss/miniflux-v2
1
0
Fork 0
mirror of https://github.com/miniflux/v2.git synced 2025-07-22 17:18:37 +00:00
Code Wiki Activity

Improve storage module

Browse source
This commit is contained in:
Frédéric Guillot 2019-10-29 22:48:07 -07:00
parent e38333e272
commit d3883126bf
13 changed files with 505 additions and 317 deletions
Download patch file Download diff file Expand all files Collapse all files

84
storage/user_session.go
View file

@ -14,13 +14,22 @@ import (
// UserSessions returns the list of sessions for the given user.
func (s *Storage) UserSessions(userID int64) (model.UserSessions, error) {
query := `SELECT
id, user_id, token, created_at, user_agent, ip
FROM user_sessions
WHERE user_id=$1 ORDER BY id DESC`
query := `
SELECT
id,
user_id,
token,
created_at,
user_agent,
ip
FROM
user_sessions
WHERE
user_id=$1 ORDER BY id DESC
`
rows, err := s.db.Query(query, userID)
if err != nil {
return nil, fmt.Errorf("unable to fetch user sessions: %v", err)
return nil, fmt.Errorf(`store: unable to fetch user sessions: %v`, err)
}
defer rows.Close()
@ -37,7 +46,7 @@ func (s *Storage) UserSessions(userID int64) (model.UserSessions, error) {
)
if err != nil {
return nil, fmt.Errorf("unable to fetch user session row: %v", err)
return nil, fmt.Errorf(`store: unable to fetch user session row: %v`, err)
}
sessions = append(sessions, &session)
@ -48,16 +57,17 @@ func (s *Storage) UserSessions(userID int64) (model.UserSessions, error) {
// CreateUserSession creates a new sessions.
func (s *Storage) CreateUserSession(username, userAgent, ip string) (sessionID string, userID int64, err error) {
err = s.db.QueryRow("SELECT id FROM users WHERE username = LOWER($1)", username).Scan(&userID)
query := `SELECT id FROM users WHERE username = LOWER($1)`
err = s.db.QueryRow(query, username).Scan(&userID)
if err != nil {
return "", 0, fmt.Errorf("unable to fetch user ID: %v", err)
return "", 0, fmt.Errorf(`store: unable to fetch user ID: %v`, err)
}
token := crypto.GenerateRandomString(64)
query := "INSERT INTO user_sessions (token, user_id, user_agent, ip) VALUES ($1, $2, $3, $4)"
query = `INSERT INTO user_sessions (token, user_id, user_agent, ip) VALUES ($1, $2, $3, $4)`
_, err = s.db.Exec(query, token, userID, userAgent, ip)
if err != nil {
return "", 0, fmt.Errorf("unable to create user session: %v", err)
return "", 0, fmt.Errorf(`store: unable to create user session: %v`, err)
}
return token, userID, nil
@ -67,7 +77,19 @@ func (s *Storage) CreateUserSession(username, userAgent, ip string) (sessionID s
func (s *Storage) UserSessionByToken(token string) (*model.UserSession, error) {
var session model.UserSession
query := "SELECT id, user_id, token, created_at, user_agent, ip FROM user_sessions WHERE token = $1"
query := `
SELECT
id,
user_id,
token,
created_at,
user_agent,
ip
FROM
user_sessions
WHERE
token = $1
`
err := s.db.QueryRow(query, token).Scan(
&session.ID,
&session.UserID,
@ -77,29 +99,31 @@ func (s *Storage) UserSessionByToken(token string) (*model.UserSession, error) {
&session.IP,
)
if err == sql.ErrNoRows {
switch {
case err == sql.ErrNoRows:
return nil, nil
} else if err != nil {
return nil, fmt.Errorf("unable to fetch user session: %v", err)
case err != nil:
return nil, fmt.Errorf(`store: unable to fetch user session: %v`, err)
default:
return &session, nil
}
return &session, nil
}
// RemoveUserSessionByToken remove a session by using the token.
func (s *Storage) RemoveUserSessionByToken(userID int64, token string) error {
result, err := s.db.Exec(`DELETE FROM user_sessions WHERE user_id=$1 AND token=$2`, userID, token)
query := `DELETE FROM user_sessions WHERE user_id=$1 AND token=$2`
result, err := s.db.Exec(query, userID, token)
if err != nil {
return fmt.Errorf("unable to remove this user session: %v", err)
return fmt.Errorf(`store: unable to remove this user session: %v`, err)
}
count, err := result.RowsAffected()
if err != nil {
return fmt.Errorf("unable to remove this user session: %v", err)
return fmt.Errorf(`store: unable to remove this user session: %v`, err)
}
if count != 1 {
return fmt.Errorf("nothing has been removed")
return fmt.Errorf(`store: nothing has been removed`)
}
return nil
@ -107,18 +131,19 @@ func (s *Storage) RemoveUserSessionByToken(userID int64, token string) error {
// RemoveUserSessionByID remove a session by using the ID.
func (s *Storage) RemoveUserSessionByID(userID, sessionID int64) error {
result, err := s.db.Exec(`DELETE FROM user_sessions WHERE user_id=$1 AND id=$2`, userID, sessionID)
query := `DELETE FROM user_sessions WHERE user_id=$1 AND id=$2`
result, err := s.db.Exec(query, userID, sessionID)
if err != nil {
return fmt.Errorf("unable to remove this user session: %v", err)
return fmt.Errorf(`store: unable to remove this user session: %v`, err)
}
count, err := result.RowsAffected()
if err != nil {
return fmt.Errorf("unable to remove this user session: %v", err)
return fmt.Errorf(`store: unable to remove this user session: %v`, err)
}
if count != 1 {
return fmt.Errorf("nothing has been removed")
return fmt.Errorf(`store: nothing has been removed`)
}
return nil
@ -126,10 +151,13 @@ func (s *Storage) RemoveUserSessionByID(userID, sessionID int64) error {
// CleanOldUserSessions removes user sessions older than specified days.
func (s *Storage) CleanOldUserSessions(days int) int64 {
query := fmt.Sprintf(`DELETE FROM user_sessions
WHERE id IN (SELECT id FROM user_sessions WHERE created_at < now() - interval '%d days')`, days)
result, err := s.db.Exec(query)
query := `
DELETE FROM
user_sessions
WHERE
id IN (SELECT id FROM user_sessions WHERE created_at < now() - interval '%d days')
`
result, err := s.db.Exec(fmt.Sprintf(query, days))
if err != nil {
return 0
}