@rapidmx/web-client 0.21.0 → 0.23.0

package/apps/shared/components/calendar/allDay.ts

@@ -3,8 +3,8 @@
 // SPDX-License-Identifier: MPL-2.0
 ///////////////////////////////////////////////////////////////////////////////
 import { format } from "date-fns";
-import { WeekdayCode } from "@rapidmx/react-shared/calendar/calendarApi.js";
-import { CalendarOccurrence, toEventWallClock } from "@rapidmx/react-shared/calendar/recurrence.js";
+import { WeekdayCode } from "../../../../lib/calendar/calendarApi.js";
+import { CalendarOccurrence, toEventWallClock } from "../../../../lib/calendar/recurrence.js";
 
 const MS_PER_DAY = 86_400_000;
 

package/apps/shared/components/calendar/eventDialogFields.ts

@@ -2,14 +2,14 @@
 // Copyright (C) 2026 Jean-Philippe Steinmetz
 // SPDX-License-Identifier: MPL-2.0
 ///////////////////////////////////////////////////////////////////////////////
-import { EventVisibility, guestPermissionsOf, visibilityOf } from "@rapidmx/react-shared/calendar/calendarApi.js";
+import { EventVisibility, guestPermissionsOf, visibilityOf } from "../../../../lib/calendar/calendarApi.js";
 import {
     MAX_EVENT_DESCRIPTION_HTML_LENGTH,
     MAX_EVENT_DESCRIPTION_LENGTH,
     htmlToPlainText,
     sanitizeEventDescriptionHtml,
-} from "@rapidmx/react-shared/calendar/eventDescription.js";
-import { CalendarOccurrence } from "@rapidmx/react-shared/calendar/recurrence.js";
+} from "../../../../lib/calendar/eventDescription.js";
+import { CalendarOccurrence } from "../../../../lib/calendar/recurrence.js";
 import { EventFormValues } from "./eventForm.js";
 
 /** The event dialog's own fields of a `CalendarEventInput` - only the ones that differ from what the event has, so saving an event no one touched these on

package/apps/shared/components/calendar/eventForm.ts

@@ -3,9 +3,9 @@
 // SPDX-License-Identifier: MPL-2.0
 ///////////////////////////////////////////////////////////////////////////////
 import { FormEvent } from "react";
-import { Attendee, BusyStatus, EventVisibility, RecurrenceRule, WeekdayCode } from "@rapidmx/react-shared/calendar/calendarApi.js";
-import { Mailbox } from "@rapidmx/react-shared/mail/mailApi.js";
-import { CalendarOccurrence } from "@rapidmx/react-shared/calendar/recurrence.js";
+import { Attendee, BusyStatus, EventVisibility, RecurrenceRule, WeekdayCode } from "../../../../lib/calendar/calendarApi.js";
+import { Mailbox } from "../../../../lib/mail/mailApi.js";
+import { CalendarOccurrence } from "../../../../lib/calendar/recurrence.js";
 
 /** Which occurrences of a recurring event an edit applies to. */
 export type EditScope = "occurrence" | "series";

package/apps/shared/components/calendar/eventFormat.ts

@@ -3,9 +3,9 @@
 // SPDX-License-Identifier: MPL-2.0
 ///////////////////////////////////////////////////////////////////////////////
 import { format } from "date-fns";
-import { Attendee, AttendeeResponseStatus, BusyStatus, EventVisibility, GuestPermissions } from "@rapidmx/react-shared/calendar/calendarApi.js";
-import { fromEventWallClock, toEventWallClock } from "@rapidmx/react-shared/calendar/recurrence.js";
-import { toDatetimeLocal } from "@rapidmx/react-shared/util/dateInput.js";
+import { Attendee, AttendeeResponseStatus, BusyStatus, EventVisibility, GuestPermissions } from "../../../../lib/calendar/calendarApi.js";
+import { fromEventWallClock, toEventWallClock } from "../../../../lib/calendar/recurrence.js";
+import { toDatetimeLocal } from "../../../../lib/util/dateInput.js";
 import { formatRecipient, isValidRecipientAddress, parseRecipient, splitRecipientList } from "../mail/compose/recipients.js";
 import { addDaysToKey, allDayDateKey } from "./allDay.js";
 

package/apps/shared/components/calendar/findTimeGrid.ts

@@ -3,8 +3,8 @@
 // SPDX-License-Identifier: MPL-2.0
 ///////////////////////////////////////////////////////////////////////////////
 import { format } from "date-fns";
