@shipfox/client-auth 6.0.1 → 6.0.3

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@shipfox/client-auth",
   "license": "MIT",
-  "version": "6.0.1",
+  "version": "6.0.3",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/ShipfoxHQ/shipfox.git",
@@ -31,13 +31,13 @@
   "dependencies": {
     "@swc/helpers": "^0.5.17",
     "@tanstack/react-form": "^1.32.0",
-    "@shipfox/api-auth-dto": "9.0.1",
-    "@shipfox/api-workspaces-dto": "9.0.1",
+    "@shipfox/api-auth-dto": "9.0.2",
+    "@shipfox/api-workspaces-dto": "9.0.2",
     "@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"
+    "@shipfox/client-invitations": "6.0.2",
+    "@shipfox/client-shell": "6.0.2",
+    "@shipfox/client-ui": "6.0.2",
+    "@shipfox/react-ui": "0.3.7"
   },
   "peerDependencies": {
     "@tanstack/react-query": "^5.101.0",

package/src/components/auth-provider.test.tsx

@@ -1,5 +1,5 @@
-import {configureApiClient} from '@shipfox/client-api';
-import {QueryClient, useQuery} from '@tanstack/react-query';
+import {ApiError, configureApiClient} from '@shipfox/client-api';
+import {QueryClient, useQuery, useQueryClient} from '@tanstack/react-query';
 import {render, screen, waitFor} from '@testing-library/react';
 import {useEffect, useRef} from 'react';
 import {useLoginAuth} from '#hooks/api/login-auth.js';
@@ -45,6 +45,8 @@ function StatusProbe() {
 
 function PrivateDataProbe() {
   const auth = useAuthState();
+  const queryClient = useQueryClient();
+  const seeded = useRef(false);
   const privateData = useQuery({
     queryKey: ['private-data'],
     queryFn: () => new Promise<string>(() => undefined),
@@ -52,6 +54,12 @@ function PrivateDataProbe() {
   });
   const login = useLoginAuth();
 
+  useEffect(() => {
+    if (!auth.isAuthenticated || seeded.current) return;
+    seeded.current = true;
+    queryClient.setQueryData(['private-data'], 'User A private data');
+  }, [auth.isAuthenticated, queryClient]);
+
   return (
     <div>
       <span data-testid="private-data">{privateData.data ?? 'loading'}</span>
@@ -114,6 +122,24 @@ describe('AuthProvider', () => {
     expect(queryClient.getQueryData(['private-data'])).toBeUndefined();
   });
 
+  test('clears a hydrated private cache before accepting the first principal', async () => {
+    const queryClient = new QueryClient();
+    const fetchImpl = vi
+      .fn()
+      .mockResolvedValue(jsonResponse({token: 'other-token', user: otherUser}));
+    configureApiClient({fetchImpl});
+    queryClient.setQueryData(['private-data'], 'previous principal private data');
+
+    render(
+      <AuthProvider queryClient={queryClient}>
+        <StatusProbe />
+      </AuthProvider>,
+    );
+
+    await waitFor(() => expect(screen.getByTestId('status')).toHaveTextContent('authenticated'));
+    expect(queryClient.getQueryData(['private-data'])).toBeUndefined();
+  });
+
   test('keeps the current session when refresh fails with a server error', async () => {
     const fetchImpl = vi
       .fn()
@@ -156,21 +182,30 @@ describe('AuthProvider', () => {
       .fn()
       .mockImplementation(() => Promise.resolve(jsonResponse({token: 'access-token', user})));
     configureApiClient({fetchImpl});
-    queryClient.setQueryData(['private-data'], 'current user private data');
     const onDone = vi.fn();
+    const onReady = vi.fn();
 
     function RefreshAfterBootProbe() {
       const auth = useAuthState();
       const refresh = useRefreshAuth();
-      const didRefresh = useRef(false);
+      const queryClient = useQueryClient();
+      const didSeed = useRef(false);
 
       useEffect(() => {
-        if (auth.status !== 'authenticated' || didRefresh.current) return;
-        didRefresh.current = true;
-        void refresh().then(onDone);
-      }, [auth.status, refresh]);
+        if (auth.status !== 'authenticated' || didSeed.current) return;
+        didSeed.current = true;
+        queryClient.setQueryData(['private-data'], 'current user private data');
+        onReady();
+      }, [auth.status, queryClient]);
 
-      return <StatusProbe />;
+      return (
+        <>
+          <StatusProbe />
+          <button type="button" onClick={() => void refresh().then(onDone)}>
+            Refresh
+          </button>
+        </>
+      );
     }
 
     render(
@@ -179,6 +214,9 @@ describe('AuthProvider', () => {
       </AuthProvider>,
     );
 
+    await waitFor(() => expect(onReady).toHaveBeenCalledTimes(1));
+    cancelQueries.mockClear();
+    screen.getByRole('button', {name: 'Refresh'}).click();
     await waitFor(() => expect(onDone).toHaveBeenCalledTimes(1));
     expect(cancelQueries).not.toHaveBeenCalled();
     expect(queryClient.getQueryData(['private-data'])).toBe('current user private data');
@@ -211,6 +249,80 @@ describe('AuthProvider', () => {
     expect(fetchImpl).toHaveBeenCalledTimes(2);
   });
 
+  test('does not restore a stale refresh result after a principal transition', async () => {
+    let refreshRequestCount = 0;
+    let workspaceRequestCount = 0;
+    const initialWorkspaceRefresh = new Promise<Response>(() => undefined);
+    const onFreshRefresh = vi.fn();
+    const onRefreshError = vi.fn();
+    const fetchImpl = vi.fn((input: RequestInfo | URL) => {
+      const url = (input as Request).url;
+      if (url.endsWith('/auth/refresh')) {
+        refreshRequestCount += 1;
+        return refreshRequestCount === 1
+          ? Promise.resolve(jsonResponse({token: 'access-token', user}))
+          : Promise.resolve(jsonResponse({token: 'other-token-2', user: otherUser}));
+      }
+      if (url.endsWith('/auth/login'))
+        return Promise.resolve(jsonResponse({token: 'other-token', user: otherUser}));
+      if (url.endsWith('/workspaces')) {
+        workspaceRequestCount += 1;
+        return workspaceRequestCount === 1
+          ? initialWorkspaceRefresh
+          : Promise.resolve(jsonResponse({memberships: []}));
+      }
+      return Promise.resolve(jsonResponse({token: 'access-token', user}));
+    });
+    configureApiClient({fetchImpl});
+
+    function RefreshAndLoginProbe() {
+      const auth = useAuthState();
+      const login = useLoginAuth();
+      const refresh = useRefreshAuth();
+
+      useEffect(() => {
+        void refresh().catch(onRefreshError);
+      }, [refresh]);
+
+      return (
+        <div>
+          <span data-testid="email">{auth.user?.email ?? 'none'}</span>
+          <button
+            type="button"
+            onClick={() =>
+              void login.mutateAsync({email: 'other@example.com', password: 'password'})
+            }
+          >
+            Login as other user
+          </button>
+          <button type="button" onClick={() => void refresh().then(onFreshRefresh)}>
+            Refresh current principal
+          </button>
+        </div>
+      );
+    }
+
+    render(
+      <AuthProvider>
+        <RefreshAndLoginProbe />
+      </AuthProvider>,
+    );
+
+    await waitFor(() => expect(workspaceRequestCount).toBe(1));
+    screen.getByRole('button', {name: 'Login as other user'}).click();
+    await waitFor(() => expect(screen.getByTestId('email')).toHaveTextContent('other@example.com'));
+    await waitFor(() => expect(onRefreshError).toHaveBeenCalledTimes(1));
+    const refreshError = onRefreshError.mock.calls[0]?.[0];
+    expect(refreshError).toBeInstanceOf(ApiError);
+    expect(refreshError).toMatchObject({code: 'unauthorized', status: 401});
+
+    screen.getByRole('button', {name: 'Refresh current principal'}).click();
+    await waitFor(() => expect(onFreshRefresh).toHaveBeenCalledTimes(1));
+    expect(refreshRequestCount).toBe(2);
+
+    expect(screen.getByTestId('email')).toHaveTextContent('other@example.com');
+  });
+
   test('logout clears local state even when the API call fails', async () => {
     const queryClient = new QueryClient();
     const cancelQueries = vi.spyOn(queryClient, 'cancelQueries');
@@ -219,8 +331,16 @@ describe('AuthProvider', () => {
       .mockResolvedValueOnce(jsonResponse({token: 'access-token', user}))
       .mockRejectedValueOnce(new Error('offline'));
     configureApiClient({fetchImpl});
-    queryClient.setQueryData(['private-data'], 'private data');
     const onQueryAbort = vi.fn();
+
+    render(
+      <AuthProvider queryClient={queryClient}>
+        <StatusProbe />
+      </AuthProvider>,
+    );
+
+    await waitFor(() => expect(screen.getByTestId('status')).toHaveTextContent('authenticated'));
+    queryClient.setQueryData(['private-data'], 'private data');
     void queryClient
       .fetchQuery({
         queryKey: ['in-flight-private-data'],
@@ -233,14 +353,7 @@ describe('AuthProvider', () => {
           }),
       })
       .catch(() => undefined);
-
-    render(
-      <AuthProvider queryClient={queryClient}>
-        <StatusProbe />
-      </AuthProvider>,
-    );
-
-    await waitFor(() => expect(screen.getByTestId('status')).toHaveTextContent('authenticated'));
+    cancelQueries.mockClear();
     screen.getByRole('button', {name: 'Logout'}).click();
 
     await waitFor(() => expect(screen.getByTestId('status')).toHaveTextContent('guest'));
@@ -312,7 +425,6 @@ describe('AuthProvider', () => {
       return Promise.resolve(jsonResponse({token: 'access-token', user}));
     });
     configureApiClient({fetchImpl});
-    queryClient.setQueryData(['private-data'], 'User A private data');
 
     render(
       <AuthProvider queryClient={queryClient}>
@@ -323,6 +435,7 @@ describe('AuthProvider', () => {
     await waitFor(() =>
       expect(screen.getByTestId('private-data')).toHaveTextContent('User A private data'),
     );
+    cancelQueries.mockClear();
     screen.getByRole('button', {name: 'Switch user'}).click();
 
     await waitFor(() =>

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

@@ -22,12 +22,25 @@ describe('parseRedirectContext', () => {
     expect(context).toEqual({invitationToken: 'raw-invitation-token'});
   });
 
+  test.each([
+    ['/%2569nvitations/accept?token=double-encoded-token', 'double-encoded-token'],
+    ['/%252569nvitations/accept?token=triple-encoded-token', 'triple-encoded-token'],
+  ])('separates an invitation token from a deeply encoded path: %s', (redirect, token) => {
+    const context = parseRedirectContext(redirect);
+
+    expect(context).toEqual({invitationToken: token});
+    expect(context.returnTo).toBeUndefined();
+  });
+
   test.each([
     'https://attacker.example',
     '//attacker.example',
     '/auth/login',
     '/%61uth/login',
+    '/%2561uth/login',
+    '/%252561uth/login',
     '/%E0%80%80',
+    '/safe/%25252e%25252e/auth/login',
   ])('rejects malformed or unsafe redirect %s', (redirect) => {
     const context = parseRedirectContext(redirect);
 

package/src/components/redirect-context.ts

@@ -1,4 +1,4 @@
-import {sanitizeRedirectPath} from './redirect-target.js';
+import {isAuthPath, resolveRedirectPath} from './redirect-target.js';
 
 const INVITATION_ACCEPT_PATH = '/invitations/accept';
 
@@ -13,14 +13,11 @@ export interface RedirectContext {
  * short-lived invitation flow instead of forwarding it through generic redirects.
  */
 export function parseRedirectContext(value: unknown): RedirectContext {
-  const redirect = sanitizeRedirectPath(value);
-  if (!redirect) return {};
+  const resolved = resolveRedirectPath(value);
+  if (!resolved || isAuthPath(resolved.pathname)) return {};
 
-  const decoded = decodeURIComponent(redirect);
-  const [path, queryString = ''] = decoded.split('?', 2);
-  if (path !== INVITATION_ACCEPT_PATH) return {returnTo: redirect};
+  if (resolved.pathname !== INVITATION_ACCEPT_PATH) return {returnTo: resolved.redirect};
 
-  const params = new URLSearchParams(queryString);
-  const invitationToken = params.get('token');
+  const invitationToken = resolved.target.searchParams.get('token');
   return invitationToken ? {invitationToken} : {};
 }

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

@@ -1,5 +1,13 @@
 import {sanitizeLogoutRedirectPath, sanitizeRedirectPath} from './redirect-target.js';
 
+function encodeRepeatedly(value: string, times: number): string {
+  let encoded = value;
+  for (let iteration = 0; iteration < times; iteration += 1) {
+    encoded = encodeURIComponent(encoded);
+  }
+  return encoded;
+}
+
 describe('sanitizeRedirectPath', () => {
   describe.each([
     ['simple absolute path', '/foo'],
@@ -41,8 +49,12 @@ describe('sanitizeRedirectPath', () => {
   });
 
   describe('decode-then-check defenses', () => {
-    test('rejects percent-encoded /auth/* path', () => {
-      const result = sanitizeRedirectPath('/%61uth/login');
+    test.each([
+      ['single-encoded', '/%61uth/login'],
+      ['double-encoded', '/%2561uth/login'],
+      ['triple-encoded', '/%252561uth/login'],
+    ])('rejects %s /auth/* path', (_label, input) => {
+      const result = sanitizeRedirectPath(input);
 
       expect(result).toBeUndefined();
     });
@@ -64,6 +76,30 @@ describe('sanitizeRedirectPath', () => {
 
       expect(result).toBeUndefined();
     });
+
+    test('fails closed when the path exceeds the decode iteration cap', () => {
+      const deeplyEncodedAuthPath = `/${encodeRepeatedly('%61', 10)}uth/login`;
+
+      expect(sanitizeRedirectPath(deeplyEncodedAuthPath)).toBeUndefined();
+    });
+
+    test('rejects malformed percent-encoding that only surfaces after the first decode', () => {
+      const result = sanitizeRedirectPath('/%25E0%2580%2580');
+
+      expect(result).toBeUndefined();
+    });
+
+    test('rejects an /auth/* path disguised behind encoded dot segments', () => {
+      const result = sanitizeRedirectPath('/safe/%25252e%25252e/auth/login');
+
+      expect(result).toBeUndefined();
+    });
+
+    test('rejects a protocol-relative URL revealed only after multiple decodes', () => {
+      const result = sanitizeRedirectPath('/%25252fevil.com');
+
+      expect(result).toBeUndefined();
+    });
   });
 });
 
@@ -90,7 +126,16 @@ describe('sanitizeLogoutRedirectPath', () => {
     ['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'],
+    ['double-encoded auth route', '/%2561uth/login'],
+    ['triple-encoded auth route', '/%252561uth/login'],
+    ['double-encoded invitation token', '/%2569nvitations/accept?token=sf_i_raw-token'],
+    ['triple-encoded invitation token', '/%252569nvitations/accept?token=sf_i_raw-token'],
     ['malformed percent encoding', '/%E0%80%80'],
+    [
+      'invitation token disguised behind encoded dot segments',
+      '/safe/%25252e%25252e/invitations/accept?token=sf_i_raw-token',
+    ],
+    ['auth route disguised behind encoded dot segments', '/safe/%25252e%25252e/auth/login'],
   ])('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

@@ -3,8 +3,38 @@ const LOGIN_PATH = '/auth/login';
 const INVITATION_ACCEPT_PATH = '/invitations/accept';
 const DEFAULT_LOGOUT_REDIRECT = LOGIN_PATH;
 const TRAILING_SLASHES = /\/+$/;
+const MAX_PATH_DECODE_ITERATIONS = 10;
 
-function resolveRedirectPath(value: unknown): URL | undefined {
+export interface ResolvedRedirectPath {
+  pathname: string;
+  redirect: string;
+  target: URL;
+}
+
+// Repeated decoding can reveal `.`/`..` segments or a `//host` prefix that were
+// hidden behind extra encoding layers (e.g. `%25252e%25252e` -> `..`). Those only
+// get collapsed and re-checked against the origin by feeding the fully-decoded,
+// percent-free string back through the URL parser; without this, a multiply
+// encoded `/safe/../auth/login` or `/safe/../invitations/accept?token=...`
+// evades the pathname checks below even though this loop "sees" the real path.
+function decodePathToFixedPoint(pathname: string): string | undefined {
+  let current = pathname;
+
+  for (let iteration = 0; iteration < MAX_PATH_DECODE_ITERATIONS; iteration += 1) {
+    let decoded: string;
+    try {
+      decoded = decodeURIComponent(current);
+    } catch {
+      return undefined;
+    }
+    if (decoded === current) return current;
+    current = decoded;
+  }
+
+  return undefined;
+}
+
+export function resolveRedirectPath(value: unknown): ResolvedRedirectPath | undefined {
   if (typeof value !== 'string' || !value.startsWith('/')) return undefined;
   let decoded: string;
   try {
@@ -19,27 +49,36 @@ function resolveRedirectPath(value: unknown): URL | undefined {
     return undefined;
   }
   if (target.origin !== REDIRECT_ORIGIN) return undefined;
-  return target;
+  const decodedPathname = decodePathToFixedPoint(target.pathname);
+  if (decodedPathname === undefined) return undefined;
+  let canonical: URL;
+  try {
+    canonical = new URL(decodedPathname, REDIRECT_ORIGIN);
+  } catch {
+    return undefined;
+  }
+  if (canonical.origin !== REDIRECT_ORIGIN) return undefined;
+  return {pathname: canonical.pathname, redirect: formatRedirectPath(target), target};
 }
 
 function formatRedirectPath(target: URL): string {
   return `${target.pathname}${target.search}${target.hash}`;
 }
 
-function isAuthPath(pathname: string): boolean {
+export 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);
+  const resolved = resolveRedirectPath(value);
+  if (!resolved || isAuthPath(resolved.pathname)) return undefined;
+  return resolved.redirect;
 }
 
-function containsInvitationToken(target: URL): boolean {
-  const normalizedPathname = target.pathname.replace(TRAILING_SLASHES, '') || '/';
+function containsInvitationToken(target: URL, pathname: string): boolean {
+  const normalizedPathname = pathname.replace(TRAILING_SLASHES, '') || '/';
   return normalizedPathname === INVITATION_ACCEPT_PATH && target.searchParams.has('token');
 }
 
@@ -50,10 +89,13 @@ function containsInvitationToken(target: URL): boolean {
  * 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)) {
+  const resolved = resolveRedirectPath(value);
+  if (!resolved) return DEFAULT_LOGOUT_REDIRECT;
+  if (
+    isAuthPath(resolved.pathname) ||
+    containsInvitationToken(resolved.target, resolved.pathname)
+  ) {
     return DEFAULT_LOGOUT_REDIRECT;
   }
-  return formatRedirectPath(target);
+  return resolved.redirect;
 }

package/src/components/workspace-switcher.tsx

@@ -11,7 +11,7 @@ import {Icon} from '@shipfox/react-ui/icon';
 import {useNavigate} from '@tanstack/react-router';
 import {useSetAtom} from 'jotai';
 import {useAuthState} from '#hooks/use-auth-state.js';
-import {lastWorkspaceIdAtom} from '#state/last-workspace.js';
+import {lastWorkspaceIdAtom, rememberLastWorkspaceId} from '#state/last-workspace.js';
 
 export interface WorkspaceSwitcherProps {
   activeWorkspaceId: string | undefined;
@@ -19,13 +19,14 @@ export interface WorkspaceSwitcherProps {
 }
 
 export function WorkspaceSwitcher({activeWorkspaceId, onSelect}: WorkspaceSwitcherProps) {
-  const {workspaces} = useAuthState();
+  const {user, workspaces} = useAuthState();
   const navigate = useNavigate();
   const setLastWorkspaceId = useSetAtom(lastWorkspaceIdAtom);
 
   const handleSelect = (workspaceId: string) => {
     try {
       setLastWorkspaceId(workspaceId);
+      if (user?.id) rememberLastWorkspaceId(user.id, workspaceId);
     } catch {
       // localStorage may throw in private browsing or quota-exceeded; persistence is best-effort.
     }

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

@@ -18,6 +18,6 @@ export function useLoginAuth() {
 
   return useMutation({
     mutationFn: loginAuth,
-    onSuccess: enterAuthenticated,
+    onSuccess: (session) => enterAuthenticated(session),
   });
 }

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

@@ -15,6 +15,6 @@ export function useLogoutAuth() {
 
   return useMutation({
     mutationFn: logoutAuth,
-    onSettled: enterGuest,
+    onSettled: () => enterGuest(),
   });
 }

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

@@ -33,6 +33,6 @@ export function useConfirmPasswordResetAuth() {
 
   return useMutation({
     mutationFn: confirmPasswordReset,
-    onSuccess: enterAuthenticated,
+    onSuccess: (session) => enterAuthenticated(session),
   });
 }

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

@@ -47,6 +47,6 @@ export function useVerifyEmailAuth() {
 
   return useMutation({
     mutationFn: verifyEmailAuth,
-    onSuccess: enterAuthenticated,
+    onSuccess: (session) => enterAuthenticated(session),
   });
 }

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

@@ -12,7 +12,8 @@ import {useNavigate} from '@tanstack/react-router';
 import {useSetAtom} from 'jotai';
 import {useState} from 'react';
 import {useCreateWorkspaceAuth} from '#hooks/api/workspace-auth.js';
-import {lastWorkspaceIdAtom} from '#state/last-workspace.js';
+import {useAuthState} from '#hooks/use-auth-state.js';
+import {lastWorkspaceIdAtom, rememberLastWorkspaceId} from '#state/last-workspace.js';
 import {workspaceOnboardingErrorToFormError} from './form-errors.js';
 
 const previewMetrics = [
@@ -34,6 +35,7 @@ const previewBars = [
 
 export function WorkspaceOnboardingPage() {
   const createWorkspace = useCreateWorkspaceAuth();
+  const {user} = useAuthState();
   const navigate = useNavigate();
   const setLastWorkspaceId = useSetAtom(lastWorkspaceIdAtom);
   const [formError, setFormError] = useState<string | undefined>();
@@ -50,6 +52,7 @@ export function WorkspaceOnboardingPage() {
         // future visits to `/` land on it.
         try {
           setLastWorkspaceId(created.id);
+          if (user?.id) rememberLastWorkspaceId(user.id, created.id);
         } catch {
           // localStorage may throw in private browsing or quota-exceeded.
         }

package/src/routes/index.tsx

@@ -10,9 +10,11 @@ export default defineRoute({
     if (!auth.isAuthenticated) throw redirect({to: '/auth/login'});
     const [first, ...rest] = auth.workspaces;
     if (!first) throw redirect({to: '/setup/workspaces/new'});
-    const target =
-      [first, ...rest].find((workspace) => workspace.id === getLastWorkspaceId()) ?? first;
-    throw redirect({to: '/workspaces/$wid', params: {wid: target.id}});
+    const principalId = auth.user?.id;
+    const target = principalId
+      ? [first, ...rest].find((workspace) => workspace.id === getLastWorkspaceId(principalId))
+      : undefined;
+    throw redirect({to: '/workspaces/$wid', params: {wid: (target ?? first).id}});
   },
   component: FullPageLoader,
 });