Skip to content

fix(elements): Sign-Up setActive not firing #3391

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.

Sign up for GitHub

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
LekoArts merged 1 commit into from
May 16, 2024
Merged

fix(elements): Sign-Up setActive not firing #3391

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/ninety-geese-knock.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@clerk/elements': patch
---

Fix `setActive` not firing upon a successful sign up.
68 changes: 36 additions & 32 deletions packages/elements/src/internals/machines/sign-up/router.machine.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { joinURL } from '@clerk/shared/url';
import type { SignUpStatus, VerificationStatus } from '@clerk/types';
import type { NonReducibleUnknown } from 'xstate';
import { and, assign, enqueueActions, log, not, or, raise, sendTo, setup, spawnChild } from 'xstate';
import { and, assign, enqueueActions, log, not, or, raise, sendTo, setup } from 'xstate';

import {
ERROR_CODES,
Expand Down Expand Up @@ -59,20 +59,18 @@ export const SignUpRouterMachine = setup({
},
navigateExternal: ({ context }, { path }: { path: string }) => context.router?.push(path),
raiseNext: raise({ type: 'NEXT' }),
setActive: (_, params?: { sessionId?: string; useLastActiveSession?: boolean }) =>
enqueueActions(({ enqueue, check, context, event }) => {
if (check('isExampleMode')) return;

const session =
params?.sessionId ||
(params?.useLastActiveSession && context.clerk.client.lastActiveSessionId) ||
((event as SignUpRouterNextEvent)?.resource || context.clerk.client.signUp).createdSessionId;
setActive: ({ context, event }, params?: { sessionId?: string; useLastActiveSession?: boolean }) => {
if (context.exampleMode) return;

const beforeEmit = () => context.router?.push(context.clerk.buildAfterSignUpUrl());
void context.clerk.setActive({ session, beforeEmit });
const session =
params?.sessionId ||
(params?.useLastActiveSession && context.clerk.client.lastActiveSessionId) ||
((event as SignUpRouterNextEvent)?.resource || context.clerk.client.signUp).createdSessionId;

enqueue.raise({ type: 'RESET' }, { delay: 2000 }); // Reset machine after 2s delay.
}),
const beforeEmit = () => context.router?.push(context.clerk.buildAfterSignUpUrl());
void context.clerk.setActive({ session, beforeEmit });
},
delayedReset: raise({ type: 'RESET' }, { delay: 3000 }), // Reset machine after 3s delay.
setError: assign({
error: (_, { error }: { error?: ClerkElementsError }) => {
if (error) return error;
Expand Down Expand Up @@ -208,16 +206,19 @@ export const SignUpRouterMachine = setup({
},
},
Init: {
entry: spawnChild('thirdPartyMachine', {
id: ThirdPartyMachineId,
systemId: ThirdPartyMachineId,
input: ({ context, self }) => ({
basePath: context.router?.basePath ?? SIGN_UP_DEFAULT_BASE_PATH,
environment: context.clerk.__unstable__environment,
flow: 'signUp',
formRef: context.formRef,
parent: self,
}),
entry: enqueueActions(({ context, enqueue, self }) => {
if (!self.getSnapshot().children[ThirdPartyMachineId]) {
Comment thread
tmilewski marked this conversation as resolved.
enqueue.spawnChild('thirdPartyMachine', {
id: ThirdPartyMachineId,
systemId: ThirdPartyMachineId,
input: {
basePath: context.router?.basePath ?? SIGN_UP_DEFAULT_BASE_PATH,
flow: 'signUp',
formRef: context.formRef,
parent: self,
},
});
}
}),
always: [
{
Expand Down Expand Up @@ -269,7 +270,7 @@ export const SignUpRouterMachine = setup({
NEXT: [
{
guard: 'isStatusComplete',
actions: 'setActive',
actions: ['setActive', 'delayedReset'],
},
{
guard: 'statusNeedsVerification',
Expand Down Expand Up @@ -302,7 +303,7 @@ export const SignUpRouterMachine = setup({
NEXT: [
{
guard: 'isStatusComplete',
actions: 'setActive',
actions: ['setActive', 'delayedReset'],
},
{
guard: 'statusNeedsVerification',
Expand All @@ -329,10 +330,13 @@ export const SignUpRouterMachine = setup({
always: [
{
guard: 'hasCreatedSession',
actions: ({ context }) => ({
type: 'setActive',
params: { sessionId: context.router?.searchParams().get(SEARCH_PARAMS.createdSession) },
}),
actions: [
({ context }) => ({
type: 'setActive',
params: { sessionId: context.router?.searchParams().get(SEARCH_PARAMS.createdSession) },
}),
'delayedReset',
],
},
{
guard: { type: 'hasClerkStatus', params: { status: 'verified' } },
Expand All @@ -347,7 +351,7 @@ export const SignUpRouterMachine = setup({
NEXT: [
{
guard: 'isStatusComplete',
actions: 'setActive',
actions: ['setActive', 'delayedReset'],
},
{
guard: 'statusNeedsContinue',
Expand All @@ -364,12 +368,12 @@ export const SignUpRouterMachine = setup({
NEXT: [
{
guard: 'isStatusComplete',
actions: 'setActive',
actions: ['setActive', 'delayedReset'],
},
{
description: 'Handle a case where the user has already been authenticated via ClerkJS',
guard: 'hasAuthenticatedViaClerkJS',
actions: { type: 'setActive', params: { useLastActiveSession: true } },
actions: [{ type: 'setActive', params: { useLastActiveSession: true } }, 'delayedReset'],
},
{
guard: 'statusNeedsVerification',
Expand Down