@shipfox/client-auth 5.0.0 → 6.0.1

package/src/pages/signup-page.tsx

@@ -1,5 +1,5 @@
 import {signupBodySchema} from '@shipfox/api-auth-dto';
-import {AuthShell} from '@shipfox/client-shell/runtime';
+import {AuthShell, useRouteSearch} from '@shipfox/client-shell/runtime';
 import {displayNameFieldError} from '@shipfox/client-ui';
 import {Button, ButtonLink} from '@shipfox/react-ui/button';
 import {Callout} from '@shipfox/react-ui/callout';
@@ -8,7 +8,7 @@ import {Icon} from '@shipfox/react-ui/icon';
 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 {EmailCodeVerification} from '#/components/email-code-verification.js';
@@ -16,6 +16,7 @@ import {useRefreshAuth} from '#hooks/api/refresh-auth.js';
 import {useSignupAuth} from '#hooks/api/signup-auth.js';
 import {useResendEmailVerificationAuth, useVerifyEmailAuth} from '#hooks/api/verify-email-auth.js';
 import {authFormDraftAtom, initialAuthFormDraft} from '#state/auth.js';
+import {validateRedirectSearch} from '../routes/inputs.js';
 import {signupErrorToFormError} from './form-errors.js';
 import {authErrorMessage} from './form-utils.js';
 import {
@@ -30,7 +31,7 @@ export function SignupPage() {
   const resendEmailVerification = useResendEmailVerificationAuth();
   const refreshAuth = useRefreshAuth();
   const navigate = useNavigate();
-  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);
@@ -50,13 +51,18 @@ export function SignupPage() {
     onSubmit: async ({value}) => {
       setFormError(undefined);
       try {
-        const body = signupBodySchema.parse({
+        const parsed = signupBodySchema.parse({
           email: value.email,
           password: value.password,
           name: value.name,
           ...(invitationToken ? {invitation_token: invitationToken} : {}),
         });
-        const result = await signup.mutateAsync(body);
+        const result = await signup.mutateAsync({
+          email: parsed.email,
+          password: parsed.password,
+          name: parsed.name,
+          ...(parsed.invitation_token ? {invitationToken: parsed.invitation_token} : {}),
+        });
         skipDraftPersistRef.current = true;
         setAuthFormDraft(initialAuthFormDraft);
 
@@ -132,9 +138,9 @@ export function SignupPage() {
     try {
       const result = await resendEmailVerification.mutateAsync({
         email: emailChallenge.email,
-        challenge_id: emailChallenge.id,
+        challengeId: emailChallenge.id,
       });
-      setNextResendAvailableAt(result.next_resend_available_at);
+      setNextResendAvailableAt(result.nextResendAvailableAt);
       toast.success('If another verification email can be sent, it will arrive shortly.');
     } catch (error) {
       setResendError(authErrorMessage(error));
@@ -154,7 +160,7 @@ export function SignupPage() {
           try {
             await verifyEmail.mutateAsync({
               email: emailChallenge.email,
-              challenge_id: emailChallenge.id,
+              challengeId: emailChallenge.id,
               code,
             });
             await refreshAuth();

package/src/pages/workspace-onboarding-page.tsx

@@ -43,8 +43,8 @@ export function WorkspaceOnboardingPage() {
     onSubmit: async ({value}) => {
       setFormError(undefined);
       try {
-        const body = createWorkspaceBodySchema.parse({name: value.name});
-        const created = await createWorkspace.mutateAsync(body);
+        const command = createWorkspaceBodySchema.parse({name: value.name});
+        const created = await createWorkspace.mutateAsync(command);
         toast.success('Workspace created.');
         // Pin the new workspace as the last-active one so a page refresh and
         // future visits to `/` land on it.

package/src/routes/inputs.test.ts

@@ -0,0 +1,17 @@
+import {validatePasswordResetSearch, validateRedirectSearch} from './inputs.js';
+
+describe('auth route inputs', () => {
+  it('keeps only a non-empty redirect', () => {
+    expect(validateRedirectSearch({redirect: '/workspaces/w-1'})).toEqual({
+      redirect: '/workspaces/w-1',
+    });
+    expect(validateRedirectSearch({redirect: ''})).toEqual({});
+    expect(validateRedirectSearch({redirect: ['unexpected']})).toEqual({});
+  });
+
+  it('keeps only a non-empty password reset token', () => {
+    expect(validatePasswordResetSearch({token: 'reset-token'})).toEqual({token: 'reset-token'});
+    expect(validatePasswordResetSearch({token: ''})).toEqual({});
+    expect(validatePasswordResetSearch({token: {value: 'unexpected'}})).toEqual({});
+  });
+});

package/src/routes/inputs.ts

@@ -0,0 +1,21 @@
+export interface AuthRedirectSearch {
+  redirect?: string;
+}
+
+export interface PasswordResetSearch {
+  token?: string;
+}
+
+export function validateRedirectSearch(input: Record<string, unknown>): AuthRedirectSearch {
+  const redirect = nonEmptyString(input.redirect);
+  return redirect ? {redirect} : {};
+}
+
+export function validatePasswordResetSearch(input: Record<string, unknown>): PasswordResetSearch {
+  const token = nonEmptyString(input.token);
+  return token ? {token} : {};
+}
+
+function nonEmptyString(value: unknown): string | undefined {
+  return typeof value === 'string' && value.length > 0 ? value : undefined;
+}

package/src/routes/login.tsx

@@ -1,8 +1,10 @@
 import {defineRoute} from '@shipfox/client-shell/runtime';
 import {GuestGuard} from '#components/auth-guard.js';
 import {LoginPage} from '#pages/login-page.js';
+import {validateRedirectSearch} from './inputs.js';
 
 export default defineRoute({
+  validateSearch: validateRedirectSearch,
   component: () => (
     <GuestGuard>
       <LoginPage />

package/src/routes/logout.tsx

@@ -1,4 +1,5 @@
 import {defineRoute} from '@shipfox/client-shell/runtime';
 import {LogoutPage} from '#pages/logout-page.js';
+import {validateRedirectSearch} from './inputs.js';
 
-export default defineRoute({component: LogoutPage});
+export default defineRoute({validateSearch: validateRedirectSearch, component: LogoutPage});

package/src/routes/reset.tsx

@@ -1,8 +1,10 @@
 import {defineRoute} from '@shipfox/client-shell/runtime';
 import {GuestGuard} from '#components/auth-guard.js';
 import {PasswordResetPage} from '#pages/password-reset-page.js';
+import {validatePasswordResetSearch} from './inputs.js';
 
 export default defineRoute({
+  validateSearch: validatePasswordResetSearch,
   component: () => (
     <GuestGuard>
       <PasswordResetPage />

package/src/routes/signup.tsx

@@ -1,8 +1,10 @@
 import {defineRoute} from '@shipfox/client-shell/runtime';
 import {GuestGuard} from '#components/auth-guard.js';
 import {SignupPage} from '#pages/signup-page.js';
+import {validateRedirectSearch} from './inputs.js';
 
 export default defineRoute({
+  validateSearch: validateRedirectSearch,
   component: () => (
     <GuestGuard>
       <SignupPage />