@shipfox/client-invitations 5.0.0 → 6.0.1

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@shipfox/client-invitations",
   "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",
@@ -31,12 +27,12 @@
   "dependencies": {
     "@swc/helpers": "^0.5.17",
     "@tanstack/react-query": "^5.101.0",
-    "@shipfox/api-auth-dto": "7.1.0",
-    "@shipfox/api-workspaces-dto": "6.0.0",
-    "@shipfox/client-api": "4.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-ui": "6.0.1",
+    "@shipfox/react-ui": "0.3.6",
+    "@shipfox/client-shell": "6.0.1"
   },
   "peerDependencies": {
     "@tanstack/react-query": "^5.101.0",
@@ -44,6 +40,9 @@
     "react": "^19.0.0",
     "react-dom": "^19.0.0"
   },
+  "imports": {
+    "#*": "./dist/*"
+  },
   "scripts": {
     "build": "shipfox-swc",
     "check": "shipfox-biome-check",

package/src/core/invitation-acceptance.ts

@@ -0,0 +1,8 @@
+export interface InvitationAcceptance {
+  membership: {
+    id: string;
+    userId: string;
+    workspaceId: string;
+  };
+  alreadyMember: boolean;
+}

package/src/hooks/api/accept-invitation.ts

@@ -1,15 +1,14 @@
-import type {
-  AcceptInvitationBodyDto,
-  AcceptInvitationResponseDto,
-} from '@shipfox/api-workspaces-dto';
-import {apiRequest} from '@shipfox/client-api';
+import {acceptInvitationResponseSchema} from '@shipfox/api-workspaces-dto';
+import {checkedApiRequest} from '@shipfox/client-api';
 import {useMutation} from '@tanstack/react-query';
+import {toInvitationAcceptance} from './invitation-acceptance-mapper.js';
 
-async function acceptInvitation(body: AcceptInvitationBodyDto) {
-  return await apiRequest<AcceptInvitationResponseDto>('/invitations/accept', {
+async function acceptInvitation(command: {token: string}) {
+  const response = await checkedApiRequest(acceptInvitationResponseSchema, '/invitations/accept', {
     method: 'POST',
-    body,
+    body: command,
   });
+  return toInvitationAcceptance(response);
 }
 
 export function useAcceptInvitation() {

package/src/hooks/api/invitation-acceptance-mapper.test.ts

@@ -0,0 +1,23 @@
+import {toInvitationAcceptance} from './invitation-acceptance-mapper.js';
+
+describe('toInvitationAcceptance', () => {
+  test('maps the acceptance response into the invitation domain', () => {
+    const result = toInvitationAcceptance({
+      membership: {
+        id: '11111111-1111-4111-8111-111111111111',
+        user_id: '22222222-2222-4222-8222-222222222222',
+        workspace_id: '33333333-3333-4333-8333-333333333333',
+      },
+      already_member: true,
+    });
+
+    expect(result).toEqual({
+      membership: {
+        id: '11111111-1111-4111-8111-111111111111',
+        userId: '22222222-2222-4222-8222-222222222222',
+        workspaceId: '33333333-3333-4333-8333-333333333333',
+      },
+      alreadyMember: true,
+    });
+  });
+});

package/src/hooks/api/invitation-acceptance-mapper.ts

@@ -0,0 +1,13 @@
+import type {AcceptInvitationResponseDto} from '@shipfox/api-workspaces-dto';
+import type {InvitationAcceptance} from '#core/invitation-acceptance.js';
+
+export function toInvitationAcceptance(dto: AcceptInvitationResponseDto): InvitationAcceptance {
+  return {
+    membership: {
+      id: dto.membership.id,
+      userId: dto.membership.user_id,
+      workspaceId: dto.membership.workspace_id,
+    },
+    alreadyMember: dto.already_member,
+  };
+}

package/src/index.ts

@@ -1,3 +1,4 @@
+export type {InvitationAcceptance} from '#core/invitation-acceptance.js';
 export {type InvitationPreview, pendingInvitation} from '#core/invitation-preview.js';
 export {completeInvitationAcceptance} from './complete-acceptance.js';
 export {useAcceptInvitation} from './hooks/api/accept-invitation.js';

package/src/pages/invitation-accept-page.tsx

@@ -1,4 +1,9 @@
-import {AuthShell, useAuthState, useRefreshAuth} from '@shipfox/client-shell/runtime';
+import {
+  AuthShell,
+  useAuthState,
+  useRefreshAuth,
+  useRouteSearch,
+} from '@shipfox/client-shell/runtime';
 import {createSingleFlight} from '@shipfox/client-ui';
 import {Button} from '@shipfox/react-ui/button';
 import {Callout} from '@shipfox/react-ui/callout';
@@ -6,20 +11,19 @@ import {ShipfoxLoader} from '@shipfox/react-ui/loader';
 import {toast} from '@shipfox/react-ui/toast';
 import {Text} from '@shipfox/react-ui/typography';
 import {formatDate} from '@shipfox/react-ui/utils';
-import {Link, useNavigate, useSearch} from '@tanstack/react-router';
+import {Link, useNavigate} from '@tanstack/react-router';
 import {useCallback, useEffect, useRef} from 'react';
 import {completeInvitationAcceptance} from '#complete-acceptance.js';
 import {useAcceptInvitation} from '#hooks/api/accept-invitation.js';
 import {usePreviewInvitation} from '#hooks/api/preview-invitation.js';
+import {validateInvitationAcceptSearch} from '../routes/inputs.js';
 
 const invitationAccepts = createSingleFlight<string, void>();
 const toastedTerminals = new Set<string>();
 const TOASTED_TERMINALS_MAX = 32;
 
 export function InvitationAcceptPage() {
-  const search = useSearch({strict: false}) as {token?: unknown};
-  const token =
-    typeof search.token === 'string' && search.token.length > 0 ? search.token : undefined;
+  const {token} = useRouteSearch(validateInvitationAcceptSearch);
   const navigate = useNavigate();
   const auth = useAuthState();
   const refreshAuth = useRefreshAuth();
@@ -53,7 +57,7 @@ export function InvitationAcceptPage() {
   const runAccept = useCallback(
     async (params: {token: string; workspaceName: string}) => {
       const result = await accept.mutateAsync({token: params.token});
-      await completeAccept(result.membership.workspace_id, params.workspaceName);
+      await completeAccept(result.membership.workspaceId, params.workspaceName);
     },
     [accept, completeAccept],
   );

package/src/routes/accept.tsx

@@ -1,4 +1,8 @@
 import {defineRoute} from '@shipfox/client-shell/runtime';
 import {InvitationAcceptPage} from '#pages/invitation-accept-page.js';
+import {validateInvitationAcceptSearch} from './inputs.js';
 
-export default defineRoute({component: InvitationAcceptPage});
+export default defineRoute({
+  validateSearch: validateInvitationAcceptSearch,
+  component: InvitationAcceptPage,
+});

package/src/routes/inputs.test.ts

@@ -0,0 +1,11 @@
+import {validateInvitationAcceptSearch} from './inputs.js';
+
+describe('invitation route inputs', () => {
+  it('accepts a token and drops missing or malformed values', () => {
+    expect(validateInvitationAcceptSearch({token: 'invite-token'})).toEqual({
+      token: 'invite-token',
+    });
+    expect(validateInvitationAcceptSearch({})).toEqual({});
+    expect(validateInvitationAcceptSearch({token: ['invite-token']})).toEqual({});
+  });
+});

package/src/routes/inputs.ts

@@ -0,0 +1,10 @@
+export interface InvitationAcceptSearch {
+  token?: string;
+}
+
+export function validateInvitationAcceptSearch(
+  input: Record<string, unknown>,
+): InvitationAcceptSearch {
+  const token = typeof input.token === 'string' && input.token.length > 0 ? input.token : undefined;
+  return token ? {token} : {};
+}