HI-VPN/hi-server
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(用户): 修复邮箱验证码校验逻辑，支持多场景验证
Some checks failed
Build docker and publish / build (20.15.1) (push) Has been cancelled
Details

Browse Source 
修改邮箱验证码校验逻辑，使其支持安全场景和注册场景的验证码校验。当任一场景验证通过时即视为验证成功，提升用户体验。
This commit is contained in:
shanshanzhong 2025-11-28 00:47:38 -08:00
parent 14f4e351f4
commit 55b8fe813d
1 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
internal/logic/public/user/bindEmailWithVerificationLogic.go
View File

@ -48,26 +48,33 @@ func (l *BindEmailWithVerificationLogic) BindEmailWithVerification(req *types.Bi
return nil, errors.Wrapf(xerr.NewErrCode(xerr.InvalidAccess), "Invalid Access")
}
// 校验邮箱验证码（安全场景）
type payload struct {
Code string `json:"code"`
LastAt int64 `json:"lastAt"`
}
cacheKey := fmt.Sprintf("%s:%s:%s", config.AuthCodeCacheKey, constant.Security, req.Email)
value, getErr := l.svcCtx.Redis.Get(l.ctx, cacheKey).Result()
if getErr != nil || value == "" {
l.Errorw("邮箱验证码校验失败", logger.Field("cacheKey", cacheKey), logger.Field("error", getErr))
return nil, errors.Wrapf(xerr.NewErrCode(xerr.VerifyCodeError), "验证码错误")
var (
scenes = []string{constant.Security.String(), constant.Register.String()}
verified = false
)
for _, scene := range scenes {
cacheKey := fmt.Sprintf("%s:%s:%s", config.AuthCodeCacheKey, scene, req.Email)
value, getErr := l.svcCtx.Redis.Get(l.ctx, cacheKey).Result()
if getErr != nil || value == "" {
continue
}
var p payload
if err := json.Unmarshal([]byte(value), &p); err != nil {
continue
}
if p.Code == req.Code {
_ = l.svcCtx.Redis.Del(l.ctx, cacheKey).Err()
verified = true
break
}
}
var p payload
if err := json.Unmarshal([]byte(value), &p); err != nil {
l.Errorw("邮箱验证码反序列化失败", logger.Field("error", err.Error()), logger.Field("value", value))
return nil, errors.Wrapf(xerr.NewErrCode(xerr.VerifyCodeError), "验证码错误")
if !verified {
return nil, errors.Wrapf(xerr.NewErrCode(xerr.VerifyCodeError), "code error")
}
if p.Code != req.Code {
return nil, errors.Wrapf(xerr.NewErrCode(xerr.VerifyCodeError), "验证码错误")
}
_ = l.svcCtx.Redis.Del(l.ctx, cacheKey).Err()
// 获取当前用户的设备标识符
deviceIdentifier, err := l.getCurrentUserDeviceIdentifier(l.ctx, u.Id)