Onboarding - add nextPath logic after email verification #12342
Merged
Conversation
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
![greptile-apps[bot]](https://avatars.githubusercontent.com/in/867647?s=60&v=4){kind=small}
There was a problem hiding this comment.
PR Summary
This PR implements nextPath logic after email verification to maintain billing session state, ensuring users are redirected to their selected plan page after verifying their email address.
- Added
verifyEmailNextPathStateto store and manage post-verification redirect paths - Modified
usePageChangeEffectNavigateLocationto handle redirection based onverifyEmailNextPath - Updated
SignUpInputDTO and mutation to includeverifyEmailNextPathparameter - Added
buildAppPathWithQueryParamsutility but needs URI encoding for security - Removed
isQueryParamInitializedStatein favor of deep equality checks for state updates
17 file(s) reviewed, 6 comment(s)
Edit PR Review Bot Settings | Greptile
| @@ -43,6 +44,7 @@ export const usePageChangeEffectNavigateLocation = () => { | |||
| const objectMetadataItem = objectMetadataItems.find( | |||
| (objectMetadataItem) => objectMetadataItem.namePlural === objectNamePlural, | |||
| ); | |||
| const verifyEmailNextPath = useRecoilValue(verifyEmailNextPathState); | |||
There was a problem hiding this comment.
style: Consider adding a type annotation for verifyEmailNextPath to make the expected type more explicit
packages/twenty-front/src/modules/app/hooks/useInitializeQueryParamState.ts
Outdated
Show resolved
Hide resolved
...nty-server/src/engine/core-modules/email-verification/services/email-verification.service.ts
Show resolved
Hide resolved
etiennejouan
commented
May 28, 2025
| @@ -58,6 +60,12 @@ export const usePageChangeEffectNavigateLocation = () => { | |||
| onboardingStatus === OnboardingStatus.PLAN_REQUIRED && | |||
| !someMatchingLocationOf([AppPath.PlanRequired, AppPath.PlanRequiredSuccess]) | |||
| ) { | |||
| if ( | |||
There was a problem hiding this comment.
Not entirely satisfied of nesting verifyEmail redirection condition here (because it should not be dependant of billing), but without, chooseYouPlan modal blinks.
|
🚀 Preview Environment Ready! Your preview environment is available at: http://bore.pub:44573 This environment will automatically shut down when the PR is closed or after 5 hours. |
ijreilly
reviewed
May 28, 2025
packages/twenty-front/src/modules/app/hooks/useInitializeQueryParamState.ts
Show resolved
Hide resolved
ijreilly
approved these changes
May 28, 2025
jordan-chalupka
pushed a commit
to InsurOS/twenty
that referenced
this pull request
Jun 1, 2025
) Context : Plan choice [on pricing page on website](https://twenty.com/pricing) should redirect you the right plan on app /plan-required page (after sign in), thanks to query parameters and BillingCheckoutSessionState sync. With email verification, an other session starts at CTA click in verification email. Initial BillingCheckoutSessionState is lost and user can't submit to the plan he choose. Solution : Pass a nextPath query parameter in email verification link To test : - Modify .env to add IS_BILLING_ENABLED (+ reset db + sync billing) + IS_EMAIL_VERIFICATION_REQUIRED - Start test from this page http://app.localhost:3001/welcome?billingCheckoutSession={%22plan%22:%22ENTERPRISE%22,%22interval%22:%22Year%22,%22requirePaymentMethod%22:true} - After verification, check you arrive on /plan-required page with Enterprise plan on a yearly interval (default is Pro/monthly). closes twentyhq#12288
jordan-chalupka
pushed a commit
to InsurOS/twenty
that referenced
this pull request
Jun 1, 2025
) Context : Plan choice [on pricing page on website](https://twenty.com/pricing) should redirect you the right plan on app /plan-required page (after sign in), thanks to query parameters and BillingCheckoutSessionState sync. With email verification, an other session starts at CTA click in verification email. Initial BillingCheckoutSessionState is lost and user can't submit to the plan he choose. Solution : Pass a nextPath query parameter in email verification link To test : - Modify .env to add IS_BILLING_ENABLED (+ reset db + sync billing) + IS_EMAIL_VERIFICATION_REQUIRED - Start test from this page http://app.localhost:3001/welcome?billingCheckoutSession={%22plan%22:%22ENTERPRISE%22,%22interval%22:%22Year%22,%22requirePaymentMethod%22:true} - After verification, check you arrive on /plan-required page with Enterprise plan on a yearly interval (default is Pro/monthly). closes twentyhq#12288
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.
Context :
Plan choice on pricing page on website should redirect you the right plan on app /plan-required page (after sign in), thanks to query parameters and BillingCheckoutSessionState sync.
With email verification, an other session starts at CTA click in verification email. Initial BillingCheckoutSessionState is lost and user can't submit to the plan he choose.
Solution :
Pass a nextPath query parameter in email verification link
To test :
closes #12288