From 5326f4c9c59cce8a1d8f78afd486ebb8688b45ab Mon Sep 17 00:00:00 2001
From: Lunny Xiao <xiaolunwen@gmail.com>
Date: Mon, 18 Oct 2021 02:51:56 +0800
Subject: [PATCH] Move session to models/login (#17338)
Move model/session.go to models/login
---
models/{ => login}/session.go | 2 +-
modules/session/db.go | 16 ++++++++--------
2 files changed, 9 insertions(+), 9 deletions(-)
rename models/{ => login}/session.go (99%)
diff --git a/models/session.go b/models/login/session.go
similarity index 99%
rename from models/session.go
rename to models/login/session.go
index 65fe2bef4f..1ddba5cd3b 100644
--- a/models/session.go
+++ b/models/login/session.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"
diff --git a/modules/session/db.go b/modules/session/db.go
index db8c01de95..bc4aeb08cd 100644
--- a/modules/session/db.go
+++ b/modules/session/db.go
@@ -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)
}
}