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.
Fix(role): Fix an issue that admin could not be set correctly under sqlite (#284)
LinkinStars7495f068dfcc
diff --git a/internal/repo/auth/auth.go b/internal/repo/auth/auth.goindex d290afcb..bcc51212 100644--- a/internal/repo/auth/auth.go+++ b/internal/repo/auth/auth.go@@ -147,8 +147,8 @@ func (ar *authRepo) AddUserTokenMapping(ctx context.Context, userID, accessTokenreturn ar.data.Cache.SetString(ctx, key, string(content), constant.UserTokenCacheTime)}-// RemoveAllUserTokens Log out all users under this user id-func (ar *authRepo) RemoveAllUserTokens(ctx context.Context, userID string) {+// RemoveUserTokens Log out all users under this user id+func (ar *authRepo) RemoveUserTokens(ctx context.Context, userID string) {key := constant.UserTokenMappingCacheKey + userIDresp, _ := ar.data.Cache.GetString(ctx, key)mapping := make(map[string]bool, 0)diff --git a/internal/repo/role/user_role_rel_repo.go b/internal/repo/role/user_role_rel_repo.goindex 85d6564b..9398a5d9 100644--- a/internal/repo/role/user_role_rel_repo.go+++ b/internal/repo/role/user_role_rel_repo.go@@ -28,15 +28,15 @@ func NewUserRoleRelRepo(data *data.Data) role.UserRoleRelRepo {func (ur *userRoleRelRepo) SaveUserRoleRel(ctx context.Context, userID string, roleID int) (err error) {_, err = ur.data.DB.Transaction(func(session *xorm.Session) (interface{}, error) {item := &entity.UserRoleRel{UserID: userID}- exist, err := ur.data.DB.Get(item)+ exist, err := session.Get(item)if err != nil {return nil, err}if exist {item.RoleID = roleID- _, err = ur.data.DB.ID(item.ID).Update(item)+ _, err = session.ID(item.ID).Update(item)} else {- _, err = ur.data.DB.Insert(&entity.UserRoleRel{UserID: userID, RoleID: roleID})+ _, err = session.Insert(&entity.UserRoleRel{UserID: userID, RoleID: roleID})}if err != nil {return nil, errdiff --git a/internal/service/auth/auth.go b/internal/service/auth/auth.goindex 75f67944..618ef5bd 100644--- a/internal/service/auth/auth.go+++ b/internal/service/auth/auth.go@@ -20,7 +20,7 @@ type AuthRepo interface {SetAdminUserCacheInfo(ctx context.Context, accessToken string, userInfo *entity.UserCacheInfo) errorRemoveAdminUserCacheInfo(ctx context.Context, accessToken string) (err error)AddUserTokenMapping(ctx context.Context, userID, accessToken string) (err error)- RemoveAllUserTokens(ctx context.Context, userID string)+ RemoveUserTokens(ctx context.Context, userID string)}// AuthService kit service@@ -85,9 +85,9 @@ func (as *AuthService) AddUserTokenMapping(ctx context.Context, userID, accessToreturn as.authRepo.AddUserTokenMapping(ctx, userID, accessToken)}-// RemoveAllUserTokens Log out all users under this user id-func (as *AuthService) RemoveAllUserTokens(ctx context.Context, userID string) {- as.authRepo.RemoveAllUserTokens(ctx, userID)+// RemoveUserTokens Log out all users under this user id+func (as *AuthService) RemoveUserTokens(ctx context.Context, userID string) {+ as.authRepo.RemoveUserTokens(ctx, userID)}//Admindiff --git a/internal/service/user_admin/user_backyard.go b/internal/service/user_admin/user_backyard.goindex 8a4e337d..6897d8d2 100644--- a/internal/service/user_admin/user_backyard.go+++ b/internal/service/user_admin/user_backyard.go@@ -116,7 +116,7 @@ func (us *UserAdminService) UpdateUserRole(ctx context.Context, req *schema.Updareturn err}- us.authService.RemoveAllUserTokens(ctx, req.UserID)+ us.authService.RemoveUserTokens(ctx, req.UserID)return}@@ -179,7 +179,7 @@ func (us *UserAdminService) UpdateUserPassword(ctx context.Context, req *schema.return err}// logout this user- us.authService.RemoveAllUserTokens(ctx, req.UserID)+ us.authService.RemoveUserTokens(ctx, req.UserID)return}