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

fix(auth): synchronize need_change_password across login, user-info and repositories

Browse Source
This commit is contained in:
ryan
2026-08-29 11:49:14 +08:00
parent 107251891f
commit d3d7c783a9
4 changed files with 32 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/plugins/domain/auth/repository.go
+27 -4
View File
@@ -8,6 +8,7 @@ import (
"Wavelet/core/contracts"
"Wavelet/pkg/util"
"context"
"strings"
"sync"
"time"
@@ -79,19 +80,41 @@ func GetAccessTokenByHash(ctx context.Context, tokenHash string) (*CachedToken,
// GetActiveUserByID 读取仍处于启用状态的用户
func GetActiveUserByID(ctx context.Context, userID uint64) (*contracts.UserDTO, error) {
var user contracts.UserDTO
if err := getDB(ctx).Table("w_users").Where("id = ? AND is_active = ?", userID, true).First(&user).Error; err != nil {
var row struct {
contracts.UserDTO
Password string `gorm:"column:password"`
}
if err := getDB(ctx).Table("w_users").Where("id = ? AND is_active = ?", userID, true).First(&row).Error; err != nil {
return nil, err
}
user := row.UserDTO
if row.Password != "" &&
!strings.HasPrefix(row.Password, "$2a$") &&
!strings.HasPrefix(row.Password, "$2b$") &&
!strings.HasPrefix(row.Password, "$2y$") &&
!strings.HasPrefix(row.Password, "$2x$") {
user.NeedChangePassword = true
}
return &user, nil
}
// GetUserByID 按 ID 读取用户（不限制启用状态）
func GetUserByID(ctx context.Context, userID uint64) (*contracts.UserDTO, error) {
var user contracts.UserDTO
if err := getDB(ctx).Table("w_users").Where("id = ?", userID).First(&user).Error; err != nil {
var row struct {
contracts.UserDTO
Password string `gorm:"column:password"`
}
if err := getDB(ctx).Table("w_users").Where("id = ?", userID).First(&row).Error; err != nil {
return nil, err
}
user := row.UserDTO
if row.Password != "" &&
!strings.HasPrefix(row.Password, "$2a$") &&
!strings.HasPrefix(row.Password, "$2b$") &&
!strings.HasPrefix(row.Password, "$2y$") &&
!strings.HasPrefix(row.Password, "$2x$") {
user.NeedChangePassword = true
}
return &user, nil
}