Skip to content

fix(example): work-os api callback to reflect documentation #4900

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.

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
34 changes: 17 additions & 17 deletions examples/react/start-workos/src/routeTree.gen.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand All @@ -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)

Expand Down Expand Up @@ -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' {
Expand Down Expand Up @@ -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
}
}
Expand All @@ -166,7 +166,7 @@ export const routeTree = rootRouteImport
._addFileChildren(rootRouteChildren)
._addFileTypes<FileRouteTypes>()
const rootServerRouteChildren: RootServerRouteChildren = {
CallbackServerRoute: CallbackServerRoute,
ApiAuthCallbackServerRoute: ApiAuthCallbackServerRoute,
}
export const serverRouteTree = rootServerRouteImport
._addFileChildren(rootServerRouteChildren)
Expand Down
Original file line number Diff line number Diff line change
@@ -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');
Expand Down