user

2026-10-07 16:16:37 +08:00 · 2026-06-08 08:19:22 +08:00
parent 4b72419a96
commit 9d0f9f0576
42 changed files with 1412 additions and 809 deletions
@@ -2,6 +2,7 @@ package user

 import (
 	"context"
+	"net/http"
 	"strings"
 	"time"

@@ -10,7 +11,6 @@ import (
 	"github.com/linux-do/credit/internal/apps/oauth"
 	"github.com/linux-do/credit/internal/common"
 	"github.com/linux-do/credit/internal/common/bind"
-	"github.com/linux-do/credit/internal/common/response"
 	"github.com/linux-do/credit/internal/db"
 	"github.com/linux-do/credit/internal/model"
 	"github.com/linux-do/credit/internal/util"
@@ -75,7 +75,7 @@ func setLoginSession(c *gin.Context, user *model.User) error {
 // @Router /api/v1/user/login [post]
 func Login(c *gin.Context) {
 	if !isPasswordLoginEnabled() {
-		response.RespondFailure(c, "管理员关闭了密码登录")
+		c.JSON(http.StatusOK, util.Err("管理员关闭了密码登录"))
 		return
 	}
 	var req loginRequest
@@ -84,36 +84,56 @@ func Login(c *gin.Context) {
 	}
 	req.Username = strings.TrimSpace(req.Username)
 	if req.Username == "" || req.Password == "" {
-		response.RespondFailure(c, "无效的参数")
+		c.JSON(http.StatusOK, util.Err("无效的参数"))
 		return
 	}

 	var user model.User
 	ctx := c.Request.Context()
 	if err := db.DB(ctx).Where("username = ?", req.Username).First(&user).Error; err != nil {
-		response.RespondFailure(c, "用户名或密码错误")
+		c.JSON(http.StatusOK, util.Err("用户名或密码错误"))
 		return
 	}
 	if !user.IsActive {
-		response.RespondFailure(c, common.BannedAccount)
+		c.JSON(http.StatusOK, util.Err(common.BannedAccount))
 		return
 	}
+
+	// 判定是否是明文密码存储
+	isPlaintext := !(strings.HasPrefix(user.Password, "$2a$") || strings.HasPrefix(user.Password, "$2b$") || strings.HasPrefix(user.Password, "$2y$"))
+
 	if !user.CheckPassword(req.Password) {
-		response.RespondFailure(c, "用户名或密码错误")
+		c.JSON(http.StatusOK, util.Err("用户名或密码错误"))
 		return
 	}

+	session := sessions.Default(c)
+	needChangePassword := false
+
+	// 如果是以明文密码登录，在数据库中置换为加密密码
+	if isPlaintext {
+		if err := user.SetEncryptedPassword(req.Password); err == nil {
+			if err := db.DB(ctx).Model(&user).Update("password", user.Password).Error; err != nil {
+				c.JSON(http.StatusOK, util.Err("升级密码安全算法失败，请重试"))
+				return
+			}
+			needChangePassword = true
+			session.Set("need_change_password", true)
+			_ = session.Save()
+		}
+	}
+
 	user.LastLoginAt = time.Now()
 	if err := db.DB(ctx).Model(&user).Update("last_login_at", user.LastLoginAt).Error; err != nil {
-		response.RespondFailure(c, err.Error())
+		c.JSON(http.StatusOK, util.Err(err.Error()))
 		return
 	}
 	if err := setLoginSession(c, &user); err != nil {
-		response.RespondFailure(c, "无法保存会话信息，请重试")
+		c.JSON(http.StatusOK, util.Err("无法保存会话信息，请重试"))
 		return
 	}

-	response.RespondSuccess(c, oauth.BuildBasicUserInfo(&user))
+	c.JSON(http.StatusOK, util.OK(oauth.BuildBasicUserInfo(&user, needChangePassword)))
 }

 // Register 用户注册
@@ -129,7 +149,7 @@ func Login(c *gin.Context) {
 // @Router /api/v1/user/register [post]
 func Register(c *gin.Context) {
 	if !isRegistrationEnabled() || !isPasswordRegisterEnabled() {
-		response.RespondFailure(c, "管理员关闭了注册")
+		c.JSON(http.StatusOK, util.Err("管理员关闭了注册"))
 		return
 	}

@@ -144,22 +164,22 @@ func Register(c *gin.Context) {
 	req.DisplayName = strings.TrimSpace(req.DisplayName)

 	if req.Username == "" || req.Password == "" {
-		response.RespondFailure(c, "无效的参数")
+		c.JSON(http.StatusOK, util.Err("无效的参数"))
 		return
 	}
 	if len(req.Password) < 8 {
-		response.RespondFailure(c, "密码长度不能少于 8 位")
+		c.JSON(http.StatusOK, util.Err("密码长度不能少于 8 位"))
 		return
 	}

 	ctx := c.Request.Context()
 	var count int64
 	if err := db.DB(ctx).Model(&model.User{}).Where("username = ?", req.Username).Count(&count).Error; err != nil {
-		response.RespondFailure(c, err.Error())
+		c.JSON(http.StatusOK, util.Err(err.Error()))
 		return
 	}
 	if count > 0 {
-		response.RespondFailure(c, "用户名已存在")
+		c.JSON(http.StatusOK, util.Err("用户名已存在"))
 		return
 	}

@@ -167,9 +187,6 @@ func Register(c *gin.Context) {
 		Username:    req.Username,
 		Nickname:    req.Nickname,
 		AvatarUrl:   "",
-		TrustLevel:  model.TrustLevelNewUser,
-		PayScore:    0,
-		SignKey:     util.GenerateUniqueIDSimple(),
 		IsActive:    true,
 		IsAdmin:     false,
 		LastLoginAt: time.Now(),
@@ -181,21 +198,21 @@ func Register(c *gin.Context) {
 		user.Nickname = req.Username
 	}
 	if err := user.SetPassword(req.Password); err != nil {
-		response.RespondFailure(c, err.Error())
+		c.JSON(http.StatusOK, util.Err(err.Error()))
 		return
 	}

 	if err := db.DB(ctx).Create(&user).Error; err != nil {
-		response.RespondFailure(c, err.Error())
+		c.JSON(http.StatusOK, util.Err(err.Error()))
 		return
 	}

 	if err := setLoginSession(c, &user); err != nil {
-		response.RespondFailure(c, "无法保存会话信息，请重试")
+		c.JSON(http.StatusOK, util.Err("无法保存会话信息，请重试"))
 		return
 	}

-	response.RespondSuccess(c, oauth.BuildBasicUserInfo(&user))
+	c.JSON(http.StatusOK, util.OK(oauth.BuildBasicUserInfo(&user, false)))
 }

 // Logout 用户退出登录
@@ -212,8 +229,80 @@ func Logout(c *gin.Context) {
 	session.Options(util.GetSessionOptions(-1))
 	session.Clear()
 	if err := session.Save(); err != nil {
-		response.RespondFailure(c, err.Error())
+		c.JSON(http.StatusOK, util.Err(err.Error()))
 		return
 	}
-	response.RespondSuccessMessage(c, "")
+	c.JSON(http.StatusOK, util.OK(""))
+}
+
+type changePasswordRequest struct {
+	OldPassword string `json:"old_password"`
+	NewPassword string `json:"new_password"`
+}
+
+// ChangePassword 修改用户密码
+// @Summary 修改用户密码
+// @Description 修改当前登录用户的密码。修改成功后，如果是首次明文登录的升级提示，则清除修改密码的提示状态。
+// @Tags user
+// @Accept json
+// @Produce json
+// @Param request body user.changePasswordRequest true "修改密码请求参数"
+// @Success 200 {object} util.ResponseAny{data=string} "修改密码成功"
+// @Failure 400 {object} util.ResponseAny "原密码错误或新密码不符合要求"
+// @Failure 401 {object} util.ResponseAny "请先登录"
+// @Router /api/v1/user/change-password [post]
+func ChangePassword(c *gin.Context) {
+	var req changePasswordRequest
+	if !bind.JSON(c, &req) {
+		return
+	}
+
+	req.OldPassword = strings.TrimSpace(req.OldPassword)
+	req.NewPassword = strings.TrimSpace(req.NewPassword)
+
+	if req.OldPassword == "" || req.NewPassword == "" {
+		c.JSON(http.StatusOK, util.Err("无效的参数"))
+		return
+	}
+	if len(req.NewPassword) < 8 {
+		c.JSON(http.StatusOK, util.Err("新密码长度不能少于 8 位"))
+		return
+	}
+
+	userObj, _ := util.GetFromContext[*model.User](c, oauth.UserObjKey)
+	if userObj == nil {
+		c.JSON(http.StatusUnauthorized, util.Err("请先登录"))
+		return
+	}
+
+	ctx := c.Request.Context()
+	var dbUser model.User
+	if err := db.DB(ctx).Where("id = ?", userObj.ID).First(&dbUser).Error; err != nil {
+		c.JSON(http.StatusOK, util.Err("未找到该用户"))
+		return
+	}
+
+	// 校验旧密码
+	if !dbUser.CheckPassword(req.OldPassword) {
+		c.JSON(http.StatusOK, util.Err("原密码不正确"))
+		return
+	}
+
+	// 加密并更新为新密码
+	if err := dbUser.SetEncryptedPassword(req.NewPassword); err != nil {
+		c.JSON(http.StatusOK, util.Err("密码加密失败，请重试"))
+		return
+	}
+
+	if err := db.DB(ctx).Model(&dbUser).Update("password", dbUser.Password).Error; err != nil {
+		c.JSON(http.StatusOK, util.Err(err.Error()))
+		return
+	}
+
+	// 清除 Session 中修改密码提示状态
+	session := sessions.Default(c)
+	session.Delete("need_change_password")
+	_ = session.Save()
+
+	c.JSON(http.StatusOK, util.OK("密码修改成功"))
 }