@shipfox/client-auth 4.0.0 → 5.0.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@shipfox/client-auth",
   "license": "MIT",
-  "version": "4.0.0",
+  "version": "5.0.0",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/ShipfoxHQ/shipfox.git",
@@ -36,9 +36,10 @@
     "@swc/helpers": "^0.5.17",
     "@tanstack/react-form": "^1.32.0",
     "@shipfox/api-auth-dto": "7.1.0",
-    "@shipfox/api-workspaces-dto": "6.0.0",
     "@shipfox/client-api": "4.0.0",
-    "@shipfox/client-shell": "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"
   },

package/src/components/email-code-verification.tsx

@@ -1,10 +1,10 @@
+import {AuthShell} from '@shipfox/client-shell/runtime';
 import {Button} from '@shipfox/react-ui/button';
 import {Callout} from '@shipfox/react-ui/callout';
 import {FormField, FormFieldInput} from '@shipfox/react-ui/form-field';
 import type {HeaderProps} from '@shipfox/react-ui/typography';
 import type {FormEvent, ReactNode, Ref} from 'react';
 import {useCallback, useEffect, useRef, useState} from 'react';
-import {AuthShell} from './auth-shell.js';
 
 const EIGHT_DIGIT_CODE_RE = /^\d{8}$/u;
 

package/src/continuation.ts

@@ -1,4 +1,4 @@
-export {AuthActions, AuthShell, type AuthShellProps} from './components/auth-shell.js';
+export {AuthActions, AuthShell, type AuthShellProps} from '@shipfox/client-shell/runtime';
 export {
   EmailCodeVerification,
   type EmailCodeVerificationProps,

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

@@ -0,0 +1,77 @@
+import type {SignupResponseDto} from '@shipfox/api-auth-dto';
+import {toSignupResult} from './auth-mapper.js';
+
+const baseUser: SignupResponseDto['user'] = {
+  id: '11111111-1111-4111-8111-111111111111',
+  email: 'signup@example.com',
+  name: null,
+  email_verified_at: null,
+  status: 'active',
+  created_at: '2026-04-27T00:00:00.000Z',
+  updated_at: '2026-04-27T00:00:00.000Z',
+};
+
+describe('toSignupResult', () => {
+  test('maps only the user when no challenge, membership, or accept error is present', () => {
+    const result = toSignupResult({user: baseUser});
+
+    expect(result).toEqual({user: {id: baseUser.id, email: baseUser.email}});
+  });
+
+  test('maps the user name and email verification when present', () => {
+    const result = toSignupResult({
+      user: {...baseUser, name: 'Ada', email_verified_at: '2026-04-27T00:00:00.000Z'},
+    });
+
+    expect(result.user).toEqual({
+      id: baseUser.id,
+      email: baseUser.email,
+      name: 'Ada',
+      emailVerifiedAt: '2026-04-27T00:00:00.000Z',
+    });
+  });
+
+  test('maps the email challenge into camelCase fields', () => {
+    const result = toSignupResult({
+      user: baseUser,
+      email_challenge: {
+        id: '22222222-2222-4222-8222-222222222222',
+        next_resend_available_at: '2026-04-27T00:01:00.000Z',
+      },
+    });
+
+    expect(result.emailChallenge).toEqual({
+      id: '22222222-2222-4222-8222-222222222222',
+      nextResendAvailableAt: '2026-04-27T00:01:00.000Z',
+    });
+  });
+
+  test('maps the invitation membership into camelCase fields', () => {
+    const result = toSignupResult({
+      user: baseUser,
+      membership: {
+        id: '33333333-3333-4333-8333-333333333333',
+        user_id: baseUser.id,
+        workspace_id: '44444444-4444-4444-8444-444444444444',
+      },
+    });
+
+    expect(result.membership).toEqual({
+      id: '33333333-3333-4333-8333-333333333333',
+      userId: baseUser.id,
+      workspaceId: '44444444-4444-4444-8444-444444444444',
+    });
+  });
+
+  test('maps the invitation accept error as-is', () => {
+    const result = toSignupResult({
+      user: baseUser,
+      accept_error: {code: 'invitation-expired', message: 'This invitation has expired.'},
+    });
+
+    expect(result.acceptError).toEqual({
+      code: 'invitation-expired',
+      message: 'This invitation has expired.',
+    });
+  });
+});

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

@@ -0,0 +1,39 @@
+import type {SignupResponseDto} from '@shipfox/api-auth-dto';
+import {
+  toAuthenticatedSession,
+  toUserIdentity,
+  type UserIdentity,
+} from '@shipfox/client-shell/runtime';
+
+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),
+    ...(dto.email_challenge
+      ? {
+          emailChallenge: {
+            id: dto.email_challenge.id,
+            nextResendAvailableAt: dto.email_challenge.next_resend_available_at,
+          },
+        }
+      : {}),
+    ...(dto.membership
+      ? {
+          membership: {
+            id: dto.membership.id,
+            userId: dto.membership.user_id,
+            workspaceId: dto.membership.workspace_id,
+          },
+        }
+      : {}),
+    ...(dto.accept_error ? {acceptError: dto.accept_error} : {}),
+  };
+}

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

