From 28e99164686c87eeedb207e170408d158faa16ad Mon Sep 17 00:00:00 2001
From: LinkinStars <linkinstar@foxmail.com>
Date: Tue, 21 Mar 2023 11:53:15 +0800
Subject: [PATCH] refactor(merge): merge 1.0.7

---
 internal/service/user_common/user.go           |  4 ++--
 .../user_external_login_service.go             |  2 +-
 internal/service/user_service.go               | 18 +-----------------
 3 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/internal/service/user_common/user.go b/internal/service/user_common/user.go
index d03aad8b..e863c8c9 100644
--- a/internal/service/user_common/user.go
+++ b/internal/service/user_common/user.go
@@ -161,14 +161,14 @@ func (us *UserCommon) CacheLoginUserInfo(ctx context.Context, userID string, use
 		UserID:      userID,
 		EmailStatus: emailStatus,
 		UserStatus:  userStatus,
-		IsAdmin:     roleID == role.RoleAdminID,
+		RoleID:      roleID,
 	}
 
 	accessToken, err = us.authService.SetUserCacheInfo(ctx, userCacheInfo)
 	if err != nil {
 		return "", nil, err
 	}
-	if userCacheInfo.IsAdmin {
+	if userCacheInfo.RoleID == role.RoleAdminID {
 		if err = us.authService.SetAdminUserCacheInfo(ctx, accessToken, &entity.UserCacheInfo{UserID: userID}); err != nil {
 			return "", nil, err
 		}
diff --git a/internal/service/user_external_login/user_external_login_service.go b/internal/service/user_external_login/user_external_login_service.go
index 2907a1d1..e741c0f7 100644
--- a/internal/service/user_external_login/user_external_login_service.go
+++ b/internal/service/user_external_login/user_external_login_service.go
@@ -191,7 +191,7 @@ func (us *UserExternalLoginService) activeUser(ctx context.Context, oldUserInfo
 	}
 
 	// try to update user avatar
-	if len(externalUserInfo.Avatar) > 0 && len(schema.FormatAvatarInfo(oldUserInfo.Avatar)) == 0 {
+	if len(externalUserInfo.Avatar) > 0 && len(schema.FormatAvatarInfo(oldUserInfo.Avatar, oldUserInfo.EMail)) == 0 {
 		avatarInfo := &schema.AvatarInfo{
 			Type:   schema.AvatarTypeCustom,
 			Custom: externalUserInfo.Avatar,
diff --git a/internal/service/user_service.go b/internal/service/user_service.go
index 3cbf62c8..c4f9fa27 100644
--- a/internal/service/user_service.go
+++ b/internal/service/user_service.go
@@ -468,27 +468,11 @@ func (us *UserService) UserVerifyEmail(ctx context.Context, req *schema.UserVeri
 
 	resp = &schema.GetUserResp{}
 	resp.GetFromUserEntity(userInfo)
-	userCacheInfo := &entity.UserCacheInfo{
-		UserID:      userInfo.ID,
-		EmailStatus: userInfo.MailStatus,
-		UserStatus:  userInfo.Status,
-		RoleID:      roleID,
-	}
-	resp.AccessToken, err = us.authService.SetUserCacheInfo(ctx, userCacheInfo)
-	if err != nil {
-		return nil, err
-	}
+	resp.AccessToken = accessToken
 	// 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
 }