Skip to content

Commit 134e3fd

Browse files
6543lafriks
andcommitted
[API] dont reqToken on GetReactions (fix #9543) (#9548)
* dont reqToken on GetReactions * ctx.Repo.CanWrite has ctx.User.IsAdmin in It Co-authored-by: Lauris BH <[email protected]>
1 parent b3c5b4b commit 134e3fd

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

routers/api/v1/api.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -664,10 +664,10 @@ func RegisterRoutes(m *macaron.Macaron) {
664664
m.Combo("", reqToken()).
665665
Patch(mustNotBeArchived, bind(api.EditIssueCommentOption{}), repo.EditIssueComment).
666666
Delete(repo.DeleteIssueComment)
667-
m.Combo("/reactions", reqToken()).
667+
m.Combo("/reactions").
668668
Get(repo.GetIssueCommentReactions).
669-
Post(bind(api.EditReactionOption{}), repo.PostIssueCommentReaction).
670-
Delete(bind(api.EditReactionOption{}), repo.DeleteIssueCommentReaction)
669+
Post(bind(api.EditReactionOption{}), reqToken(), repo.PostIssueCommentReaction).
670+
Delete(bind(api.EditReactionOption{}), reqToken(), repo.DeleteIssueCommentReaction)
671671
})
672672
})
673673
m.Group("/:index", func() {
@@ -704,10 +704,10 @@ func RegisterRoutes(m *macaron.Macaron) {
704704
m.Put("/:user", reqToken(), repo.AddIssueSubscription)
705705
m.Delete("/:user", reqToken(), repo.DelIssueSubscription)
706706
})
707-
m.Combo("/reactions", reqToken()).
707+
m.Combo("/reactions").
708708
Get(repo.GetIssueReactions).
709-
Post(bind(api.EditReactionOption{}), repo.PostIssueReaction).
710-
Delete(bind(api.EditReactionOption{}), repo.DeleteIssueReaction)
709+
Post(bind(api.EditReactionOption{}), reqToken(), repo.PostIssueReaction).
710+
Delete(bind(api.EditReactionOption{}), reqToken(), repo.DeleteIssueReaction)
711711
})
712712
}, mustEnableIssuesOrPulls)
713713
m.Group("/labels", func() {

routers/api/v1/repo/issue_reaction.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ func GetIssueCommentReactions(ctx *context.APIContext) {
5555
return
5656
}
5757

58-
if !ctx.Repo.CanRead(models.UnitTypeIssues) && !ctx.User.IsAdmin {
58+
if !ctx.Repo.CanRead(models.UnitTypeIssues) {
5959
ctx.Error(http.StatusForbidden, "GetIssueCommentReactions", errors.New("no permission to get reactions"))
6060
return
6161
}
@@ -179,7 +179,7 @@ func changeIssueCommentReaction(ctx *context.APIContext, form api.EditReactionOp
179179
ctx.Error(http.StatusInternalServerError, "comment.LoadIssue() failed", err)
180180
}
181181

182-
if comment.Issue.IsLocked && !ctx.Repo.CanWrite(models.UnitTypeIssues) && !ctx.User.IsAdmin {
182+
if comment.Issue.IsLocked && !ctx.Repo.CanWrite(models.UnitTypeIssues) {
183183
ctx.Error(http.StatusForbidden, "ChangeIssueCommentReaction", errors.New("no permission to change reaction"))
184184
return
185185
}
@@ -261,7 +261,7 @@ func GetIssueReactions(ctx *context.APIContext) {
261261
return
262262
}
263263

264-
if !ctx.Repo.CanRead(models.UnitTypeIssues) && !ctx.User.IsAdmin {
264+
if !ctx.Repo.CanRead(models.UnitTypeIssues) {
265265
ctx.Error(http.StatusForbidden, "GetIssueReactions", errors.New("no permission to get reactions"))
266266
return
267267
}
@@ -380,7 +380,7 @@ func changeIssueReaction(ctx *context.APIContext, form api.EditReactionOption, i
380380
return
381381
}
382382

383-
if issue.IsLocked && !ctx.Repo.CanWrite(models.UnitTypeIssues) && !ctx.User.IsAdmin {
383+
if issue.IsLocked && !ctx.Repo.CanWrite(models.UnitTypeIssues) {
384384
ctx.Error(http.StatusForbidden, "ChangeIssueCommentReaction", errors.New("no permission to change reaction"))
385385
return
386386
}

0 commit comments

Comments
 (0)