fix: 登录和注册返回完整用户信息
This commit is contained in:
@@ -12,11 +12,14 @@ import (
|
||||
"juwan-backend/common/utils/contextj"
|
||||
"juwan-backend/common/utils/pwdUtils"
|
||||
"regexp"
|
||||
"time"
|
||||
|
||||
"juwan-backend/app/users/api/internal/svc"
|
||||
"juwan-backend/app/users/api/internal/types"
|
||||
|
||||
"github.com/jinzhu/copier"
|
||||
"github.com/zeromicro/go-zero/core/logx"
|
||||
"k8s.io/apimachinery/pkg/util/json"
|
||||
)
|
||||
|
||||
type RegisterLogic struct {
|
||||
@@ -78,7 +81,31 @@ func (l *RegisterLogic) Register(req *types.RegisterReq) (*types.RegisterResp, s
|
||||
return nil, "", errors.New(fmt.Sprintf("failed to register user: %v", err.Error()))
|
||||
}
|
||||
|
||||
userResp, err := l.svcCtx.UserRpc.GetUserByUsername(l.ctx, &pb.GetUserByUsernameReq{
|
||||
Username: req.Username,
|
||||
})
|
||||
if err != nil {
|
||||
logx.Errorf("GetUserByUsername err: %v", err)
|
||||
return nil, "", errors.New("get user failed")
|
||||
}
|
||||
|
||||
user := &types.User{}
|
||||
err = copier.Copy(user, userResp.Users)
|
||||
if err != nil {
|
||||
logx.Errorf("copier.Copy err: %v", err)
|
||||
return nil, "", errors.New("copy user failed")
|
||||
}
|
||||
var verificationStatus map[string]string
|
||||
err = json.Unmarshal([]byte(userResp.Users.VerificationStatus), &verificationStatus)
|
||||
if err != nil {
|
||||
logx.Errorf("json.Unmarshal err: %v", err)
|
||||
}
|
||||
user.VerifiedRoles = userResp.Users.VerifiedRoles
|
||||
user.VerificationStatus = verificationStatus
|
||||
user.Role = userResp.Users.CurrentRole
|
||||
user.CreatedAt = time.Unix(userResp.Users.CreatedAt, 0).Format(time.DateTime)
|
||||
|
||||
return &types.RegisterResp{
|
||||
User: types.User{},
|
||||
User: *user,
|
||||
}, res.Res, nil
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user