-
Notifications
You must be signed in to change notification settings - Fork 35
fix: block entering a room for not active accounts #256
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -558,6 +558,17 @@ func (h *SlackHandler) GetSessionTokens(c echo.Context) error { | |
| return echo.NewHTTPError(http.StatusForbidden, "You don't have access to this session") | ||
| } | ||
|
|
||
| // Check if user has access (paid or active trial) | ||
| hasAccess, err := checkUserHasAccess(h.DB, user) | ||
| if err != nil { | ||
| c.Logger().Error("Error getting user subscription: ", err) | ||
| return echo.NewHTTPError(http.StatusInternalServerError, "Failed to check subscription status") | ||
| } | ||
|
|
||
| if !hasAccess { | ||
| return c.JSON(http.StatusPaymentRequired, map[string]string{"error": "trial-ended"}) | ||
| } | ||
|
|
||
|
Comment on lines
+561
to
+571
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. nit: We have a flavour of this in 3 places, at some point it would be worth extracting this as a util |
||
| // Generate LiveKit tokens for this room | ||
| tokens, err := generateLiveKitTokens(&h.ServerState, room.ID, user) | ||
| if err != nil { | ||
|
|
||
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
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.
HTTP 403 for trial-ended conflicts with the frontend's expected 402 status code.
deepLinkUtils.ts(Line 94) checks forresponse.status === 402to handle trial expiration, but this endpoint returnshttp.StatusForbidden(403). The frontend's 403 handler (Line 101-102) would catch this instead and show "You don't have access to this session. It belongs to a different team." — a misleading message for expired trials.Align on a single status code. 402 (Payment Required) is semantically appropriate for subscription/trial access gating. This would also require updating
slackHandlers.go.Proposed fix (if choosing 402)
if !hasAccess { _ = notifications.SendTelegramNotification(fmt.Sprintf("Unsubscribed user %s tried to join room %s", user.ID, room.Name), h.Config) - return c.JSON(http.StatusForbidden, map[string]string{"error": "trial-ended"}) + return c.JSON(http.StatusPaymentRequired, map[string]string{"error": "trial-ended"}) }📝 Committable suggestion
🤖 Prompt for AI Agents