Skip to content

Commit 5326f4c

Browse files
authored
Move session to models/login (#17338)
Move model/session.go to models/login
1 parent 26dfe88 commit 5326f4c

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

models/session.go renamed to models/login/session.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Use of this source code is governed by a MIT-style
33
// license that can be found in the LICENSE file.
44

5-
package models
5+
package login
66

77
import (
88
"fmt"

modules/session/db.go

+8-8
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"log"
99
"sync"
1010

11-
"code.gitea.io/gitea/models"
11+
"code.gitea.io/gitea/models/login"
1212
"code.gitea.io/gitea/modules/timeutil"
1313

1414
"gitea.com/go-chi/session"
@@ -72,7 +72,7 @@ func (s *DBStore) Release() error {
7272
return err
7373
}
7474

75-
return models.UpdateSession(s.sid, data)
75+
return login.UpdateSession(s.sid, data)
7676
}
7777

7878
// Flush deletes all session data.
@@ -98,7 +98,7 @@ func (p *DBProvider) Init(maxLifetime int64, connStr string) error {
9898

9999
// Read returns raw session store by session ID.
100100
func (p *DBProvider) Read(sid string) (session.RawStore, error) {
101-
s, err := models.ReadSession(sid)
101+
s, err := login.ReadSession(sid)
102102
if err != nil {
103103
return nil, err
104104
}
@@ -118,7 +118,7 @@ func (p *DBProvider) Read(sid string) (session.RawStore, error) {
118118

119119
// Exist returns true if session with given ID exists.
120120
func (p *DBProvider) Exist(sid string) bool {
121-
has, err := models.ExistSession(sid)
121+
has, err := login.ExistSession(sid)
122122
if err != nil {
123123
panic("session/DB: error checking existence: " + err.Error())
124124
}
@@ -127,12 +127,12 @@ func (p *DBProvider) Exist(sid string) bool {
127127

128128
// Destroy deletes a session by session ID.
129129
func (p *DBProvider) Destroy(sid string) error {
130-
return models.DestroySession(sid)
130+
return login.DestroySession(sid)
131131
}
132132

133133
// Regenerate regenerates a session store from old session ID to new one.
134134
func (p *DBProvider) Regenerate(oldsid, sid string) (_ session.RawStore, err error) {
135-
s, err := models.RegenerateSession(oldsid, sid)
135+
s, err := login.RegenerateSession(oldsid, sid)
136136
if err != nil {
137137
return nil, err
138138

@@ -153,7 +153,7 @@ func (p *DBProvider) Regenerate(oldsid, sid string) (_ session.RawStore, err err
153153

154154
// Count counts and returns number of sessions.
155155
func (p *DBProvider) Count() int {
156-
total, err := models.CountSessions()
156+
total, err := login.CountSessions()
157157
if err != nil {
158158
panic("session/DB: error counting records: " + err.Error())
159159
}
@@ -162,7 +162,7 @@ func (p *DBProvider) Count() int {
162162

163163
// GC calls GC to clean expired sessions.
164164
func (p *DBProvider) GC() {
165-
if err := models.CleanupSessions(p.maxLifetime); err != nil {
165+
if err := login.CleanupSessions(p.maxLifetime); err != nil {
166166
log.Printf("session/DB: error garbage collecting: %v", err)
167167
}
168168
}

0 commit comments

Comments
 (0)