admin permissions #338
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -359,7 +359,6 @@ func (ctrl *ActivityController) AddCategoryToActivity(c *fiber.Ctx) error { | |
| return errs.InvalidUUID() | ||
| } | ||
|
|
||
| req := models.AddCategoryToActivityRequest{ | ||
| CategoryName: c.Params("categoryName"), | ||
| } | ||
|
|
@@ -408,7 +407,6 @@ func (ctrl *ActivityController) RemoveCategoryFromActivity(c *fiber.Ctx) error { | |
| return errs.InvalidUUID() | ||
| } | ||
|
|
||
| req := models.AddCategoryToActivityRequest{ | ||
| CategoryName: c.Params("categoryName"), | ||
| } | ||
|
|
@@ -506,6 +504,43 @@ func (ctrl *ActivityController) GetActivityRSVPs(c *fiber.Ctx) error { | |
| return c.Status(http.StatusOK).JSON(rsvps) | ||
| } | ||
|
|
||
| // RemoveActivityRSVP removes a specific user's RSVP from an activity. | ||
| // @Summary Remove activity RSVP | ||
| // @Description Removes a user's RSVP from an activity. Only the activity proposer or a trip admin can remove another user's RSVP. | ||
| // @Tags activities | ||
| // @Param tripID path string true "Trip ID" | ||
| // @Param activityID path string true "Activity ID" | ||
| // @Param userID path string true "User ID of the RSVP to remove" | ||
| // @Success 204 "No Content" | ||
| // @Failure 400 {object} errs.APIError | ||
| // @Failure 401 {object} errs.APIError | ||
| // @Failure 403 {object} errs.APIError | ||
| // @Failure 404 {object} errs.APIError | ||
| // @Failure 500 {object} errs.APIError | ||
| // @Router /api/v1/trips/{tripID}/activities/{activityID}/rsvps/{userID} [delete] | ||
| func (ctrl *ActivityController) RemoveActivityRSVP(c *fiber.Ctx) error { | ||
| tripID, activityID, err := ctrl.parseTripAndActivityIDs(c) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| targetUserID, err := validators.ValidateID(c.Params("userID")) | ||
| if err != nil { | ||
| return errs.InvalidUUID() | ||
| } | ||
|
|
||
| callerID, err := validators.ExtractUserID(c) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| if err := ctrl.activityService.RemoveActivityRSVP(c.Context(), tripID, activityID, callerID, targetUserID); err != nil { | ||
| return err | ||
| } | ||
|
|
||
| return c.SendStatus(http.StatusNoContent) | ||
| } | ||
|
|
||
| // @Summary Parse link into activity data | ||
| // @Description Fetches a URL and extracts structured activity fields (name, description, thumbnail) for form autofill. Supports Airbnb, Booking.com, TikTok, Instagram, and generic travel blog URLs. | ||
| // @Tags activities | ||
|
|
||
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -211,13 +211,14 @@ func (ctrl *MembershipController) UpdateMembership(c *fiber.Ctx) error { | |
| } | ||
|
|
||
| // @Summary Remove member from trip | ||
| // @Description Removes a user from a trip. Only admins can remove members. | ||
| // @Tags memberships | ||
| // @Param tripID path string true "Trip ID" | ||
| // @Param userID path string true "User ID" | ||
| // @Success 204 "No Content" | ||
| // @Failure 400 {object} errs.APIError | ||
| // @Failure 401 {object} errs.APIError | ||
| // @Failure 403 {object} errs.APIError | ||
| // @Failure 404 {object} errs.APIError | ||
| // @Failure 500 {object} errs.APIError | ||
| // @Router /api/v1/trips/{tripID}/memberships/{userID} [delete] | ||
|
|
@@ -233,6 +234,23 @@ func (ctrl *MembershipController) RemoveMember(c *fiber.Ctx) error { | |
| return errs.InvalidUUID() | ||
| } | ||
|
|
||
| // Admins can remove anyone; members can only remove themselves | ||
| authUserID, ok := c.Locals("userID").(string) | ||
| if !ok { | ||
| return errs.Unauthorized() | ||
| } | ||
| authUserUUID, err := validators.ValidateID(authUserID) | ||
| if err != nil { | ||
| return errs.Unauthorized() | ||
| } | ||
| isAdmin, err := ctrl.membershipService.IsAdmin(c.Context(), tripID, authUserUUID) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| if !isAdmin && authUserUUID != userID { | ||
| return errs.Forbidden() | ||
| } | ||
|
|
||
| if err := ctrl.membershipService.RemoveMember(c.Context(), tripID, userID); err != nil { | ||
| return err | ||
| } | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Authorization description is incorrect for membership removal.
Line 3191 says only admins can remove members, but this endpoint also allows users to remove themselves. Please update the annotation/source comment and regenerate Swagger so the contract matches runtime behavior.
Suggested documentation fix
🤖 Prompt for AI Agents