@shipfox/client-auth 5.0.0 → 6.0.1

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@shipfox/client-auth",
   "license": "MIT",
-  "version": "5.0.0",
+  "version": "6.0.1",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/ShipfoxHQ/shipfox.git",
@@ -10,10 +10,6 @@
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
-  "imports": {
-    "#*": "./dist/*",
-    "#test/*": "./test/*"
-  },
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
@@ -35,13 +31,13 @@
   "dependencies": {
     "@swc/helpers": "^0.5.17",
     "@tanstack/react-form": "^1.32.0",
-    "@shipfox/api-auth-dto": "7.1.0",
-    "@shipfox/client-api": "4.0.0",
-    "@shipfox/api-workspaces-dto": "6.0.0",
-    "@shipfox/client-invitations": "5.0.0",
-    "@shipfox/client-shell": "5.0.0",
-    "@shipfox/client-ui": "4.0.0",
-    "@shipfox/react-ui": "0.3.5"
+    "@shipfox/api-auth-dto": "9.0.1",
+    "@shipfox/api-workspaces-dto": "9.0.1",
+    "@shipfox/client-api": "6.0.1",
+    "@shipfox/client-invitations": "6.0.1",
+    "@shipfox/client-shell": "6.0.1",
+    "@shipfox/client-ui": "6.0.1",
+    "@shipfox/react-ui": "0.3.6"
   },
   "peerDependencies": {
     "@tanstack/react-query": "^5.101.0",
@@ -50,6 +46,9 @@
     "react": "^19.0.0",
     "react-dom": "^19.0.0"
   },
