Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move session to models/login #17338

Merged
merged 2 commits into from
Oct 17, 2021
Merged

Move session to models/login #17338

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
78ace38
Move session to models/login
lunny Oct 17, 2021
a4e75f1
Merge branch 'main' into lunny/move_session
zeripath Oct 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion models/session.go → models/login/session.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
16 changes: 8 additions & 8 deletions modules/session/db.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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.
Expand All @@ -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
}
Expand All @@ -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())
}
Expand All @@ -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

Expand All @@ -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())
}
Expand All @@ -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)
}
}
Expand Down