mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-12-22 12:54:53 -05:00
Move session to models/login (#17338)
Move model/session.go to models/login
This commit is contained in:
parent
26dfe88ff2
commit
5326f4c9c5
2 changed files with 9 additions and 9 deletions
|
@ -2,7 +2,7 @@
|
||||||
// Use of this source code is governed by a MIT-style
|
// Use of this source code is governed by a MIT-style
|
||||||
// license that can be found in the LICENSE file.
|
// license that can be found in the LICENSE file.
|
||||||
|
|
||||||
package models
|
package login
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
|
@ -8,7 +8,7 @@ import (
|
||||||
"log"
|
"log"
|
||||||
"sync"
|
"sync"
|
||||||
|
|
||||||
"code.gitea.io/gitea/models"
|
"code.gitea.io/gitea/models/login"
|
||||||
"code.gitea.io/gitea/modules/timeutil"
|
"code.gitea.io/gitea/modules/timeutil"
|
||||||
|
|
||||||
"gitea.com/go-chi/session"
|
"gitea.com/go-chi/session"
|
||||||
|
@ -72,7 +72,7 @@ func (s *DBStore) Release() error {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
return models.UpdateSession(s.sid, data)
|
return login.UpdateSession(s.sid, data)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Flush deletes all session 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.
|
// Read returns raw session store by session ID.
|
||||||
func (p *DBProvider) Read(sid string) (session.RawStore, error) {
|
func (p *DBProvider) Read(sid string) (session.RawStore, error) {
|
||||||
s, err := models.ReadSession(sid)
|
s, err := login.ReadSession(sid)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
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.
|
// Exist returns true if session with given ID exists.
|
||||||
func (p *DBProvider) Exist(sid string) bool {
|
func (p *DBProvider) Exist(sid string) bool {
|
||||||
has, err := models.ExistSession(sid)
|
has, err := login.ExistSession(sid)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic("session/DB: error checking existence: " + err.Error())
|
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.
|
// Destroy deletes a session by session ID.
|
||||||
func (p *DBProvider) Destroy(sid string) error {
|
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.
|
// Regenerate regenerates a session store from old session ID to new one.
|
||||||
func (p *DBProvider) Regenerate(oldsid, sid string) (_ session.RawStore, err error) {
|
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 {
|
if err != nil {
|
||||||
return nil, err
|
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.
|
// Count counts and returns number of sessions.
|
||||||
func (p *DBProvider) Count() int {
|
func (p *DBProvider) Count() int {
|
||||||
total, err := models.CountSessions()
|
total, err := login.CountSessions()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic("session/DB: error counting records: " + err.Error())
|
panic("session/DB: error counting records: " + err.Error())
|
||||||
}
|
}
|
||||||
|
@ -162,7 +162,7 @@ func (p *DBProvider) Count() int {
|
||||||
|
|
||||||
// GC calls GC to clean expired sessions.
|
// GC calls GC to clean expired sessions.
|
||||||
func (p *DBProvider) GC() {
|
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)
|
log.Printf("session/DB: error garbage collecting: %v", err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue