@shipfox/client-invitations 12.0.2 → 13.0.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@shipfox/client-invitations",
   "license": "MIT",
-  "version": "12.0.2",
+  "version": "13.0.0",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/ShipfoxHQ/shipfox.git",
@@ -27,12 +27,12 @@
   "dependencies": {
     "@swc/helpers": "^0.5.17",
     "@tanstack/react-query": "^5.101.0",
-    "@shipfox/api-auth-dto": "10.2.0",
+    "@shipfox/api-workspaces-dto": "12.0.0",
+    "@shipfox/client-shell": "13.0.0",
     "@shipfox/client-api": "6.0.1",
-    "@shipfox/client-ui": "6.0.2",
-    "@shipfox/api-workspaces-dto": "11.0.0",
-    "@shipfox/client-shell": "12.0.2",
-    "@shipfox/react-ui": "0.3.7"
+    "@shipfox/client-ui": "13.0.0",
+    "@shipfox/api-auth-dto": "12.0.0",
+    "@shipfox/react-ui": "0.4.0"
   },
   "peerDependencies": {
     "@tanstack/react-query": "^5.101.0",

package/src/complete-acceptance.test.ts

@@ -22,34 +22,32 @@ describe('completeInvitationAcceptance', () => {
     await completeInvitationAcceptance({
       navigate,
       refreshAuth,
+      userId: 'user-1',
       workspaceId: 'workspace-1',
       workspaceName: 'Acme',
     });
 
     expect(refreshAuth).toHaveBeenCalledTimes(1);
     expect(toast.success).toHaveBeenCalledWith('You joined Acme.');
-    expect(navigate).toHaveBeenCalledWith({
-      params: {wid: 'workspace-1'},
-      to: '/workspaces/$wid',
-    });
+    expect(navigate).toHaveBeenCalledWith({to: '/'});
     expect(calls).toEqual(['refreshAuth', 'navigate']);
   });
 
-  it('still navigates when auth refresh fails', async () => {
+  it('does not navigate through the stale root route when auth refresh fails', async () => {
     const refreshAuth = vi.fn(() => Promise.reject(new Error('refresh failed')));
     const navigate = vi.fn();
 
-    await completeInvitationAcceptance({
-      navigate,
-      refreshAuth,
-      workspaceId: 'workspace-1',
-      workspaceName: 'Acme',
-    });
+    await expect(
+      completeInvitationAcceptance({
+        navigate,
+        refreshAuth,
+        userId: 'user-1',
+        workspaceId: 'workspace-1',
+        workspaceName: 'Acme',
+      }),
+    ).resolves.toBe(false);
 
     expect(toast.success).toHaveBeenCalledWith('You joined Acme.');
-    expect(navigate).toHaveBeenCalledWith({
-      params: {wid: 'workspace-1'},
-      to: '/workspaces/$wid',
-    });
+    expect(navigate).not.toHaveBeenCalled();
   });
 });

package/src/complete-acceptance.ts

@@ -1,3 +1,4 @@
+import {rememberLastWorkspaceId} from '@shipfox/client-shell/runtime';
 import {toast} from '@shipfox/react-ui/toast';
 import type {NavigateOptions} from '@tanstack/react-router';
 
@@ -5,29 +6,30 @@ import type {NavigateOptions} from '@tanstack/react-router';
  * Final step of every successful invitation accept path (existing-user match,
  * signup-with-invitation success, login-then-accept). Refreshes the auth
  * session so the JWT carries the new membership before navigating, then
- * routes the user into the workspace home.
+ * routes the user into the workspace home when the refreshed session is ready.
  *
  * `refreshAuth` is passed in so this helper stays a plain function (no hook).
  * Call sites construct it via `useRefreshAuth()` from `@shipfox/client-shell/runtime`.
  */
 export async function completeInvitationAcceptance(params: {
+  userId: string;
   workspaceId: string;
   workspaceName: string;
   refreshAuth: () => Promise<unknown>;
   navigate: (opts: NavigateOptions) => Promise<void> | void;
-}): Promise<void> {
+}): Promise<boolean> {
   // Access tokens embed memberships at issue time, so refresh before AuthGuard
   // reads the accepted workspace.
+  let refreshed = true;
   try {
     await params.refreshAuth();
   } catch {
-    // Even if refresh fails the membership is real in the DB; surface the
-    // success toast and let the user re-auth if their session has fully
-    // expired. The next API call will redirect to login as usual.
+    // The membership is real in the DB, but the root route cannot resolve the
+    // joined workspace until the auth workspace list has been refreshed.
+    refreshed = false;
   }
+  rememberLastWorkspaceId(params.userId, params.workspaceId);
   toast.success(`You joined ${params.workspaceName}.`);
-  await params.navigate({
-    to: '/workspaces/$wid',
-    params: {wid: params.workspaceId},
-  });
+  if (refreshed) await params.navigate({to: '/'});
+  return refreshed;
 }

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

