feat(elements): Remove hardcoded /sign-in path#2725

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 14 commits into from
Feb 6, 2024
Merged

feat(elements): Remove hardcoded /sign-in path #2725

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
661597e
feat(shared): Add joinURL helper
LekoArts Feb 5, 2024
3f99039
chore(elements): Example fixes
LekoArts Feb 5, 2024
514269f
feat(elements): Do not hardcode /sign-in
LekoArts Feb 5, 2024
70f9fb7
chore(elements): Chores
LekoArts Feb 5, 2024
0a2622a
chore(repo): Add empty changeset
LekoArts Feb 5, 2024
8e12951
chore(elements): Bump package version
LekoArts Feb 5, 2024
f76ae61
chore(elements): Bump package version
LekoArts Feb 5, 2024
4366d9f
chore(repo): Add changeset
LekoArts Feb 5, 2024
fa66aae
chore(repo): Delete changeset+
LekoArts Feb 5, 2024
5b5942c
Update thirty-kings-trade.md
LekoArts Feb 5, 2024
faceac7
chore(elements): Use SocialProviderIcon from correct imports
LekoArts Feb 6, 2024
b631c4e
chore(elements): Allow passing required prop to CustomField
LekoArts Feb 6, 2024
3e57c18
fix(elements): Use OTPInput when name="code"
LekoArts Feb 6, 2024
7c7d65a
chore(elements): Add some JSDoc comments
LekoArts Feb 6, 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/thirty-kings-trade.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/shared': patch
---

Add `joinURL` helper to `@clerk/shared/url`
2 changes: 1 addition & 1 deletion package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/elements/examples/nextjs/app/otp-playground/page.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@ import { AnimatePresence, motion } from 'framer-motion';