-import { ApiRequestError } from "@rapidmx/react-shared/util/api.js";
-import { AvailabilitySummary } from "@rapidmx/react-shared/calendar/freeBusyApi.js";
+import { ApiRequestError } from "../../../../lib/util/api.js";
+import { AvailabilitySummary } from "../../../../lib/calendar/freeBusyApi.js";
 import { addDaysToKey } from "./allDay.js";
 import { msToWallString, wallStringToMs } from "./eventFormat.js";
 

package/apps/shared/components/calendar/layout/CalendarShell.tsx

@@ -3,11 +3,12 @@
 // SPDX-License-Identifier: MPL-2.0
 ///////////////////////////////////////////////////////////////////////////////
 import React, { createContext, PropsWithChildren, ReactNode, useCallback, useContext, useEffect, useMemo, useState } from "react";
-import { ApiRequestError } from "@rapidmx/react-shared/util/api.js";
-import { accentColorForMailbox, colorForFolder } from "@rapidmx/react-shared/calendar/calendarColors.js";
-import { Folder, Mailbox, listFolders, listMailboxes } from "@rapidmx/react-shared/mail/mailApi.js";
-import Alert from "@rapidmx/react-shared/components/feedback/Alert.js";
-import Skeleton, { SkeletonList } from "@rapidmx/react-shared/components/feedback/Skeleton.js";
+import { ApiRequestError } from "../../../../../lib/util/api.js";
+import { useApiClient } from "../../../../../lib/util/apiClientContext.js";
+import { accentColorForMailbox, colorForFolder } from "../../../../../lib/calendar/calendarColors.js";
+import { Folder, Mailbox, listFolders, listMailboxes } from "../../../../../lib/mail/mailApi.js";
+import Alert from "../../../../../lib/components/feedback/Alert.js";
+import Skeleton, { SkeletonList } from "../../../../../lib/components/feedback/Skeleton.js";
 import AppShell, { AppShellProps } from "../../layout/AppShell.js";
 import { useLocation } from "../../../navigation/index.js";
 import MailboxProvisioning from "../../layout/MailboxProvisioning.js";
