fix(用户绑定): 修复邮箱绑定流程中用户ID未正确赋值的问题
All checks were successful
Build docker and publish / build (20.15.1) (push) Successful in 7m10s

在邮箱不存在的情况下,确保将当前设备用户的ID正确赋值给emailUserId变量,以保证后续token生成和返回结果正确
This commit is contained in:
shanshanzhong 2025-11-05 18:40:48 -08:00
parent 15f4e69dc3
commit 004acd03d2

View File

@ -34,6 +34,12 @@ func NewBindEmailWithVerificationLogic(ctx context.Context, svcCtx *svc.ServiceC
} }
} }
// BindEmailWithVerification 处理邮箱绑定流程,并在邮箱已存在时转移设备归属
// 参数说明:
// - req: 绑定邮箱请求,包含邮箱地址等信息
// 返回值:
// - *types.BindEmailWithVerificationResponse: 包含绑定结果、消息、token、用户ID
// - error: 发生错误时返回具体错误
func (l *BindEmailWithVerificationLogic) BindEmailWithVerification(req *types.BindEmailWithVerificationRequest) (*types.BindEmailWithVerificationResponse, error) { func (l *BindEmailWithVerificationLogic) BindEmailWithVerification(req *types.BindEmailWithVerificationRequest) (*types.BindEmailWithVerificationResponse, error) {
// 获取当前用户 // 获取当前用户
u, ok := l.ctx.Value(constant.CtxKeyUser).(*user.User) u, ok := l.ctx.Value(constant.CtxKeyUser).(*user.User)
@ -65,13 +71,15 @@ func (l *BindEmailWithVerificationLogic) BindEmailWithVerification(req *types.Bi
var emailUserId int64 var emailUserId int64
if err != nil { if err != nil {
if errors.Is(err, gorm.ErrRecordNotFound) { if errors.Is(err, gorm.ErrRecordNotFound) {
// 邮箱不存在,创建新的邮箱用户: 不需要创建邮箱用户 // 邮箱不存在,不创建新用户,直接将邮箱认证绑定到当前设备用户
l.Infow(" 为当前设备做 邮箱绑定操作; 在 user_auth_methods 中添加记录", logger.Field("email", req.Email)) l.Infow(" 为当前设备做 邮箱绑定操作; 在 user_auth_methods 中添加记录", logger.Field("email", req.Email))
err = l.addAuthMethodForEmailUser(u.Id, req.Email) err = l.addAuthMethodForEmailUser(u.Id, req.Email)
if err != nil { if err != nil {
l.Errorw("添加邮箱用户认证方法失败", logger.Field("error", err.Error()), logger.Field("user_id", u.Id)) l.Errorw("添加邮箱用户认证方法失败", logger.Field("error", err.Error()), logger.Field("user_id", u.Id))
return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "添加邮箱用户认证方法失败") return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "添加邮箱用户认证方法失败")
} }
// 关键修复:为后续 token 生成与返回结果赋值绑定后的用户ID
emailUserId = u.Id
} else { } else {
// 数据库查询错误 // 数据库查询错误
l.Errorw("查询邮箱绑定状态失败", logger.Field("error", err.Error())) l.Errorw("查询邮箱绑定状态失败", logger.Field("error", err.Error()))