fix: add server-side redirect for users with pending invites on onboarding page#2
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>
Greptile OverviewGreptile SummaryThis PR adds server-side redirect logic for users with pending team invites during onboarding. The implementation extracts pending invite checks into a new Major changes:
Critical issue:
Confidence Score: 0/5
Important Files Changed
Sequence DiagramsequenceDiagram
participant User
participant OnboardingPage as Onboarding Page
participant Session as getServerSession
participant MembershipRepo as MembershipRepository
participant Database as Prisma DB
User->>OnboardingPage: Navigate to /onboarding/getting-started
OnboardingPage->>Session: getServerSession()
Session-->>OnboardingPage: session data
alt No session or user ID
OnboardingPage->>User: redirect(/auth/login)
else Has session
OnboardingPage->>MembershipRepo: hasPendingInviteByUserId(userId)
MembershipRepo->>Database: findFirst(userId, accepted: true)
Note over MembershipRepo,Database: BUG: Should query accepted: false
Database-->>MembershipRepo: membership or null
MembershipRepo-->>OnboardingPage: boolean result
alt Has pending invite
OnboardingPage->>User: redirect(/onboarding/personal/settings)
else No pending invite
OnboardingPage->>User: render OnboardingView
end
end
|
| const pendingInvite = await prisma.membership.findFirst({ | ||
| where: { | ||
| userId, | ||
| accepted: true, |
There was a problem hiding this comment.
inverted logic - checks accepted: true but should check accepted: false for pending invites
Suggested change
| accepted: true, | |
| accepted: false, |
Prompt To Fix With AI
This is a comment left during a code review.
Path: packages/features/membership/repositories/MembershipRepository.ts
Line: 588:588
Comment:
inverted logic - checks `accepted: true` but should check `accepted: false` for pending invites
```suggestion
accepted: false,
```
How can I resolve this? If you propose a fix, please make it concise.| return redirect("/onboarding/personal/settings"); | ||
| } | ||
|
|
||
| const userEmail = session.user.email || ''; |
There was a problem hiding this comment.
quote style changed from double to single - inconsistent with rest of codebase formatting
Note: If this suggestion doesn't match your team's coding style, reply to this and let me know. I'll remember it for next time!
Prompt To Fix With AI
This is a comment left during a code review.
Path: apps/web/app/(use-page-wrapper)/onboarding/getting-started/page.tsx
Line: 35:35
Comment:
quote style changed from double to single - inconsistent with rest of codebase formatting
<sub>Note: If this suggestion doesn't match your team's coding style, reply to this and let me know. I'll remember it for next time!</sub>
How can I resolve this? If you propose a fix, please make it concise.
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.
Benchmark PR from agentic-review-benchmarks#2