p90524618
/
answer
mirror of https://gitee.com/answerdev/answer.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

refactor(merge): merge 1.0.7

This commit is contained in:
LinkinStars 2023-03-21 11:53:15 +08:00
parent 9bd9b475f4
commit 28e9916468
3 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
internal/service/user_common/user.go
View File

@ -161,14 +161,14 @@ func (us *UserCommon) CacheLoginUserInfo(ctx context.Context, userID string, use
UserID: userID, UserID: userID,
EmailStatus: emailStatus, EmailStatus: emailStatus,
UserStatus: userStatus, UserStatus: userStatus,
IsAdmin: roleID == role.RoleAdminID, RoleID: roleID,
} }
accessToken, err = us.authService.SetUserCacheInfo(ctx, userCacheInfo) accessToken, err = us.authService.SetUserCacheInfo(ctx, userCacheInfo)
if err != nil { if err != nil {
return "", nil, err return "", nil, err
} }
if userCacheInfo.IsAdmin { if userCacheInfo.RoleID == role.RoleAdminID {
if err = us.authService.SetAdminUserCacheInfo(ctx, accessToken, &entity.UserCacheInfo{UserID: userID}); err != nil { if err = us.authService.SetAdminUserCacheInfo(ctx, accessToken, &entity.UserCacheInfo{UserID: userID}); err != nil {
return "", nil, err return "", nil, err
} }

2
internal/service/user_external_login/user_external_login_service.go
View File

@ -191,7 +191,7 @@ func (us *UserExternalLoginService) activeUser(ctx context.Context, oldUserInfo
} }
// try to update user avatar // 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{ avatarInfo := &schema.AvatarInfo{
Type: schema.AvatarTypeCustom, Type: schema.AvatarTypeCustom,
Custom: externalUserInfo.Avatar, Custom: externalUserInfo.Avatar,

18
internal/service/user_service.go
View File

@ -468,27 +468,11 @@ func (us *UserService) UserVerifyEmail(ctx context.Context, req *schema.UserVeri
resp = &schema.GetUserResp{} resp = &schema.GetUserResp{}
resp.GetFromUserEntity(userInfo) resp.GetFromUserEntity(userInfo)
userCacheInfo := &entity.UserCacheInfo{ resp.AccessToken = accessToken
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
}
// User verified email will update user email status. So user status cache should be updated. // User verified email will update user email status. So user status cache should be updated.
if err = us.authService.SetUserStatus(ctx, userCacheInfo); err != nil { if err = us.authService.SetUserStatus(ctx, userCacheInfo); err != nil {
return nil, err 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 return resp, nil
} }