mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-10-31 22:38:58 +00:00
[MODERATION] Remove blocked user collaborations with doer
- When the doer blocks an user, who is also an collaborator on an repository that the doer owns, remove that collaboration. - Added unit tests. - Refactor the unit test to be more organized.
This commit is contained in:
parent
61b9f120aa
commit
ec87016178
4 changed files with 90 additions and 12 deletions
|
@ -137,6 +137,19 @@ func ChangeCollaborationAccessMode(ctx context.Context, repo *Repository, uid in
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// GetCollaboratorWithUser returns all collaborator IDs of collabUserID on
|
||||||
|
// repositories of ownerID.
|
||||||
|
func GetCollaboratorWithUser(ctx context.Context, ownerID, collabUserID int64) ([]int64, error) {
|
||||||
|
collabsID := make([]int64, 0, 8)
|
||||||
|
err := db.GetEngine(ctx).Table("collaboration").Select("collaboration.`id`").
|
||||||
|
Join("INNER", "repository", "repository.id = collaboration.repo_id").
|
||||||
|
Where("repository.`owner_id` = ?", ownerID).
|
||||||
|
And("collaboration.`user_id` = ?", collabUserID).
|
||||||
|
Find(&collabsID)
|
||||||
|
|
||||||
|
return collabsID, err
|
||||||
|
}
|
||||||
|
|
||||||
// IsOwnerMemberCollaborator checks if a provided user is the owner, a collaborator or a member of a team in a repository
|
// IsOwnerMemberCollaborator checks if a provided user is the owner, a collaborator or a member of a team in a repository
|
||||||
func IsOwnerMemberCollaborator(repo *Repository, userID int64) (bool, error) {
|
func IsOwnerMemberCollaborator(repo *Repository, userID int64) (bool, error) {
|
||||||
if repo.OwnerID == userID {
|
if repo.OwnerID == userID {
|
||||||
|
|
|
@ -11,6 +11,7 @@ import (
|
||||||
access_model "code.gitea.io/gitea/models/perm/access"
|
access_model "code.gitea.io/gitea/models/perm/access"
|
||||||
repo_model "code.gitea.io/gitea/models/repo"
|
repo_model "code.gitea.io/gitea/models/repo"
|
||||||
"code.gitea.io/gitea/models/unittest"
|
"code.gitea.io/gitea/models/unittest"
|
||||||
|
user_model "code.gitea.io/gitea/models/user"
|
||||||
|
|
||||||
"github.com/stretchr/testify/assert"
|
"github.com/stretchr/testify/assert"
|
||||||
)
|
)
|
||||||
|
@ -156,3 +157,23 @@ func TestRepo_GetCollaboration(t *testing.T) {
|
||||||
assert.NoError(t, err)
|
assert.NoError(t, err)
|
||||||
assert.Nil(t, collab)
|
assert.Nil(t, collab)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestGetCollaboratorWithUser(t *testing.T) {
|
||||||
|
assert.NoError(t, unittest.PrepareTestDatabase())
|
||||||
|
|
||||||
|
user16 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 16})
|
||||||
|
user15 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 15})
|
||||||
|
user18 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 18})
|
||||||
|
|
||||||
|
collabs, err := repo_model.GetCollaboratorWithUser(db.DefaultContext, user16.ID, user15.ID)
|
||||||
|
assert.NoError(t, err)
|
||||||
|
assert.Len(t, collabs, 2)
|
||||||
|
assert.EqualValues(t, 5, collabs[0])
|
||||||
|
assert.EqualValues(t, 7, collabs[1])
|
||||||
|
|
||||||
|
collabs, err = repo_model.GetCollaboratorWithUser(db.DefaultContext, user16.ID, user18.ID)
|
||||||
|
assert.NoError(t, err)
|
||||||
|
assert.Len(t, collabs, 2)
|
||||||
|
assert.EqualValues(t, 6, collabs[0])
|
||||||
|
assert.EqualValues(t, 8, collabs[1])
|
||||||
|
}
|
||||||
|
|
|
@ -54,5 +54,17 @@ func BlockUser(ctx context.Context, userID, blockID int64) error {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Remove blocked user as collaborator from repositories the user owns as an
|
||||||
|
// individual.
|
||||||
|
collabsID, err := repo_model.GetCollaboratorWithUser(ctx, userID, blockID)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
_, err = db.GetEngine(ctx).In("id", collabsID).Delete(&repo_model.Collaboration{})
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
return committer.Commit()
|
return committer.Commit()
|
||||||
}
|
}
|
||||||
|
|
|
@ -22,20 +22,52 @@ func TestBlockUser(t *testing.T) {
|
||||||
doer := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 5})
|
doer := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 5})
|
||||||
blockedUser := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1})
|
blockedUser := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1})
|
||||||
|
|
||||||
// Follow each other.
|
t.Run("Follow", func(t *testing.T) {
|
||||||
assert.NoError(t, user_model.FollowUser(db.DefaultContext, doer.ID, blockedUser.ID))
|
defer user_model.UnblockUser(db.DefaultContext, doer.ID, blockedUser.ID)
|
||||||
assert.NoError(t, user_model.FollowUser(db.DefaultContext, blockedUser.ID, doer.ID))
|
|
||||||
|
|
||||||
// Blocked user watch repository of doer.
|
// Follow each other.
|
||||||
repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{OwnerID: doer.ID})
|
assert.NoError(t, user_model.FollowUser(db.DefaultContext, doer.ID, blockedUser.ID))
|
||||||
assert.NoError(t, repo_model.WatchRepo(db.DefaultContext, blockedUser.ID, repo.ID, true))
|
assert.NoError(t, user_model.FollowUser(db.DefaultContext, blockedUser.ID, doer.ID))
|
||||||
|
|
||||||
assert.NoError(t, BlockUser(db.DefaultContext, doer.ID, blockedUser.ID))
|
assert.NoError(t, BlockUser(db.DefaultContext, doer.ID, blockedUser.ID))
|
||||||
|
|
||||||
// Ensure they aren't following each other anymore.
|
// Ensure they aren't following each other anymore.
|
||||||
assert.False(t, user_model.IsFollowing(doer.ID, blockedUser.ID))
|
assert.False(t, user_model.IsFollowing(doer.ID, blockedUser.ID))
|
||||||
assert.False(t, user_model.IsFollowing(blockedUser.ID, doer.ID))
|
assert.False(t, user_model.IsFollowing(blockedUser.ID, doer.ID))
|
||||||
|
})
|
||||||
|
|
||||||
// Ensure blocked user isn't following doer's repository.
|
t.Run("Watch", func(t *testing.T) {
|
||||||
assert.False(t, repo_model.IsWatching(blockedUser.ID, repo.ID))
|
defer user_model.UnblockUser(db.DefaultContext, doer.ID, blockedUser.ID)
|
||||||
|
|
||||||
|
// Blocked user watch repository of doer.
|
||||||
|
repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{OwnerID: doer.ID})
|
||||||
|
assert.NoError(t, repo_model.WatchRepo(db.DefaultContext, blockedUser.ID, repo.ID, true))
|
||||||
|
|
||||||
|
assert.NoError(t, BlockUser(db.DefaultContext, doer.ID, blockedUser.ID))
|
||||||
|
|
||||||
|
// Ensure blocked user isn't following doer's repository.
|
||||||
|
assert.False(t, repo_model.IsWatching(blockedUser.ID, repo.ID))
|
||||||
|
})
|
||||||
|
|
||||||
|
t.Run("Collaboration", func(t *testing.T) {
|
||||||
|
doer := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 16})
|
||||||
|
blockedUser := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 18})
|
||||||
|
repo1 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 22, OwnerID: doer.ID})
|
||||||
|
repo2 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 21, OwnerID: doer.ID})
|
||||||
|
defer user_model.UnblockUser(db.DefaultContext, doer.ID, blockedUser.ID)
|
||||||
|
|
||||||
|
isBlockedUserCollab := func(repo *repo_model.Repository) bool {
|
||||||
|
isCollaborator, err := repo_model.IsCollaborator(db.DefaultContext, repo.ID, blockedUser.ID)
|
||||||
|
assert.NoError(t, err)
|
||||||
|
return isCollaborator
|
||||||
|
}
|
||||||
|
|
||||||
|
assert.True(t, isBlockedUserCollab(repo1))
|
||||||
|
assert.True(t, isBlockedUserCollab(repo2))
|
||||||
|
|
||||||
|
assert.NoError(t, BlockUser(db.DefaultContext, doer.ID, blockedUser.ID))
|
||||||
|
|
||||||
|
assert.False(t, isBlockedUserCollab(repo1))
|
||||||
|
assert.False(t, isBlockedUserCollab(repo2))
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue