chore(tanstack-react-start): Reuse existing auth object from server handler

Author: wobsoriano

packages/tanstack-react-start/src/server/getAuth.ts

@@ -1,29 +1,18 @@
 import type { AuthenticateRequestOptions, GetAuthFn } from '@clerk/backend/internal';
 import { getAuthObjectForAcceptedToken } from '@clerk/backend/internal';
+import { getContext } from '@tanstack/react-start/server';
 
 import { errorThrower } from '../utils';
 import { noFetchFnCtxPassedInGetAuth } from '../utils/errors';
-import { authenticateRequest } from './authenticateRequest';
-import { loadOptions } from './loadOptions';
-import type { LoaderOptions } from './types';
 
-type GetAuthOptions = { acceptsToken?: AuthenticateRequestOptions['acceptsToken'] } & Pick<LoaderOptions, 'secretKey'>;
+type GetAuthOptions = { acceptsToken?: AuthenticateRequestOptions['acceptsToken'] };
 
-export const getAuth: GetAuthFn<Request, true> = (async (request: Request, opts?: GetAuthOptions) => {
+export const getAuth: GetAuthFn<Request> = ((request: Request, opts?: GetAuthOptions) => {
   if (!request) {
     return errorThrower.throw(noFetchFnCtxPassedInGetAuth);
   }
 
-  const { acceptsToken, ...restOptions } = opts || {};
+  const authObjectFn = getContext('auth');
 
-  const loadedOptions = loadOptions(request, restOptions);
-
-  const requestState = await authenticateRequest(request, {
-    ...loadedOptions,
-    acceptsToken: 'any',
-  });
-
-  const authObject = requestState.toAuth();
-
-  return getAuthObjectForAcceptedToken({ authObject, acceptsToken });
-}) as GetAuthFn<Request, true>;
+  return getAuthObjectForAcceptedToken({ authObject: authObjectFn(), acceptsToken: opts?.acceptsToken });
+}) as GetAuthFn<Request>;

packages/tanstack-react-start/src/server/middlewareHandler.ts

@@ -1,5 +1,10 @@
 import type { AnyRouter } from '@tanstack/react-router';
-import type { CustomizeStartHandler, HandlerCallback, RequestHandler } from '@tanstack/react-start/server';
+import {
+  type CustomizeStartHandler,
+  getEvent,
+  type HandlerCallback,
+  type RequestHandler,
+} from '@tanstack/react-start/server';
 
 import { authenticateRequest } from './authenticateRequest';
 import { ClerkHandshakeRedirect } from './errors';
@@ -13,6 +18,8 @@ export function createClerkHandler<TRouter extends AnyRouter>(
 ) {
   return (cb: HandlerCallback<TRouter>): RequestHandler => {
     return eventHandler(async ({ request, router, responseHeaders }) => {
+      const event = getEvent();
+
       try {
         const loadedOptions = loadOptions(request, clerkOptions);
 
@@ -21,6 +28,9 @@ export function createClerkHandler<TRouter extends AnyRouter>(
           acceptsToken: 'any',
         });
 
+        // Set context for getAuth to use
+        event.context.auth = () => requestState.toAuth();
+
         const { clerkInitialState, headers } = getResponseClerkState(requestState, loadedOptions);
 
         // Merging the TanStack router context with the Clerk context and loading the router