diff --git a/routers/api/v1/repo/issue_lock.go b/routers/api/v1/repo/issue_lock.go index f10d199f9e7..e645dc4a690 100644 --- a/routers/api/v1/repo/issue_lock.go +++ b/routers/api/v1/repo/issue_lock.go @@ -61,7 +61,7 @@ func LockIssue(ctx *context.APIContext) { if !issue.IsLocked { opt := &issues_model.IssueLockOptions{ - Doer: ctx.ContextUser, + Doer: ctx.Doer, Issue: issue, Reason: reason, } @@ -121,7 +121,7 @@ func UnlockIssue(ctx *context.APIContext) { if issue.IsLocked { opt := &issues_model.IssueLockOptions{ - Doer: ctx.ContextUser, + Doer: ctx.Doer, Issue: issue, } diff --git a/tests/integration/api_issue_lock_test.go b/tests/integration/api_issue_lock_test.go index 86f7b0eab23..21c04935dd0 100644 --- a/tests/integration/api_issue_lock_test.go +++ b/tests/integration/api_issue_lock_test.go @@ -17,6 +17,7 @@ import ( "gitea.dev/tests" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" ) func TestAPILockIssue(t *testing.T) { @@ -71,4 +72,26 @@ func TestAPILockIssue(t *testing.T) { req = NewRequest(t, "DELETE", urlStr).AddTokenAuth(token34) MakeRequest(t, req, http.StatusForbidden) }) + + t.Run("DoerOnOrganizationRepo", func(t *testing.T) { + // the lock and unlock comments are posted by the signed-in user, not by the organization owning the repository + issue := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{ID: 6}) + repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: issue.RepoID}) + org := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: repo.OwnerID}) + require.True(t, org.IsOrganization()) + doer := unittest.AssertExistsAndLoadBean(t, &user_model.User{Name: "user2"}) // an owner of the organization + session := loginUser(t, doer.Name) + token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteIssue, auth_model.AccessTokenScopeWriteRepository) + urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/issues/%d/lock", org.Name, repo.Name, issue.Index) + + req := NewRequestWithJSON(t, "PUT", urlStr, api.LockIssueOption{Reason: "Spam"}).AddTokenAuth(token) + MakeRequest(t, req, http.StatusNoContent) + lockComment := unittest.AssertExistsAndLoadBean(t, &issues_model.Comment{IssueID: issue.ID, Type: issues_model.CommentTypeLock}) + assert.Equal(t, doer.ID, lockComment.PosterID) + + req = NewRequest(t, "DELETE", urlStr).AddTokenAuth(token) + MakeRequest(t, req, http.StatusNoContent) + unlockComment := unittest.AssertExistsAndLoadBean(t, &issues_model.Comment{IssueID: issue.ID, Type: issues_model.CommentTypeUnlock}) + assert.Equal(t, doer.ID, unlockComment.PosterID) + }) }