export default function Page() {
return (
<SignIn>
<SignIn path='/otp-playground'>
<Start>
<div className='h-dvh flex items-center justify-center bg-neutral-800'>
<Field name='code'>
Expand Down
13 changes: 13 additions & 0 deletions packages/elements/examples/nextjs/app/page.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -58,6 +58,19 @@ export default function Home() {
<p className='m-0 max-w-[30ch] text-sm opacity-50'>Sign up using Elements</p>
</Link>

<Link
href='/otp-playground'
className='group rounded-lg border border-transparent px-5 py-4 transition-colors hover:border-gray-300 hover:bg-gray-100 hover:dark:border-neutral-700 hover:dark:bg-neutral-800/30'
>
<h2 className='mb-3 text-2xl font-semibold'>
OTP{' '}
<span className='inline-block transition-transform group-hover:translate-x-1 motion-reduce:transform-none'>
-&gt;
</span>
</h2>
<p className='m-0 max-w-[30ch] text-sm opacity-50'>OTP Playground</p>
</Link>

<a
href='https://clerk.com/docs/custom-flows/overview#sign-in-flow'
className='group rounded-lg border border-transparent px-5 py-4 transition-colors hover:border-gray-300 hover:bg-gray-100 hover:dark:border-neutral-700 hover:dark:bg-neutral-800/30'
Expand Down
11 changes: 9 additions & 2 deletions packages/elements/examples/nextjs/app/sign-in/[[...sign-in]]/page.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,19 @@
'use client';

import { GlobalError, Submit } from '@clerk/elements/common';
import { Continue, Factor, SignIn, SocialProvider, Start, Verification } from '@clerk/elements/sign-in';
import {
Continue,
Factor,
SignIn,
SocialProvider,
SocialProviderIcon,
Start,
Verification,
} from '@clerk/elements/sign-in';

import { H1, H2, H3, HR as Hr, P } from '@/components/design';
import { CustomField, CustomSubmit } from '@/components/form';
import { SignInDebug } from '@/components/sign-in-debug';
import { SocialProviderIcon } from '@/components/social-providers';

export default function SignInPage() {
return (
Expand Down
11 changes: 9 additions & 2 deletions packages/elements/examples/nextjs/app/sign-up/[[...sign-up]]/page.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,19 @@
'use client';

import { GlobalError } from '@clerk/elements/common';
import { Continue, SignUp, SocialProvider, Start, Verification, Verify } from '@clerk/elements/sign-up';
import {
Continue,
SignUp,
SocialProvider,
SocialProviderIcon,
Start,
Verification,
Verify,
} from '@clerk/elements/sign-up';

import { H1, HR as Hr } from '@/components/design';
import { CustomField, CustomSubmit } from '@/components/form';
import { SignUpDebug } from '@/components/sign-up-debug';
import { SocialProviderIcon } from '@/components/social-providers';

export default function SignUpPage() {
return (
Expand Down
62 changes: 32 additions & 30 deletions packages/elements/examples/nextjs/components/form.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,38 +32,40 @@ function OTPInputSegment({ value, status }: any) {
);
}

export const CustomField = forwardRef<typeof Input, { name: string; label: string }>(function CustomField(
{ name, label },
forwardedRef,
) {
const inputProps =
name === 'code'
? {
render: OTPInputSegment,
}
: {
className: 'bg-tertiary rounded-sm px-2 py-1 border border-foreground data-[invalid]:border-red-500',
ref: forwardedRef,
};
export const CustomField = forwardRef<typeof Input, { name: string; label: string; required?: boolean }>(
function CustomField({ name, label, required = false }, forwardedRef) {
const inputProps =
name === 'code'
? {
render: OTPInputSegment,
className: 'flex gap-3',
required,
}
: {
className: 'bg-tertiary rounded-sm px-2 py-1 border border-foreground data-[invalid]:border-red-500',
ref: forwardedRef,
required,
};

return (
<ElementsField
name={name}
className='flex flex-col gap-4'
>
<div className='flex gap-4 justify-between items-center'>
<Label>{label}</Label>
<Input
name={name}
{...inputProps}
/>
</div>
return (
<ElementsField
name={name}
className='flex flex-col gap-4'
>
<div className='flex gap-4 justify-between items-center'>
<Label>{label}</Label>
<Input
name={name}
{...inputProps}
/>
</div>

<FieldError className='block text-red-400 font-mono' />
<FieldState>{({ state }) => <pre className='opacity-60 text-xs'>Field state: {state}</pre>}</FieldState>
</ElementsField>
);
});
<FieldError className='block text-red-400 font-mono' />
<FieldState>{({ state }) => <pre className='opacity-60 text-xs'>Field state: {state}</pre>}</FieldState>
</ElementsField>
);
},
);

export const CustomSubmit = forwardRef<HTMLButtonElement, React.ComponentPropsWithoutRef<'button'>>(
function CustomButton(props, forwardedRef) {
Expand Down
2 changes: 1 addition & 1 deletion packages/elements/package.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
"name": "@clerk/elements",
"version": "0.1.1",
"version": "0.1.2",
"description": "Clerk Elements",
"keywords": [
"clerk",
Expand Down
69 changes: 30 additions & 39 deletions packages/elements/src/internals/machines/sign-in/sign-in.machine.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import type { ClerkAPIResponseError } from '@clerk/shared/error';
import { isClerkAPIResponseError } from '@clerk/shared/error';
import { joinURL } from '@clerk/shared/url';
import type {
LoadedClerk,
OAuthStrategy,
Expand DownExpand Up@@ -41,12 +42,14 @@ export interface SignInMachineContext extends MachineContext {
resource: SignInResource | null;
router: ClerkRouter;
thirdPartyProviders: EnabledThirdPartyProviders;
signUpPath: string;
}

export interface SignInMachineInput {
clerk: LoadedClerk;
form: ActorRefFrom<typeof FormMachine>;
router: ClerkRouter;
signUpPath: string;
}

export type SignInMachineTags = 'state:start' | 'state:first-factor' | 'state:second-factor' | 'external';
Expand DownExpand Up@@ -115,7 +118,11 @@ export const SignInMachine = setup({
console.error(event.error);
},
navigateTo({ context }, { path }: { path: string }) {
context.router.replace(path);
const resolvedPath = joinURL(context.router.basePath, path);
context.router.replace(resolvedPath);
},
navigateToSignUp({ context }) {
context.router.push(context.signUpPath);
},
raiseFailure: raise(({ event }) => {
assertActorEventError(event);
Expand DownExpand Up@@ -143,8 +150,7 @@ export const SignInMachine = setup({
isCurrentFactorPassword: ({ context }) => context.currentFactor?.strategy === 'password',
isCurrentFactorTOTP: ({ context }) => context.currentFactor?.strategy === 'totp',
isCurrentPath: ({ context }, params: { path: string }) => {
const path = params?.path;
return path ? context.router.pathname() === path : false;
return context.router.match(params?.path);
},
isLoggedIn: ({ context }) => Boolean(context.clerk.user),
isSignInComplete: ({ context }) => context?.resource?.status === 'complete',
Expand DownExpand Up@@ -179,6 +185,7 @@ export const SignInMachine = setup({
resource: null,
router: input.router,
thirdPartyProviders: getEnabledThirdPartyProviders(input.clerk.__unstable__environment),
signUpPath: input.signUpPath,
}),
initial: 'Init',
on: {
Expand All@@ -198,22 +205,22 @@ export const SignInMachine = setup({
},
{
description: 'If the SignIn resource is empty, invoke the sign-in start flow',
guard: or([not('hasSignInResource'), { type: 'isCurrentPath', params: { path: '/sign-in' } }]),
guard: or([not('hasSignInResource'), { type: 'isCurrentPath', params: { path: '/' } }]),
target: 'Start',
},
{
description: 'Go to FirstFactor flow state',
guard: and(['needsFirstFactor', { type: 'isCurrentPath', params: { path: '/sign-in/continue' } }]),
guard: and(['needsFirstFactor', { type: 'isCurrentPath', params: { path: '/continue' } }]),
target: 'FirstFactor',
},
{
description: 'Go to SecondFactor flow state',
guard: and(['needsSecondFactor', { type: 'isCurrentPath', params: { path: '/sign-in/continue' } }]),
guard: and(['needsSecondFactor', { type: 'isCurrentPath', params: { path: '/continue' } }]),
target: 'SecondFactor',
},
{
description: 'Go to SSO Callback state',
guard: { type: 'isCurrentPath', params: { path: '/sign-in/sso-callback' } },
guard: { type: 'isCurrentPath', params: { path: '/sso-callback' } },
target: 'SSOCallback',
},
{
Expand DownExpand Up@@ -241,12 +248,20 @@ export const SignInMachine = setup({
Start: {
id: 'Start',
tags: 'state:start',
description: 'The intial state of the sign-in flow.',
description: 'The initial state of the sign-in flow.',
initial: 'AwaitingInput',
on: {
'AUTHENTICATE.OAUTH': '#SignIn.AuthenticatingWithRedirect',
'AUTHENTICATE.SAML': '#SignIn.AuthenticatingWithRedirect',
},
entry: [
{
type: 'navigateTo',
params: {
path: '/',
},
},
],
onDone: [
{
guard: 'isSignInComplete',
Expand DownExpand Up@@ -297,7 +312,7 @@ export const SignInMachine = setup({
FirstFactor: {
tags: 'state:first-factor',
initial: 'DeterminingState',
entry: 'assignStartingFirstFactor',
entry: [{ type: 'navigateTo', params: { path: '/continue' } }, 'assignStartingFirstFactor'],
onDone: [
{
guard: 'isSignInComplete',
Expand DownExpand Up@@ -385,7 +400,7 @@ export const SignInMachine = setup({
SecondFactor: {
tags: 'state:second-factor',
initial: 'DeterminingState',
entry: 'assignStartingSecondFactor',
entry: [{ type: 'navigateTo', params: { path: '/continue' } }, 'assignStartingSecondFactor'],
onDone: [
{
guard: 'isSignInComplete',
Expand DownExpand Up@@ -507,48 +522,24 @@ export const SignInMachine = setup({
'CLERKJS.NAVIGATE.RESET_PASSWORD': '#SignIn.NotImplemented',
'CLERKJS.NAVIGATE.SIGN_IN': {
actions: [
log('Navigating to sign in'),
log('Navigating to sign in root'),
{
type: 'navigateTo',
params: {
path: '/sign-in',
path: '/',
},
},
],
},
'CLERKJS.NAVIGATE.SIGN_UP': {
actions: [
log('Navigating to sign in'),
{
type: 'navigateTo',
params: {
path: '/sign-up',
},
},
],
actions: [log('Navigating to sign up'), 'navigateToSignUp'],
},
'CLERKJS.NAVIGATE.VERIFICATION': {
actions: [
log('Navigating to sign in'),
{
type: 'navigateTo',
params: {
path: '/sign-up',
},
},
],
actions: [log('Navigating to sign in'), 'navigateToSignUp'],
},
'CLERKJS.NAVIGATE.CONTINUE': {
description: 'Redirect to the sign-up flow',
actions: [
log('Navigating to sign up'),
{
type: 'navigateTo',
params: {
path: '/sign-up',
},
},
],
actions: [log('Navigating to sign up'), 'navigateToSignUp'],
},
'CLERKJS.NAVIGATE.*': {
target: '#SignIn.Start',
Expand Down
2 changes: 0 additions & 2 deletions packages/elements/src/internals/machines/sign-up/sign-up.actors.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -118,8 +118,6 @@ function fieldsToSignUpParams<T extends SignUpCreateParams | SignUpUpdateParams>
): Pick<T, SignUpAdditionalKeys> {
const params: SignUpUpdateParams = {};

// TODO: Determine what takes priority

fields.forEach(({ value }, key) => {
if (isSignUpParam(key) && value !== undefined) {
params[key] = value as string;
Expand Down
2 changes: 1 addition & 1 deletion packages/elements/src/internals/machines/sign-up/sign-up.machine.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -329,7 +329,7 @@ export const SignUpMachine = setup({
Start: {
id: 'Start',
tags: 'state:start',
description: 'The intial state of the sign-in flow.',
description: 'The intial state of the sign-up flow.',
entry: 'assignThirdPartyProviders',
initial: 'AwaitingInput',
on: {
Expand Down
2 changes: 1 addition & 1 deletion packages/elements/src/react/common/form/index.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -148,7 +148,7 @@ const useInput = ({ name: inputName, value: initialValue, type: inputType, ...pa
const shouldBeHidden = false;
const type = inputType ?? determineInputTypeFromName(name);

const Element = inputType === 'otp' ? OTPInput : RadixControl;
const Element = type === 'otp' ? OTPInput : RadixControl;

let props = {};
if (inputType === 'otp') {
Expand Down
5 changes: 5 additions & 0 deletions packages/elements/src/react/router/router.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,10 @@ export type ClerkHostRouter = {
* Internal Clerk router, used by Clerk components to interact with the host's router.
*/
export type ClerkRouter = {
/**
* The basePath the router is currently mounted on.
*/
basePath: string;
/**
* Creates a child router instance scoped to the provided base path.
*/
Expand DownExpand Up@@ -108,5 +112,6 @@ export function createClerkRouter(router: ClerkHostRouter, basePath: string = '/
replace,
pathname: router.pathname,
searchParams: router.searchParams,
basePath: normalizedBasePath,
};
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
feat(elements): Remove hardcoded /sign-in path#2725

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 14 commits into

from

Feb 6, 2024
 Merged


feat(elements): Remove hardcoded /sign-in path
#2725
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
661597e

feat(shared): Add joinURL helper


LekoArts Feb 5, 2024
3f99039

chore(elements): Example fixes


LekoArts Feb 5, 2024
514269f

feat(elements): Do not hardcode /sign-in


LekoArts Feb 5, 2024
70f9fb7

chore(elements): Chores


LekoArts Feb 5, 2024
0a2622a

chore(repo): Add empty changeset


LekoArts Feb 5, 2024
8e12951

chore(elements): Bump package version


LekoArts Feb 5, 2024
f76ae61

chore(elements): Bump package version


LekoArts Feb 5, 2024
4366d9f

chore(repo): Add changeset


LekoArts Feb 5, 2024
fa66aae

chore(repo): Delete changeset+


LekoArts Feb 5, 2024
5b5942c

Update thirty-kings-trade.md


LekoArts Feb 5, 2024
faceac7

chore(elements): Use SocialProviderIcon from correct imports


LekoArts Feb 6, 2024
b631c4e

chore(elements): Allow passing required prop to CustomField


LekoArts Feb 6, 2024
3e57c18

fix(elements): Use OTPInput when name="code"


LekoArts Feb 6, 2024
7c7d65a

chore(elements): Add some JSDoc comments


LekoArts Feb 6, 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/thirty-kings-trade.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/shared': patch
---

Add `joinURL` helper to `@clerk/shared/url`

2 changes: 1 addition & 1 deletion
package-lock.json

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


2 changes: 1 addition & 1 deletion
packages/elements/examples/nextjs/app/otp-playground/page.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@ import { AnimatePresence, motion } from 'framer-motion';

export default function Page() {
 return (
 <SignIn>
 <SignIn path='/otp-playground'>
 <Start>
 <div className='h-dvh flex items-center justify-center bg-neutral-800'>
 <Field name='code'>
Expand Down

13 changes: 13 additions & 0 deletions
packages/elements/examples/nextjs/app/page.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -58,6 +58,19 @@ export default function Home() {
 <p className='m-0 max-w-[30ch] text-sm opacity-50'>Sign up using Elements</p>
 </Link>

 <Link
 href='/otp-playground'
 className='group rounded-lg border border-transparent px-5 py-4 transition-colors hover:border-gray-300 hover:bg-gray-100 hover:dark:border-neutral-700 hover:dark:bg-neutral-800/30'
 >
 <h2 className='mb-3 text-2xl font-semibold'>
 OTP{' '}
 <span className='inline-block transition-transform group-hover:translate-x-1 motion-reduce:transform-none'>
 -&gt;
 </span>
 </h2>
 <p className='m-0 max-w-[30ch] text-sm opacity-50'>OTP Playground</p>
 </Link>

 <a
 href='https://clerk.com/docs/custom-flows/overview#sign-in-flow'
 className='group rounded-lg border border-transparent px-5 py-4 transition-colors hover:border-gray-300 hover:bg-gray-100 hover:dark:border-neutral-700 hover:dark:bg-neutral-800/30'
Expand Down

11 changes: 9 additions & 2 deletions
packages/elements/examples/nextjs/app/sign-in/[[...sign-in]]/page.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,19 @@
'use client';

import { GlobalError, Submit } from '@clerk/elements/common';
import { Continue, Factor, SignIn, SocialProvider, Start, Verification } from '@clerk/elements/sign-in';
import {
 Continue,
 Factor,
 SignIn,
 SocialProvider,
 SocialProviderIcon,
 Start,
 Verification,
} from '@clerk/elements/sign-in';

import { H1, H2, H3, HR as Hr, P } from '@/components/design';
import { CustomField, CustomSubmit } from '@/components/form';
import { SignInDebug } from '@/components/sign-in-debug';
import { SocialProviderIcon } from '@/components/social-providers';

export default function SignInPage() {
 return (
Expand Down

11 changes: 9 additions & 2 deletions
packages/elements/examples/nextjs/app/sign-up/[[...sign-up]]/page.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,19 @@
'use client';

import { GlobalError } from '@clerk/elements/common';
import { Continue, SignUp, SocialProvider, Start, Verification, Verify } from '@clerk/elements/sign-up';
import {
 Continue,
 SignUp,
 SocialProvider,
 SocialProviderIcon,
 Start,
 Verification,
 Verify,
} from '@clerk/elements/sign-up';

import { H1, HR as Hr } from '@/components/design';
import { CustomField, CustomSubmit } from '@/components/form';
import { SignUpDebug } from '@/components/sign-up-debug';
import { SocialProviderIcon } from '@/components/social-providers';

export default function SignUpPage() {
 return (
Expand Down

62 changes: 32 additions & 30 deletions
packages/elements/examples/nextjs/components/form.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,38 +32,40 @@ function OTPInputSegment({ value, status }: any) {
 );
}

export const CustomField = forwardRef<typeof Input, { name: string; label: string }>(function CustomField(
 { name, label },
 forwardedRef,
) {
 const inputProps =
 name === 'code'
 ? {
 render: OTPInputSegment,
 }
 : {
 className: 'bg-tertiary rounded-sm px-2 py-1 border border-foreground data-[invalid]:border-red-500',
 ref: forwardedRef,
 };
export const CustomField = forwardRef<typeof Input, { name: string; label: string; required?: boolean }>(
 function CustomField({ name, label, required = false }, forwardedRef) {
 const inputProps =
 name === 'code'
 ? {
 render: OTPInputSegment,
 className: 'flex gap-3',
 required,
 }
 : {
 className: 'bg-tertiary rounded-sm px-2 py-1 border border-foreground data-[invalid]:border-red-500',
 ref: forwardedRef,
 required,
 };

 return (
 <ElementsField
 name={name}
 className='flex flex-col gap-4'
 >
 <div className='flex gap-4 justify-between items-center'>
 <Label>{label}</Label>
 <Input
 name={name}
 {...inputProps}
 />
 </div>
return (
<ElementsField
name={name}
className='flex flex-col gap-4'
>
<div className='flex gap-4 justify-between items-center'>
<Label>{label}</Label>
<Input
name={name}
{...inputProps}
/>
</div>

 <FieldError className='block text-red-400 font-mono' />
 <FieldState>{({ state }) => <pre className='opacity-60 text-xs'>Field state: {state}</pre>}</FieldState>
 </ElementsField>
 );
});
 <FieldError className='block text-red-400 font-mono' />
 <FieldState>{({ state }) => <pre className='opacity-60 text-xs'>Field state: {state}</pre>}</FieldState>
 </ElementsField>
 );
 },
);

export const CustomSubmit = forwardRef<HTMLButtonElement, React.ComponentPropsWithoutRef<'button'>>(
 function CustomButton(props, forwardedRef) {
Expand Down

2 changes: 1 addition & 1 deletion
packages/elements/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
 "name": "@clerk/elements",
 "version": "0.1.1",
 "version": "0.1.2",
 "description": "Clerk Elements",
 "keywords": [
 "clerk",
Expand Down

69 changes: 30 additions & 39 deletions
packages/elements/src/internals/machines/sign-in/sign-in.machine.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import type { ClerkAPIResponseError } from '@clerk/shared/error';
import { isClerkAPIResponseError } from '@clerk/shared/error';
import { joinURL } from '@clerk/shared/url';
import type {
 LoadedClerk,
 OAuthStrategy,
Expand DownExpand Up@@ -41,12 +42,14 @@ export interface SignInMachineContext extends MachineContext {
 resource: SignInResource | null;
 router: ClerkRouter;
 thirdPartyProviders: EnabledThirdPartyProviders;
 signUpPath: string;
}

export interface SignInMachineInput {
 clerk: LoadedClerk;
 form: ActorRefFrom<typeof FormMachine>;
 router: ClerkRouter;
 signUpPath: string;
}

export type SignInMachineTags = 'state:start' | 'state:first-factor' | 'state:second-factor' | 'external';
Expand DownExpand Up@@ -115,7 +118,11 @@ export const SignInMachine = setup({
 console.error(event.error);
 },
 navigateTo({ context }, { path }: { path: string }) {
 context.router.replace(path);
 const resolvedPath = joinURL(context.router.basePath, path);
 context.router.replace(resolvedPath);
 },
 navigateToSignUp({ context }) {
 context.router.push(context.signUpPath);
 },
 raiseFailure: raise(({ event }) => {
 assertActorEventError(event);
Expand DownExpand Up@@ -143,8 +150,7 @@ export const SignInMachine = setup({
 isCurrentFactorPassword: ({ context }) => context.currentFactor?.strategy === 'password',
 isCurrentFactorTOTP: ({ context }) => context.currentFactor?.strategy === 'totp',
 isCurrentPath: ({ context }, params: { path: string }) => {
 const path = params?.path;
 return path ? context.router.pathname() === path : false;
 return context.router.match(params?.path);
 },
 isLoggedIn: ({ context }) => Boolean(context.clerk.user),
 isSignInComplete: ({ context }) => context?.resource?.status === 'complete',
Expand DownExpand Up@@ -179,6 +185,7 @@ export const SignInMachine = setup({
 resource: null,
 router: input.router,
 thirdPartyProviders: getEnabledThirdPartyProviders(input.clerk.__unstable__environment),
 signUpPath: input.signUpPath,
 }),
 initial: 'Init',
 on: {
Expand All@@ -198,22 +205,22 @@ export const SignInMachine = setup({
 },
 {
 description: 'If the SignIn resource is empty, invoke the sign-in start flow',
 guard: or([not('hasSignInResource'), { type: 'isCurrentPath', params: { path: '/sign-in' } }]),
 guard: or([not('hasSignInResource'), { type: 'isCurrentPath', params: { path: '/' } }]),
 target: 'Start',
 },
 {
 description: 'Go to FirstFactor flow state',
 guard: and(['needsFirstFactor', { type: 'isCurrentPath', params: { path: '/sign-in/continue' } }]),
 guard: and(['needsFirstFactor', { type: 'isCurrentPath', params: { path: '/continue' } }]),
 target: 'FirstFactor',
 },
 {
 description: 'Go to SecondFactor flow state',
 guard: and(['needsSecondFactor', { type: 'isCurrentPath', params: { path: '/sign-in/continue' } }]),
 guard: and(['needsSecondFactor', { type: 'isCurrentPath', params: { path: '/continue' } }]),
 target: 'SecondFactor',
 },
 {
 description: 'Go to SSO Callback state',
 guard: { type: 'isCurrentPath', params: { path: '/sign-in/sso-callback' } },
 guard: { type: 'isCurrentPath', params: { path: '/sso-callback' } },
 target: 'SSOCallback',
 },
 {
Expand DownExpand Up@@ -241,12 +248,20 @@ export const SignInMachine = setup({
 Start: {
 id: 'Start',
 tags: 'state:start',
 description: 'The intial state of the sign-in flow.',
 description: 'The initial state of the sign-in flow.',
 initial: 'AwaitingInput',
 on: {
 'AUTHENTICATE.OAUTH': '#SignIn.AuthenticatingWithRedirect',
 'AUTHENTICATE.SAML': '#SignIn.AuthenticatingWithRedirect',
 },
 entry: [
 {
 type: 'navigateTo',
 params: {
 path: '/',
 },
 },
 ],
 onDone: [
 {
 guard: 'isSignInComplete',
Expand DownExpand Up@@ -297,7 +312,7 @@ export const SignInMachine = setup({
 FirstFactor: {
 tags: 'state:first-factor',
 initial: 'DeterminingState',
 entry: 'assignStartingFirstFactor',
 entry: [{ type: 'navigateTo', params: { path: '/continue' } }, 'assignStartingFirstFactor'],
 onDone: [
 {
 guard: 'isSignInComplete',
Expand DownExpand Up@@ -385,7 +400,7 @@ export const SignInMachine = setup({
 SecondFactor: {
 tags: 'state:second-factor',
 initial: 'DeterminingState',
 entry: 'assignStartingSecondFactor',
 entry: [{ type: 'navigateTo', params: { path: '/continue' } }, 'assignStartingSecondFactor'],
 onDone: [
 {
 guard: 'isSignInComplete',
Expand DownExpand Up@@ -507,48 +522,24 @@ export const SignInMachine = setup({
 'CLERKJS.NAVIGATE.RESET_PASSWORD': '#SignIn.NotImplemented',
 'CLERKJS.NAVIGATE.SIGN_IN': {
 actions: [
 log('Navigating to sign in'),
 log('Navigating to sign in root'),
 {
 type: 'navigateTo',
 params: {
 path: '/sign-in',
 path: '/',
 },
 },
 ],
 },
 'CLERKJS.NAVIGATE.SIGN_UP': {
 actions: [
 log('Navigating to sign in'),
 {
 type: 'navigateTo',
 params: {
 path: '/sign-up',
 },
 },
 ],
 actions: [log('Navigating to sign up'), 'navigateToSignUp'],
 },
 'CLERKJS.NAVIGATE.VERIFICATION': {
 actions: [
 log('Navigating to sign in'),
 {
 type: 'navigateTo',
 params: {
 path: '/sign-up',
 },
 },
 ],
 actions: [log('Navigating to sign in'), 'navigateToSignUp'],
 },
 'CLERKJS.NAVIGATE.CONTINUE': {
 description: 'Redirect to the sign-up flow',
 actions: [
 log('Navigating to sign up'),
 {
 type: 'navigateTo',
 params: {
 path: '/sign-up',
 },
 },
 ],
 actions: [log('Navigating to sign up'), 'navigateToSignUp'],
 },
 'CLERKJS.NAVIGATE.*': {
 target: '#SignIn.Start',
Expand Down

2 changes: 0 additions & 2 deletions
packages/elements/src/internals/machines/sign-up/sign-up.actors.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -118,8 +118,6 @@ function fieldsToSignUpParams<T extends SignUpCreateParams | SignUpUpdateParams>
): Pick<T, SignUpAdditionalKeys> {
 const params: SignUpUpdateParams = {};

 // TODO: Determine what takes priority

 fields.forEach(({ value }, key) => {
 if (isSignUpParam(key) && value !== undefined) {
 params[key] = value as string;
Expand Down

2 changes: 1 addition & 1 deletion
packages/elements/src/internals/machines/sign-up/sign-up.machine.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -329,7 +329,7 @@ export const SignUpMachine = setup({
 Start: {
 id: 'Start',
 tags: 'state:start',
 description: 'The intial state of the sign-in flow.',
 description: 'The intial state of the sign-up flow.',
 entry: 'assignThirdPartyProviders',
 initial: 'AwaitingInput',
 on: {
Expand Down

2 changes: 1 addition & 1 deletion
packages/elements/src/react/common/form/index.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -148,7 +148,7 @@ const useInput = ({ name: inputName, value: initialValue, type: inputType, ...pa
 const shouldBeHidden = false;
 const type = inputType ?? determineInputTypeFromName(name);

 const Element = inputType === 'otp' ? OTPInput : RadixControl;
 const Element = type === 'otp' ? OTPInput : RadixControl;

 let props = {};
 if (inputType === 'otp') {
Expand Down

5 changes: 5 additions & 0 deletions
packages/elements/src/react/router/router.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,10 @@ export type ClerkHostRouter = {
 * Internal Clerk router, used by Clerk components to interact with the host's router.
 */
export type ClerkRouter = {
 /**
 * The basePath the router is currently mounted on.
 */
 basePath: string;
 /**
 * Creates a child router instance scoped to the provided base path.
 */
Expand DownExpand Up@@ -108,5 +112,6 @@ export function createClerkRouter(router: ClerkHostRouter, basePath: string = '/
 replace,
 pathname: router.pathname,
 searchParams: router.searchParams,
 basePath: normalizedBasePath,
 };
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
feat(elements): Remove hardcoded /sign-in path#2725

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 14 commits into

from

Feb 6, 2024
 Merged


feat(elements): Remove hardcoded /sign-in path
#2725
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
661597e

feat(shared): Add joinURL helper


LekoArts Feb 5, 2024
3f99039

chore(elements): Example fixes


LekoArts Feb 5, 2024
514269f

feat(elements): Do not hardcode /sign-in


LekoArts Feb 5, 2024
70f9fb7

chore(elements): Chores


LekoArts Feb 5, 2024
0a2622a

chore(repo): Add empty changeset


LekoArts Feb 5, 2024
8e12951

chore(elements): Bump package version


LekoArts Feb 5, 2024
f76ae61

chore(elements): Bump package version


LekoArts Feb 5, 2024
4366d9f

chore(repo): Add changeset


LekoArts Feb 5, 2024
fa66aae

chore(repo): Delete changeset+


LekoArts Feb 5, 2024
5b5942c

Update thirty-kings-trade.md


LekoArts Feb 5, 2024
faceac7

chore(elements): Use SocialProviderIcon from correct imports


LekoArts Feb 6, 2024
b631c4e

chore(elements): Allow passing required prop to CustomField


LekoArts Feb 6, 2024
3e57c18

fix(elements): Use OTPInput when name="code"


LekoArts Feb 6, 2024
7c7d65a

chore(elements): Add some JSDoc comments


LekoArts Feb 6, 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/thirty-kings-trade.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/shared': patch
---

Add `joinURL` helper to `@clerk/shared/url`

2 changes: 1 addition & 1 deletion
package-lock.json

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


2 changes: 1 addition & 1 deletion
packages/elements/examples/nextjs/app/otp-playground/page.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@ import { AnimatePresence, motion } from 'framer-motion';

export default function Page() {
 return (
 <SignIn>
 <SignIn path='/otp-playground'>
 <Start>
 <div className='h-dvh flex items-center justify-center bg-neutral-800'>
 <Field name='code'>
Expand Down

13 changes: 13 additions & 0 deletions
packages/elements/examples/nextjs/app/page.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -58,6 +58,19 @@ export default function Home() {
 <p className='m-0 max-w-[30ch] text-sm opacity-50'>Sign up using Elements</p>
 </Link>

 <Link
 href='/otp-playground'
 className='group rounded-lg border border-transparent px-5 py-4 transition-colors hover:border-gray-300 hover:bg-gray-100 hover:dark:border-neutral-700 hover:dark:bg-neutral-800/30'
 >
 <h2 className='mb-3 text-2xl font-semibold'>
 OTP{' '}
 <span className='inline-block transition-transform group-hover:translate-x-1 motion-reduce:transform-none'>
 -&gt;
 </span>
 </h2>
 <p className='m-0 max-w-[30ch] text-sm opacity-50'>OTP Playground</p>
 </Link>

 <a
 href='https://clerk.com/docs/custom-flows/overview#sign-in-flow'
 className='group rounded-lg border border-transparent px-5 py-4 transition-colors hover:border-gray-300 hover:bg-gray-100 hover:dark:border-neutral-700 hover:dark:bg-neutral-800/30'
Expand Down

11 changes: 9 additions & 2 deletions
packages/elements/examples/nextjs/app/sign-in/[[...sign-in]]/page.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,19 @@
'use client';

import { GlobalError, Submit } from '@clerk/elements/common';
import { Continue, Factor, SignIn, SocialProvider, Start, Verification } from '@clerk/elements/sign-in';
import {
 Continue,
 Factor,
 SignIn,
 SocialProvider,
 SocialProviderIcon,
 Start,
 Verification,
} from '@clerk/elements/sign-in';

import { H1, H2, H3, HR as Hr, P } from '@/components/design';
import { CustomField, CustomSubmit } from '@/components/form';
import { SignInDebug } from '@/components/sign-in-debug';
import { SocialProviderIcon } from '@/components/social-providers';

export default function SignInPage() {
 return (
Expand Down

11 changes: 9 additions & 2 deletions
packages/elements/examples/nextjs/app/sign-up/[[...sign-up]]/page.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,19 @@
'use client';

import { GlobalError } from '@clerk/elements/common';
import { Continue, SignUp, SocialProvider, Start, Verification, Verify } from '@clerk/elements/sign-up';
import {
 Continue,
 SignUp,
 SocialProvider,
 SocialProviderIcon,
 Start,
 Verification,
 Verify,
} from '@clerk/elements/sign-up';

import { H1, HR as Hr } from '@/components/design';
import { CustomField, CustomSubmit } from '@/components/form';
import { SignUpDebug } from '@/components/sign-up-debug';
import { SocialProviderIcon } from '@/components/social-providers';

export default function SignUpPage() {
 return (
Expand Down

62 changes: 32 additions & 30 deletions
packages/elements/examples/nextjs/components/form.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,38 +32,40 @@ function OTPInputSegment({ value, status }: any) {
 );
}

export const CustomField = forwardRef<typeof Input, { name: string; label: string }>(function CustomField(
 { name, label },
 forwardedRef,
) {
 const inputProps =
 name === 'code'
 ? {
 render: OTPInputSegment,
 }
 : {
 className: 'bg-tertiary rounded-sm px-2 py-1 border border-foreground data-[invalid]:border-red-500',
 ref: forwardedRef,
 };
export const CustomField = forwardRef<typeof Input, { name: string; label: string; required?: boolean }>(
 function CustomField({ name, label, required = false }, forwardedRef) {
 const inputProps =
 name === 'code'
 ? {
 render: OTPInputSegment,
 className: 'flex gap-3',
 required,
 }
 : {
 className: 'bg-tertiary rounded-sm px-2 py-1 border border-foreground data-[invalid]:border-red-500',
 ref: forwardedRef,
 required,
 };

 return (
 <ElementsField
 name={name}
 className='flex flex-col gap-4'
 >
 <div className='flex gap-4 justify-between items-center'>
 <Label>{label}</Label>
 <Input
 name={name}
 {...inputProps}
 />
 </div>
return (
<ElementsField
name={name}
className='flex flex-col gap-4'
>
<div className='flex gap-4 justify-between items-center'>
<Label>{label}</Label>
<Input
name={name}
{...inputProps}
/>
</div>

 <FieldError className='block text-red-400 font-mono' />
 <FieldState>{({ state }) => <pre className='opacity-60 text-xs'>Field state: {state}</pre>}</FieldState>
 </ElementsField>
 );
});
 <FieldError className='block text-red-400 font-mono' />
 <FieldState>{({ state }) => <pre className='opacity-60 text-xs'>Field state: {state}</pre>}</FieldState>
 </ElementsField>
 );
 },
);

export const CustomSubmit = forwardRef<HTMLButtonElement, React.ComponentPropsWithoutRef<'button'>>(
 function CustomButton(props, forwardedRef) {
Expand Down

2 changes: 1 addition & 1 deletion
packages/elements/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
 "name": "@clerk/elements",
 "version": "0.1.1",
 "version": "0.1.2",
 "description": "Clerk Elements",
 "keywords": [
 "clerk",
Expand Down

69 changes: 30 additions & 39 deletions
packages/elements/src/internals/machines/sign-in/sign-in.machine.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import type { ClerkAPIResponseError } from '@clerk/shared/error';
import { isClerkAPIResponseError } from '@clerk/shared/error';
import { joinURL } from '@clerk/shared/url';
import type {
 LoadedClerk,
 OAuthStrategy,
Expand DownExpand Up@@ -41,12 +42,14 @@ export interface SignInMachineContext extends MachineContext {
 resource: SignInResource | null;
 router: ClerkRouter;
 thirdPartyProviders: EnabledThirdPartyProviders;
 signUpPath: string;
}

export interface SignInMachineInput {
 clerk: LoadedClerk;
 form: ActorRefFrom<typeof FormMachine>;
 router: ClerkRouter;
 signUpPath: string;
}

export type SignInMachineTags = 'state:start' | 'state:first-factor' | 'state:second-factor' | 'external';
Expand DownExpand Up@@ -115,7 +118,11 @@ export const SignInMachine = setup({
 console.error(event.error);
 },
 navigateTo({ context }, { path }: { path: string }) {
 context.router.replace(path);
 const resolvedPath = joinURL(context.router.basePath, path);
 context.router.replace(resolvedPath);
 },
 navigateToSignUp({ context }) {
 context.router.push(context.signUpPath);
 },
 raiseFailure: raise(({ event }) => {
 assertActorEventError(event);
Expand DownExpand Up@@ -143,8 +150,7 @@ export const SignInMachine = setup({
 isCurrentFactorPassword: ({ context }) => context.currentFactor?.strategy === 'password',
 isCurrentFactorTOTP: ({ context }) => context.currentFactor?.strategy === 'totp',
 isCurrentPath: ({ context }, params: { path: string }) => {
 const path = params?.path;
 return path ? context.router.pathname() === path : false;
 return context.router.match(params?.path);
 },
 isLoggedIn: ({ context }) => Boolean(context.clerk.user),
 isSignInComplete: ({ context }) => context?.resource?.status === 'complete',
Expand DownExpand Up@@ -179,6 +185,7 @@ export const SignInMachine = setup({
 resource: null,
 router: input.router,
 thirdPartyProviders: getEnabledThirdPartyProviders(input.clerk.__unstable__environment),
 signUpPath: input.signUpPath,
 }),
 initial: 'Init',
 on: {
Expand All@@ -198,22 +205,22 @@ export const SignInMachine = setup({
 },
 {
 description: 'If the SignIn resource is empty, invoke the sign-in start flow',
 guard: or([not('hasSignInResource'), { type: 'isCurrentPath', params: { path: '/sign-in' } }]),
 guard: or([not('hasSignInResource'), { type: 'isCurrentPath', params: { path: '/' } }]),
 target: 'Start',
 },
 {
 description: 'Go to FirstFactor flow state',
 guard: and(['needsFirstFactor', { type: 'isCurrentPath', params: { path: '/sign-in/continue' } }]),
 guard: and(['needsFirstFactor', { type: 'isCurrentPath', params: { path: '/continue' } }]),
 target: 'FirstFactor',
 },
 {
 description: 'Go to SecondFactor flow state',
 guard: and(['needsSecondFactor', { type: 'isCurrentPath', params: { path: '/sign-in/continue' } }]),
 guard: and(['needsSecondFactor', { type: 'isCurrentPath', params: { path: '/continue' } }]),
 target: 'SecondFactor',
 },
 {
 description: 'Go to SSO Callback state',
 guard: { type: 'isCurrentPath', params: { path: '/sign-in/sso-callback' } },
 guard: { type: 'isCurrentPath', params: { path: '/sso-callback' } },
 target: 'SSOCallback',
 },
 {
Expand DownExpand Up@@ -241,12 +248,20 @@ export const SignInMachine = setup({
 Start: {
 id: 'Start',
 tags: 'state:start',
 description: 'The intial state of the sign-in flow.',
 description: 'The initial state of the sign-in flow.',
 initial: 'AwaitingInput',
 on: {
 'AUTHENTICATE.OAUTH': '#SignIn.AuthenticatingWithRedirect',
 'AUTHENTICATE.SAML': '#SignIn.AuthenticatingWithRedirect',
 },
 entry: [
 {
 type: 'navigateTo',
 params: {
 path: '/',
 },
 },
 ],
 onDone: [
 {
 guard: 'isSignInComplete',
Expand DownExpand Up@@ -297,7 +312,7 @@ export const SignInMachine = setup({
 FirstFactor: {
 tags: 'state:first-factor',
 initial: 'DeterminingState',
 entry: 'assignStartingFirstFactor',
 entry: [{ type: 'navigateTo', params: { path: '/continue' } }, 'assignStartingFirstFactor'],
 onDone: [
 {
 guard: 'isSignInComplete',
Expand DownExpand Up@@ -385,7 +400,7 @@ export const SignInMachine = setup({
 SecondFactor: {
 tags: 'state:second-factor',
 initial: 'DeterminingState',
 entry: 'assignStartingSecondFactor',
 entry: [{ type: 'navigateTo', params: { path: '/continue' } }, 'assignStartingSecondFactor'],
 onDone: [
 {
 guard: 'isSignInComplete',
Expand DownExpand Up@@ -507,48 +522,24 @@ export const SignInMachine = setup({
 'CLERKJS.NAVIGATE.RESET_PASSWORD': '#SignIn.NotImplemented',
 'CLERKJS.NAVIGATE.SIGN_IN': {
 actions: [
 log('Navigating to sign in'),
 log('Navigating to sign in root'),
 {
 type: 'navigateTo',
 params: {
 path: '/sign-in',
 path: '/',
 },
 },
 ],
 },
 'CLERKJS.NAVIGATE.SIGN_UP': {
 actions: [
 log('Navigating to sign in'),
 {
 type: 'navigateTo',
 params: {
 path: '/sign-up',
 },
 },
 ],
 actions: [log('Navigating to sign up'), 'navigateToSignUp'],
 },
 'CLERKJS.NAVIGATE.VERIFICATION': {
 actions: [
 log('Navigating to sign in'),
 {
 type: 'navigateTo',
 params: {
 path: '/sign-up',
 },
 },
 ],
 actions: [log('Navigating to sign in'), 'navigateToSignUp'],
 },
 'CLERKJS.NAVIGATE.CONTINUE': {
 description: 'Redirect to the sign-up flow',
 actions: [
 log('Navigating to sign up'),
 {
 type: 'navigateTo',
 params: {
 path: '/sign-up',
 },
 },
 ],
 actions: [log('Navigating to sign up'), 'navigateToSignUp'],
 },
 'CLERKJS.NAVIGATE.*': {
 target: '#SignIn.Start',
Expand Down

2 changes: 0 additions & 2 deletions
packages/elements/src/internals/machines/sign-up/sign-up.actors.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -118,8 +118,6 @@ function fieldsToSignUpParams<T extends SignUpCreateParams | SignUpUpdateParams>
): Pick<T, SignUpAdditionalKeys> {
 const params: SignUpUpdateParams = {};

 // TODO: Determine what takes priority

 fields.forEach(({ value }, key) => {
 if (isSignUpParam(key) && value !== undefined) {
 params[key] = value as string;
Expand Down

2 changes: 1 addition & 1 deletion
packages/elements/src/internals/machines/sign-up/sign-up.machine.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -329,7 +329,7 @@ export const SignUpMachine = setup({
 Start: {
 id: 'Start',
 tags: 'state:start',
 description: 'The intial state of the sign-in flow.',
 description: 'The intial state of the sign-up flow.',
 entry: 'assignThirdPartyProviders',
 initial: 'AwaitingInput',
 on: {
Expand Down

2 changes: 1 addition & 1 deletion
packages/elements/src/react/common/form/index.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -148,7 +148,7 @@ const useInput = ({ name: inputName, value: initialValue, type: inputType, ...pa
 const shouldBeHidden = false;
 const type = inputType ?? determineInputTypeFromName(name);

 const Element = inputType === 'otp' ? OTPInput : RadixControl;
 const Element = type === 'otp' ? OTPInput : RadixControl;

 let props = {};
 if (inputType === 'otp') {
Expand Down

5 changes: 5 additions & 0 deletions
packages/elements/src/react/router/router.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,10 @@ export type ClerkHostRouter = {
 * Internal Clerk router, used by Clerk components to interact with the host's router.
 */
export type ClerkRouter = {
 /**
 * The basePath the router is currently mounted on.
 */
 basePath: string;
 /**
 * Creates a child router instance scoped to the provided base path.
 */
Expand DownExpand Up@@ -108,5 +112,6 @@ export function createClerkRouter(router: ClerkHostRouter, basePath: string = '/
 replace,
 pathname: router.pathname,
 searchParams: router.searchParams,
 basePath: normalizedBasePath,
 };
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
feat(elements): Remove hardcoded /sign-in path#2725

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 14 commits into

from

Feb 6, 2024
 Merged


feat(elements): Remove hardcoded /sign-in path
#2725
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
661597e

feat(shared): Add joinURL helper


LekoArts Feb 5, 2024
3f99039

chore(elements): Example fixes


LekoArts Feb 5, 2024
514269f

feat(elements): Do not hardcode /sign-in


LekoArts Feb 5, 2024
70f9fb7

chore(elements): Chores


LekoArts Feb 5, 2024
0a2622a

chore(repo): Add empty changeset


LekoArts Feb 5, 2024
8e12951

chore(elements): Bump package version


LekoArts Feb 5, 2024
f76ae61

chore(elements): Bump package version


LekoArts Feb 5, 2024
4366d9f

chore(repo): Add changeset


LekoArts Feb 5, 2024
fa66aae

chore(repo): Delete changeset+


LekoArts Feb 5, 2024
5b5942c

Update thirty-kings-trade.md


LekoArts Feb 5, 2024
faceac7

chore(elements): Use SocialProviderIcon from correct imports


LekoArts Feb 6, 2024
b631c4e

chore(elements): Allow passing required prop to CustomField


LekoArts Feb 6, 2024
3e57c18

fix(elements): Use OTPInput when name="code"


LekoArts Feb 6, 2024
7c7d65a

chore(elements): Add some JSDoc comments


LekoArts Feb 6, 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/thirty-kings-trade.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/shared': patch
---

Add `joinURL` helper to `@clerk/shared/url`

2 changes: 1 addition & 1 deletion
package-lock.json

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


2 changes: 1 addition & 1 deletion
packages/elements/examples/nextjs/app/otp-playground/page.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@ import { AnimatePresence, motion } from 'framer-motion';

export default function Page() {
 return (
 <SignIn>
 <SignIn path='/otp-playground'>
 <Start>
 <div className='h-dvh flex items-center justify-center bg-neutral-800'>
 <Field name='code'>
Expand Down

13 changes: 13 additions & 0 deletions
packages/elements/examples/nextjs/app/page.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -58,6 +58,19 @@ export default function Home() {
 <p className='m-0 max-w-[30ch] text-sm opacity-50'>Sign up using Elements</p>
 </Link>

 <Link
 href='/otp-playground'
 className='group rounded-lg border border-transparent px-5 py-4 transition-colors hover:border-gray-300 hover:bg-gray-100 hover:dark:border-neutral-700 hover:dark:bg-neutral-800/30'
 >
 <h2 className='mb-3 text-2xl font-semibold'>
 OTP{' '}
 <span className='inline-block transition-transform group-hover:translate-x-1 motion-reduce:transform-none'>
 -&gt;
 </span>
 </h2>
 <p className='m-0 max-w-[30ch] text-sm opacity-50'>OTP Playground</p>
 </Link>

 <a
 href='https://clerk.com/docs/custom-flows/overview#sign-in-flow'
 className='group rounded-lg border border-transparent px-5 py-4 transition-colors hover:border-gray-300 hover:bg-gray-100 hover:dark:border-neutral-700 hover:dark:bg-neutral-800/30'
Expand Down

11 changes: 9 additions & 2 deletions
packages/elements/examples/nextjs/app/sign-in/[[...sign-in]]/page.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,19 @@
'use client';

import { GlobalError, Submit } from '@clerk/elements/common';
import { Continue, Factor, SignIn, SocialProvider, Start, Verification } from '@clerk/elements/sign-in';
import {
 Continue,
 Factor,
 SignIn,
 SocialProvider,
 SocialProviderIcon,
 Start,
 Verification,
} from '@clerk/elements/sign-in';

import { H1, H2, H3, HR as Hr, P } from '@/components/design';
import { CustomField, CustomSubmit } from '@/components/form';
import { SignInDebug } from '@/components/sign-in-debug';
import { SocialProviderIcon } from '@/components/social-providers';

export default function SignInPage() {
 return (
Expand Down

11 changes: 9 additions & 2 deletions
packages/elements/examples/nextjs/app/sign-up/[[...sign-up]]/page.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,19 @@
'use client';

import { GlobalError } from '@clerk/elements/common';
import { Continue, SignUp, SocialProvider, Start, Verification, Verify } from '@clerk/elements/sign-up';
import {
 Continue,
 SignUp,
 SocialProvider,
 SocialProviderIcon,
 Start,
 Verification,
 Verify,
} from '@clerk/elements/sign-up';

import { H1, HR as Hr } from '@/components/design';
import { CustomField, CustomSubmit } from '@/components/form';
import { SignUpDebug } from '@/components/sign-up-debug';
import { SocialProviderIcon } from '@/components/social-providers';

export default function SignUpPage() {
 return (
Expand Down

62 changes: 32 additions & 30 deletions
packages/elements/examples/nextjs/components/form.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,38 +32,40 @@ function OTPInputSegment({ value, status }: any) {
 );
}

export const CustomField = forwardRef<typeof Input, { name: string; label: string }>(function CustomField(
 { name, label },
 forwardedRef,
) {
 const inputProps =
 name === 'code'
 ? {
 render: OTPInputSegment,
 }
 : {
 className: 'bg-tertiary rounded-sm px-2 py-1 border border-foreground data-[invalid]:border-red-500',
 ref: forwardedRef,
 };
export const CustomField = forwardRef<typeof Input, { name: string; label: string; required?: boolean }>(
 function CustomField({ name, label, required = false }, forwardedRef) {
 const inputProps =
 name === 'code'
 ? {
 render: OTPInputSegment,
 className: 'flex gap-3',
 required,
 }
 : {
 className: 'bg-tertiary rounded-sm px-2 py-1 border border-foreground data-[invalid]:border-red-500',
 ref: forwardedRef,
 required,
 };

 return (
 <ElementsField
 name={name}
 className='flex flex-col gap-4'
 >
 <div className='flex gap-4 justify-between items-center'>
 <Label>{label}</Label>
 <Input
 name={name}
 {...inputProps}
 />
 </div>
return (
<ElementsField
name={name}
className='flex flex-col gap-4'
>
<div className='flex gap-4 justify-between items-center'>
<Label>{label}</Label>
<Input
name={name}
{...inputProps}
/>
</div>

 <FieldError className='block text-red-400 font-mono' />
 <FieldState>{({ state }) => <pre className='opacity-60 text-xs'>Field state: {state}</pre>}</FieldState>
 </ElementsField>
 );
});
 <FieldError className='block text-red-400 font-mono' />
 <FieldState>{({ state }) => <pre className='opacity-60 text-xs'>Field state: {state}</pre>}</FieldState>
 </ElementsField>
 );
 },
);

export const CustomSubmit = forwardRef<HTMLButtonElement, React.ComponentPropsWithoutRef<'button'>>(
 function CustomButton(props, forwardedRef) {
Expand Down

2 changes: 1 addition & 1 deletion
packages/elements/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
 "name": "@clerk/elements",
 "version": "0.1.1",
 "version": "0.1.2",
 "description": "Clerk Elements",
 "keywords": [
 "clerk",
Expand Down

69 changes: 30 additions & 39 deletions
packages/elements/src/internals/machines/sign-in/sign-in.machine.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import type { ClerkAPIResponseError } from '@clerk/shared/error';
import { isClerkAPIResponseError } from '@clerk/shared/error';
import { joinURL } from '@clerk/shared/url';
import type {
 LoadedClerk,
 OAuthStrategy,
Expand DownExpand Up@@ -41,12 +42,14 @@ export interface SignInMachineContext extends MachineContext {
 resource: SignInResource | null;
 router: ClerkRouter;
 thirdPartyProviders: EnabledThirdPartyProviders;
 signUpPath: string;
}

export interface SignInMachineInput {
 clerk: LoadedClerk;
 form: ActorRefFrom<typeof FormMachine>;
 router: ClerkRouter;
 signUpPath: string;
}

export type SignInMachineTags = 'state:start' | 'state:first-factor' | 'state:second-factor' | 'external';
Expand DownExpand Up@@ -115,7 +118,11 @@ export const SignInMachine = setup({
 console.error(event.error);
 },
 navigateTo({ context }, { path }: { path: string }) {
 context.router.replace(path);
 const resolvedPath = joinURL(context.router.basePath, path);
 context.router.replace(resolvedPath);
 },
 navigateToSignUp({ context }) {
 context.router.push(context.signUpPath);
 },
 raiseFailure: raise(({ event }) => {
 assertActorEventError(event);
Expand DownExpand Up@@ -143,8 +150,7 @@ export const SignInMachine = setup({
 isCurrentFactorPassword: ({ context }) => context.currentFactor?.strategy === 'password',
 isCurrentFactorTOTP: ({ context }) => context.currentFactor?.strategy === 'totp',
 isCurrentPath: ({ context }, params: { path: string }) => {
 const path = params?.path;
 return path ? context.router.pathname() === path : false;
 return context.router.match(params?.path);
 },
 isLoggedIn: ({ context }) => Boolean(context.clerk.user),
 isSignInComplete: ({ context }) => context?.resource?.status === 'complete',
Expand DownExpand Up@@ -179,6 +185,7 @@ export const SignInMachine = setup({
 resource: null,
 router: input.router,
 thirdPartyProviders: getEnabledThirdPartyProviders(input.clerk.__unstable__environment),
 signUpPath: input.signUpPath,
 }),
 initial: 'Init',
 on: {
Expand All@@ -198,22 +205,22 @@ export const SignInMachine = setup({
 },
 {
 description: 'If the SignIn resource is empty, invoke the sign-in start flow',
 guard: or([not('hasSignInResource'), { type: 'isCurrentPath', params: { path: '/sign-in' } }]),
 guard: or([not('hasSignInResource'), { type: 'isCurrentPath', params: { path: '/' } }]),
 target: 'Start',
 },
 {
 description: 'Go to FirstFactor flow state',
 guard: and(['needsFirstFactor', { type: 'isCurrentPath', params: { path: '/sign-in/continue' } }]),
 guard: and(['needsFirstFactor', { type: 'isCurrentPath', params: { path: '/continue' } }]),
 target: 'FirstFactor',
 },
 {
 description: 'Go to SecondFactor flow state',
 guard: and(['needsSecondFactor', { type: 'isCurrentPath', params: { path: '/sign-in/continue' } }]),
 guard: and(['needsSecondFactor', { type: 'isCurrentPath', params: { path: '/continue' } }]),
 target: 'SecondFactor',
 },
 {
 description: 'Go to SSO Callback state',
 guard: { type: 'isCurrentPath', params: { path: '/sign-in/sso-callback' } },
 guard: { type: 'isCurrentPath', params: { path: '/sso-callback' } },
 target: 'SSOCallback',
 },
 {
Expand DownExpand Up@@ -241,12 +248,20 @@ export const SignInMachine = setup({
 Start: {
 id: 'Start',
 tags: 'state:start',
 description: 'The intial state of the sign-in flow.',
 description: 'The initial state of the sign-in flow.',
 initial: 'AwaitingInput',
 on: {
 'AUTHENTICATE.OAUTH': '#SignIn.AuthenticatingWithRedirect',
 'AUTHENTICATE.SAML': '#SignIn.AuthenticatingWithRedirect',
 },
 entry: [
 {
 type: 'navigateTo',
 params: {
 path: '/',
 },
 },
 ],
 onDone: [
 {
 guard: 'isSignInComplete',
Expand DownExpand Up@@ -297,7 +312,7 @@ export const SignInMachine = setup({
 FirstFactor: {
 tags: 'state:first-factor',
 initial: 'DeterminingState',
 entry: 'assignStartingFirstFactor',
 entry: [{ type: 'navigateTo', params: { path: '/continue' } }, 'assignStartingFirstFactor'],
 onDone: [
 {
 guard: 'isSignInComplete',
Expand DownExpand Up@@ -385,7 +400,7 @@ export const SignInMachine = setup({
 SecondFactor: {
 tags: 'state:second-factor',
 initial: 'DeterminingState',
 entry: 'assignStartingSecondFactor',
 entry: [{ type: 'navigateTo', params: { path: '/continue' } }, 'assignStartingSecondFactor'],
 onDone: [
 {
 guard: 'isSignInComplete',
Expand DownExpand Up@@ -507,48 +522,24 @@ export const SignInMachine = setup({
 'CLERKJS.NAVIGATE.RESET_PASSWORD': '#SignIn.NotImplemented',
 'CLERKJS.NAVIGATE.SIGN_IN': {
 actions: [
 log('Navigating to sign in'),
 log('Navigating to sign in root'),
 {
 type: 'navigateTo',
 params: {
 path: '/sign-in',
 path: '/',
 },
 },
 ],
 },
 'CLERKJS.NAVIGATE.SIGN_UP': {
 actions: [
 log('Navigating to sign in'),
 {
 type: 'navigateTo',
 params: {
 path: '/sign-up',
 },
 },
 ],
 actions: [log('Navigating to sign up'), 'navigateToSignUp'],
 },
 'CLERKJS.NAVIGATE.VERIFICATION': {
 actions: [
 log('Navigating to sign in'),
 {
 type: 'navigateTo',
 params: {
 path: '/sign-up',
 },
 },
 ],
 actions: [log('Navigating to sign in'), 'navigateToSignUp'],
 },
 'CLERKJS.NAVIGATE.CONTINUE': {
 description: 'Redirect to the sign-up flow',
 actions: [
 log('Navigating to sign up'),
 {
 type: 'navigateTo',
 params: {
 path: '/sign-up',
 },
 },
 ],
 actions: [log('Navigating to sign up'), 'navigateToSignUp'],
 },
 'CLERKJS.NAVIGATE.*': {
 target: '#SignIn.Start',
Expand Down

2 changes: 0 additions & 2 deletions
packages/elements/src/internals/machines/sign-up/sign-up.actors.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -118,8 +118,6 @@ function fieldsToSignUpParams<T extends SignUpCreateParams | SignUpUpdateParams>
): Pick<T, SignUpAdditionalKeys> {
 const params: SignUpUpdateParams = {};

 // TODO: Determine what takes priority

 fields.forEach(({ value }, key) => {
 if (isSignUpParam(key) && value !== undefined) {
 params[key] = value as string;
Expand Down

2 changes: 1 addition & 1 deletion
packages/elements/src/internals/machines/sign-up/sign-up.machine.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -329,7 +329,7 @@ export const SignUpMachine = setup({
 Start: {
 id: 'Start',
 tags: 'state:start',
 description: 'The intial state of the sign-in flow.',
 description: 'The intial state of the sign-up flow.',
 entry: 'assignThirdPartyProviders',
 initial: 'AwaitingInput',
 on: {
Expand Down

2 changes: 1 addition & 1 deletion
packages/elements/src/react/common/form/index.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -148,7 +148,7 @@ const useInput = ({ name: inputName, value: initialValue, type: inputType, ...pa
 const shouldBeHidden = false;
 const type = inputType ?? determineInputTypeFromName(name);

 const Element = inputType === 'otp' ? OTPInput : RadixControl;
 const Element = type === 'otp' ? OTPInput : RadixControl;

 let props = {};
 if (inputType === 'otp') {
Expand Down

5 changes: 5 additions & 0 deletions
packages/elements/src/react/router/router.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,10 @@ export type ClerkHostRouter = {
 * Internal Clerk router, used by Clerk components to interact with the host's router.
 */
export type ClerkRouter = {
 /**
 * The basePath the router is currently mounted on.
 */
 basePath: string;
 /**
 * Creates a child router instance scoped to the provided base path.
 */
Expand DownExpand Up@@ -108,5 +112,6 @@ export function createClerkRouter(router: ClerkHostRouter, basePath: string = '/
 replace,
 pathname: router.pathname,
 searchParams: router.searchParams,
 basePath: normalizedBasePath,
 };
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
feat(elements): Remove hardcoded /sign-in path#2725

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 14 commits into

from

Feb 6, 2024
 Merged


feat(elements): Remove hardcoded /sign-in path
#2725
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
661597e

feat(shared): Add joinURL helper


LekoArts Feb 5, 2024
3f99039

chore(elements): Example fixes


LekoArts Feb 5, 2024
514269f

feat(elements): Do not hardcode /sign-in


LekoArts Feb 5, 2024
70f9fb7

chore(elements): Chores


LekoArts Feb 5, 2024
0a2622a

chore(repo): Add empty changeset


LekoArts Feb 5, 2024
8e12951

chore(elements): Bump package version


LekoArts Feb 5, 2024
f76ae61

chore(elements): Bump package version


LekoArts Feb 5, 2024
4366d9f

chore(repo): Add changeset


LekoArts Feb 5, 2024
fa66aae

chore(repo): Delete changeset+


LekoArts Feb 5, 2024
5b5942c

Update thirty-kings-trade.md


LekoArts Feb 5, 2024
faceac7

chore(elements): Use SocialProviderIcon from correct imports


LekoArts Feb 6, 2024
b631c4e

chore(elements): Allow passing required prop to CustomField


LekoArts Feb 6, 2024
3e57c18

fix(elements): Use OTPInput when name="code"


LekoArts Feb 6, 2024
7c7d65a

chore(elements): Add some JSDoc comments


LekoArts Feb 6, 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/thirty-kings-trade.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/shared': patch
---

Add `joinURL` helper to `@clerk/shared/url`

2 changes: 1 addition & 1 deletion
package-lock.json

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


2 changes: 1 addition & 1 deletion
packages/elements/examples/nextjs/app/otp-playground/page.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@ import { AnimatePresence, motion } from 'framer-motion';

export default function Page() {
 return (
 <SignIn>
 <SignIn path='/otp-playground'>
 <Start>
 <div className='h-dvh flex items-center justify-center bg-neutral-800'>
 <Field name='code'>
Expand Down

13 changes: 13 additions & 0 deletions
packages/elements/examples/nextjs/app/page.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -58,6 +58,19 @@ export default function Home() {
 <p className='m-0 max-w-[30ch] text-sm opacity-50'>Sign up using Elements</p>
 </Link>

 <Link
 href='/otp-playground'
 className='group rounded-lg border border-transparent px-5 py-4 transition-colors hover:border-gray-300 hover:bg-gray-100 hover:dark:border-neutral-700 hover:dark:bg-neutral-800/30'
 >
 <h2 className='mb-3 text-2xl font-semibold'>
 OTP{' '}
 <span className='inline-block transition-transform group-hover:translate-x-1 motion-reduce:transform-none'>
 -&gt;
 </span>
 </h2>
 <p className='m-0 max-w-[30ch] text-sm opacity-50'>OTP Playground</p>
 </Link>

 <a
 href='https://clerk.com/docs/custom-flows/overview#sign-in-flow'
 className='group rounded-lg border border-transparent px-5 py-4 transition-colors hover:border-gray-300 hover:bg-gray-100 hover:dark:border-neutral-700 hover:dark:bg-neutral-800/30'
Expand Down

11 changes: 9 additions & 2 deletions
packages/elements/examples/nextjs/app/sign-in/[[...sign-in]]/page.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,19 @@
'use client';

import { GlobalError, Submit } from '@clerk/elements/common';
import { Continue, Factor, SignIn, SocialProvider, Start, Verification } from '@clerk/elements/sign-in';
import {
 Continue,
 Factor,
 SignIn,
 SocialProvider,
 SocialProviderIcon,
 Start,
 Verification,
} from '@clerk/elements/sign-in';

import { H1, H2, H3, HR as Hr, P } from '@/components/design';
import { CustomField, CustomSubmit } from '@/components/form';
import { SignInDebug } from '@/components/sign-in-debug';
import { SocialProviderIcon } from '@/components/social-providers';

export default function SignInPage() {
 return (
Expand Down

11 changes: 9 additions & 2 deletions
packages/elements/examples/nextjs/app/sign-up/[[...sign-up]]/page.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,19 @@
'use client';

import { GlobalError } from '@clerk/elements/common';
import { Continue, SignUp, SocialProvider, Start, Verification, Verify } from '@clerk/elements/sign-up';
import {
 Continue,
 SignUp,
 SocialProvider,
 SocialProviderIcon,
 Start,
 Verification,
 Verify,
} from '@clerk/elements/sign-up';

import { H1, HR as Hr } from '@/components/design';
import { CustomField, CustomSubmit } from '@/components/form';
import { SignUpDebug } from '@/components/sign-up-debug';
import { SocialProviderIcon } from '@/components/social-providers';

export default function SignUpPage() {
 return (
Expand Down

62 changes: 32 additions & 30 deletions
packages/elements/examples/nextjs/components/form.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,38 +32,40 @@ function OTPInputSegment({ value, status }: any) {
 );
}

export const CustomField = forwardRef<typeof Input, { name: string; label: string }>(function CustomField(
 { name, label },
 forwardedRef,
) {
 const inputProps =
 name === 'code'
 ? {
 render: OTPInputSegment,
 }
 : {
 className: 'bg-tertiary rounded-sm px-2 py-1 border border-foreground data-[invalid]:border-red-500',
 ref: forwardedRef,
 };
export const CustomField = forwardRef<typeof Input, { name: string; label: string; required?: boolean }>(
 function CustomField({ name, label, required = false }, forwardedRef) {
 const inputProps =
 name === 'code'
 ? {
 render: OTPInputSegment,
 className: 'flex gap-3',
 required,
 }
 : {
 className: 'bg-tertiary rounded-sm px-2 py-1 border border-foreground data-[invalid]:border-red-500',
 ref: forwardedRef,
 required,
 };

 return (
 <ElementsField
 name={name}
 className='flex flex-col gap-4'
 >
 <div className='flex gap-4 justify-between items-center'>
 <Label>{label}</Label>
 <Input
 name={name}
 {...inputProps}
 />
 </div>
return (
<ElementsField
name={name}
className='flex flex-col gap-4'
>
<div className='flex gap-4 justify-between items-center'>
<Label>{label}</Label>
<Input
name={name}
{...inputProps}
/>
</div>

 <FieldError className='block text-red-400 font-mono' />
 <FieldState>{({ state }) => <pre className='opacity-60 text-xs'>Field state: {state}</pre>}</FieldState>
 </ElementsField>
 );
});
 <FieldError className='block text-red-400 font-mono' />
 <FieldState>{({ state }) => <pre className='opacity-60 text-xs'>Field state: {state}</pre>}</FieldState>
 </ElementsField>
 );
 },
);

export const CustomSubmit = forwardRef<HTMLButtonElement, React.ComponentPropsWithoutRef<'button'>>(
 function CustomButton(props, forwardedRef) {
Expand Down

2 changes: 1 addition & 1 deletion
packages/elements/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
 "name": "@clerk/elements",
 "version": "0.1.1",
 "version": "0.1.2",
 "description": "Clerk Elements",
 "keywords": [
 "clerk",
Expand Down

69 changes: 30 additions & 39 deletions
packages/elements/src/internals/machines/sign-in/sign-in.machine.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import type { ClerkAPIResponseError } from '@clerk/shared/error';
import { isClerkAPIResponseError } from '@clerk/shared/error';
import { joinURL } from '@clerk/shared/url';
import type {
 LoadedClerk,
 OAuthStrategy,
Expand DownExpand Up@@ -41,12 +42,14 @@ export interface SignInMachineContext extends MachineContext {
 resource: SignInResource | null;
 router: ClerkRouter;
 thirdPartyProviders: EnabledThirdPartyProviders;
 signUpPath: string;
}

export interface SignInMachineInput {
 clerk: LoadedClerk;
 form: ActorRefFrom<typeof FormMachine>;
 router: ClerkRouter;
 signUpPath: string;
}

export type SignInMachineTags = 'state:start' | 'state:first-factor' | 'state:second-factor' | 'external';
Expand DownExpand Up@@ -115,7 +118,11 @@ export const SignInMachine = setup({
 console.error(event.error);
 },
 navigateTo({ context }, { path }: { path: string }) {
 context.router.replace(path);
 const resolvedPath = joinURL(context.router.basePath, path);
 context.router.replace(resolvedPath);
 },
 navigateToSignUp({ context }) {
 context.router.push(context.signUpPath);
 },
 raiseFailure: raise(({ event }) => {
 assertActorEventError(event);
Expand DownExpand Up@@ -143,8 +150,7 @@ export const SignInMachine = setup({
 isCurrentFactorPassword: ({ context }) => context.currentFactor?.strategy === 'password',
 isCurrentFactorTOTP: ({ context }) => context.currentFactor?.strategy === 'totp',
 isCurrentPath: ({ context }, params: { path: string }) => {
 const path = params?.path;
 return path ? context.router.pathname() === path : false;
 return context.router.match(params?.path);
 },
 isLoggedIn: ({ context }) => Boolean(context.clerk.user),
 isSignInComplete: ({ context }) => context?.resource?.status === 'complete',
Expand DownExpand Up@@ -179,6 +185,7 @@ export const SignInMachine = setup({
 resource: null,
 router: input.router,
 thirdPartyProviders: getEnabledThirdPartyProviders(input.clerk.__unstable__environment),
 signUpPath: input.signUpPath,
 }),
 initial: 'Init',
 on: {
Expand All@@ -198,22 +205,22 @@ export const SignInMachine = setup({
 },
 {
 description: 'If the SignIn resource is empty, invoke the sign-in start flow',
 guard: or([not('hasSignInResource'), { type: 'isCurrentPath', params: { path: '/sign-in' } }]),
 guard: or([not('hasSignInResource'), { type: 'isCurrentPath', params: { path: '/' } }]),
 target: 'Start',
 },
 {
 description: 'Go to FirstFactor flow state',
 guard: and(['needsFirstFactor', { type: 'isCurrentPath', params: { path: '/sign-in/continue' } }]),
 guard: and(['needsFirstFactor', { type: 'isCurrentPath', params: { path: '/continue' } }]),
 target: 'FirstFactor',
 },
 {
 description: 'Go to SecondFactor flow state',
 guard: and(['needsSecondFactor', { type: 'isCurrentPath', params: { path: '/sign-in/continue' } }]),
 guard: and(['needsSecondFactor', { type: 'isCurrentPath', params: { path: '/continue' } }]),
 target: 'SecondFactor',
 },
 {
 description: 'Go to SSO Callback state',
 guard: { type: 'isCurrentPath', params: { path: '/sign-in/sso-callback' } },
 guard: { type: 'isCurrentPath', params: { path: '/sso-callback' } },
 target: 'SSOCallback',
 },
 {
Expand DownExpand Up@@ -241,12 +248,20 @@ export const SignInMachine = setup({
 Start: {
 id: 'Start',
 tags: 'state:start',
 description: 'The intial state of the sign-in flow.',
 description: 'The initial state of the sign-in flow.',
 initial: 'AwaitingInput',
 on: {
 'AUTHENTICATE.OAUTH': '#SignIn.AuthenticatingWithRedirect',
 'AUTHENTICATE.SAML': '#SignIn.AuthenticatingWithRedirect',
 },
 entry: [
 {
 type: 'navigateTo',
 params: {
 path: '/',
 },
 },
 ],
 onDone: [
 {
 guard: 'isSignInComplete',
Expand DownExpand Up@@ -297,7 +312,7 @@ export const SignInMachine = setup({
 FirstFactor: {
 tags: 'state:first-factor',
 initial: 'DeterminingState',
 entry: 'assignStartingFirstFactor',
 entry: [{ type: 'navigateTo', params: { path: '/continue' } }, 'assignStartingFirstFactor'],
 onDone: [
 {
 guard: 'isSignInComplete',
Expand DownExpand Up@@ -385,7 +400,7 @@ export const SignInMachine = setup({
 SecondFactor: {
 tags: 'state:second-factor',
 initial: 'DeterminingState',
 entry: 'assignStartingSecondFactor',
 entry: [{ type: 'navigateTo', params: { path: '/continue' } }, 'assignStartingSecondFactor'],
 onDone: [
 {
 guard: 'isSignInComplete',
Expand DownExpand Up@@ -507,48 +522,24 @@ export const SignInMachine = setup({
 'CLERKJS.NAVIGATE.RESET_PASSWORD': '#SignIn.NotImplemented',
 'CLERKJS.NAVIGATE.SIGN_IN': {
 actions: [
 log('Navigating to sign in'),
 log('Navigating to sign in root'),
 {
 type: 'navigateTo',
 params: {
 path: '/sign-in',
 path: '/',
 },
 },
 ],
 },
 'CLERKJS.NAVIGATE.SIGN_UP': {
 actions: [
 log('Navigating to sign in'),
 {
 type: 'navigateTo',
 params: {
 path: '/sign-up',
 },
 },
 ],
 actions: [log('Navigating to sign up'), 'navigateToSignUp'],
 },
 'CLERKJS.NAVIGATE.VERIFICATION': {
 actions: [
 log('Navigating to sign in'),
 {
 type: 'navigateTo',
 params: {
 path: '/sign-up',
 },
 },
 ],
 actions: [log('Navigating to sign in'), 'navigateToSignUp'],
 },
 'CLERKJS.NAVIGATE.CONTINUE': {
 description: 'Redirect to the sign-up flow',
 actions: [
 log('Navigating to sign up'),
 {
 type: 'navigateTo',
 params: {
 path: '/sign-up',
 },
 },
 ],
 actions: [log('Navigating to sign up'), 'navigateToSignUp'],
 },
 'CLERKJS.NAVIGATE.*': {
 target: '#SignIn.Start',
Expand Down

2 changes: 0 additions & 2 deletions
packages/elements/src/internals/machines/sign-up/sign-up.actors.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -118,8 +118,6 @@ function fieldsToSignUpParams<T extends SignUpCreateParams | SignUpUpdateParams>
): Pick<T, SignUpAdditionalKeys> {
 const params: SignUpUpdateParams = {};

 // TODO: Determine what takes priority

 fields.forEach(({ value }, key) => {
 if (isSignUpParam(key) && value !== undefined) {
 params[key] = value as string;
Expand Down

2 changes: 1 addition & 1 deletion
packages/elements/src/internals/machines/sign-up/sign-up.machine.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -329,7 +329,7 @@ export const SignUpMachine = setup({
 Start: {
 id: 'Start',
 tags: 'state:start',
 description: 'The intial state of the sign-in flow.',
 description: 'The intial state of the sign-up flow.',
 entry: 'assignThirdPartyProviders',
 initial: 'AwaitingInput',
 on: {
Expand Down

2 changes: 1 addition & 1 deletion
packages/elements/src/react/common/form/index.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -148,7 +148,7 @@ const useInput = ({ name: inputName, value: initialValue, type: inputType, ...pa
 const shouldBeHidden = false;
 const type = inputType ?? determineInputTypeFromName(name);

 const Element = inputType === 'otp' ? OTPInput : RadixControl;
 const Element = type === 'otp' ? OTPInput : RadixControl;

 let props = {};
 if (inputType === 'otp') {
Expand Down

5 changes: 5 additions & 0 deletions
packages/elements/src/react/router/router.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,10 @@ export type ClerkHostRouter = {
 * Internal Clerk router, used by Clerk components to interact with the host's router.
 */
export type ClerkRouter = {
 /**
 * The basePath the router is currently mounted on.
 */
 basePath: string;
 /**
 * Creates a child router instance scoped to the provided base path.
 */
Expand DownExpand Up@@ -108,5 +112,6 @@ export function createClerkRouter(router: ClerkHostRouter, basePath: string = '/
 replace,
 pathname: router.pathname,
 searchParams: router.searchParams,
 basePath: normalizedBasePath,
 };
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
feat(elements): Remove hardcoded /sign-in path#2725

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 14 commits into

from

Feb 6, 2024
 Merged


feat(elements): Remove hardcoded /sign-in path
#2725
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
661597e

feat(shared): Add joinURL helper


LekoArts Feb 5, 2024
3f99039

chore(elements): Example fixes


LekoArts Feb 5, 2024
514269f

feat(elements): Do not hardcode /sign-in


LekoArts Feb 5, 2024
70f9fb7

chore(elements): Chores


LekoArts Feb 5, 2024
0a2622a

chore(repo): Add empty changeset


LekoArts Feb 5, 2024
8e12951

chore(elements): Bump package version


LekoArts Feb 5, 2024
f76ae61

chore(elements): Bump package version


LekoArts Feb 5, 2024
4366d9f

chore(repo): Add changeset


LekoArts Feb 5, 2024
fa66aae

chore(repo): Delete changeset+


LekoArts Feb 5, 2024
5b5942c

Update thirty-kings-trade.md


LekoArts Feb 5, 2024
faceac7

chore(elements): Use SocialProviderIcon from correct imports


LekoArts Feb 6, 2024
b631c4e

chore(elements): Allow passing required prop to CustomField


LekoArts Feb 6, 2024
3e57c18

fix(elements): Use OTPInput when name="code"


LekoArts Feb 6, 2024
7c7d65a

chore(elements): Add some JSDoc comments


LekoArts Feb 6, 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/thirty-kings-trade.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/shared': patch
---

Add `joinURL` helper to `@clerk/shared/url`

2 changes: 1 addition & 1 deletion
package-lock.json

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


2 changes: 1 addition & 1 deletion
packages/elements/examples/nextjs/app/otp-playground/page.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@ import { AnimatePresence, motion } from 'framer-motion';

export default function Page() {
 return (
 <SignIn>
 <SignIn path='/otp-playground'>
 <Start>
 <div className='h-dvh flex items-center justify-center bg-neutral-800'>
 <Field name='code'>
Expand Down

13 changes: 13 additions & 0 deletions
packages/elements/examples/nextjs/app/page.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -58,6 +58,19 @@ export default function Home() {
 <p className='m-0 max-w-[30ch] text-sm opacity-50'>Sign up using Elements</p>
 </Link>

 <Link
 href='/otp-playground'
 className='group rounded-lg border border-transparent px-5 py-4 transition-colors hover:border-gray-300 hover:bg-gray-100 hover:dark:border-neutral-700 hover:dark:bg-neutral-800/30'
 >
 <h2 className='mb-3 text-2xl font-semibold'>
 OTP{' '}
 <span className='inline-block transition-transform group-hover:translate-x-1 motion-reduce:transform-none'>
 -&gt;
 </span>
 </h2>
 <p className='m-0 max-w-[30ch] text-sm opacity-50'>OTP Playground</p>
 </Link>

 <a
 href='https://clerk.com/docs/custom-flows/overview#sign-in-flow'
 className='group rounded-lg border border-transparent px-5 py-4 transition-colors hover:border-gray-300 hover:bg-gray-100 hover:dark:border-neutral-700 hover:dark:bg-neutral-800/30'
Expand Down

11 changes: 9 additions & 2 deletions
packages/elements/examples/nextjs/app/sign-in/[[...sign-in]]/page.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,19 @@
'use client';

import { GlobalError, Submit } from '@clerk/elements/common';
import { Continue, Factor, SignIn, SocialProvider, Start, Verification } from '@clerk/elements/sign-in';
import {
 Continue,
 Factor,
 SignIn,
 SocialProvider,
 SocialProviderIcon,
 Start,
 Verification,
} from '@clerk/elements/sign-in';

import { H1, H2, H3, HR as Hr, P } from '@/components/design';
import { CustomField, CustomSubmit } from '@/components/form';
import { SignInDebug } from '@/components/sign-in-debug';
import { SocialProviderIcon } from '@/components/social-providers';

export default function SignInPage() {
 return (
Expand Down

11 changes: 9 additions & 2 deletions
packages/elements/examples/nextjs/app/sign-up/[[...sign-up]]/page.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,19 @@
'use client';

import { GlobalError } from '@clerk/elements/common';
import { Continue, SignUp, SocialProvider, Start, Verification, Verify } from '@clerk/elements/sign-up';
import {
 Continue,
 SignUp,
 SocialProvider,
 SocialProviderIcon,
 Start,
 Verification,
 Verify,
} from '@clerk/elements/sign-up';

import { H1, HR as Hr } from '@/components/design';
import { CustomField, CustomSubmit } from '@/components/form';
import { SignUpDebug } from '@/components/sign-up-debug';
import { SocialProviderIcon } from '@/components/social-providers';

export default function SignUpPage() {
 return (
Expand Down

62 changes: 32 additions & 30 deletions
packages/elements/examples/nextjs/components/form.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,38 +32,40 @@ function OTPInputSegment({ value, status }: any) {
 );
}

export const CustomField = forwardRef<typeof Input, { name: string; label: string }>(function CustomField(
 { name, label },
 forwardedRef,
) {
 const inputProps =
 name === 'code'
 ? {
 render: OTPInputSegment,
 }
 : {
 className: 'bg-tertiary rounded-sm px-2 py-1 border border-foreground data-[invalid]:border-red-500',
 ref: forwardedRef,
 };
export const CustomField = forwardRef<typeof Input, { name: string; label: string; required?: boolean }>(
 function CustomField({ name, label, required = false }, forwardedRef) {
 const inputProps =
 name === 'code'
 ? {
 render: OTPInputSegment,
 className: 'flex gap-3',
 required,
 }
 : {
 className: 'bg-tertiary rounded-sm px-2 py-1 border border-foreground data-[invalid]:border-red-500',
 ref: forwardedRef,
 required,
 };

 return (
 <ElementsField
 name={name}
 className='flex flex-col gap-4'
 >
 <div className='flex gap-4 justify-between items-center'>
 <Label>{label}</Label>
 <Input
 name={name}
 {...inputProps}
 />
 </div>
return (
<ElementsField
name={name}
className='flex flex-col gap-4'
>
<div className='flex gap-4 justify-between items-center'>
<Label>{label}</Label>
<Input
name={name}
{...inputProps}
/>
</div>

 <FieldError className='block text-red-400 font-mono' />
 <FieldState>{({ state }) => <pre className='opacity-60 text-xs'>Field state: {state}</pre>}</FieldState>
 </ElementsField>
 );
});
 <FieldError className='block text-red-400 font-mono' />
 <FieldState>{({ state }) => <pre className='opacity-60 text-xs'>Field state: {state}</pre>}</FieldState>
 </ElementsField>
 );
 },
);

export const CustomSubmit = forwardRef<HTMLButtonElement, React.ComponentPropsWithoutRef<'button'>>(
 function CustomButton(props, forwardedRef) {
Expand Down

2 changes: 1 addition & 1 deletion
packages/elements/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
 "name": "@clerk/elements",
 "version": "0.1.1",
 "version": "0.1.2",
 "description": "Clerk Elements",
 "keywords": [
 "clerk",
Expand Down

69 changes: 30 additions & 39 deletions
packages/elements/src/internals/machines/sign-in/sign-in.machine.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import type { ClerkAPIResponseError } from '@clerk/shared/error';
import { isClerkAPIResponseError } from '@clerk/shared/error';
import { joinURL } from '@clerk/shared/url';
import type {
 LoadedClerk,
 OAuthStrategy,
Expand DownExpand Up@@ -41,12 +42,14 @@ export interface SignInMachineContext extends MachineContext {
 resource: SignInResource | null;
 router: ClerkRouter;
 thirdPartyProviders: EnabledThirdPartyProviders;
 signUpPath: string;
}

export interface SignInMachineInput {
 clerk: LoadedClerk;
 form: ActorRefFrom<typeof FormMachine>;
 router: ClerkRouter;
 signUpPath: string;
}

export type SignInMachineTags = 'state:start' | 'state:first-factor' | 'state:second-factor' | 'external';
Expand DownExpand Up@@ -115,7 +118,11 @@ export const SignInMachine = setup({
 console.error(event.error);
 },
 navigateTo({ context }, { path }: { path: string }) {
 context.router.replace(path);
 const resolvedPath = joinURL(context.router.basePath, path);
 context.router.replace(resolvedPath);
 },
 navigateToSignUp({ context }) {
 context.router.push(context.signUpPath);
 },
 raiseFailure: raise(({ event }) => {
 assertActorEventError(event);
Expand DownExpand Up@@ -143,8 +150,7 @@ export const SignInMachine = setup({
 isCurrentFactorPassword: ({ context }) => context.currentFactor?.strategy === 'password',
 isCurrentFactorTOTP: ({ context }) => context.currentFactor?.strategy === 'totp',
 isCurrentPath: ({ context }, params: { path: string }) => {
 const path = params?.path;
 return path ? context.router.pathname() === path : false;
 return context.router.match(params?.path);
 },
 isLoggedIn: ({ context }) => Boolean(context.clerk.user),
 isSignInComplete: ({ context }) => context?.resource?.status === 'complete',
Expand DownExpand Up@@ -179,6 +185,7 @@ export const SignInMachine = setup({
 resource: null,
 router: input.router,
 thirdPartyProviders: getEnabledThirdPartyProviders(input.clerk.__unstable__environment),
 signUpPath: input.signUpPath,
 }),
 initial: 'Init',
 on: {
Expand All@@ -198,22 +205,22 @@ export const SignInMachine = setup({
 },
 {
 description: 'If the SignIn resource is empty, invoke the sign-in start flow',
 guard: or([not('hasSignInResource'), { type: 'isCurrentPath', params: { path: '/sign-in' } }]),
 guard: or([not('hasSignInResource'), { type: 'isCurrentPath', params: { path: '/' } }]),
 target: 'Start',
 },
 {
 description: 'Go to FirstFactor flow state',
 guard: and(['needsFirstFactor', { type: 'isCurrentPath', params: { path: '/sign-in/continue' } }]),
 guard: and(['needsFirstFactor', { type: 'isCurrentPath', params: { path: '/continue' } }]),
 target: 'FirstFactor',
 },
 {
 description: 'Go to SecondFactor flow state',
 guard: and(['needsSecondFactor', { type: 'isCurrentPath', params: { path: '/sign-in/continue' } }]),
 guard: and(['needsSecondFactor', { type: 'isCurrentPath', params: { path: '/continue' } }]),
 target: 'SecondFactor',
 },
 {
 description: 'Go to SSO Callback state',
 guard: { type: 'isCurrentPath', params: { path: '/sign-in/sso-callback' } },
 guard: { type: 'isCurrentPath', params: { path: '/sso-callback' } },
 target: 'SSOCallback',
 },
 {
Expand DownExpand Up@@ -241,12 +248,20 @@ export const SignInMachine = setup({
 Start: {
 id: 'Start',
 tags: 'state:start',
 description: 'The intial state of the sign-in flow.',
 description: 'The initial state of the sign-in flow.',
 initial: 'AwaitingInput',
 on: {
 'AUTHENTICATE.OAUTH': '#SignIn.AuthenticatingWithRedirect',
 'AUTHENTICATE.SAML': '#SignIn.AuthenticatingWithRedirect',
 },
 entry: [
 {
 type: 'navigateTo',
 params: {
 path: '/',
 },
 },
 ],
 onDone: [
 {
 guard: 'isSignInComplete',
Expand DownExpand Up@@ -297,7 +312,7 @@ export const SignInMachine = setup({
 FirstFactor: {
 tags: 'state:first-factor',
 initial: 'DeterminingState',
 entry: 'assignStartingFirstFactor',
 entry: [{ type: 'navigateTo', params: { path: '/continue' } }, 'assignStartingFirstFactor'],
 onDone: [
 {
 guard: 'isSignInComplete',
Expand DownExpand Up@@ -385,7 +400,7 @@ export const SignInMachine = setup({
 SecondFactor: {
 tags: 'state:second-factor',
 initial: 'DeterminingState',
 entry: 'assignStartingSecondFactor',
 entry: [{ type: 'navigateTo', params: { path: '/continue' } }, 'assignStartingSecondFactor'],
 onDone: [
 {
 guard: 'isSignInComplete',
Expand DownExpand Up@@ -507,48 +522,24 @@ export const SignInMachine = setup({
 'CLERKJS.NAVIGATE.RESET_PASSWORD': '#SignIn.NotImplemented',
 'CLERKJS.NAVIGATE.SIGN_IN': {
 actions: [
 log('Navigating to sign in'),
 log('Navigating to sign in root'),
 {
 type: 'navigateTo',
 params: {
 path: '/sign-in',
 path: '/',
 },
 },
 ],
 },
 'CLERKJS.NAVIGATE.SIGN_UP': {
 actions: [
 log('Navigating to sign in'),
 {
 type: 'navigateTo',
 params: {
 path: '/sign-up',
 },
 },
 ],
 actions: [log('Navigating to sign up'), 'navigateToSignUp'],
 },
 'CLERKJS.NAVIGATE.VERIFICATION': {
 actions: [
 log('Navigating to sign in'),
 {
 type: 'navigateTo',
 params: {
 path: '/sign-up',
 },
 },
 ],
 actions: [log('Navigating to sign in'), 'navigateToSignUp'],
 },
 'CLERKJS.NAVIGATE.CONTINUE': {
 description: 'Redirect to the sign-up flow',
 actions: [
 log('Navigating to sign up'),
 {
 type: 'navigateTo',
 params: {
 path: '/sign-up',
 },
 },
 ],
 actions: [log('Navigating to sign up'), 'navigateToSignUp'],
 },
 'CLERKJS.NAVIGATE.*': {
 target: '#SignIn.Start',
Expand Down

2 changes: 0 additions & 2 deletions
packages/elements/src/internals/machines/sign-up/sign-up.actors.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -118,8 +118,6 @@ function fieldsToSignUpParams<T extends SignUpCreateParams | SignUpUpdateParams>
): Pick<T, SignUpAdditionalKeys> {
 const params: SignUpUpdateParams = {};

 // TODO: Determine what takes priority

 fields.forEach(({ value }, key) => {
 if (isSignUpParam(key) && value !== undefined) {
 params[key] = value as string;
Expand Down

2 changes: 1 addition & 1 deletion
packages/elements/src/internals/machines/sign-up/sign-up.machine.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -329,7 +329,7 @@ export const SignUpMachine = setup({
 Start: {
 id: 'Start',
 tags: 'state:start',
 description: 'The intial state of the sign-in flow.',
 description: 'The intial state of the sign-up flow.',
 entry: 'assignThirdPartyProviders',
 initial: 'AwaitingInput',
 on: {
Expand Down

2 changes: 1 addition & 1 deletion
packages/elements/src/react/common/form/index.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -148,7 +148,7 @@ const useInput = ({ name: inputName, value: initialValue, type: inputType, ...pa
 const shouldBeHidden = false;
 const type = inputType ?? determineInputTypeFromName(name);

 const Element = inputType === 'otp' ? OTPInput : RadixControl;
 const Element = type === 'otp' ? OTPInput : RadixControl;

 let props = {};
 if (inputType === 'otp') {
Expand Down

5 changes: 5 additions & 0 deletions
packages/elements/src/react/router/router.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,10 @@ export type ClerkHostRouter = {
 * Internal Clerk router, used by Clerk components to interact with the host's router.
 */
export type ClerkRouter = {
 /**
 * The basePath the router is currently mounted on.
 */
 basePath: string;
 /**
 * Creates a child router instance scoped to the provided base path.
 */
Expand DownExpand Up@@ -108,5 +112,6 @@ export function createClerkRouter(router: ClerkHostRouter, basePath: string = '/
 replace,
 pathname: router.pathname,
 searchParams: router.searchParams,
 basePath: normalizedBasePath,
 };
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
feat(elements): Remove hardcoded /sign-in path#2725

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 14 commits into

from

Feb 6, 2024
 Merged


feat(elements): Remove hardcoded /sign-in path
#2725
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
661597e

feat(shared): Add joinURL helper


LekoArts Feb 5, 2024
3f99039

chore(elements): Example fixes


LekoArts Feb 5, 2024
514269f

feat(elements): Do not hardcode /sign-in


LekoArts Feb 5, 2024
70f9fb7

chore(elements): Chores


LekoArts Feb 5, 2024
0a2622a

chore(repo): Add empty changeset


LekoArts Feb 5, 2024
8e12951

chore(elements): Bump package version


LekoArts Feb 5, 2024
f76ae61

chore(elements): Bump package version


LekoArts Feb 5, 2024
4366d9f

chore(repo): Add changeset


LekoArts Feb 5, 2024
fa66aae

chore(repo): Delete changeset+


LekoArts Feb 5, 2024
5b5942c

Update thirty-kings-trade.md


LekoArts Feb 5, 2024
faceac7

chore(elements): Use SocialProviderIcon from correct imports


LekoArts Feb 6, 2024
b631c4e

chore(elements): Allow passing required prop to CustomField


LekoArts Feb 6, 2024
3e57c18

fix(elements): Use OTPInput when name="code"


LekoArts Feb 6, 2024
7c7d65a

chore(elements): Add some JSDoc comments


LekoArts Feb 6, 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/thirty-kings-trade.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/shared': patch
---

Add `joinURL` helper to `@clerk/shared/url`

2 changes: 1 addition & 1 deletion
package-lock.json

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


2 changes: 1 addition & 1 deletion
packages/elements/examples/nextjs/app/otp-playground/page.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@ import { AnimatePresence, motion } from 'framer-motion';

export default function Page() {
 return (
 <SignIn>
 <SignIn path='/otp-playground'>
 <Start>
 <div className='h-dvh flex items-center justify-center bg-neutral-800'>
 <Field name='code'>
Expand Down

13 changes: 13 additions & 0 deletions
packages/elements/examples/nextjs/app/page.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -58,6 +58,19 @@ export default function Home() {
 <p className='m-0 max-w-[30ch] text-sm opacity-50'>Sign up using Elements</p>
 </Link>

 <Link
 href='/otp-playground'
 className='group rounded-lg border border-transparent px-5 py-4 transition-colors hover:border-gray-300 hover:bg-gray-100 hover:dark:border-neutral-700 hover:dark:bg-neutral-800/30'
 >
 <h2 className='mb-3 text-2xl font-semibold'>
 OTP{' '}
 <span className='inline-block transition-transform group-hover:translate-x-1 motion-reduce:transform-none'>
 -&gt;
 </span>
 </h2>
 <p className='m-0 max-w-[30ch] text-sm opacity-50'>OTP Playground</p>
 </Link>

 <a
 href='https://clerk.com/docs/custom-flows/overview#sign-in-flow'
 className='group rounded-lg border border-transparent px-5 py-4 transition-colors hover:border-gray-300 hover:bg-gray-100 hover:dark:border-neutral-700 hover:dark:bg-neutral-800/30'
Expand Down

11 changes: 9 additions & 2 deletions
packages/elements/examples/nextjs/app/sign-in/[[...sign-in]]/page.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,19 @@
'use client';

import { GlobalError, Submit } from '@clerk/elements/common';
import { Continue, Factor, SignIn, SocialProvider, Start, Verification } from '@clerk/elements/sign-in';
import {
 Continue,
 Factor,
 SignIn,
 SocialProvider,
 SocialProviderIcon,
 Start,
 Verification,
} from '@clerk/elements/sign-in';

import { H1, H2, H3, HR as Hr, P } from '@/components/design';
import { CustomField, CustomSubmit } from '@/components/form';
import { SignInDebug } from '@/components/sign-in-debug';
import { SocialProviderIcon } from '@/components/social-providers';

export default function SignInPage() {
 return (
Expand Down

11 changes: 9 additions & 2 deletions
packages/elements/examples/nextjs/app/sign-up/[[...sign-up]]/page.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,19 @@
'use client';

import { GlobalError } from '@clerk/elements/common';
import { Continue, SignUp, SocialProvider, Start, Verification, Verify } from '@clerk/elements/sign-up';
import {
 Continue,
 SignUp,
 SocialProvider,
 SocialProviderIcon,
 Start,
 Verification,
 Verify,
} from '@clerk/elements/sign-up';

import { H1, HR as Hr } from '@/components/design';
import { CustomField, CustomSubmit } from '@/components/form';
import { SignUpDebug } from '@/components/sign-up-debug';
import { SocialProviderIcon } from '@/components/social-providers';

export default function SignUpPage() {
 return (
Expand Down

62 changes: 32 additions & 30 deletions
packages/elements/examples/nextjs/components/form.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,38 +32,40 @@ function OTPInputSegment({ value, status }: any) {
 );
}

export const CustomField = forwardRef<typeof Input, { name: string; label: string }>(function CustomField(
 { name, label },
 forwardedRef,
) {
 const inputProps =
 name === 'code'
 ? {
 render: OTPInputSegment,
 }
 : {
 className: 'bg-tertiary rounded-sm px-2 py-1 border border-foreground data-[invalid]:border-red-500',
 ref: forwardedRef,
 };
export const CustomField = forwardRef<typeof Input, { name: string; label: string; required?: boolean }>(
 function CustomField({ name, label, required = false }, forwardedRef) {
 const inputProps =
 name === 'code'
 ? {
 render: OTPInputSegment,
 className: 'flex gap-3',
 required,
 }
 : {
 className: 'bg-tertiary rounded-sm px-2 py-1 border border-foreground data-[invalid]:border-red-500',
 ref: forwardedRef,
 required,
 };

 return (
 <ElementsField
 name={name}
 className='flex flex-col gap-4'
 >
 <div className='flex gap-4 justify-between items-center'>
 <Label>{label}</Label>
 <Input
 name={name}
 {...inputProps}
 />
 </div>
return (
<ElementsField
name={name}
className='flex flex-col gap-4'
>
<div className='flex gap-4 justify-between items-center'>
<Label>{label}</Label>
<Input
name={name}
{...inputProps}
/>
</div>

 <FieldError className='block text-red-400 font-mono' />
 <FieldState>{({ state }) => <pre className='opacity-60 text-xs'>Field state: {state}</pre>}</FieldState>
 </ElementsField>
 );
});
 <FieldError className='block text-red-400 font-mono' />
 <FieldState>{({ state }) => <pre className='opacity-60 text-xs'>Field state: {state}</pre>}</FieldState>
 </ElementsField>
 );
 },
);

export const CustomSubmit = forwardRef<HTMLButtonElement, React.ComponentPropsWithoutRef<'button'>>(
 function CustomButton(props, forwardedRef) {
Expand Down

2 changes: 1 addition & 1 deletion
packages/elements/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
 "name": "@clerk/elements",
 "version": "0.1.1",
 "version": "0.1.2",
 "description": "Clerk Elements",
 "keywords": [
 "clerk",
Expand Down

69 changes: 30 additions & 39 deletions
packages/elements/src/internals/machines/sign-in/sign-in.machine.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import type { ClerkAPIResponseError } from '@clerk/shared/error';
import { isClerkAPIResponseError } from '@clerk/shared/error';
import { joinURL } from '@clerk/shared/url';
import type {
 LoadedClerk,
 OAuthStrategy,
Expand DownExpand Up@@ -41,12 +42,14 @@ export interface SignInMachineContext extends MachineContext {
 resource: SignInResource | null;
 router: ClerkRouter;
 thirdPartyProviders: EnabledThirdPartyProviders;
 signUpPath: string;
}

export interface SignInMachineInput {
 clerk: LoadedClerk;
 form: ActorRefFrom<typeof FormMachine>;
 router: ClerkRouter;
 signUpPath: string;
}

export type SignInMachineTags = 'state:start' | 'state:first-factor' | 'state:second-factor' | 'external';
Expand DownExpand Up@@ -115,7 +118,11 @@ export const SignInMachine = setup({
 console.error(event.error);
 },
 navigateTo({ context }, { path }: { path: string }) {
 context.router.replace(path);
 const resolvedPath = joinURL(context.router.basePath, path);
 context.router.replace(resolvedPath);
 },
 navigateToSignUp({ context }) {
 context.router.push(context.signUpPath);
 },
 raiseFailure: raise(({ event }) => {
 assertActorEventError(event);
Expand DownExpand Up@@ -143,8 +150,7 @@ export const SignInMachine = setup({
 isCurrentFactorPassword: ({ context }) => context.currentFactor?.strategy === 'password',
 isCurrentFactorTOTP: ({ context }) => context.currentFactor?.strategy === 'totp',
 isCurrentPath: ({ context }, params: { path: string }) => {
 const path = params?.path;
 return path ? context.router.pathname() === path : false;
 return context.router.match(params?.path);
 },
 isLoggedIn: ({ context }) => Boolean(context.clerk.user),
 isSignInComplete: ({ context }) => context?.resource?.status === 'complete',
Expand DownExpand Up@@ -179,6 +185,7 @@ export const SignInMachine = setup({
 resource: null,
 router: input.router,
 thirdPartyProviders: getEnabledThirdPartyProviders(input.clerk.__unstable__environment),
 signUpPath: input.signUpPath,
 }),
 initial: 'Init',
 on: {
Expand All@@ -198,22 +205,22 @@ export const SignInMachine = setup({
 },
 {
 description: 'If the SignIn resource is empty, invoke the sign-in start flow',
 guard: or([not('hasSignInResource'), { type: 'isCurrentPath', params: { path: '/sign-in' } }]),
 guard: or([not('hasSignInResource'), { type: 'isCurrentPath', params: { path: '/' } }]),
 target: 'Start',
 },
 {
 description: 'Go to FirstFactor flow state',
 guard: and(['needsFirstFactor', { type: 'isCurrentPath', params: { path: '/sign-in/continue' } }]),
 guard: and(['needsFirstFactor', { type: 'isCurrentPath', params: { path: '/continue' } }]),
 target: 'FirstFactor',
 },
 {
 description: 'Go to SecondFactor flow state',
 guard: and(['needsSecondFactor', { type: 'isCurrentPath', params: { path: '/sign-in/continue' } }]),
 guard: and(['needsSecondFactor', { type: 'isCurrentPath', params: { path: '/continue' } }]),
 target: 'SecondFactor',
 },
 {
 description: 'Go to SSO Callback state',
 guard: { type: 'isCurrentPath', params: { path: '/sign-in/sso-callback' } },
 guard: { type: 'isCurrentPath', params: { path: '/sso-callback' } },
 target: 'SSOCallback',
 },
 {
Expand DownExpand Up@@ -241,12 +248,20 @@ export const SignInMachine = setup({
 Start: {
 id: 'Start',
 tags: 'state:start',
 description: 'The intial state of the sign-in flow.',
 description: 'The initial state of the sign-in flow.',
 initial: 'AwaitingInput',
 on: {
 'AUTHENTICATE.OAUTH': '#SignIn.AuthenticatingWithRedirect',
 'AUTHENTICATE.SAML': '#SignIn.AuthenticatingWithRedirect',
 },
 entry: [
 {
 type: 'navigateTo',
 params: {
 path: '/',
 },
 },
 ],
 onDone: [
 {
 guard: 'isSignInComplete',
Expand DownExpand Up@@ -297,7 +312,7 @@ export const SignInMachine = setup({
 FirstFactor: {
 tags: 'state:first-factor',
 initial: 'DeterminingState',
 entry: 'assignStartingFirstFactor',
 entry: [{ type: 'navigateTo', params: { path: '/continue' } }, 'assignStartingFirstFactor'],
 onDone: [
 {
 guard: 'isSignInComplete',
Expand DownExpand Up@@ -385,7 +400,7 @@ export const SignInMachine = setup({
 SecondFactor: {
 tags: 'state:second-factor',
 initial: 'DeterminingState',
 entry: 'assignStartingSecondFactor',
 entry: [{ type: 'navigateTo', params: { path: '/continue' } }, 'assignStartingSecondFactor'],
 onDone: [
 {
 guard: 'isSignInComplete',
Expand DownExpand Up@@ -507,48 +522,24 @@ export const SignInMachine = setup({
 'CLERKJS.NAVIGATE.RESET_PASSWORD': '#SignIn.NotImplemented',
 'CLERKJS.NAVIGATE.SIGN_IN': {
 actions: [
 log('Navigating to sign in'),
 log('Navigating to sign in root'),
 {
 type: 'navigateTo',
 params: {
 path: '/sign-in',
 path: '/',
 },
 },
 ],
 },
 'CLERKJS.NAVIGATE.SIGN_UP': {
 actions: [
 log('Navigating to sign in'),
 {
 type: 'navigateTo',
 params: {
 path: '/sign-up',
 },
 },
 ],
 actions: [log('Navigating to sign up'), 'navigateToSignUp'],
 },
 'CLERKJS.NAVIGATE.VERIFICATION': {
 actions: [
 log('Navigating to sign in'),
 {
 type: 'navigateTo',
 params: {
 path: '/sign-up',
 },
 },
 ],
 actions: [log('Navigating to sign in'), 'navigateToSignUp'],
 },
 'CLERKJS.NAVIGATE.CONTINUE': {
 description: 'Redirect to the sign-up flow',
 actions: [
 log('Navigating to sign up'),
 {
 type: 'navigateTo',
 params: {
 path: '/sign-up',
 },
 },
 ],
 actions: [log('Navigating to sign up'), 'navigateToSignUp'],
 },
 'CLERKJS.NAVIGATE.*': {
 target: '#SignIn.Start',
Expand Down

2 changes: 0 additions & 2 deletions
packages/elements/src/internals/machines/sign-up/sign-up.actors.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -118,8 +118,6 @@ function fieldsToSignUpParams<T extends SignUpCreateParams | SignUpUpdateParams>
): Pick<T, SignUpAdditionalKeys> {
 const params: SignUpUpdateParams = {};

 // TODO: Determine what takes priority

 fields.forEach(({ value }, key) => {
 if (isSignUpParam(key) && value !== undefined) {
 params[key] = value as string;
Expand Down

2 changes: 1 addition & 1 deletion
packages/elements/src/internals/machines/sign-up/sign-up.machine.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -329,7 +329,7 @@ export const SignUpMachine = setup({
 Start: {
 id: 'Start',
 tags: 'state:start',
 description: 'The intial state of the sign-in flow.',
 description: 'The intial state of the sign-up flow.',
 entry: 'assignThirdPartyProviders',
 initial: 'AwaitingInput',
 on: {
Expand Down

2 changes: 1 addition & 1 deletion
packages/elements/src/react/common/form/index.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -148,7 +148,7 @@ const useInput = ({ name: inputName, value: initialValue, type: inputType, ...pa
 const shouldBeHidden = false;
 const type = inputType ?? determineInputTypeFromName(name);

 const Element = inputType === 'otp' ? OTPInput : RadixControl;
 const Element = type === 'otp' ? OTPInput : RadixControl;

 let props = {};
 if (inputType === 'otp') {
Expand Down

5 changes: 5 additions & 0 deletions
packages/elements/src/react/router/router.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,10 @@ export type ClerkHostRouter = {
 * Internal Clerk router, used by Clerk components to interact with the host's router.
 */
export type ClerkRouter = {
 /**
 * The basePath the router is currently mounted on.
 */
 basePath: string;
 /**
 * Creates a child router instance scoped to the provided base path.
 */
Expand DownExpand Up@@ -108,5 +112,6 @@ export function createClerkRouter(router: ClerkHostRouter, basePath: string = '/
 replace,
 pathname: router.pathname,
 searchParams: router.searchParams,
 basePath: normalizedBasePath,
 };
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
feat(elements): Remove hardcoded /sign-in path#2725

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 14 commits into

from

Feb 6, 2024
 Merged


feat(elements): Remove hardcoded /sign-in path
#2725
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
661597e

feat(shared): Add joinURL helper


LekoArts Feb 5, 2024
3f99039

chore(elements): Example fixes


LekoArts Feb 5, 2024
514269f

feat(elements): Do not hardcode /sign-in


LekoArts Feb 5, 2024
70f9fb7

chore(elements): Chores


LekoArts Feb 5, 2024
0a2622a

chore(repo): Add empty changeset


LekoArts Feb 5, 2024
8e12951

chore(elements): Bump package version


LekoArts Feb 5, 2024
f76ae61

chore(elements): Bump package version


LekoArts Feb 5, 2024
4366d9f

chore(repo): Add changeset


LekoArts Feb 5, 2024
fa66aae

chore(repo): Delete changeset+


LekoArts Feb 5, 2024
5b5942c

Update thirty-kings-trade.md


LekoArts Feb 5, 2024
faceac7

chore(elements): Use SocialProviderIcon from correct imports


LekoArts Feb 6, 2024
b631c4e

chore(elements): Allow passing required prop to CustomField


LekoArts Feb 6, 2024
3e57c18

fix(elements): Use OTPInput when name="code"


LekoArts Feb 6, 2024
7c7d65a

chore(elements): Add some JSDoc comments


LekoArts Feb 6, 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/thirty-kings-trade.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/shared': patch
---

Add `joinURL` helper to `@clerk/shared/url`

2 changes: 1 addition & 1 deletion
package-lock.json

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


2 changes: 1 addition & 1 deletion
packages/elements/examples/nextjs/app/otp-playground/page.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@ import { AnimatePresence, motion } from 'framer-motion';

export default function Page() {
 return (
 <SignIn>
 <SignIn path='/otp-playground'>
 <Start>
 <div className='h-dvh flex items-center justify-center bg-neutral-800'>
 <Field name='code'>
Expand Down

13 changes: 13 additions & 0 deletions
packages/elements/examples/nextjs/app/page.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -58,6 +58,19 @@ export default function Home() {
 <p className='m-0 max-w-[30ch] text-sm opacity-50'>Sign up using Elements</p>
 </Link>

 <Link
 href='/otp-playground'
 className='group rounded-lg border border-transparent px-5 py-4 transition-colors hover:border-gray-300 hover:bg-gray-100 hover:dark:border-neutral-700 hover:dark:bg-neutral-800/30'
 >
 <h2 className='mb-3 text-2xl font-semibold'>
 OTP{' '}
 <span className='inline-block transition-transform group-hover:translate-x-1 motion-reduce:transform-none'>
 -&gt;
 </span>
 </h2>
 <p className='m-0 max-w-[30ch] text-sm opacity-50'>OTP Playground</p>
 </Link>

 <a
 href='https://clerk.com/docs/custom-flows/overview#sign-in-flow'
 className='group rounded-lg border border-transparent px-5 py-4 transition-colors hover:border-gray-300 hover:bg-gray-100 hover:dark:border-neutral-700 hover:dark:bg-neutral-800/30'
Expand Down

11 changes: 9 additions & 2 deletions
packages/elements/examples/nextjs/app/sign-in/[[...sign-in]]/page.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,19 @@
'use client';

import { GlobalError, Submit } from '@clerk/elements/common';
import { Continue, Factor, SignIn, SocialProvider, Start, Verification } from '@clerk/elements/sign-in';
import {
 Continue,
 Factor,
 SignIn,
 SocialProvider,
 SocialProviderIcon,
 Start,
 Verification,
} from '@clerk/elements/sign-in';

import { H1, H2, H3, HR as Hr, P } from '@/components/design';
import { CustomField, CustomSubmit } from '@/components/form';
import { SignInDebug } from '@/components/sign-in-debug';
import { SocialProviderIcon } from '@/components/social-providers';

export default function SignInPage() {
 return (
Expand Down

11 changes: 9 additions & 2 deletions
packages/elements/examples/nextjs/app/sign-up/[[...sign-up]]/page.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,19 @@
'use client';

import { GlobalError } from '@clerk/elements/common';
import { Continue, SignUp, SocialProvider, Start, Verification, Verify } from '@clerk/elements/sign-up';
import {
 Continue,
 SignUp,
 SocialProvider,
 SocialProviderIcon,
 Start,
 Verification,
 Verify,
} from '@clerk/elements/sign-up';

import { H1, HR as Hr } from '@/components/design';
import { CustomField, CustomSubmit } from '@/components/form';
import { SignUpDebug } from '@/components/sign-up-debug';
import { SocialProviderIcon } from '@/components/social-providers';

export default function SignUpPage() {
 return (
Expand Down

62 changes: 32 additions & 30 deletions
packages/elements/examples/nextjs/components/form.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,38 +32,40 @@ function OTPInputSegment({ value, status }: any) {
 );
}

export const CustomField = forwardRef<typeof Input, { name: string; label: string }>(function CustomField(
 { name, label },
 forwardedRef,
) {
 const inputProps =
 name === 'code'
 ? {
 render: OTPInputSegment,
 }
 : {
 className: 'bg-tertiary rounded-sm px-2 py-1 border border-foreground data-[invalid]:border-red-500',
 ref: forwardedRef,
 };
export const CustomField = forwardRef<typeof Input, { name: string; label: string; required?: boolean }>(
 function CustomField({ name, label, required = false }, forwardedRef) {
 const inputProps =
 name === 'code'
 ? {
 render: OTPInputSegment,
 className: 'flex gap-3',
 required,
 }
 : {
 className: 'bg-tertiary rounded-sm px-2 py-1 border border-foreground data-[invalid]:border-red-500',
 ref: forwardedRef,
 required,
 };

 return (
 <ElementsField
 name={name}
 className='flex flex-col gap-4'
 >
 <div className='flex gap-4 justify-between items-center'>
 <Label>{label}</Label>
 <Input
 name={name}
 {...inputProps}
 />
 </div>
return (
<ElementsField
name={name}
className='flex flex-col gap-4'
>
<div className='flex gap-4 justify-between items-center'>
<Label>{label}</Label>
<Input
name={name}
{...inputProps}
/>
</div>

 <FieldError className='block text-red-400 font-mono' />
 <FieldState>{({ state }) => <pre className='opacity-60 text-xs'>Field state: {state}</pre>}</FieldState>
 </ElementsField>
 );
});
 <FieldError className='block text-red-400 font-mono' />
 <FieldState>{({ state }) => <pre className='opacity-60 text-xs'>Field state: {state}</pre>}</FieldState>
 </ElementsField>
 );
 },
);

export const CustomSubmit = forwardRef<HTMLButtonElement, React.ComponentPropsWithoutRef<'button'>>(
 function CustomButton(props, forwardedRef) {
Expand Down

2 changes: 1 addition & 1 deletion
packages/elements/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
 "name": "@clerk/elements",
 "version": "0.1.1",
 "version": "0.1.2",
 "description": "Clerk Elements",
 "keywords": [
 "clerk",
Expand Down

69 changes: 30 additions & 39 deletions
packages/elements/src/internals/machines/sign-in/sign-in.machine.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import type { ClerkAPIResponseError } from '@clerk/shared/error';
import { isClerkAPIResponseError } from '@clerk/shared/error';
import { joinURL } from '@clerk/shared/url';
import type {
 LoadedClerk,
 OAuthStrategy,
Expand DownExpand Up@@ -41,12 +42,14 @@ export interface SignInMachineContext extends MachineContext {
 resource: SignInResource | null;
 router: ClerkRouter;
 thirdPartyProviders: EnabledThirdPartyProviders;
 signUpPath: string;
}

export interface SignInMachineInput {
 clerk: LoadedClerk;
 form: ActorRefFrom<typeof FormMachine>;
 router: ClerkRouter;
 signUpPath: string;
}

export type SignInMachineTags = 'state:start' | 'state:first-factor' | 'state:second-factor' | 'external';
Expand DownExpand Up@@ -115,7 +118,11 @@ export const SignInMachine = setup({
 console.error(event.error);
 },
 navigateTo({ context }, { path }: { path: string }) {
 context.router.replace(path);
 const resolvedPath = joinURL(context.router.basePath, path);
 context.router.replace(resolvedPath);
 },
 navigateToSignUp({ context }) {
 context.router.push(context.signUpPath);
 },
 raiseFailure: raise(({ event }) => {
 assertActorEventError(event);
Expand DownExpand Up@@ -143,8 +150,7 @@ export const SignInMachine = setup({
 isCurrentFactorPassword: ({ context }) => context.currentFactor?.strategy === 'password',
 isCurrentFactorTOTP: ({ context }) => context.currentFactor?.strategy === 'totp',
 isCurrentPath: ({ context }, params: { path: string }) => {
 const path = params?.path;
 return path ? context.router.pathname() === path : false;
 return context.router.match(params?.path);
 },
 isLoggedIn: ({ context }) => Boolean(context.clerk.user),
 isSignInComplete: ({ context }) => context?.resource?.status === 'complete',
Expand DownExpand Up@@ -179,6 +185,7 @@ export const SignInMachine = setup({
 resource: null,
 router: input.router,
 thirdPartyProviders: getEnabledThirdPartyProviders(input.clerk.__unstable__environment),
 signUpPath: input.signUpPath,
 }),
 initial: 'Init',
 on: {
Expand All@@ -198,22 +205,22 @@ export const SignInMachine = setup({
 },
 {
 description: 'If the SignIn resource is empty, invoke the sign-in start flow',
 guard: or([not('hasSignInResource'), { type: 'isCurrentPath', params: { path: '/sign-in' } }]),
 guard: or([not('hasSignInResource'), { type: 'isCurrentPath', params: { path: '/' } }]),
 target: 'Start',
 },
 {
 description: 'Go to FirstFactor flow state',
 guard: and(['needsFirstFactor', { type: 'isCurrentPath', params: { path: '/sign-in/continue' } }]),
 guard: and(['needsFirstFactor', { type: 'isCurrentPath', params: { path: '/continue' } }]),
 target: 'FirstFactor',
 },
 {
 description: 'Go to SecondFactor flow state',
 guard: and(['needsSecondFactor', { type: 'isCurrentPath', params: { path: '/sign-in/continue' } }]),
 guard: and(['needsSecondFactor', { type: 'isCurrentPath', params: { path: '/continue' } }]),
 target: 'SecondFactor',
 },
 {
 description: 'Go to SSO Callback state',
 guard: { type: 'isCurrentPath', params: { path: '/sign-in/sso-callback' } },
 guard: { type: 'isCurrentPath', params: { path: '/sso-callback' } },
 target: 'SSOCallback',
 },
 {
Expand DownExpand Up@@ -241,12 +248,20 @@ export const SignInMachine = setup({
 Start: {
 id: 'Start',
 tags: 'state:start',
 description: 'The intial state of the sign-in flow.',
 description: 'The initial state of the sign-in flow.',
 initial: 'AwaitingInput',
 on: {
 'AUTHENTICATE.OAUTH': '#SignIn.AuthenticatingWithRedirect',
 'AUTHENTICATE.SAML': '#SignIn.AuthenticatingWithRedirect',
 },
 entry: [
 {
 type: 'navigateTo',
 params: {
 path: '/',
 },
 },
 ],
 onDone: [
 {
 guard: 'isSignInComplete',
Expand DownExpand Up@@ -297,7 +312,7 @@ export const SignInMachine = setup({
 FirstFactor: {
 tags: 'state:first-factor',
 initial: 'DeterminingState',
 entry: 'assignStartingFirstFactor',
 entry: [{ type: 'navigateTo', params: { path: '/continue' } }, 'assignStartingFirstFactor'],
 onDone: [
 {
 guard: 'isSignInComplete',
Expand DownExpand Up@@ -385,7 +400,7 @@ export const SignInMachine = setup({
 SecondFactor: {
 tags: 'state:second-factor',
 initial: 'DeterminingState',
 entry: 'assignStartingSecondFactor',
 entry: [{ type: 'navigateTo', params: { path: '/continue' } }, 'assignStartingSecondFactor'],
 onDone: [
 {
 guard: 'isSignInComplete',
Expand DownExpand Up@@ -507,48 +522,24 @@ export const SignInMachine = setup({
 'CLERKJS.NAVIGATE.RESET_PASSWORD': '#SignIn.NotImplemented',
 'CLERKJS.NAVIGATE.SIGN_IN': {
 actions: [
 log('Navigating to sign in'),
 log('Navigating to sign in root'),
 {
 type: 'navigateTo',
 params: {
 path: '/sign-in',
 path: '/',
 },
 },
 ],
 },
 'CLERKJS.NAVIGATE.SIGN_UP': {
 actions: [
 log('Navigating to sign in'),
 {
 type: 'navigateTo',
 params: {
 path: '/sign-up',
 },
 },
 ],
 actions: [log('Navigating to sign up'), 'navigateToSignUp'],
 },
 'CLERKJS.NAVIGATE.VERIFICATION': {
 actions: [
 log('Navigating to sign in'),
 {
 type: 'navigateTo',
 params: {
 path: '/sign-up',
 },
 },
 ],
 actions: [log('Navigating to sign in'), 'navigateToSignUp'],
 },
 'CLERKJS.NAVIGATE.CONTINUE': {
 description: 'Redirect to the sign-up flow',
 actions: [
 log('Navigating to sign up'),
 {
 type: 'navigateTo',
 params: {
 path: '/sign-up',
 },
 },
 ],
 actions: [log('Navigating to sign up'), 'navigateToSignUp'],
 },
 'CLERKJS.NAVIGATE.*': {
 target: '#SignIn.Start',
Expand Down

2 changes: 0 additions & 2 deletions
packages/elements/src/internals/machines/sign-up/sign-up.actors.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -118,8 +118,6 @@ function fieldsToSignUpParams<T extends SignUpCreateParams | SignUpUpdateParams>
): Pick<T, SignUpAdditionalKeys> {
 const params: SignUpUpdateParams = {};

 // TODO: Determine what takes priority

 fields.forEach(({ value }, key) => {
 if (isSignUpParam(key) && value !== undefined) {
 params[key] = value as string;
Expand Down

2 changes: 1 addition & 1 deletion
packages/elements/src/internals/machines/sign-up/sign-up.machine.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -329,7 +329,7 @@ export const SignUpMachine = setup({
 Start: {
 id: 'Start',
 tags: 'state:start',
 description: 'The intial state of the sign-in flow.',
 description: 'The intial state of the sign-up flow.',
 entry: 'assignThirdPartyProviders',
 initial: 'AwaitingInput',
 on: {
Expand Down

2 changes: 1 addition & 1 deletion
packages/elements/src/react/common/form/index.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -148,7 +148,7 @@ const useInput = ({ name: inputName, value: initialValue, type: inputType, ...pa
 const shouldBeHidden = false;
 const type = inputType ?? determineInputTypeFromName(name);

 const Element = inputType === 'otp' ? OTPInput : RadixControl;
 const Element = type === 'otp' ? OTPInput : RadixControl;

 let props = {};
 if (inputType === 'otp') {
Expand Down

5 changes: 5 additions & 0 deletions
packages/elements/src/react/router/router.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,10 @@ export type ClerkHostRouter = {
 * Internal Clerk router, used by Clerk components to interact with the host's router.
 */
export type ClerkRouter = {
 /**
 * The basePath the router is currently mounted on.
 */
 basePath: string;
 /**
 * Creates a child router instance scoped to the provided base path.
 */
Expand DownExpand Up@@ -108,5 +112,6 @@ export function createClerkRouter(router: ClerkHostRouter, basePath: string = '/
 replace,
 pathname: router.pathname,
 searchParams: router.searchParams,
 basePath: normalizedBasePath,
 };
}
Loading