Move session to models/login (#17338)

Move model/session.go to models/login
tokarchuk/v1.17
Lunny Xiao 3 years ago committed by GitHub
parent 26dfe88ff2
commit 5326f4c9c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      models/login/session.go
  2. 16
      modules/session/db.go

@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT-style
// license that can be found in the LICENSE file.
package models
package login
import (
"fmt"

@ -8,7 +8,7 @@ import (
"log"
"sync"
"code.gitea.io/gitea/models"
"code.gitea.io/gitea/models/login"
"code.gitea.io/gitea/modules/timeutil"
"gitea.com/go-chi/session"
@ -72,7 +72,7 @@ func (s *DBStore) Release() error {
return err
}
return models.UpdateSession(s.sid, data)
return login.UpdateSession(s.sid, data)
}
// Flush deletes all session data.
@ -98,7 +98,7 @@ func (p *DBProvider) Init(maxLifetime int64, connStr string) error {
// Read returns raw session store by session ID.
func (p *DBProvider) Read(sid string) (session.RawStore, error) {
s, err := models.ReadSession(sid)
s, err := login.ReadSession(sid)
if err != nil {
return nil, err
}
@ -118,7 +118,7 @@ func (p *DBProvider) Read(sid string) (session.RawStore, error) {
// Exist returns true if session with given ID exists.
func (p *DBProvider) Exist(sid string) bool {
has, err := models.ExistSession(sid)
has, err := login.ExistSession(sid)
if err != nil {
panic("session/DB: error checking existence: " + err.Error())
}
@ -127,12 +127,12 @@ func (p *DBProvider) Exist(sid string) bool {
// Destroy deletes a session by session ID.
func (p *DBProvider) Destroy(sid string) error {
return models.DestroySession(sid)
return login.DestroySession(sid)
}
// Regenerate regenerates a session store from old session ID to new one.
func (p *DBProvider) Regenerate(oldsid, sid string) (_ session.RawStore, err error) {
s, err := models.RegenerateSession(oldsid, sid)
s, err := login.RegenerateSession(oldsid, sid)
if err != nil {
return nil, err
@ -153,7 +153,7 @@ func (p *DBProvider) Regenerate(oldsid, sid string) (_ session.RawStore, err err
// Count counts and returns number of sessions.
func (p *DBProvider) Count() int {
total, err := models.CountSessions()
total, err := login.CountSessions()
if err != nil {
panic("session/DB: error counting records: " + err.Error())
}
@ -162,7 +162,7 @@ func (p *DBProvider) Count() int {
// GC calls GC to clean expired sessions.
func (p *DBProvider) GC() {
if err := models.CleanupSessions(p.maxLifetime); err != nil {
if err := login.CleanupSessions(p.maxLifetime); err != nil {
log.Printf("session/DB: error garbage collecting: %v", err)
}
}

Loading…
Cancel
Save