Allow admins and org owners to change org member public status #28294
+20
−6
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
a1012112796
approved these changes
Dec 6, 2023
|
Use |
|
@yp05327 Like this? |
|
Can be simpler. if userToPublicize.ID != ctx.Doer.ID && !ctx.Doer.IsAdmin {
isOwner, err := ctx.Org.Organization.IsOwnedBy(ctx, ctx.Doer.ID)
if err != nil {
ctx.Error(http.StatusInternalServerError, "IsOwnedBy", err)
return
}
if !isOwner {
ctx.Error(http.StatusForbidden, "", "Cannot publicize another member")
return
}
} |
|
@yp05327 That is indeed better, updated. Thanks for the suggestion. |
lunny
reviewed
Feb 2, 2024
| @@ -236,18 +236,16 @@ func PublicizeMember(ctx *context.APIContext) { | |||
| if ctx.Written() { | |||
| return | |||
| } | |||
| allowed := userToPublicize.ID != ctx.Doer.ID && !ctx.Doer.IsAdmin | |||
| if !allowed { | |||
| if userToPublicize.ID != ctx.Doer.ID && !ctx.Doer.IsAdmin { | |||
There was a problem hiding this comment.
@lunny Indeed, the first commit was correct, then in the second I inadvertently broke it (notice how previously allowed would be true if the Doer was neither the user to publicize nor an admin). This actually fixes that error. Feel free to check the logic, and that it's now correct, yourself.
lunny
reviewed
Feb 2, 2024
| @@ -287,18 +285,16 @@ func ConcealMember(ctx *context.APIContext) { | |||
| if ctx.Written() { | |||
| return | |||
| } | |||
| allowed := userToConceal.ID != ctx.Doer.ID && !ctx.Doer.IsAdmin | |||
| if !allowed { | |||
| if userToConceal.ID != ctx.Doer.ID && !ctx.Doer.IsAdmin { | |||
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Allows admins and org owners to change org member public status.
Before, this would return
Error 403: Cannot publicize another memberdespite the fact that the same user could make the same change through the GUI.Fixes #28372