tcjlj/OpenFlare
1
0
Fork 0
mirror of https://github.com/Rain-kl/OpenFlare.git synced 2026-10-06 07:36:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

登录状态记录

Browse Source
This commit is contained in:
ryan
2026-06-12 10:08:02 +08:00
parent 62fcd245f2
commit 1fe5118029
9 changed files with 185 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/apps/admin/system_config/routers_test.go
+5 -3
View File
@@ -23,6 +23,8 @@ import (
"github.com/gin-gonic/gin"
)
const expectedDefaultConfigsCount = 28
func setupTestRouter(authUser *model.User) *gin.Engine {
gin.SetMode(gin.TestMode)
r := gin.New()
@@ -137,9 +139,9 @@ func TestListSystemConfigs(t *testing.T) {
var configs []model.SystemConfig
_ = json.Unmarshal(dataBytes, &configs)
// Defaults seed 27 configurations
if len(configs) != 27 {
t.Errorf("expected 27 default configs, got %d", len(configs))
// Defaults seed configurations
if len(configs) != expectedDefaultConfigsCount {
t.Errorf("expected %d default configs, got %d", expectedDefaultConfigsCount, len(configs))
}
})
internal/apps/oauth/sources.go
+16 -2
View File
@@ -165,10 +165,24 @@ func containsScope(scopes []string, scope string) bool {
return false
}
func setLoginSession(c *gin.Context, user *model.User) error {
func setLoginSession(ctx context.Context, c *gin.Context, user *model.User) error {
session := sessions.Default(c)
session.Set(UserIDKey, user.ID)
session.Set(UserNameKey, user.Username)
// 根据系统配置动态设置 Session 过期时间
maxAge := 0
ttlHours, err := model.GetIntByKey(ctx, model.ConfigKeyLoginSessionTTLHours)
if err == nil {
if ttlHours == -1 {
// 永不过期，设置为 10 年
maxAge = 10 * 365 * 24 * 3600
} else if ttlHours > 0 {
maxAge = ttlHours * 3600
}
}
session.Options(util.GetSessionOptions(maxAge))
return session.Save()
}
@@ -508,7 +522,7 @@ func handleCallbackLogin(ctx context.Context, c *gin.Context, source *model.Auth
user.LastLoginAt = time.Now()
_ = db.DB(ctx).Model(&user).Update("last_login_at", user.LastLoginAt).Error
if err := setLoginSession(c, &user); err != nil {
if err := setLoginSession(ctx, c, &user); err != nil {
c.JSON(http.StatusInternalServerError, util.Err(err.Error()))
return
}
internal/apps/user/routers.go
+17 -3
View File
@@ -58,10 +58,24 @@ func isRegistrationEnabled() bool {
return enabled
}
func setLoginSession(c *gin.Context, user *model.User) error {
func setLoginSession(ctx context.Context, c *gin.Context, user *model.User) error {
session := sessions.Default(c)
session.Set(oauth.UserIDKey, user.ID)
session.Set(oauth.UserNameKey, user.Username)
// 根据系统配置动态设置 Session 过期时间
maxAge := 0
ttlHours, err := model.GetIntByKey(ctx, model.ConfigKeyLoginSessionTTLHours)
if err == nil {
if ttlHours == -1 {
// 永不过期，设置为 10 年
maxAge = 10 * 365 * 24 * 3600
} else if ttlHours > 0 {
maxAge = ttlHours * 3600
}
}
session.Options(util.GetSessionOptions(maxAge))
if err := session.Save(); err != nil {
return err
}
@@ -134,7 +148,7 @@ func Login(c *gin.Context) {
c.JSON(http.StatusOK, util.Err(err.Error()))
return
}
if err := setLoginSession(c, &user); err != nil {
if err := setLoginSession(ctx, c, &user); err != nil {
c.JSON(http.StatusOK, util.Err(errSaveSessionFailed))
return
}
@@ -218,7 +232,7 @@ func Register(c *gin.Context) {
return
}
if err := setLoginSession(c, &user); err != nil {
if err := setLoginSession(ctx, c, &user); err != nil {
c.JSON(http.StatusOK, util.Err(errSaveSessionFailed))
return
}