+  "imports": {
+    "#*": "./dist/*"
+  },
   "scripts": {
     "build": "shipfox-swc",
     "check": "shipfox-biome-check",

package/src/components/auth-guard.tsx

@@ -1,8 +1,10 @@
+import {useRouteSearch} from '@shipfox/client-shell/runtime';
 import {FullPageLoader} from '@shipfox/react-ui/loader';
-import {Navigate, useRouter, useSearch} from '@tanstack/react-router';
+import {Navigate, useRouter} from '@tanstack/react-router';
 import {type PropsWithChildren, useEffect} from 'react';
 import {useAuthState} from '#hooks/use-auth-state.js';
 import {WorkspaceOnboardingPage} from '#pages/workspace-onboarding-page.js';
+import {validateRedirectSearch} from '../routes/inputs.js';
 import {sanitizeRedirectPath} from './redirect-target.js';
 
 export function AuthGuard({children}: PropsWithChildren) {
@@ -21,7 +23,7 @@ export function AuthGuard({children}: PropsWithChildren) {
 
 export function GuestGuard({children}: PropsWithChildren) {
   const auth = useAuthState();
-  const search = useSearch({strict: false}) as {redirect?: unknown};
+  const search = useRouteSearch(validateRedirectSearch);
   const router = useRouter();
   const target = sanitizeRedirectPath(search.redirect);
 

package/src/components/redirect-target.test.ts

@@ -1,4 +1,4 @@
-import {sanitizeRedirectPath} from './redirect-target.js';
+import {sanitizeLogoutRedirectPath, sanitizeRedirectPath} from './redirect-target.js';
 
 describe('sanitizeRedirectPath', () => {
   describe.each([
@@ -66,3 +66,34 @@ describe('sanitizeRedirectPath', () => {
     });
   });
 });
+
+describe('sanitizeLogoutRedirectPath', () => {
+  describe.each([
+    ['explicit login fallback', '/auth/login', '/auth/login'],
+    ['same-origin workspace path', '/workspaces/abc', '/workspaces/abc'],
+    [
+      'same-origin path with search and hash',
+      '/workspaces/abc?tab=runs#header',
+      '/workspaces/abc?tab=runs#header',
+    ],
+  ])('accepts %s', (_label, input, expected) => {
+    test('returns the safe destination', () => {
+      expect(sanitizeLogoutRedirectPath(input)).toBe(expected);
+    });
+  });
+
+  describe.each([
+    ['missing redirect', undefined],
+    ['external URL', 'https://attacker.example'],
+    ['protocol-relative URL', '//attacker.example'],
+    ['auth route other than login', '/auth/reset'],
+    ['login route with a query', '/auth/login?redirect=/workspaces/abc'],
+    ['raw invitation token', '/invitations/accept?token=sf_i_raw-token'],
+    ['raw invitation token with trailing slash', '/invitations/accept/?token=sf_i_raw-token'],
+    ['malformed percent encoding', '/%E0%80%80'],
+  ])('falls back for %s', (_label, input) => {
+    test('returns login without forwarding unsafe state', () => {
+      expect(sanitizeLogoutRedirectPath(input)).toBe('/auth/login');
+    });
+  });
+});

package/src/components/redirect-target.ts

@@ -1,8 +1,10 @@
 const REDIRECT_ORIGIN = 'https://shipfox-redirect.invalid';
+const LOGIN_PATH = '/auth/login';
+const INVITATION_ACCEPT_PATH = '/invitations/accept';
+const DEFAULT_LOGOUT_REDIRECT = LOGIN_PATH;
+const TRAILING_SLASHES = /\/+$/;
 
-// Resolves and canonicalizes an internal path before returning it, so browser URL
-// parsing cannot turn a seemingly safe path into an external or auth route.
-export function sanitizeRedirectPath(value: unknown): string | undefined {
+function resolveRedirectPath(value: unknown): URL | undefined {
   if (typeof value !== 'string' || !value.startsWith('/')) return undefined;
   let decoded: string;
   try {
@@ -17,6 +19,41 @@ export function sanitizeRedirectPath(value: unknown): string | undefined {
     return undefined;
   }
   if (target.origin !== REDIRECT_ORIGIN) return undefined;
-  if (target.pathname === '/auth' || target.pathname.startsWith('/auth/')) return undefined;
+  return target;
+}
+
+function formatRedirectPath(target: URL): string {
   return `${target.pathname}${target.search}${target.hash}`;
 }
+
+function isAuthPath(pathname: string): boolean {
+  return pathname === '/auth' || pathname.startsWith('/auth/');
+}
+
+// Resolves and canonicalizes an internal path before returning it, so browser URL
+// parsing cannot turn a seemingly safe path into an external or auth route.
+export function sanitizeRedirectPath(value: unknown): string | undefined {
+  const target = resolveRedirectPath(value);
+  if (!target || isAuthPath(target.pathname)) return undefined;
+  return formatRedirectPath(target);
+}
+
+function containsInvitationToken(target: URL): boolean {
+  const normalizedPathname = target.pathname.replace(TRAILING_SLASHES, '') || '/';
+  return normalizedPathname === INVITATION_ACCEPT_PATH && target.searchParams.has('token');
+}
+
+/**
+ * Returns the destination used by the shared logout route.
+ *
+ * Login is the only auth destination allowed, and invitation tokens never
+ * survive this boundary. Invalid values fail closed to login.
+ */
+export function sanitizeLogoutRedirectPath(value: unknown): string {
+  const target = resolveRedirectPath(value);
+  if (!target) return DEFAULT_LOGOUT_REDIRECT;
+  if (isAuthPath(target.pathname) || containsInvitationToken(target)) {
+    return DEFAULT_LOGOUT_REDIRECT;
+  }
+  return formatRedirectPath(target);
+}

package/src/core/auth.ts

@@ -0,0 +1,55 @@
+export interface LoginCommand {
+  email: string;
+  password: string;
+}
+
+export interface SignupCommand extends LoginCommand {
+  name: string;
+  invitationToken?: string;
+}
+
+export interface PasswordResetRequestCommand {
+  email: string;
+}
+
+export interface PasswordResetConfirmCommand {
+  token: string;
+  newPassword: string;
+}
+
+export interface VerifyEmailCommand {
+  email: string;
+  challengeId: string;
+  code: string;
+}
+
+export interface ResendEmailVerificationCommand {
+  email: string;
+  challengeId: string;
+}
+
+export interface WorkspaceCreateCommand {
+  name: string;
+}
+
+export interface Workspace {
+  id: string;
+  name: string;
+  status: 'active' | 'suspended' | 'deleted';
+}
+
+export interface SignupResult {
+  user: {
+    id: string;
+    email: string;
+    name?: string;
+    emailVerifiedAt?: string;
+  };
+  emailChallenge?: {id: string; nextResendAvailableAt: string};
+  membership?: {id: string; userId: string; workspaceId: string};
+  acceptError?: {code: string; message: string};
+}
+
+export interface EmailVerificationResendResult {
+  nextResendAvailableAt: string;
+}

package/src/hooks/api/auth-mapper.ts

@@ -1,19 +1,9 @@
 import type {SignupResponseDto} from '@shipfox/api-auth-dto';
-import {
-  toAuthenticatedSession,
-  toUserIdentity,
-  type UserIdentity,
-} from '@shipfox/client-shell/runtime';
+import {toAuthenticatedSession, toUserIdentity} from '@shipfox/client-shell/runtime';
+import type {SignupResult} from '#core/auth.js';
 
 export {toAuthenticatedSession};
 
-export interface SignupResult {
-  user: UserIdentity;
-  emailChallenge?: {id: string; nextResendAvailableAt: string};
-  membership?: {id: string; userId: string; workspaceId: string};
-  acceptError?: {code: string; message: string};
-}
-
 export function toSignupResult(dto: SignupResponseDto): SignupResult {
   return {
     user: toUserIdentity(dto.user),

package/src/hooks/api/login-auth.ts

@@ -1,13 +1,14 @@
-import {type LoginBodyDto, loginResponseSchema} from '@shipfox/api-auth-dto';
+import {loginResponseSchema} from '@shipfox/api-auth-dto';
 import {checkedApiRequest} from '@shipfox/client-api';
 import {useMutation} from '@tanstack/react-query';
+import type {LoginCommand} from '#core/auth.js';
 import {useAuthTransition} from '#state/auth.js';
 import {toAuthenticatedSession} from './auth-mapper.js';
 
-export async function loginAuth(body: LoginBodyDto) {
+export async function loginAuth(command: LoginCommand) {
   const response = await checkedApiRequest(loginResponseSchema, '/auth/login', {
     method: 'POST',
-    body,
+    body: command,
   });
   return toAuthenticatedSession(response);
 }

package/src/hooks/api/logout-auth.ts

@@ -1,10 +1,10 @@
-import {apiRequest} from '@shipfox/client-api';
+import {checkedApiRequest, emptyResponseSchema} from '@shipfox/client-api';
 import {useMutation} from '@tanstack/react-query';
 import {useAuthTransition} from '#state/auth.js';
 
 async function logoutAuth() {
   try {
-    await apiRequest<void>('/auth/logout', {method: 'POST', body: {}});
+    await checkedApiRequest(emptyResponseSchema, '/auth/logout', {method: 'POST', body: {}});
   } catch {
     // Logout is best-effort: local session state must clear even if the API is offline.
   }

package/src/hooks/api/password-reset-auth.test.ts

@@ -55,7 +55,7 @@ describe('confirmPasswordReset', () => {
       });
     });
     configureApiClient({fetchImpl});
-    const body = {token: 'reset-token', new_password: 'new password is long'};
+    const body = {token: 'reset-token', newPassword: 'new password is long'};
 
     const result = await confirmPasswordReset(body);
 
@@ -63,6 +63,6 @@ describe('confirmPasswordReset', () => {
     expect(result.accessToken).toBe('reset-access-token');
     expect(request.url).toBe('https://api.example.test/auth/password-reset/confirm');
     expect(request.method).toBe('POST');
-    expect(requestBody).toEqual(body);
+    expect(requestBody).toEqual({token: body.token, new_password: body.newPassword});
   });
 });

package/src/hooks/api/password-reset-auth.ts

@@ -1,24 +1,24 @@
-import {
-  type PasswordResetConfirmBodyDto,
-  type PasswordResetRequestBodyDto,
-  passwordResetConfirmResponseSchema,
-} from '@shipfox/api-auth-dto';
-import {apiRequest, checkedApiRequest} from '@shipfox/client-api';
+import {passwordResetConfirmResponseSchema} from '@shipfox/api-auth-dto';
+import {checkedApiRequest, emptyResponseSchema} from '@shipfox/client-api';
 import {useMutation} from '@tanstack/react-query';
+import type {PasswordResetConfirmCommand, PasswordResetRequestCommand} from '#core/auth.js';
 import {useAuthTransition} from '#state/auth.js';
 import {toAuthenticatedSession} from './auth-mapper.js';
 
-export async function requestPasswordReset(body: PasswordResetRequestBodyDto) {
-  await apiRequest<void>('/auth/password-reset', {method: 'POST', body});
+export async function requestPasswordReset(command: PasswordResetRequestCommand) {
+  await checkedApiRequest(emptyResponseSchema, '/auth/password-reset', {
+    method: 'POST',
+    body: command,
+  });
 }
 
-export async function confirmPasswordReset(body: PasswordResetConfirmBodyDto) {
+export async function confirmPasswordReset(command: PasswordResetConfirmCommand) {
   const response = await checkedApiRequest(
     passwordResetConfirmResponseSchema,
     '/auth/password-reset/confirm',
     {
       method: 'POST',
-      body,
+      body: {token: command.token, new_password: command.newPassword},
     },
   );
   return toAuthenticatedSession(response);

package/src/hooks/api/refresh-auth.ts

@@ -1,5 +1,6 @@
 export {
   authRefreshQueryKey,
+  authRefreshQueryOptions,
   getAuthRefreshDelayMs,
   useRefreshAuth,
 } from '@shipfox/client-shell/runtime';

package/src/hooks/api/signup-auth.ts

@@ -1,12 +1,18 @@
-import {type SignupBodyDto, signupResponseSchema} from '@shipfox/api-auth-dto';
+import {signupResponseSchema} from '@shipfox/api-auth-dto';
 import {checkedApiRequest} from '@shipfox/client-api';
 import {useMutation} from '@tanstack/react-query';
+import type {SignupCommand} from '#core/auth.js';
 import {toSignupResult} from './auth-mapper.js';
 
-async function signupAuth(body: SignupBodyDto) {
+async function signupAuth(command: SignupCommand) {
   const response = await checkedApiRequest(signupResponseSchema, '/auth/signup', {
     method: 'POST',
-    body,
+    body: {
+      email: command.email,
+      password: command.password,
+      name: command.name,
+      ...(command.invitationToken ? {invitation_token: command.invitationToken} : {}),
+    },
   });
   return toSignupResult(response);
 }

package/src/hooks/api/verify-email-auth.ts

@@ -1,31 +1,41 @@
 import {
-  type VerifyEmailConfirmBodyDto,
-  type VerifyEmailResendBodyDto,
   verifyEmailConfirmResponseSchema,
   verifyEmailResendResponseSchema,
 } from '@shipfox/api-auth-dto';
 import {checkedApiRequest} from '@shipfox/client-api';
 import {useMutation} from '@tanstack/react-query';
+import type {
+  EmailVerificationResendResult,
+  ResendEmailVerificationCommand,
+  VerifyEmailCommand,
+} from '#core/auth.js';
 import {useAuthTransition} from '#state/auth.js';
 import {toAuthenticatedSession} from './auth-mapper.js';
 
-async function verifyEmailAuth(body: VerifyEmailConfirmBodyDto) {
+async function verifyEmailAuth(command: VerifyEmailCommand) {
   const response = await checkedApiRequest(
     verifyEmailConfirmResponseSchema,
     '/auth/verify-email/confirm',
     {
       method: 'POST',
-      body,
+      body: {email: command.email, challenge_id: command.challengeId, code: command.code},
     },
   );
   return toAuthenticatedSession(response);
 }
 
-async function resendEmailVerificationAuth(body: VerifyEmailResendBodyDto) {
-  return await checkedApiRequest(verifyEmailResendResponseSchema, '/auth/verify-email/resend', {
-    method: 'POST',
-    body,
-  });
+async function resendEmailVerificationAuth(command: ResendEmailVerificationCommand) {
+  const response = await checkedApiRequest(
+    verifyEmailResendResponseSchema,
+    '/auth/verify-email/resend',
+    {
+      method: 'POST',
+      body: {email: command.email, challenge_id: command.challengeId},
+    },
+  );
+  return {
+    nextResendAvailableAt: response.next_resend_available_at,
+  } satisfies EmailVerificationResendResult;
 }
 
 export function useResendEmailVerificationAuth() {

package/src/hooks/api/workspace-auth.ts

@@ -1,19 +1,24 @@
-import {type CreateWorkspaceBodyDto, workspaceResponseSchema} from '@shipfox/api-workspaces-dto';
+import {workspaceResponseSchema} from '@shipfox/api-workspaces-dto';
 import {checkedApiRequest} from '@shipfox/client-api';
-import {listUserWorkspaces, userWorkspacesQueryKey} from '@shipfox/client-shell/runtime';
+import {
+  listUserWorkspaces,
+  userWorkspacesQueryKey,
+  userWorkspacesQueryOptions,
+} from '@shipfox/client-shell/runtime';
 import {useMutation} from '@tanstack/react-query';
+import type {WorkspaceCreateCommand} from '#core/auth.js';
 import {useRefreshAuth} from './refresh-auth.js';
 import {toWorkspace} from './workspace-mapper.js';
 
-export async function createWorkspace(body: CreateWorkspaceBodyDto) {
+export async function createWorkspace(command: WorkspaceCreateCommand) {
   const response = await checkedApiRequest(workspaceResponseSchema, '/workspaces', {
     method: 'POST',
-    body,
+    body: {name: command.name},
   });
   return toWorkspace(response);
 }
 
-export {listUserWorkspaces, userWorkspacesQueryKey};
+export {listUserWorkspaces, userWorkspacesQueryKey, userWorkspacesQueryOptions};
 
 export function useCreateWorkspaceAuth() {
   const refreshAuth = useRefreshAuth();

package/src/hooks/api/workspace-mapper.ts

@@ -1,10 +1,5 @@
 import type {WorkspaceResponseDto} from '@shipfox/api-workspaces-dto';
-
-export interface Workspace {
-  id: string;
-  name: string;
-  status: 'active' | 'suspended' | 'deleted';
-}
+import type {Workspace} from '#core/auth.js';
 
 export function toWorkspace(dto: WorkspaceResponseDto): Workspace {
   return {id: dto.id, name: dto.name, status: dto.status};

package/src/pages/login-page.tsx

@@ -1,16 +1,17 @@
 import {loginBodySchema} from '@shipfox/api-auth-dto';
-import {AuthShell} from '@shipfox/client-shell/runtime';
+import {AuthShell, useRouteSearch} from '@shipfox/client-shell/runtime';
 import {Button, ButtonLink} from '@shipfox/react-ui/button';
 import {Callout} from '@shipfox/react-ui/callout';
 import {FormField, FormFieldInput, fieldError} from '@shipfox/react-ui/form-field';
 import {Icon} from '@shipfox/react-ui/icon';
 import {Text} from '@shipfox/react-ui/typography';
 import {useForm} from '@tanstack/react-form';
-import {Link, useSearch} from '@tanstack/react-router';
+import {Link} from '@tanstack/react-router';
 import {useAtom} from 'jotai';
 import {useEffect, useRef, useState} from 'react';
 import {useLoginAuth} from '#hooks/api/login-auth.js';
 import {authFormDraftAtom, initialAuthFormDraft} from '#state/auth.js';
+import {validateRedirectSearch} from '../routes/inputs.js';
 import {loginErrorToFormError} from './form-errors.js';
 import {
   extractInvitationToken,
@@ -20,7 +21,7 @@ import {
 
 export function LoginPage() {
   const login = useLoginAuth();
-  const search = useSearch({strict: false}) as {redirect?: unknown};
+  const search = useRouteSearch(validateRedirectSearch);
   const invitationToken = extractInvitationToken(search.redirect);
   const invitationPreview = useInvitationContext(invitationToken);
   const invitationPending = pendingInvitation(invitationPreview.data);

package/src/pages/logout-page.test.tsx

@@ -0,0 +1,75 @@
+import {configureApiClient} from '@shipfox/client-api';
+import {AuthRuntime} from '@shipfox/client-shell/runtime';
+import {QueryClient, QueryClientProvider} from '@tanstack/react-query';
+import {
+  createMemoryHistory,
+  createRootRoute,
+  createRoute,
+  createRouter,
+  Outlet,
+  RouterProvider,
+} from '@tanstack/react-router';
+import {render, screen} from '@testing-library/react';
+import {Provider as JotaiProvider} from 'jotai';
+import {LogoutPage} from './logout-page.js';
+
+function renderLogoutPage(path: string) {
+  const rootRoute = createRootRoute({component: Outlet});
+  const logoutRoute = createRoute({
+    getParentRoute: () => rootRoute,
+    path: '/auth/logout',
+    component: LogoutPage,
+  });
+  const loginRoute = createRoute({
+    getParentRoute: () => rootRoute,
+    path: '/auth/login',
+    component: () => <h1>Login destination</h1>,
+  });
+  const workspaceRoute = createRoute({
+    getParentRoute: () => rootRoute,
+    path: '/workspaces/$wid',
+    component: () => <h1>Workspace destination</h1>,
+  });
+  const router = createRouter({
+    history: createMemoryHistory({initialEntries: [path]}),
+    routeTree: rootRoute.addChildren([logoutRoute, loginRoute, workspaceRoute]),
+  });
+  const queryClient = new QueryClient();
+
+  render(
+    <QueryClientProvider client={queryClient}>
+      <JotaiProvider>
+        <AuthRuntime effects={false}>
+          <RouterProvider router={router} />
+        </AuthRuntime>
+      </JotaiProvider>
+    </QueryClientProvider>,
+  );
+}
+
+describe('LogoutPage', () => {
+  beforeEach(() => {
+    configureApiClient({baseUrl: 'https://api.example.test', getAccessToken: undefined});
+  });
+
+  test('logs out before following a safe same-origin redirect', async () => {
+    const fetchImpl = vi.fn().mockResolvedValue(new Response(null, {status: 204}));
+    configureApiClient({fetchImpl});
+
+    renderLogoutPage('/auth/logout?redirect=%2Fworkspaces%2Facme');
+
+    expect(await screen.findByRole('heading', {name: 'Workspace destination'})).toBeVisible();
+    const request = fetchImpl.mock.calls[0]?.[0] as Request;
+    expect(request.url).toBe('https://api.example.test/auth/logout');
+    expect(request.method).toBe('POST');
+  });
+
+  test('falls back to login without forwarding an invitation token', async () => {
+    const fetchImpl = vi.fn().mockResolvedValue(new Response(null, {status: 204}));
+    configureApiClient({fetchImpl});
+
+    renderLogoutPage('/auth/logout?redirect=%2Finvitations%2Faccept%3Ftoken%3Dsf_i_raw-token');
+
+    expect(await screen.findByRole('heading', {name: 'Login destination'})).toBeVisible();
+  });
+});

package/src/pages/logout-page.tsx

@@ -1,27 +1,23 @@
-import {AuthShell} from '@shipfox/client-shell/runtime';
+import {AuthShell, useRouteSearch} from '@shipfox/client-shell/runtime';
 import {Text} from '@shipfox/react-ui/typography';
-import {useNavigate, useRouter, useSearch} from '@tanstack/react-router';
+import {useRouter} from '@tanstack/react-router';
 import {useEffect} from 'react';
-import {sanitizeRedirectPath} from '#/components/redirect-target.js';
+import {sanitizeLogoutRedirectPath} from '#/components/redirect-target.js';
 import {useLogoutAuth} from '#hooks/api/logout-auth.js';
+import {validateRedirectSearch} from '../routes/inputs.js';
 
 export function LogoutPage() {
   const logout = useLogoutAuth();
-  const navigate = useNavigate();
   const router = useRouter();
-  const search = useSearch({strict: false}) as {redirect?: unknown};
-  const target = sanitizeRedirectPath(search.redirect);
+  const search = useRouteSearch(validateRedirectSearch);
+  const target = sanitizeLogoutRedirectPath(search.redirect);
 
   useEffect(() => {
     logout.mutateAsync().finally(() => {
-      if (target !== undefined) {
-        // Same-origin runtime path; let history drive route resolution.
-        router.history.replace(target);
-      } else {
-        navigate({to: '/auth/login', replace: true});
-      }
+      // Same-origin runtime path; let history drive route resolution.
+      router.history.replace(target);
     });
-  }, [logout.mutateAsync, navigate, router, target]);
+  }, [logout.mutateAsync, router, target]);
 
   return (
     <AuthShell title="Logging out" description="Ending your Shipfox session.">

package/src/pages/password-reset-page.tsx

@@ -2,14 +2,14 @@ import {
   passwordResetConfirmBodySchema,
   passwordResetRequestBodySchema,
 } from '@shipfox/api-auth-dto';
-import {AuthShell} from '@shipfox/client-shell/runtime';
+import {AuthShell, useRouteSearch} from '@shipfox/client-shell/runtime';
 import {Button, ButtonLink} from '@shipfox/react-ui/button';
 import {Callout} from '@shipfox/react-ui/callout';
 import {FormField, FormFieldInput, fieldError} from '@shipfox/react-ui/form-field';
 import {toast} from '@shipfox/react-ui/toast';
 import {Text} from '@shipfox/react-ui/typography';
 import {useForm} from '@tanstack/react-form';
-import {Link, useNavigate, useSearch} from '@tanstack/react-router';
+import {Link, useNavigate} from '@tanstack/react-router';
 import {useAtom} from 'jotai';
 import {useEffect, useRef, useState} from 'react';
 import {
@@ -17,14 +17,14 @@ import {
   useRequestPasswordResetAuth,
 } from '#hooks/api/password-reset-auth.js';
 import {authFormDraftAtom, initialAuthFormDraft} from '#state/auth.js';
+import {validatePasswordResetSearch} from '../routes/inputs.js';
 import {
   passwordResetConfirmErrorToFormError,
   passwordResetRequestErrorToFormError,
 } from './form-errors.js';
 
 export function PasswordResetPage() {
-  const search = useSearch({strict: false});
-  const token = typeof search.token === 'string' ? search.token : undefined;
+  const {token} = useRouteSearch(validatePasswordResetSearch);
 
   if (token) {
     return <PasswordResetConfirm token={token} />;
@@ -160,7 +160,7 @@ function PasswordResetConfirm({token}: {token: string}) {
           token,
           new_password: value.new_password,
         });
-        await confirmPasswordReset.mutateAsync(body);
+        await confirmPasswordReset.mutateAsync({token: body.token, newPassword: body.new_password});
         setAuthFormDraft(initialAuthFormDraft);
         toast.success('Your password has been changed. You are now logged in.');
         await navigate({to: '/', replace: true});