From 430304ae992cc990fec5ce399b142fc0454593a0 Mon Sep 17 00:00:00 2001 From: Maximilian <44229844+maxscn@users.noreply.github.com> Date: Sat, 30 Aug 2025 00:21:24 +0200 Subject: [PATCH 1/3] Rename examples/react/start-workos/src/routes/callback.tsx to examples/react/start-workos/src/routes/api/auth/callback.tsx --- .../react/start-workos/src/routes/{ => api/auth}/callback.tsx | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename examples/react/start-workos/src/routes/{ => api/auth}/callback.tsx (100%) diff --git a/examples/react/start-workos/src/routes/callback.tsx b/examples/react/start-workos/src/routes/api/auth/callback.tsx similarity index 100% rename from examples/react/start-workos/src/routes/callback.tsx rename to examples/react/start-workos/src/routes/api/auth/callback.tsx From f7857db1cf0db08e2fb749a3d67c3dde10620270 Mon Sep 17 00:00:00 2001 From: Maximilian <44229844+maxscn@users.noreply.github.com> Date: Sat, 30 Aug 2025 00:22:36 +0200 Subject: [PATCH 2/3] Update router.tsx --- examples/react/start-workos/src/router.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/react/start-workos/src/router.tsx b/examples/react/start-workos/src/router.tsx index 52d8fffb8f8..9abe341f5d5 100644 --- a/examples/react/start-workos/src/router.tsx +++ b/examples/react/start-workos/src/router.tsx @@ -12,6 +12,6 @@ export function createRouter() { declare module '@tanstack/react-router' { interface Register { - rotuer: ReturnType; + router: ReturnType; } } From 700c9ff6e1711280ec779cc94c85f4640da93a27 Mon Sep 17 00:00:00 2001 From: SeanCassiere <33615041+SeanCassiere@users.noreply.github.com> Date: Fri, 5 Sep 2025 08:37:07 +1200 Subject: [PATCH 3/3] chore: update route-tree and imports --- .../react/start-workos/src/routeTree.gen.ts | 34 +++++++++---------- .../src/routes/api/auth/callback.tsx | 8 ++--- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/examples/react/start-workos/src/routeTree.gen.ts b/examples/react/start-workos/src/routeTree.gen.ts index 3032457ca5f..e7d11fd8942 100644 --- a/examples/react/start-workos/src/routeTree.gen.ts +++ b/examples/react/start-workos/src/routeTree.gen.ts @@ -15,7 +15,7 @@ import { Route as LogoutRouteImport } from './routes/logout' import { Route as AuthenticatedRouteImport } from './routes/_authenticated' import { Route as IndexRouteImport } from './routes/index' import { Route as AuthenticatedAccountRouteImport } from './routes/_authenticated/account' -import { ServerRoute as CallbackServerRouteImport } from './routes/callback' +import { ServerRoute as ApiAuthCallbackServerRouteImport } from './routes/api/auth/callback' const rootServerRouteImport = createServerRootRoute() @@ -38,9 +38,9 @@ const AuthenticatedAccountRoute = AuthenticatedAccountRouteImport.update({ path: '/account', getParentRoute: () => AuthenticatedRoute, } as any) -const CallbackServerRoute = CallbackServerRouteImport.update({ - id: '/callback', - path: '/callback', +const ApiAuthCallbackServerRoute = ApiAuthCallbackServerRouteImport.update({ + id: '/api/auth/callback', + path: '/api/auth/callback', getParentRoute: () => rootServerRouteImport, } as any) @@ -80,25 +80,25 @@ export interface RootRouteChildren { LogoutRoute: typeof LogoutRoute } export interface FileServerRoutesByFullPath { - '/callback': typeof CallbackServerRoute + '/api/auth/callback': typeof ApiAuthCallbackServerRoute } export interface FileServerRoutesByTo { - '/callback': typeof CallbackServerRoute + '/api/auth/callback': typeof ApiAuthCallbackServerRoute } export interface FileServerRoutesById { __root__: typeof rootServerRouteImport - '/callback': typeof CallbackServerRoute + '/api/auth/callback': typeof ApiAuthCallbackServerRoute } export interface FileServerRouteTypes { fileServerRoutesByFullPath: FileServerRoutesByFullPath - fullPaths: '/callback' + fullPaths: '/api/auth/callback' fileServerRoutesByTo: FileServerRoutesByTo - to: '/callback' - id: '__root__' | '/callback' + to: '/api/auth/callback' + id: '__root__' | '/api/auth/callback' fileServerRoutesById: FileServerRoutesById } export interface RootServerRouteChildren { - CallbackServerRoute: typeof CallbackServerRoute + ApiAuthCallbackServerRoute: typeof ApiAuthCallbackServerRoute } declare module '@tanstack/react-router' { @@ -135,11 +135,11 @@ declare module '@tanstack/react-router' { } declare module '@tanstack/react-start/server' { interface ServerFileRoutesByPath { - '/callback': { - id: '/callback' - path: '/callback' - fullPath: '/callback' - preLoaderRoute: typeof CallbackServerRouteImport + '/api/auth/callback': { + id: '/api/auth/callback' + path: '/api/auth/callback' + fullPath: '/api/auth/callback' + preLoaderRoute: typeof ApiAuthCallbackServerRouteImport parentRoute: typeof rootServerRouteImport } } @@ -166,7 +166,7 @@ export const routeTree = rootRouteImport ._addFileChildren(rootRouteChildren) ._addFileTypes() const rootServerRouteChildren: RootServerRouteChildren = { - CallbackServerRoute: CallbackServerRoute, + ApiAuthCallbackServerRoute: ApiAuthCallbackServerRoute, } export const serverRouteTree = rootServerRouteImport ._addFileChildren(rootServerRouteChildren) diff --git a/examples/react/start-workos/src/routes/api/auth/callback.tsx b/examples/react/start-workos/src/routes/api/auth/callback.tsx index 3d3fc3fd8db..edc7d29c138 100644 --- a/examples/react/start-workos/src/routes/api/auth/callback.tsx +++ b/examples/react/start-workos/src/routes/api/auth/callback.tsx @@ -1,9 +1,9 @@ import { createServerFileRoute } from '@tanstack/react-start/server'; -import { getConfig } from '../authkit/ssr/config'; -import { saveSession } from '../authkit/ssr/session'; -import { getWorkOS } from '../authkit/ssr/workos'; +import { getConfig } from '../../../authkit/ssr/config'; +import { saveSession } from '../../../authkit/ssr/session'; +import { getWorkOS } from '../../../authkit/ssr/workos'; -export const ServerRoute = createServerFileRoute('/callback').methods({ +export const ServerRoute = createServerFileRoute('/api/auth/callback').methods({ GET: async ({ request }) => { const url = new URL(request.url); const code = url.searchParams.get('code');