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): add externalID for login user
LinkinStarsba475ddfbb1c
diff --git a/internal/service/user_external_login/user_external_login_service.go b/internal/service/user_external_login/user_external_login_service.goindex b5754221..912d9135 100644--- a/internal/service/user_external_login/user_external_login_service.go+++ b/internal/service/user_external_login/user_external_login_service.go@@ -322,15 +322,15 @@ func (us *UserExternalLoginService) ExternalLoginUnbinding(// CheckUserStatusInUserCenter check user status in user centerfunc (us *UserExternalLoginService) CheckUserStatusInUserCenter(ctx context.Context, userID string) (- valid bool, err error) {+ valid bool, externalID string, err error) {// If enable user center plugin, user status should be checked by user centeruserCenter, ok := plugin.GetUserCenter()if !ok {- return true, nil+ return true, "", nil}userInfoList, err := us.GetExternalLoginUserInfoList(ctx, userID)if err != nil {- return false, err+ return false, "", err}var thisUcUserInfo *entity.UserExternalLoginfor _, t := range userInfoList {@@ -341,11 +341,11 @@ func (us *UserExternalLoginService) CheckUserStatusInUserCenter(ctx context.Cont}// If this user not login by user center, no need to check user statusif thisUcUserInfo == nil {- return true, nil+ return true, "", nil}userStatus := userCenter.UserStatus(thisUcUserInfo.ExternalID)if userStatus == plugin.UserStatusDeleted {- return false, nil+ return false, thisUcUserInfo.ExternalID, nil}- return true, nil+ return true, thisUcUserInfo.ExternalID, nil}diff --git a/internal/service/user_service.go b/internal/service/user_service.goindex 19e97550..2d05ea13 100644--- a/internal/service/user_service.go+++ b/internal/service/user_service.go@@ -80,6 +80,9 @@ func (us *UserService) GetUserInfoByUserID(ctx context.Context, token, userID stif !exist {return nil, errors.BadRequest(reason.UserNotFound)}+ if userInfo.Status == entity.UserStatusDeleted {+ return nil, errors.Unauthorized(reason.UnauthorizedError)+ }roleID, err := us.userRoleService.GetUserRole(ctx, userInfo.ID)if err != nil {log.Error(err)@@ -119,7 +122,7 @@ func (us *UserService) EmailLogin(ctx context.Context, req *schema.UserEmailLogiif !us.verifyPassword(ctx, req.Pass, userInfo.Pass) {return nil, errors.BadRequest(reason.EmailOrPasswordWrong)}- ok, err := us.userExternalLoginService.CheckUserStatusInUserCenter(ctx, userInfo.ID)+ ok, externalID, err := us.userExternalLoginService.CheckUserStatusInUserCenter(ctx, userInfo.ID)if err != nil {return nil, err}@@ -144,6 +147,7 @@ func (us *UserService) EmailLogin(ctx context.Context, req *schema.UserEmailLogiEmailStatus: userInfo.MailStatus,UserStatus: userInfo.Status,RoleID: roleID,+ ExternalID: externalID,}resp.AccessToken, err = us.authService.SetUserCacheInfo(ctx, userCacheInfo)if err != nil {