Skip to content

feat(elements): Add support for sign in with email_link via redirect_url #3926

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
dstaley merged 5 commits into from
Aug 15, 2024
Merged

feat(elements): Add support for sign in with email_link via redirect_url #3926

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e56e0b5
feat(elements): Add partial support for sign in with email_link first…
dstaley Aug 9, 2024
98fe986
fix(elements): Use Sign In default base path
dstaley Aug 9, 2024
805e172
Merge branch 'main' into ds.feat/elements-email-link-sign-in
dstaley Aug 13, 2024
bddc955
chore(elements): Add changeset
dstaley Aug 13, 2024
57061c6
Merge branch 'main' into ds.feat/elements-email-link-sign-in
dstaley Aug 13, 2024
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/dry-shrimps-study.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@clerk/elements": patch
---

feat(elements): Add support for sign in with email_link via redirect_url
1 change: 1 addition & 0 deletions packages/elements/src/internals/machines/sign-in/router.machine.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,6 +379,7 @@ export const SignInRouterMachine = setup({
input: ({ context, self }) => ({
formRef: context.formRef,
parent: self,
basePath: context.router?.basePath,
}),
onDone: {
actions: 'raiseNext',
Expand Down
12 changes: 10 additions & 2 deletions packages/elements/src/internals/machines/sign-in/verification.machine.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,11 @@ import type {
import type { DoneActorEvent } from 'xstate';
import { assign, fromPromise, log, sendTo, setup } from 'xstate';

import { RESENDABLE_COUNTDOWN_DEFAULT } from '~/internals/constants';
import {
MAGIC_LINK_VERIFY_PATH_ROUTE,
RESENDABLE_COUNTDOWN_DEFAULT,
SIGN_IN_DEFAULT_BASE_PATH,
} from '~/internals/constants';
import { ClerkElementsRuntimeError } from '~/internals/errors';
import type { FormFields } from '~/internals/machines/form';
import type { SignInStrategyName, WithParams } from '~/internals/machines/shared';
Expand Down Expand Up @@ -179,6 +183,7 @@ const SignInVerificationMachine = setup({
id: SignInVerificationMachineId,
context: ({ input }) => ({
currentFactor: null,
basePath: input.basePath || SIGN_IN_DEFAULT_BASE_PATH,
formRef: input.formRef,
loadingStep: 'verifications',
parent: input.parent,
Expand Down Expand Up @@ -237,7 +242,10 @@ const SignInVerificationMachine = setup({
input: ({ context }) => ({
parent: context.parent,
resendable: context.resendable,
params: context.currentFactor as PrepareFirstFactorParams,
params: {
...context.currentFactor,
redirectUrl: `${window.location.origin}${context.basePath}${MAGIC_LINK_VERIFY_PATH_ROUTE}`,
Copy link
Member Author

@dstaley dstaley Aug 9, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It might make sense for this URL to be built somewhere else. In clerk-js we have a buildURL helper that handles appending the origin based on the routing type.

} as PrepareFirstFactorParams,
}),
onDone: {
actions: 'resendableReset',
Expand Down
2 changes: 2 additions & 0 deletions packages/elements/src/internals/machines/sign-in/verification.types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ export type SignInVerificationEvents =
export interface SignInVerificationInput {
formRef: ActorRefFrom<typeof FormMachine>;
parent: SignInRouterMachineActorRef;
basePath?: string;
}

// ---------------------------------- Context ---------------------------------- //
Expand All @@ -51,6 +52,7 @@ export interface SignInVerificationContext {
registeredStrategies: Set<SignInStrategyName>;
resendable: boolean;
resendableAfter: number;
basePath?: string;
}

// ---------------------------------- Delays ---------------------------------- //
Expand Down