A Q&A platform software for teams at any scales. Whether it's a community forum, help center, or knowledge management platform, you can always count on Apache Answer.
feat(user): return user info when changed email
LinkinStars150432835b03
diff --git a/internal/controller/user_controller.go b/internal/controller/user_controller.goindex a1489e41..4fb7f8a6 100644--- a/internal/controller/user_controller.go+++ b/internal/controller/user_controller.go@@ -529,9 +529,9 @@ func (uc *UserController) UserChangeEmailVerify(ctx *gin.Context) {return}- err := uc.userService.UserChangeEmailVerify(ctx, req.Content)+ resp, err := uc.userService.UserChangeEmailVerify(ctx, req.Content)uc.actionService.ActionRecordDel(ctx, schema.ActionRecordTypeEmail, ctx.ClientIP())- handler.HandleResponse(ctx, err, nil)+ handler.HandleResponse(ctx, err, resp)}// UserRanking get user rankingdiff --git a/internal/service/user_service.go b/internal/service/user_service.goindex 5aef83ef..f6a6f093 100644--- a/internal/service/user_service.go+++ b/internal/service/user_service.go@@ -535,37 +535,66 @@ func (us *UserService) UserChangeEmailSendCode(ctx context.Context, req *schema.}// UserChangeEmailVerify user change email verify code-func (us *UserService) UserChangeEmailVerify(ctx context.Context, content string) (err error) {+func (us *UserService) UserChangeEmailVerify(ctx context.Context, content string) (resp *schema.GetUserResp, err error) {data := &schema.EmailCodeContent{}err = data.FromJSONString(content)if err != nil {- return errors.BadRequest(reason.EmailVerifyURLExpired)+ return nil, errors.BadRequest(reason.EmailVerifyURLExpired)}_, exist, err := us.userRepo.GetByEmail(ctx, data.Email)if err != nil {- return err+ return nil, err}if exist {- return errors.BadRequest(reason.EmailDuplicate)+ return nil, errors.BadRequest(reason.EmailDuplicate)}- _, exist, err = us.userRepo.GetByUserID(ctx, data.UserID)+ userInfo, exist, err := us.userRepo.GetByUserID(ctx, data.UserID)if err != nil {- return err+ return nil, err}if !exist {- return errors.BadRequest(reason.UserNotFound)+ return nil, errors.BadRequest(reason.UserNotFound)}err = us.userRepo.UpdateEmail(ctx, data.UserID, data.Email)if err != nil {- return errors.BadRequest(reason.UserNotFound)+ return nil, errors.BadRequest(reason.UserNotFound)}err = us.userRepo.UpdateEmailStatus(ctx, data.UserID, entity.EmailStatusAvailable)if err != nil {- return err+ return nil, err}- return nil++ roleID, err := us.userRoleService.GetUserRole(ctx, userInfo.ID)+ if err != nil {+ log.Error(err)+ }++ resp = &schema.GetUserResp{}+ resp.GetFromUserEntity(userInfo)+ userCacheInfo := &entity.UserCacheInfo{+ UserID: userInfo.ID,+ EmailStatus: entity.EmailStatusAvailable,+ UserStatus: userInfo.Status,+ RoleID: roleID,+ }+ resp.AccessToken, err = us.authService.SetUserCacheInfo(ctx, userCacheInfo)+ if err != nil {+ return nil, err+ }+ // User verified email will update user email status. So user status cache should be updated.+ if err = us.authService.SetUserStatus(ctx, userCacheInfo); err != nil {+ return nil, err+ }+ resp.RoleID = userCacheInfo.RoleID+ if resp.RoleID == role.RoleAdminID {+ err = us.authService.SetAdminUserCacheInfo(ctx, resp.AccessToken, &entity.UserCacheInfo{UserID: userInfo.ID})+ if err != nil {+ return nil, err+ }+ }+ return resp, nil}// getSiteUrl get site url