fix(web): Hubspot onboarding invite member flow #5674
There are no files selected for viewing
This file contains 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 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 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 |
|---|---|---|
|
|
@@ -28,13 +28,16 @@ export interface LocationState { | |
|
|
||
| export function LoginForm({ email, invitationToken }: LoginFormProps) { | ||
| const segment = useSegment(); | ||
| const { login, currentUser, organizations } = useAuth(); | ||
| const { startVercelSetup } = useVercelIntegration(); | ||
| const { isFromVercel, params: vercelParams } = useVercelParams(); | ||
| const [params] = useSearchParams(); | ||
| const tokenInQuery = params.get('token'); | ||
| const source = params.get('source'); | ||
| const sourceWidget = params.get('source_widget'); | ||
| const invitationTokenFromGithub = params.get('invitationToken') as string; | ||
| const isRedirectedFromLoginPage = params.get('isLoginPage') as string; | ||
|
|
||
| const { isLoading: isLoadingAcceptInvite, acceptInvite } = useAcceptInvite(); | ||
| const navigate = useNavigate(); | ||
| const location = useLocation(); | ||
|
|
@@ -48,40 +51,59 @@ export function LoginForm({ email, invitationToken }: LoginFormProps) { | |
| } | ||
| >((data) => api.post('/v1/auth/login', data)); | ||
|
|
||
| const handleLoginInUseEffect = async () => { | ||
| // if currentUser is true, it means user exists, then while accepting invitation, InvitationPage will handle accept this case | ||
| if (currentUser) { | ||
| return; | ||
| } | ||
|
|
||
| // if token from github is not present | ||
jainpawan21 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| if (!tokenInQuery) { | ||
| return; | ||
| } | ||
|
|
||
| // handle github login after invitation | ||
| if (invitationTokenFromGithub) { | ||
| await login(tokenInQuery); | ||
| const updatedToken = await acceptInvite(invitationTokenFromGithub); | ||
|
|
||
| if (updatedToken) { | ||
| await login(updatedToken, isRedirectedFromLoginPage === 'true' ? ROUTES.WORKFLOWS : ROUTES.AUTH_APPLICATION); | ||
|
There was a problem hiding this comment. Ouch. This has to be done this way as the accept invitation endpoint is authenticated but it shouldn't. Removing the What do you think? There was a problem hiding this comment. I think, the user should exist before accepting invitation. So current |
||
|
|
||
| return; | ||
| } | ||
| } | ||
|
|
||
| if (organizations) { | ||
| navigate(ROUTES.WORKFLOWS); | ||
| } else { | ||
| await login(tokenInQuery, ROUTES.AUTH_APPLICATION); | ||
| } | ||
|
|
||
| if (isFromVercel) { | ||
| await login(tokenInQuery); | ||
| startVercelSetup(); | ||
|
|
||
| return; | ||
| } | ||
|
|
||
| if (source === 'cli') { | ||
| segment.track('Dashboard Visit', { | ||
| widget: sourceWidget || 'unknown', | ||
| source: 'cli', | ||
| }); | ||
| await login(tokenInQuery, ROUTES.GET_STARTED); | ||
|
|
||
| return; | ||
| } | ||
|
|
||
| await login(tokenInQuery, ROUTES.WORKFLOWS); | ||
| }; | ||
|
|
||
| useEffect(() => { | ||
| handleLoginInUseEffect(); | ||
| // eslint-disable-next-line react-hooks/exhaustive-deps | ||
| }, [login]); | ||
|
|
||
| const signupLink = isFromVercel ? `${ROUTES.AUTH_SIGNUP}?${params.toString()}` : ROUTES.AUTH_SIGNUP; | ||
| const resetPasswordLink = isFromVercel | ||
|
|
@@ -135,7 +157,7 @@ export function LoginForm({ email, invitationToken }: LoginFormProps) { | |
|
|
||
| return ( | ||
| <> | ||
| <OAuth invitationToken={invitationToken} isLoginPage={true} /> | ||
| <form noValidate onSubmit={handleSubmit(onLogin)}> | ||
| <Input | ||
| error={emailClientError || emailServerError} | ||
|
|
||
This file contains 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 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 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 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 |
|---|---|---|
|
|
@@ -48,6 +48,10 @@ export const buildOauthRedirectUrl = (request): string => { | |
| if (invitationToken) { | ||
| url += `&invitationToken=${invitationToken}`; | ||
| } | ||
| const isLoginPage = JSON.parse(request.query.state).isLoginPage; | ||
|
There was a problem hiding this comment. Instead of marking whether OAuth comes from loginPage, we can add a There was a problem hiding this comment. @SokratisVidros which means instead of hardcoed |
||
| if (isLoginPage) { | ||
| url += `&isLoginPage=${isLoginPage}`; | ||
| } | ||
|
|
||
| return url; | ||
| }; | ||
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.
This indicates a routing issue as the invitation handling should be done in one place, not between pages. It's OK for now but we will have to get back to this.