Uh oh!
There was an error while loading. Please reload this page.
feat(tanstack-react-start): Introduce middleware and support for TanStack Start RC#6859
Uh oh!
There was an error while loading. Please reload this page.
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| --- | ||
| "@clerk/tanstack-react-start": minor | ||
| --- | ||
| Added support for [TanStack Start v1 RC](https://tanstack.com/blog/announcing-tanstack-start-v1)! Includes a new `clerkMiddleware()` global middleware replacing the custom server handler. | ||
| Usage: | ||
| 1. Create a `src/start.ts` file and add `clerkMiddleware()` to the list of request middlewares: | ||
| ```ts | ||
| // src/start.ts | ||
| import { clerkMiddleware } from '@clerk/tanstack-react-start/server' | ||
| import { createStart } from '@tanstack/react-start' | ||
| export const startInstance = createStart(() => { | ||
| return { | ||
| requestMiddleware: [clerkMiddleware()], | ||
| } | ||
| }) | ||
| ``` | ||
| 2. Add `<ClerkProvider>` to your root route | ||
| ```tsx | ||
| // src/routes/__root.tsx | ||
| import { ClerkProvider } from '@clerk/tanstack-react-start' | ||
| export const Route = createRootRoute({...}) | ||
| function RootDocument({ children }: { children: React.ReactNode }) { | ||
| return ( | ||
| <ClerkProvider> | ||
| <html> | ||
| <head> | ||
| <HeadContent /> | ||
| </head> | ||
| <body> | ||
| {children} | ||
| <Scripts /> | ||
| </body> | ||
| </html> | ||
| </ClerkProvider> | ||
| ) | ||
| } | ||
| ``` | ||
| The `getAuth()` helper is now `auth()` and can now be called within server routes and functions, without passing a Request object: | ||
| ```ts | ||
| import { auth } from '@clerk/tanstack-react-start/server' | ||
| const authStateFn = createServerFn().handler(async () => { | ||
| const { userId } = await auth() | ||
| if (!userId) { | ||
| throw redirect({ | ||
| to: '/sign-in', | ||
| }) | ||
| } | ||
| return { userId } | ||
| }) | ||
| export const Route = createFileRoute('/')({ | ||
| component: Home, | ||
| beforeLoad: async () => await authStateFn(), | ||
| loader: async ({ context }) => { | ||
| return { userId: context.userId } | ||
| }, | ||
| }) | ||
| ``` |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Uh oh!
There was an error while loading. Please reload this page.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| import { clerkMiddleware } from '@clerk/tanstack-react-start/server'; | ||
| import { createStart } from '@tanstack/react-start'; | ||
| export const startInstance = createStart(() => { | ||
coderabbitai[bot] marked this conversation as resolved.
Uh oh!There was an error while loading. Please reload this page. | ||
| return { | ||
| requestMiddleware: [clerkMiddleware()], | ||
| }; | ||
| }); | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -2,6 +2,7 @@ import { tanstackStart } from '@tanstack/react-start/plugin/vite'; | ||
| import { defineConfig } from 'vite'; | ||
| import tsConfigPaths from 'vite-tsconfig-paths'; | ||
| import tailwindcss from '@tailwindcss/vite'; | ||
| import viteReact from '@vitejs/plugin-react'; | ||
wobsoriano marked this conversation as resolved.
Uh oh!There was an error while loading. Please reload this page. | ||
| export default defineConfig({ | ||
| plugins: [ | ||
| @@ -10,5 +11,6 @@ export default defineConfig({ | ||
| }), | ||
| tanstackStart(), | ||
| tailwindcss(), | ||
| viteReact(), | ||
| ], | ||
| }); | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,6 @@ | ||
| import { ClerkProvider as ReactClerkProvider } from '@clerk/clerk-react'; | ||
| import { ScriptOnce } from '@tanstack/react-router'; | ||
| import { getGlobalStartContext } from '@tanstack/react-start'; | ||
wobsoriano marked this conversation as resolved.
Uh oh!There was an error while loading. Please reload this page. | ||
| import { useEffect } from 'react'; | ||
| import { isClient } from '../utils'; | ||
| @@ -19,15 +20,14 @@ const awaitableNavigateRef: { current: ReturnType<typeof useAwaitableNavigate> | | ||
| export function ClerkProvider({ children, ...providerProps }: TanstackStartClerkProviderProps): JSX.Element { | ||
| const awaitableNavigate = useAwaitableNavigate(); | ||
| // @ts-expect-error: Untyped internal Clerk initial state | ||
| const clerkInitialState = getGlobalStartContext()?.clerkInitialState ?? {}; | ||
| useEffect(() => { | ||
| awaitableNavigateRef.current = awaitableNavigate; | ||
| }, [awaitableNavigate]); | ||
| const clerkInitState = isClient() ? (window as any).__clerk_init_state : clerkInitialState; | ||
| const { clerkSsrState, ...restInitState } = pickFromClerkInitState(clerkInitState?.__internal_clerk_state); | ||
| @@ -38,7 +38,7 @@ export function ClerkProvider({ children, ...providerProps }: TanstackStartClerk | ||
| return ( | ||
| <> | ||
| <ScriptOnce>{`window.__clerk_init_state = ${JSON.stringify(clerkInitialState)};`}</ScriptOnce> | ||
Contributor There was a problem hiding this comment. Escape serialized JSON to avoid XSS/script-breaking sequences. Embedding raw Apply this diff: - <ScriptOnce>{`window.__clerk_init_state = ${JSON.stringify(clerkInitialState)};`}</ScriptOnce>+ <ScriptOnce>{`window.__clerk_init_state = ${safeSerialize(clerkInitialState)};`}</ScriptOnce>Add this helper near the top of the file (outside the component): // Safe JSON serializer for embedding into inline <script> tagsconstsafeSerialize=(data: unknown): string=>JSON.stringify(data).replace(/</g,'\\u003c')// avoid </script.replace(/-->/g,'--\\u003e')// avoid HTML comment close.replace(/\u2028/g,'\\u2028')// line sep.replace(/\u2029/g,'\\u2029');// paragraph sepAs per coding guidelines: “Provide meaningful error messages” and “Validate and sanitize outputs.” 🤖 Prompt for AI Agents | ||
| <ClerkOptionsProvider options={mergedProps}> | ||
| <ReactClerkProvider | ||
| initialState={clerkSsrState} | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| import type { SessionAuthObject } from '@clerk/backend'; | ||
| import type { AuthOptions, GetAuthFnNoRequest } from '@clerk/backend/internal'; | ||
| import { getAuthObjectForAcceptedToken } from '@clerk/backend/internal'; | ||
| import { getGlobalStartContext } from '@tanstack/react-start'; | ||
| import { errorThrower } from '../utils'; | ||
| import { clerkMiddlewareNotConfigured } from '../utils/errors'; | ||
| export const auth: GetAuthFnNoRequest<SessionAuthObject, true> = (async (opts?: AuthOptions) => { | ||
| // @ts-expect-error: Untyped internal Clerk start context | ||
| const authObjectFn = getGlobalStartContext().auth; | ||
| if (!authObjectFn) { | ||
| return errorThrower.throw(clerkMiddlewareNotConfigured); | ||
| } | ||
| // We're keeping it a promise for now for future changes | ||
| const authObject = await Promise.resolve(authObjectFn({ treatPendingAsSignedOut: opts?.treatPendingAsSignedOut })); | ||
| return getAuthObjectForAcceptedToken({ authObject, acceptsToken: opts?.acceptsToken }); | ||
| }) as GetAuthFnNoRequest<SessionAuthObject, true>; |
Oops, something went wrong.
Uh oh!
There was an error while loading. Please reload this page.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| import type { RequestState } from '@clerk/backend/internal'; | ||
| import { AuthStatus, constants } from '@clerk/backend/internal'; | ||
| import { handleNetlifyCacheInDevInstance } from '@clerk/shared/netlifyCacheHandler'; | ||
| import type { PendingSessionOptions } from '@clerk/types'; | ||
| import type { AnyRequestMiddleware } from '@tanstack/react-start'; | ||
| import { createMiddleware, json } from '@tanstack/react-start'; | ||
| import { clerkClient } from './clerkClient'; | ||
| import { loadOptions } from './loadOptions'; | ||
| import type { ClerkMiddlewareOptions } from './types'; | ||
| import { getResponseClerkState } from './utils'; | ||
| export const clerkMiddleware = (options?: ClerkMiddlewareOptions): AnyRequestMiddleware => { | ||
| return createMiddleware().server(async args => { | ||
| const loadedOptions = loadOptions(args.request, options); | ||
| const requestState = await clerkClient().authenticateRequest(args.request, { | ||
| ...loadedOptions, | ||
| acceptsToken: 'any', | ||
| }); | ||
| const locationHeader = requestState.headers.get(constants.Headers.Location); | ||
| if (locationHeader) { | ||
| handleNetlifyCacheInDevInstance({ | ||
| locationHeader, | ||
| requestStateHeaders: requestState.headers, | ||
| publishableKey: requestState.publishableKey, | ||
| }); | ||
| // Trigger a handshake redirect | ||
| // eslint-disable-next-line @typescript-eslint/only-throw-error | ||
| throw json(null, { status: 307, headers: requestState.headers }); | ||
| } | ||
| if (requestState.status === AuthStatus.Handshake) { | ||
| throw new Error('Clerk: handshake status without redirect'); | ||
| } | ||
| const clerkInitialState = getResponseClerkState(requestState as RequestState, loadedOptions); | ||
| const result = await args.next({ | ||
| context: { | ||
| clerkInitialState, | ||
MemberAuthor There was a problem hiding this comment. This will be accessed by | ||
| auth: (opts?: PendingSessionOptions) => requestState.toAuth(opts), | ||
| }, | ||
| }); | ||
| if (requestState.headers) { | ||
| requestState.headers.forEach((value, key) => { | ||
| result.response.headers.append(key, value); | ||
| }); | ||
| } | ||
| return result; | ||
| }); | ||
| }; | ||
Oops, something went wrong.
Uh oh!
There was an error while loading. Please reload this page.
Oops, something went wrong.
Uh oh!
There was an error while loading. Please reload this page.
Oops, something went wrong.
Uh oh!
There was an error while loading. Please reload this page.
Oops, something went wrong.
Uh oh!
There was an error while loading. Please reload this page.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.