@@ -75,6 +76,7 @@ export default function CalendarShell({
     pluginNav,
     children,
 }: PropsWithChildren<CalendarShellProps>) {
+    const client = useApiClient();
     const [status, setStatus] = useState<Status>("checking");
     const [error, setError] = useState<string | null>(null);
     const [mailboxes, setMailboxes] = useState<Mailbox[]>([]);
@@ -93,7 +95,7 @@ export default function CalendarShell({
         if (!userUid) {
             return;
         }
-        listMailboxes({ limit: 100 })
+        listMailboxes({ limit: 100 }, client)
             .then((result) => {
                 setMailboxes(orderMailboxes(result, userUid));
                 setStatus("ready");
@@ -102,7 +104,7 @@ export default function CalendarShell({
                 setError(err instanceof ApiRequestError ? err.message : "Could not load your mailboxes.");
                 setStatus("error");
             });
-    }, [userUid]);
+    }, [userUid, client]);
 
     const ownMailboxUid = primaryMailboxUid(mailboxes, userUid);
     const mailboxUid: string | undefined =
@@ -117,7 +119,7 @@ export default function CalendarShell({
         let cancelled = false;
         void Promise.all(
             mailboxes.map((mailbox) =>
-                listFolders(mailbox.uid)
+                listFolders(mailbox.uid, client)
                     .then((folders): MailboxCalendars => ({ mailbox, calendarFolders: folders.filter((f) => f.type === "calendar") }))
                     .catch(
                         (err): MailboxCalendars => ({
@@ -135,7 +137,7 @@ export default function CalendarShell({
         return () => {
             cancelled = true;
         };
-    }, [mailboxes, folderRefreshToken]);
+    }, [mailboxes, folderRefreshToken, client]);
 
     const calendarFolders = useMemo(() => mailboxCalendars.flatMap((mc) => mc.calendarFolders), [mailboxCalendars]);
     const folderUid: string | undefined = calendarFolders.find((f) => f.mailboxUid === mailboxUid)?.uid;

package/apps/shared/components/contacts/ContactDetailPane.tsx

@@ -3,10 +3,10 @@
 // SPDX-License-Identifier: MPL-2.0
 ///////////////////////////////////////////////////////////////////////////////
 import React, { useState } from "react";
-import { Contact } from "@rapidmx/react-shared/contacts/contactsApi.js";
-import Button from "@rapidmx/react-shared/components/buttons/Button.js";
-import Alert from "@rapidmx/react-shared/components/feedback/Alert.js";
-import ContactAvatar from "@rapidmx/react-shared/components/avatar/ContactAvatar.js";
+import { Contact } from "../../../../lib/contacts/contactsApi.js";
+import Button from "../../../../lib/components/buttons/Button.js";
+import Alert from "../../../../lib/components/feedback/Alert.js";
+import ContactAvatar from "../../../../lib/components/avatar/ContactAvatar.js";
 import KeyChangeReview from "./KeyChangeReview.js";
 import { KEY_CHANGE_STALE_MESSAGE, formatDate, keyPinnedSince, revocationLabel } from "./contactKeys.js";
 import { clearPinnedSignerCache } from "../mail/pinnedSigners.js";

package/apps/shared/components/contacts/ContactForm.tsx

@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: MPL-2.0
 ///////////////////////////////////////////////////////////////////////////////
 import React, { FormEvent, useState } from "react";
-import { ApiRequestError } from "@rapidmx/react-shared/util/api.js";
+import { ApiRequestError } from "../../../../lib/util/api.js";
 import {
     Contact,
     ContactAddressKind,
@@ -13,11 +13,12 @@ import {
     ContactPostalAddress,
     createContact,
     updateContact,
-} from "@rapidmx/react-shared/contacts/contactsApi.js";
-import { Mailbox } from "@rapidmx/react-shared/mail/mailApi.js";
-import Alert from "@rapidmx/react-shared/components/feedback/Alert.js";
-import Button from "@rapidmx/react-shared/components/buttons/Button.js";
-import FormField from "@rapidmx/react-shared/components/forms/FormField.js";
+} from "../../../../lib/contacts/contactsApi.js";
+import { Mailbox } from "../../../../lib/mail/mailApi.js";
+import Alert from "../../../../lib/components/feedback/Alert.js";
+import Button from "../../../../lib/components/buttons/Button.js";
+import FormField from "../../../../lib/components/forms/FormField.js";
+import { useApiClient } from "../../../../lib/util/apiClientContext.js";
 import { findWellKnownFolderUid } from "../../mail/findWellKnownFolderUid.js";
 import { clearPinnedSignerCache } from "../mail/pinnedSigners.js";
 
@@ -46,6 +47,7 @@ const ADDRESS_KINDS: ContactAddressKind[] = ["home", "work", "other"];
  * desktop-and-mobile-inline (see that route's own doc comment on why "new" never gets a dedicated route).
  */
 export default function ContactForm({ contact, mailboxUid, folderUid, mailboxes, onSaved, onCancel }: ContactFormProps) {
+    const client = useApiClient();
     const [targetMailboxUid, setTargetMailboxUid] = useState(mailboxUid);
     const [displayName, setDisplayName] = useState(contact?.displayName ?? "");
     const [givenName, setGivenName] = useState(contact?.givenName ?? "");
@@ -115,23 +117,31 @@ export default function ContactForm({ contact, mailboxUid, folderUid, mailboxes,
             };
             let saved: Contact;
             if (contact) {
-                saved = await updateContact({
-                    uid: contact.uid,
-                    version: contact.version,
-                    ...(input as Omit<ContactPatch, "uid" | "version">),
-                });
+                saved = await updateContact(
+                    {
+                        uid: contact.uid,
+                        version: contact.version,
+                        ...(input as Omit<ContactPatch, "uid" | "version">),
+                    },
+                    client,
+                );
             } else {
                 const targetFolderUid =
-                    targetMailboxUid === mailboxUid ? folderUid : await findWellKnownFolderUid(targetMailboxUid as string, "contacts");
+                    targetMailboxUid === mailboxUid
+                        ? folderUid
+                        : await findWellKnownFolderUid(targetMailboxUid as string, "contacts", client);
                 if (!targetFolderUid) {
                     setError("That mailbox has no Contacts folder.");
                     return;
                 }
-                saved = await createContact({
-                    mailboxUid: targetMailboxUid as string,
-                    folderUid: targetFolderUid,
-                    ...(input as Omit<Parameters<typeof createContact>[0], "mailboxUid" | "folderUid">),
-                });
+                saved = await createContact(
+                    {
+                        mailboxUid: targetMailboxUid as string,
+                        folderUid: targetFolderUid,
+                        ...(input as Omit<Parameters<typeof createContact>[0], "mailboxUid" | "folderUid">),
+                    },
+                    client,
+                );
             }
             // A message opened later in this page load must see the changed contact's signing keys.
             clearPinnedSignerCache();

package/apps/shared/components/contacts/ContactsSidebar.tsx

@@ -4,9 +4,10 @@
 ///////////////////////////////////////////////////////////////////////////////
 import React, { FormEvent, useEffect, useMemo, useState } from "react";
 import { HiOutlineBars3 } from "react-icons/hi2";
-import { ApiRequestError } from "@rapidmx/react-shared/util/api.js";
-import { Contact, ContactList, createContactList, listContactLists } from "@rapidmx/react-shared/contacts/contactsApi.js";
-import Drawer from "@rapidmx/react-shared/components/overlays/Drawer.js";
+import { ApiRequestError } from "../../../../lib/util/api.js";
+import { Contact, ContactList, createContactList, listContactLists } from "../../../../lib/contacts/contactsApi.js";
+import Drawer from "../../../../lib/components/overlays/Drawer.js";
+import { useApiClient } from "../../../../lib/util/apiClientContext.js";
 import { notifyApiError } from "../../notifications/apiErrors.js";
 
 export type ContactsView =
@@ -97,6 +98,7 @@ function NavItem({
  * `ContactsShellContext` itself minimal (mailbox/folder resolution only).
  */
 export default function ContactsSidebar({ mailboxUid, contacts, active, onSelect, refreshToken, showDeleted = true }: ContactsSidebarProps) {
+    const client = useApiClient();
     const [lists, setLists] = useState<ContactList[]>([]);
     const [listsError, setListsError] = useState<string | null>(null);
     const [addingList, setAddingList] = useState(false);
@@ -109,7 +111,7 @@ export default function ContactsSidebar({ mailboxUid, contacts, active, onSelect
             return;
         }
         setListsError(null);
-        listContactLists(mailboxUid, { limit: 200 })
+        listContactLists(mailboxUid, { limit: 200 }, client)
             .then(setLists)
             .catch((err) => setListsError(err instanceof ApiRequestError ? err.message : "Could not load contact lists."));
     }, [mailboxUid, refreshToken]);
@@ -140,7 +142,7 @@ export default function ContactsSidebar({ mailboxUid, contacts, active, onSelect
             return;
         }
         try {
-            const created = await createContactList({ mailboxUid, name: newListName.trim() });
+            const created = await createContactList({ mailboxUid, name: newListName.trim() }, client);
             setLists((prev) => [...prev, created].sort((a, b) => a.name.localeCompare(b.name)));
             setNewListName("");
             setAddingList(false);

package/apps/shared/components/contacts/KeyChangeReview.tsx

@@ -3,11 +3,11 @@
 // SPDX-License-Identifier: MPL-2.0
 ///////////////////////////////////////////////////////////////////////////////
 import React, { useState } from "react";
-import { PinnedKeyChangedError, resolveKeyConflict, type KeyConflict } from "@rapidmx/react-shared/crypto/keyvaultApi.js";
-import Modal from "@rapidmx/react-shared/components/overlays/Modal.js";
-import Alert from "@rapidmx/react-shared/components/feedback/Alert.js";
-import Button from "@rapidmx/react-shared/components/buttons/Button.js";
-import { ApiRequestError } from "@rapidmx/react-shared/util/api.js";
+import { PinnedKeyChangedError, resolveKeyConflict, type KeyConflict } from "../../../../lib/crypto/keyvaultApi.js";
+import Modal from "../../../../lib/components/overlays/Modal.js";
+import Alert from "../../../../lib/components/feedback/Alert.js";
+import Button from "../../../../lib/components/buttons/Button.js";
+import { ApiRequestError } from "../../../../lib/util/api.js";
 import { conflictSourceLabel, formatDate, groupFingerprint, keyChangeErrorMessage } from "./contactKeys.js";
 
 export interface KeyChangeReviewProps {

package/apps/shared/components/contacts/contactKeys.ts

@@ -4,9 +4,9 @@
 ///////////////////////////////////////////////////////////////////////////////
 /** Display and error helpers for a contact's pinned keys and key changes (`KeyChangeReview`, `ContactDetailPane`,
  * `MessageDetailPane`). */
-import { ApiRequestError } from "@rapidmx/react-shared/util/api.js";
-import type { Contact } from "@rapidmx/react-shared/contacts/contactsApi.js";
-import { PinnedKeyChangedError, type KeyConflict, type PublicKey } from "@rapidmx/react-shared/crypto/keyvaultApi.js";
+import { ApiRequestError } from "../../../../lib/util/api.js";
+import type { Contact } from "../../../../lib/contacts/contactsApi.js";
+import { PinnedKeyChangedError, type KeyConflict, type PublicKey } from "../../../../lib/crypto/keyvaultApi.js";
 
 export const KEY_CHANGE_STALE_MESSAGE = "This contact's keys changed while you were looking; reload to see the latest.";
 export const KEY_CHANGE_INVALID_MESSAGE =

package/apps/shared/components/contacts/layout/ContactsShell.tsx

@@ -4,11 +4,12 @@
 ///////////////////////////////////////////////////////////////////////////////
 import React, { createContext, PropsWithChildren, ReactNode, useContext, useEffect, useMemo, useState } from "react";
 import { HiOutlineBars3 } from "react-icons/hi2";
-import { ApiRequestError } from "@rapidmx/react-shared/util/api.js";
-import Drawer from "@rapidmx/react-shared/components/overlays/Drawer.js";
-import { Folder, Mailbox, listFolders, listMailboxes } from "@rapidmx/react-shared/mail/mailApi.js";
-import Alert from "@rapidmx/react-shared/components/feedback/Alert.js";
-import Skeleton, { SkeletonList } from "@rapidmx/react-shared/components/feedback/Skeleton.js";
+import { ApiRequestError } from "../../../../../lib/util/api.js";
+import Drawer from "../../../../../lib/components/overlays/Drawer.js";
+import { Folder, Mailbox, listFolders, listMailboxes } from "../../../../../lib/mail/mailApi.js";
+import { useApiClient } from "../../../../../lib/util/apiClientContext.js";
+import Alert from "../../../../../lib/components/feedback/Alert.js";
+import Skeleton, { SkeletonList } from "../../../../../lib/components/feedback/Skeleton.js";
 import AppShell, { AppShellProps } from "../../layout/AppShell.js";
 import { useLocation, useNavigate } from "../../../navigation/index.js";
 import MailboxProvisioning from "../../layout/MailboxProvisioning.js";
@@ -50,6 +51,7 @@ export default function ContactsShell({
     pluginNav,
     children,
 }: PropsWithChildren<ContactsShellProps>) {
+    const client = useApiClient();
     const [status, setStatus] = useState<Status>("checking");
     const [error, setError] = useState<string | null>(null);
     const [mailboxes, setMailboxes] = useState<Mailbox[]>([]);
@@ -75,7 +77,7 @@ export default function ContactsShell({
         if (!userUid) {
             return;
         }
-        listMailboxes({ limit: 100 })
+        listMailboxes({ limit: 100 }, client)
             .then((result) => {
                 setMailboxes(orderMailboxes(result, userUid));
                 setStatus("ready");
@@ -96,7 +98,7 @@ export default function ContactsShell({
             return;
         }
         setFolderError(null);
-        listFolders(mailboxUid)
+        listFolders(mailboxUid, client)
             .then(setFolders)
             .catch((err) => setFolderError(err instanceof ApiRequestError ? err.message : "Could not load this mailbox's contacts folder."));
     }, [mailboxUid]);

package/apps/shared/components/escrow/layout/EscrowShell.tsx

@@ -5,12 +5,12 @@
 import "../../../styles/app.css";
 import React, { PropsWithChildren, ReactNode, useEffect, useState } from "react";
 import { HiOutlineClipboardDocumentList, HiOutlineFolderOpen } from "react-icons/hi2";
-import { ApiRequestError } from "@rapidmx/react-shared/util/api.js";
-import { listMatters } from "@rapidmx/react-shared/admin/mattersApi.js";
-import { useSessionRefresh } from "@rapidmx/react-shared/auth/session.js";
-import { getBranding } from "@rapidmx/react-shared/branding/brandingApi.js";
-import Alert from "@rapidmx/react-shared/components/feedback/Alert.js";
-import BottomTabBar, { NavItem } from "@rapidmx/react-shared/components/navigation/BottomTabBar.js";
+import { ApiRequestError } from "../../../../../lib/util/api.js";
+import { listMatters } from "../../../../../lib/admin/mattersApi.js";
+import { useSessionRefresh } from "../../../../../lib/auth/session.js";
+import { getBranding } from "../../../../../lib/branding/brandingApi.js";
+import Alert from "../../../../../lib/components/feedback/Alert.js";
+import BottomTabBar, { NavItem } from "../../../../../lib/components/navigation/BottomTabBar.js";
 import UserMenu from "../../layout/UserMenu.js";
 import RailIcon from "../../layout/RailIcon.js";
 import AppearanceProvider from "../../../appearance/AppearanceProvider.js";

package/apps/shared/components/forms/StringListField.tsx

@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: MPL-2.0
 ///////////////////////////////////////////////////////////////////////////////
 import React, { useState } from "react";
-import Button from "@rapidmx/react-shared/components/buttons/Button.js";
+import Button from "../../../../lib/components/buttons/Button.js";
 
 export interface StringListFieldProps {
     label: string;

package/apps/shared/components/layout/AppShell.tsx

@@ -13,24 +13,25 @@ import {
     HiOutlineUsers,
 } from "react-icons/hi2";
 import { useRouter } from "@rapidrest/react/client";
-import { useSessionRefresh } from "@rapidmx/react-shared/auth/session.js";
-import { getSetupStatus } from "@rapidmx/react-shared/admin/setupApi.js";
-import { stopImpersonating } from "@rapidmx/react-shared/mail/mailApi.js";
-import useBranding from "@rapidmx/react-shared/branding/useBranding.js";
-import { useIdleKeyTimeout } from "@rapidmx/react-shared/crypto/useIdleKeyTimeout.js";
+import { useSessionRefresh } from "../../../../lib/auth/session.js";
+import { getSetupStatus } from "../../../../lib/admin/setupApi.js";
+import { stopImpersonating } from "../../../../lib/mail/mailApi.js";
+import { useApiClient } from "../../../../lib/util/apiClientContext.js";
+import useBranding from "../../../../lib/branding/useBranding.js";
+import { useIdleKeyTimeout } from "../../../../lib/crypto/useIdleKeyTimeout.js";
 import ComposeProvider from "../mail/compose/ComposeContext.js";
 import { flushComposeDrafts, markSigningOut } from "../mail/compose/composeFlushRegistry.js";
-import BottomTabBar, { NavItem } from "@rapidmx/react-shared/components/navigation/BottomTabBar.js";
+import BottomTabBar, { NavItem } from "../../../../lib/components/navigation/BottomTabBar.js";
 import { FrameBrandingFooter, FrameBrandingHeader, useBrandingHtml } from "./BrandingChrome.js";
 import RailIcon from "./RailIcon.js";
 import AppearanceProvider from "../../appearance/AppearanceProvider.js";
 import { clearAppearanceCache } from "../../appearance/appearanceCache.js";
-import type { Branding } from "@rapidmx/react-shared/branding/brandingApi.js";
+import type { Branding } from "../../../../lib/branding/brandingApi.js";
 import UserMenu from "./UserMenu.js";
 import { UnlockPromptProvider } from "./UnlockPromptProvider.js";
 import { SIGN_OUT_CHANNEL, destroyAllLocalIndexes } from "../../search/localIndexRpcClient.js";
-import { authApiFetch, setApiUnauthorizedObserver } from "@rapidmx/react-shared/util/api.js";
-import { destroyUnlockedKeys } from "@rapidmx/react-shared/crypto/keySession.js";
+import { authApiFetch, setApiUnauthorizedObserver } from "../../../../lib/util/api.js";
+import { destroyUnlockedKeys } from "../../../../lib/crypto/keySession.js";
 import { clearPinnedSignerCache } from "../mail/pinnedSigners.js";
 import { mergePluginNavItems, PluginNav, PluginNavProps } from "../../plugins/pluginNav.js";
 import { useInAppFrame } from "../../navigation/frameContext.js";
@@ -172,6 +173,7 @@ export function AppChrome({
     hideChrome,
     children,
 }: PropsWithChildren<AppChromeProps>) {
+    const client = useApiClient();
     const [stoppingImpersonation, setStoppingImpersonation] = useState(false);
     // The keyboard shortcuts dialog: opened by `?`/Ctrl+/ (`GlobalShortcuts`) and by the account menu's item.
     const [shortcutsOpen, setShortcutsOpen] = useState(false);
@@ -226,7 +228,7 @@ export function AppChrome({
         if (!userUid || impersonating || !trusted) {
             return;
         }
-        getSetupStatus()
+        getSetupStatus(client)
             .then((status) => {
                 if (status.required) {
                     window.location.href = "/admin/setup";

package/apps/shared/components/layout/BrandingChrome.tsx

@@ -5,7 +5,7 @@
 import React, { ReactNode, useEffect, useLayoutEffect, useRef, useState } from "react";
 import { createPortal } from "react-dom";
 import DOMPurify from "dompurify";
-import type { Branding } from "@rapidmx/react-shared/branding/brandingApi.js";
+import type { Branding } from "../../../../lib/branding/brandingApi.js";
 import { useHeaderHeightRef } from "../../notifications/headerOffset.js";
 
 /** Elements that could run script, restyle the whole page, collect input, or embed another page - stripped on

package/apps/shared/components/layout/KeyEnrollmentGate.tsx

@@ -3,11 +3,11 @@
 // SPDX-License-Identifier: MPL-2.0
 ///////////////////////////////////////////////////////////////////////////////
 import React, { useEffect, useState } from "react";
-import { ApiRequestError } from "@rapidmx/react-shared/util/api.js";
-import Alert from "@rapidmx/react-shared/components/feedback/Alert.js";
-import Button from "@rapidmx/react-shared/components/buttons/Button.js";
-import FormField from "@rapidmx/react-shared/components/forms/FormField.js";
-import { enrollKey, getKeyVault, PublicKey, VaultAlreadyInitializedError } from "@rapidmx/react-shared/crypto/keyvaultApi.js";
+import { ApiRequestError } from "../../../../lib/util/api.js";
+import Alert from "../../../../lib/components/feedback/Alert.js";
+import Button from "../../../../lib/components/buttons/Button.js";
+import FormField from "../../../../lib/components/forms/FormField.js";
+import { enrollKey, getKeyVault, PublicKey, VaultAlreadyInitializedError } from "../../../../lib/crypto/keyvaultApi.js";
 import { UnopenableKeysNotice, unlockErrorMessage } from "./UnlockPromptProvider.js";
 import { FrameTakeover } from "../../navigation/frameContext.js";
 import { RecoveryFollowUp, RecoveryFollowUpModal, UnlockModeToggle, startRecoveryUnlock } from "./RecoveryCodeUnlock.js";
@@ -16,10 +16,10 @@ import {
     getUnlockedKeys,
     unlockWithPassword,
     type UnlockResult,
-} from "@rapidmx/react-shared/crypto/keySession.js";
-import { buildAad, generateMasterKey, sealWithKey } from "@rapidmx/react-shared/crypto/masterKey.js";
-import { buildPasswordWrap, buildRecoveryWraps } from "@rapidmx/react-shared/crypto/masterKeyWraps.js";
-import { exportPrivateKeyPkcs8, generateKeyPairWithCsr } from "@rapidmx/react-shared/crypto/keys.js";
+} from "../../../../lib/crypto/keySession.js";
+import { buildAad, generateMasterKey, sealWithKey } from "../../../../lib/crypto/masterKey.js";
+import { buildPasswordWrap, buildRecoveryWraps } from "../../../../lib/crypto/masterKeyWraps.js";
+import { exportPrivateKeyPkcs8, generateKeyPairWithCsr } from "../../../../lib/crypto/keys.js";
 
 type Status = "checking" | "setup_password" | "enrolling" | "already_set_up" | "show_recovery_codes" | "unlock" | "unlocking" | "ready";
 

package/apps/shared/components/layout/MailboxProvisioning.tsx

@@ -3,10 +3,11 @@
 // SPDX-License-Identifier: MPL-2.0
 ///////////////////////////////////////////////////////////////////////////////
 import React, { useEffect, useState } from "react";
-import { ApiRequestError } from "@rapidmx/react-shared/util/api.js";
-import { MailboxAutoProvisionAliasOption, autoProvisionMailbox } from "@rapidmx/react-shared/mail/mailApi.js";
-import Alert from "@rapidmx/react-shared/components/feedback/Alert.js";
-import Button from "@rapidmx/react-shared/components/buttons/Button.js";
+import { ApiRequestError } from "../../../../lib/util/api.js";
+import { MailboxAutoProvisionAliasOption, autoProvisionMailbox } from "../../../../lib/mail/mailApi.js";
+import { useApiClient } from "../../../../lib/util/apiClientContext.js";
+import Alert from "../../../../lib/components/feedback/Alert.js";
+import Button from "../../../../lib/components/buttons/Button.js";
 import { FrameTakeover } from "../../navigation/frameContext.js";
 
 type Status = "checking" | "needs_selection" | "creating" | "unavailable" | "retryable";
@@ -48,6 +49,7 @@ function unavailableReason(err: unknown): string | null {
  * administrator they ask can tell why - see `unavailableReason()`.
  */
 export default function MailboxProvisioning() {
+    const client = useApiClient();
     const [status, setStatus] = useState<Status>("checking");
     const [options, setOptions] = useState<MailboxAutoProvisionAliasOption[]>([]);
     const [selected, setSelected] = useState("");
@@ -61,7 +63,7 @@ export default function MailboxProvisioning() {
 
     useEffect(() => {
         setStatus("checking");
-        autoProvisionMailbox()
+        autoProvisionMailbox(undefined, client)
             .then((result) => {
                 if (result.status === "needs_selection") {
                     // `autoProvision()` only ever returns this status with a non-empty cross product of
@@ -99,7 +101,7 @@ export default function MailboxProvisioning() {
         setStatus("creating");
         setError(null);
         try {
-            await autoProvisionMailbox({ alias: option.alias, domain: option.domain });
+            await autoProvisionMailbox({ alias: option.alias, domain: option.domain }, client);
             window.location.reload();
         } catch (err) {
             setError(err instanceof ApiRequestError ? err.message : "Could not create your mailbox.");

package/apps/shared/components/layout/RecoveryCodeUnlock.tsx

@@ -12,19 +12,19 @@
  * on the unlock straight away, and then show `RecoveryFollowUpModal` for the follow-up steps.
  */
 import React, { FormEvent, useState } from "react";
-import { ApiRequestError } from "@rapidmx/react-shared/util/api.js";
-import { getUnlockedKeys, unlockWithRecoveryCode } from "@rapidmx/react-shared/crypto/keySession.js";
-import { getKeyVault, type PublicKey } from "@rapidmx/react-shared/crypto/keyvaultApi.js";
-import { KeysLockedError } from "@rapidmx/react-shared/crypto/masterKey.js";
+import { ApiRequestError } from "../../../../lib/util/api.js";
+import { getUnlockedKeys, unlockWithRecoveryCode } from "../../../../lib/crypto/keySession.js";
+import { getKeyVault, type PublicKey } from "../../../../lib/crypto/keyvaultApi.js";
+import { KeysLockedError } from "../../../../lib/crypto/masterKey.js";
 import {
     PasswordWrapReplaceError,
     consumeRecoveryCode,
     replacePasswordWrap,
-} from "@rapidmx/react-shared/crypto/masterKeyWraps.js";
-import Modal from "@rapidmx/react-shared/components/overlays/Modal.js";
-import Alert from "@rapidmx/react-shared/components/feedback/Alert.js";
-import Button from "@rapidmx/react-shared/components/buttons/Button.js";
-import FormField from "@rapidmx/react-shared/components/forms/FormField.js";
+} from "../../../../lib/crypto/masterKeyWraps.js";
+import Modal from "../../../../lib/components/overlays/Modal.js";
+import Alert from "../../../../lib/components/feedback/Alert.js";
+import Button from "../../../../lib/components/buttons/Button.js";
+import FormField from "../../../../lib/components/forms/FormField.js";
 
 /** The same minimum every other "set an encryption password" form in this app uses. */
 export const MIN_PASSWORD_LENGTH = 8;

package/apps/shared/components/layout/ThemeSwitch.tsx

@@ -4,7 +4,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 import React, { useContext, useId, useRef } from "react";
 import { HiOutlineComputerDesktop, HiOutlineMoon, HiOutlineSun } from "react-icons/hi2";
-import type { AppearanceMode } from "@rapidmx/react-shared/appearance/preferencesApi.js";
+import type { AppearanceMode } from "../../../../lib/appearance/preferencesApi.js";
 import { AppearanceContext, INERT_APPEARANCE } from "../../appearance/appearanceContext.js";
 
 const CHOICES: { mode: AppearanceMode; label: string; hint: string; Icon: typeof HiOutlineSun }[] = [

package/apps/shared/components/layout/UnlockPromptProvider.tsx

@@ -9,12 +9,12 @@ import {
     UnlockedKeys,
     UnlockResult,
     UnopenableEncryptionKeyError,
-} from "@rapidmx/react-shared/crypto/keySession.js";
-import type { PublicKey } from "@rapidmx/react-shared/crypto/keyvaultApi.js";
-import Modal from "@rapidmx/react-shared/components/overlays/Modal.js";
-import Alert from "@rapidmx/react-shared/components/feedback/Alert.js";
-import Button from "@rapidmx/react-shared/components/buttons/Button.js";
-import FormField from "@rapidmx/react-shared/components/forms/FormField.js";
+} from "../../../../lib/crypto/keySession.js";
+import type { PublicKey } from "../../../../lib/crypto/keyvaultApi.js";
+import Modal from "../../../../lib/components/overlays/Modal.js";
+import Alert from "../../../../lib/components/feedback/Alert.js";
+import Button from "../../../../lib/components/buttons/Button.js";
+import FormField from "../../../../lib/components/forms/FormField.js";
 import {
     RECOVERY_CODE_ERROR,
     RecoveryFollowUp,