Code Review Bench PR #26829 - fix: add server-side redirect for users with pending invites on onboarding page#2
Open
tomerqodo wants to merge 3 commits intobase_pr_26829_20260125_7092from
Conversation
…rding page When users sign up with an invite token, they were being redirected to /onboarding/getting-started (plan selection page) instead of going directly to /onboarding/personal/settings. This caused users to see the payment prompt for team/org plans before being redirected. This fix adds a server-side check in the /onboarding/getting-started page to redirect users with pending invites directly to the personal onboarding flow, preventing them from seeing the plan selection page. Also refactored onboardingUtils.ts to use MembershipRepository instead of direct prisma access. Co-Authored-By: sean@cal.com <Sean@brydon.io>
Co-Authored-By: sean@cal.com <Sean@brydon.io>
This was referenced Jan 25, 2026
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
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.
Code Review Bench PR calcom#26829
Original PR Title: fix: add server-side redirect for users with pending invites on onboarding page
Original PR Description: ## What does this PR do?
When users sign up with an invite token, they were being redirected to
/onboarding/getting-started(plan selection page) instead of going directly to/onboarding/personal/settings. This caused users to see the payment prompt for team/org plans before being redirected by the client-side check, which was confusing.This fix adds a server-side check in the
/onboarding/getting-startedpage to redirect users with pending invites directly to the personal onboarding flow, preventing them from seeing the plan selection page entirely.Also refactored
onboardingUtils.tsto useMembershipRepositoryinstead of direct prisma access (following the "no prisma outside of repositories" pattern).Mandatory Tasks (DO NOT REMOVE)
How should this be tested?
/onboarding/personal/settingsinstead of/onboarding/getting-startedChecklist
Human Review Checklist
accepted: falseon membership correctly identifies users who signed up via invite token/onboarding/personal/settingsis the correct redirect destination for invited usersUpdates since last revision
hasPendingInviteByUserIdmethod inMembershipRepository.integration-test.tscovering:truewhen user has a pending invite (accepted: false)falsewhen user has no pending invites (all accepted)falsewhen user has no memberships at alltruewhen user has both accepted and pending invitesLink to Devin run: https://app.devin.ai/sessions/4e32655b88134d1eb18481fc6ae2b35a
Requested by: @sean-brydon
Original PR URL: calcom#26829