refactor: 统一认证响应

This commit is contained in:
zetaloop
2026-04-03 17:46:08 +08:00
parent 3eb44d8a73
commit 5ff573f8fc
7 changed files with 22 additions and 51 deletions
@@ -36,33 +36,33 @@ func NewRegisterLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Register
var usernameRegex = regexp.MustCompile("^[a-zA-Z0-9_]+$")
func (l *RegisterLogic) Register(req *types.RegisterReq) (resp *types.RegisterResp, err error) {
func (l *RegisterLogic) Register(req *types.RegisterReq) (*types.RegisterResp, string, error) {
existingUser, err := l.svcCtx.UserRpc.GetUserByUsername(l.ctx, &pb.GetUserByUsernameReq{
Username: req.Username,
})
if len(req.Username) < 3 {
return nil, errors.New("username must be at least 3 characters long")
return nil, "", errors.New("username must be at least 3 characters long")
}
if len(req.Username) > 20 {
return nil, errors.New("username must be at most 20 characters long")
return nil, "", errors.New("username must be at most 20 characters long")
}
if !usernameRegex.MatchString(req.Username) {
return nil, errors.New("username can only contain letters, numbers, and underscores")
return nil, "", errors.New("username can only contain letters, numbers, and underscores")
}
if err == nil && existingUser != nil {
return nil, errors.New("user already exists")
return nil, "", errors.New("user already exists")
}
hashedPassword, err := pwdUtils.HashPassword(req.Password)
if err != nil {
return nil, errors.New("hash password failed")
return nil, "", errors.New("hash password failed")
}
requestId, err := contextj.RIdFrom(l.ctx)
logx.Infof("requestId: %s", requestId)
if err != nil {
logx.Errorf("contextj.RequestIdFrom failed: %v", err)
return nil, errors.New("contextj.RequestIdFrom failed")
return nil, "", errors.New("contextj.RequestIdFrom failed")
}
res, err := l.svcCtx.UserRpc.Register(l.ctx, &usercenter.RegisterReq{
@@ -75,13 +75,10 @@ func (l *RegisterLogic) Register(req *types.RegisterReq) (resp *types.RegisterRe
})
if err != nil {
logx.Error("failed to register user: ", err)
return nil, errors.New(fmt.Sprintf("failed to register user: %v", err.Error()))
return nil, "", errors.New(fmt.Sprintf("failed to register user: %v", err.Error()))
}
// 返回响应
return &types.RegisterResp{
AccessToken: "",
RefreshToken: res.Res,
User: types.User{},
}, nil
User: types.User{},
}, res.Res, nil
}