From 63e1da69a1b1dea1a026f7714a2b26e8356e9fbf Mon Sep 17 00:00:00 2001 From: alvin Date: Sun, 1 Sep 2024 21:32:19 +0800 Subject: [PATCH] refactor: add err handling for activeUser --- internal/service/content/user_service.go | 2 ++ .../user_external_login/user_center_login_service.go | 8 ++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/internal/service/content/user_service.go b/internal/service/content/user_service.go index 11f3bb63..974151a5 100644 --- a/internal/service/content/user_service.go +++ b/internal/service/content/user_service.go @@ -527,6 +527,7 @@ func (us *UserService) UserVerifyEmail(ctx context.Context, req *schema.UserVeri } if err = us.userActivity.UserActive(ctx, userInfo.ID); err != nil { log.Error(err) + return nil, err } // In the case of three-party login, the associated users are bound @@ -660,6 +661,7 @@ func (us *UserService) UserChangeEmailVerify(ctx context.Context, content string if userInfo.MailStatus == entity.EmailStatusToBeVerified { if err = us.userActivity.UserActive(ctx, userInfo.ID); err != nil { log.Error(err) + return nil, err } } diff --git a/internal/service/user_external_login/user_center_login_service.go b/internal/service/user_external_login/user_center_login_service.go index 6089d626..5ff47bce 100644 --- a/internal/service/user_external_login/user_center_login_service.go +++ b/internal/service/user_external_login/user_center_login_service.go @@ -129,7 +129,9 @@ func (us *UserCenterLoginService) ExternalLogin( return nil, err } - us.activeUser(ctx, oldUserInfo) + if err := us.activeUser(ctx, oldUserInfo); err != nil { + return nil, err + } accessToken, _, err := us.userCommonService.CacheLoginUserInfo( ctx, oldUserInfo.ID, oldUserInfo.MailStatus, oldUserInfo.Status, oldExternalLoginUserInfo.ExternalID) @@ -181,10 +183,12 @@ func (us *UserCenterLoginService) registerNewUser(ctx context.Context, provider return userInfo, nil } -func (us *UserCenterLoginService) activeUser(ctx context.Context, oldUserInfo *entity.User) { +func (us *UserCenterLoginService) activeUser(ctx context.Context, oldUserInfo *entity.User) error { if err := us.userActivity.UserActive(ctx, oldUserInfo.ID); err != nil { log.Error(err) + return err } + return nil } func (us *UserCenterLoginService) UserCenterUserSettings(ctx context.Context, userID string) (