@@ -12,7 +12,7 @@ import {toast} from '@shipfox/react-ui/toast';
 import {Text} from '@shipfox/react-ui/typography';
 import {formatDate} from '@shipfox/react-ui/utils';
 import {Link, useNavigate} from '@tanstack/react-router';
-import {useCallback, useEffect, useRef} from 'react';
+import {useCallback, useEffect, useRef, useState} from 'react';
 import {completeInvitationAcceptance} from '#complete-acceptance.js';
 import {useAcceptInvitation} from '#hooks/api/accept-invitation.js';
 import {usePreviewInvitation} from '#hooks/api/preview-invitation.js';
@@ -30,8 +30,42 @@ export function InvitationAcceptPage() {
   const preview = usePreviewInvitation(token);
   const accept = useAcceptInvitation();
   const hasKickedAccept = useRef(false);
+  const hasRetriedWorkspaceHydration = useRef(false);
+  const [authRefreshFailed, setAuthRefreshFailed] = useState(false);
+  const [pendingWorkspaceId, setPendingWorkspaceId] = useState<string>();
 
   useEffect(() => {
+    if (!pendingWorkspaceId || auth.isLoading || !auth.isAuthenticated) return;
+    if (!auth.workspaces.some(({id}) => id === pendingWorkspaceId)) {
+      if (hasRetriedWorkspaceHydration.current) {
+        setPendingWorkspaceId(undefined);
+        setAuthRefreshFailed(true);
+        return;
+      }
+      hasRetriedWorkspaceHydration.current = true;
+      void refreshAuth().catch(() => {
+        setPendingWorkspaceId(undefined);
+        setAuthRefreshFailed(true);
+      });
+      return;
+    }
+
+    setPendingWorkspaceId(undefined);
+    void navigate({to: '/', replace: true});
+  }, [
+    auth.isAuthenticated,
+    auth.isLoading,
+    auth.workspaces,
+    navigate,
+    pendingWorkspaceId,
+    refreshAuth,
+  ]);
+
+  useEffect(() => {
+    hasKickedAccept.current = false;
+    hasRetriedWorkspaceHydration.current = false;
+    setAuthRefreshFailed(false);
+    setPendingWorkspaceId(undefined);
     if (!token) {
       toast.error('This invitation link is missing a token.');
       const timeout = window.setTimeout(() => {
@@ -44,14 +78,20 @@ export function InvitationAcceptPage() {
 
   const completeAccept = useCallback(
     async (workspaceId: string, workspaceName: string) => {
-      await completeInvitationAcceptance({
+      const userId = auth.user?.id;
+      if (!userId) throw new Error('Cannot complete invitation without an authenticated user.');
+      const refreshed = await completeInvitationAcceptance({
+        userId,
         workspaceId,
         workspaceName,
         refreshAuth,
-        navigate,
+        // Wait for the refreshed workspace list to reach the router context
+        // before resolving the root route.
+        navigate: () => setPendingWorkspaceId(workspaceId),
       });
+      if (!refreshed) setAuthRefreshFailed(true);
     },
-    [navigate, refreshAuth],
+    [auth.user?.id, refreshAuth],
   );
 
   const runAccept = useCallback(
@@ -223,6 +263,32 @@ export function InvitationAcceptPage() {
     );
   }
 
+  if (authRefreshFailed) {
+    return (
+      <AuthShell title={data.workspaceName} description={inviterLine}>
+        <Callout role="alert" type="error">
+          You joined {data.workspaceName}, but we couldn't refresh your session. Retry to continue
+          to the workspace.
+        </Callout>
+        <Button
+          className="w-full"
+          onClick={async () => {
+            try {
+              await refreshAuth();
+              setAuthRefreshFailed(false);
+              hasRetriedWorkspaceHydration.current = false;
+              setPendingWorkspaceId(data.workspaceId);
+            } catch {
+              setAuthRefreshFailed(true);
+            }
+          }}
+        >
+          Retry
+        </Button>
+      </AuthShell>
+    );
+  }
+
   // Authenticated + matches — auto-accept is in flight or about to render its
   // result. Show either the pending state or the error state.
   if (accept.isError) {