@@ -37,7 +37,7 @@ describe('loginAuth', () => {
     const result = await loginAuth(body);
 
     const request = fetchImpl.mock.calls[0]?.[0] as Request;
-    expect(result.token).toBe('access-token');
+    expect(result.accessToken).toBe('access-token');
     expect(request.url).toBe('https://api.example.test/auth/login');
     expect(request.method).toBe('POST');
     expect(requestBody).toEqual(body);

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

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

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

@@ -60,7 +60,7 @@ describe('confirmPasswordReset', () => {
     const result = await confirmPasswordReset(body);
 
     const request = fetchImpl.mock.calls[0]?.[0] as Request;
-    expect(result.token).toBe('reset-access-token');
+    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);

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

@@ -1,21 +1,27 @@
-import type {
-  PasswordResetConfirmBodyDto,
-  PasswordResetConfirmResponseDto,
-  PasswordResetRequestBodyDto,
+import {
+  type PasswordResetConfirmBodyDto,
+  type PasswordResetRequestBodyDto,
+  passwordResetConfirmResponseSchema,
 } from '@shipfox/api-auth-dto';
-import {apiRequest} from '@shipfox/client-api';
+import {apiRequest, checkedApiRequest} from '@shipfox/client-api';
 import {useMutation} from '@tanstack/react-query';
 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 confirmPasswordReset(body: PasswordResetConfirmBodyDto) {
-  return await apiRequest<PasswordResetConfirmResponseDto>('/auth/password-reset/confirm', {
-    method: 'POST',
-    body,
-  });
+  const response = await checkedApiRequest(
+    passwordResetConfirmResponseSchema,
+    '/auth/password-reset/confirm',
+    {
+      method: 'POST',
+      body,
+    },
+  );
+  return toAuthenticatedSession(response);
 }
 
 export function useRequestPasswordResetAuth() {

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

@@ -1,9 +1,14 @@
-import type {SignupBodyDto, SignupResponseDto} from '@shipfox/api-auth-dto';
-import {apiRequest} from '@shipfox/client-api';
+import {type SignupBodyDto, signupResponseSchema} from '@shipfox/api-auth-dto';
+import {checkedApiRequest} from '@shipfox/client-api';
 import {useMutation} from '@tanstack/react-query';
+import {toSignupResult} from './auth-mapper.js';
 
 async function signupAuth(body: SignupBodyDto) {
-  return await apiRequest<SignupResponseDto>('/auth/signup', {method: 'POST', body});
+  const response = await checkedApiRequest(signupResponseSchema, '/auth/signup', {
+    method: 'POST',
+    body,
+  });
+  return toSignupResult(response);
 }
 
 export function useSignupAuth() {

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

@@ -1,22 +1,28 @@
-import type {
-  VerifyEmailConfirmBodyDto,
-  VerifyEmailConfirmResponseDto,
-  VerifyEmailResendBodyDto,
-  VerifyEmailResendResponseDto,
+import {
+  type VerifyEmailConfirmBodyDto,
+  type VerifyEmailResendBodyDto,
+  verifyEmailConfirmResponseSchema,
+  verifyEmailResendResponseSchema,
 } from '@shipfox/api-auth-dto';
-import {apiRequest} from '@shipfox/client-api';
+import {checkedApiRequest} from '@shipfox/client-api';
 import {useMutation} from '@tanstack/react-query';
 import {useAuthTransition} from '#state/auth.js';
+import {toAuthenticatedSession} from './auth-mapper.js';
 
 async function verifyEmailAuth(body: VerifyEmailConfirmBodyDto) {
-  return await apiRequest<VerifyEmailConfirmResponseDto>('/auth/verify-email/confirm', {
-    method: 'POST',
-    body,
-  });
+  const response = await checkedApiRequest(
+    verifyEmailConfirmResponseSchema,
+    '/auth/verify-email/confirm',
+    {
+      method: 'POST',
+      body,
+    },
+  );
+  return toAuthenticatedSession(response);
 }
 
 async function resendEmailVerificationAuth(body: VerifyEmailResendBodyDto) {
-  return await apiRequest<VerifyEmailResendResponseDto>('/auth/verify-email/resend', {
+  return await checkedApiRequest(verifyEmailResendResponseSchema, '/auth/verify-email/resend', {
     method: 'POST',
     body,
   });

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

@@ -1,11 +1,16 @@
-import type {CreateWorkspaceBodyDto, WorkspaceResponseDto} from '@shipfox/api-workspaces-dto';
-import {apiRequest} from '@shipfox/client-api';
+import {type CreateWorkspaceBodyDto, workspaceResponseSchema} from '@shipfox/api-workspaces-dto';
+import {checkedApiRequest} from '@shipfox/client-api';
 import {listUserWorkspaces, userWorkspacesQueryKey} from '@shipfox/client-shell/runtime';
 import {useMutation} from '@tanstack/react-query';
 import {useRefreshAuth} from './refresh-auth.js';
+import {toWorkspace} from './workspace-mapper.js';
 
 export async function createWorkspace(body: CreateWorkspaceBodyDto) {
-  return await apiRequest<WorkspaceResponseDto>('/workspaces', {method: 'POST', body});
+  const response = await checkedApiRequest(workspaceResponseSchema, '/workspaces', {
+    method: 'POST',
+    body,
+  });
+  return toWorkspace(response);
 }
 
 export {listUserWorkspaces, userWorkspacesQueryKey};

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

@@ -0,0 +1,21 @@
+import type {WorkspaceResponseDto} from '@shipfox/api-workspaces-dto';
+import {toWorkspace} from './workspace-mapper.js';
+
+describe('toWorkspace', () => {
+  test.each([
+    'active',
+    'suspended',
+    'deleted',
+  ] as const)('maps a %s workspace to its domain shape', (status) => {
+    const dto: WorkspaceResponseDto = {
+      id: '11111111-1111-4111-8111-111111111111',
+      name: 'Acme',
+      status,
+      settings: {},
+      created_at: '2026-04-27T00:00:00.000Z',
+      updated_at: '2026-04-27T00:00:00.000Z',
+    };
+
+    expect(toWorkspace(dto)).toEqual({id: dto.id, name: dto.name, status});
+  });
+});

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

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

package/src/index.ts

@@ -1,6 +1,5 @@
 export * from './components/auth-guard.js';
 export * from './components/auth-provider.js';
-export * from './components/auth-shell.js';
 export {WorkspaceCrumb, type WorkspaceCrumbProps} from './components/workspace-crumb.js';
 export {WorkspaceSwitcher, type WorkspaceSwitcherProps} from './components/workspace-switcher.js';
 export * from './hooks/index.js';

package/src/pages/invitation-context.ts

@@ -1,39 +1,16 @@
-import type {
-  PreviewInvitationPendingDto,
-  PreviewInvitationResponseDto,
-} from '@shipfox/api-workspaces-dto';
-import {apiRequest} from '@shipfox/client-api';
-import {useQuery} from '@tanstack/react-query';
+import {
+  type InvitationPreview,
+  pendingInvitation,
+  usePreviewInvitation,
+} from '@shipfox/client-invitations';
 import {parseRedirectContext} from '#/components/redirect-context.js';
 
 export function extractInvitationToken(redirect: unknown): string | undefined {
   return parseRedirectContext(redirect).invitationToken;
 }
 
-async function fetchPreview(token: string): Promise<PreviewInvitationResponseDto> {
-  const params = new URLSearchParams({token});
-  return await apiRequest<PreviewInvitationResponseDto>(
-    `/invitations/preview?${params.toString()}`,
-  );
-}
-
-export function pendingInvitation(
-  data: PreviewInvitationResponseDto | undefined,
-): PreviewInvitationPendingDto | undefined {
-  return data?.status === 'pending' ? data : undefined;
-}
-
-/**
- * Mirrors the hook in `@shipfox/client-invitations` but lives in `client-auth`
- * to avoid a circular dependency. Signup/login pages call this to lock the
- * email field when arriving from an invitation link.
- */
 export function useInvitationContext(token: string | undefined) {
-  return useQuery({
-    queryKey: ['invitations', 'preview', token ?? ''] as const,
-    queryFn: () => fetchPreview(token as string),
-    enabled: Boolean(token),
-    retry: false,
-    staleTime: 30_000,
-  });
+  return usePreviewInvitation(token);
 }
+
+export {type InvitationPreview, pendingInvitation};

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

@@ -70,7 +70,7 @@ describe('LoginPage', () => {
         return Promise.resolve(
           jsonResponse({
             status: 'pending',
-            workspace_id: 'workspace-1',
+            workspace_id: '11111111-1111-4111-8111-111111111111',
             workspace_name: 'Invite Workspace',
             email: 'invitee@example.com',
             invited_by_display: 'owner@example.com',

package/src/pages/login-page.tsx

@@ -1,4 +1,5 @@
 import {loginBodySchema} from '@shipfox/api-auth-dto';
+import {AuthShell} 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';
@@ -8,7 +9,6 @@ import {useForm} from '@tanstack/react-form';
 import {Link, useSearch} from '@tanstack/react-router';
 import {useAtom} from 'jotai';
 import {useEffect, useRef, useState} from 'react';
-import {AuthShell} from '#/components/auth-shell.js';
 import {useLoginAuth} from '#hooks/api/login-auth.js';
 import {authFormDraftAtom, initialAuthFormDraft} from '#state/auth.js';
 import {loginErrorToFormError} from './form-errors.js';
@@ -81,7 +81,7 @@ export function LoginPage() {
     ? `/invitations/accept?token=${encodeURIComponent(invitationToken)}`
     : undefined;
   const headerTitle = invitationPending
-    ? `Join ${invitationPending.workspace_name}`
+    ? `Join ${invitationPending.workspaceName}`
     : 'Connect to Shipfox';
   const headerDescription = invitationPending
     ? 'Log in to accept your invitation.'

package/src/pages/logout-page.tsx

@@ -1,7 +1,7 @@
+import {AuthShell} from '@shipfox/client-shell/runtime';
 import {Text} from '@shipfox/react-ui/typography';
 import {useNavigate, useRouter, useSearch} from '@tanstack/react-router';
 import {useEffect} from 'react';
-import {AuthShell} from '#/components/auth-shell.js';
 import {sanitizeRedirectPath} from '#/components/redirect-target.js';
 import {useLogoutAuth} from '#hooks/api/logout-auth.js';
 

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

@@ -2,6 +2,7 @@ import {
   passwordResetConfirmBodySchema,
   passwordResetRequestBodySchema,
 } from '@shipfox/api-auth-dto';
+import {AuthShell} 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';
@@ -11,12 +12,10 @@ import {useForm} from '@tanstack/react-form';
 import {Link, useNavigate, useSearch} from '@tanstack/react-router';
 import {useAtom} from 'jotai';
 import {useEffect, useRef, useState} from 'react';
-import {AuthShell} from '#/components/auth-shell.js';
 import {
   useConfirmPasswordResetAuth,
   useRequestPasswordResetAuth,
 } from '#hooks/api/password-reset-auth.js';
-import {useRefreshAuth} from '#hooks/api/refresh-auth.js';
 import {authFormDraftAtom, initialAuthFormDraft} from '#state/auth.js';
 import {
   passwordResetConfirmErrorToFormError,
@@ -148,7 +147,6 @@ function PasswordResetRequest() {
 
 function PasswordResetConfirm({token}: {token: string}) {
   const confirmPasswordReset = useConfirmPasswordResetAuth();
-  const refreshAuth = useRefreshAuth();
   const navigate = useNavigate();
   const [, setAuthFormDraft] = useAtom(authFormDraftAtom);
   const [formError, setFormError] = useState<string | undefined>();
@@ -163,7 +161,6 @@ function PasswordResetConfirm({token}: {token: string}) {
           new_password: value.new_password,
         });
         await confirmPasswordReset.mutateAsync(body);
-        await refreshAuth();
         setAuthFormDraft(initialAuthFormDraft);
         toast.success('Your password has been changed. You are now logged in.');
         await navigate({to: '/', replace: true});

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

@@ -137,7 +137,7 @@ describe('SignupPage', () => {
         return Promise.resolve(
           jsonResponse({
             status: 'pending',
-            workspace_id: 'workspace-1',
+            workspace_id: '11111111-1111-4111-8111-111111111111',
             workspace_name: 'Invite Workspace',
             email: 'invitee@example.com',
             invited_by_display: 'owner@example.com',

package/src/pages/signup-page.tsx

@@ -1,4 +1,5 @@
 import {signupBodySchema} from '@shipfox/api-auth-dto';
+import {AuthShell} 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';
@@ -10,7 +11,6 @@ import {useForm} from '@tanstack/react-form';
 import {Link, useNavigate, useSearch} from '@tanstack/react-router';
 import {useAtom} from 'jotai';
 import {useEffect, useRef, useState} from 'react';
-import {AuthShell} from '#/components/auth-shell.js';
 import {EmailCodeVerification} from '#/components/email-code-verification.js';
 import {useRefreshAuth} from '#hooks/api/refresh-auth.js';
 import {useSignupAuth} from '#hooks/api/signup-auth.js';
@@ -67,16 +67,16 @@ export function SignupPage() {
             // Refresh failures don't block the success message — the next API
             // call's 401 handling will re-route the user.
           }
-          toast.success(`You joined ${invitationPending.workspace_name}.`);
+          toast.success(`You joined ${invitationPending.workspaceName}.`);
           await navigate({
             to: '/workspaces/$wid',
-            params: {wid: result.membership.workspace_id},
+            params: {wid: result.membership.workspaceId},
           });
           return;
         }
 
-        if (invitationToken && result.accept_error) {
-          toast.error(result.accept_error.message);
+        if (invitationToken && result.acceptError) {
+          toast.error(result.acceptError.message);
           await navigate({
             to: '/invitations/accept',
             search: {token: invitationToken},
@@ -84,12 +84,12 @@ export function SignupPage() {
           return;
         }
 
-        if (!result.email_challenge) {
+        if (!result.emailChallenge) {
           throw new Error('Signup did not return an email verification challenge');
         }
-        setEmailChallenge({email: result.user.email, id: result.email_challenge.id});
+        setEmailChallenge({email: result.user.email, id: result.emailChallenge.id});
         setResendError(undefined);
-        setNextResendAvailableAt(result.email_challenge.next_resend_available_at);
+        setNextResendAvailableAt(result.emailChallenge.nextResendAvailableAt);
       } catch (error) {
         const mapped = signupErrorToFormError(error);
         if (mapped.kind === 'field') {
@@ -181,7 +181,7 @@ export function SignupPage() {
   }
 
   const headerTitle = invitationPending
-    ? `Join ${invitationPending.workspace_name}`
+    ? `Join ${invitationPending.workspaceName}`
     : 'Create your Shipfox account';
   const headerDescription = invitationPending
     ? `Create an account to accept your invitation.`