@rapidmx/web-client 0.21.0 → 0.22.0

package/dist/apps/shared/components/mail/MailSelectionBar.d.ts

@@ -1,6 +1,6 @@
 import React from "react";
-import { Folder, Message } from "@rapidmx/react-shared/mail/mailApi.js";
-import { Label } from "@rapidmx/react-shared/mail/labelsApi.js";
+import { Folder, Message } from "../../../../lib/mail/mailApi.js";
+import { Label } from "../../../../lib/mail/labelsApi.js";
 export interface MailSelectionBarProps {
     selected: Message[];
     /** Every message currently listed - what "Select all" selects and what `allSelected` is measured against. */

package/dist/apps/shared/components/mail/MenuButton.js

@@ -5,7 +5,7 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
 ///////////////////////////////////////////////////////////////////////////////
 import { useEffect, useRef, useState } from "react";
 import { HiCheck, HiChevronDown, HiChevronLeft, HiChevronRight, HiMinus } from "react-icons/hi2";
-import PopoverPortal from "@rapidmx/react-shared/components/overlays/PopoverPortal.js";
+import PopoverPortal from "../../../../lib/components/overlays/PopoverPortal.js";
 // `PopoverPortal` positions a fixed-size box (it has no auto-height mode), so the menu's height is
 // computed from its own contents rather than measured - from whichever level is *shown*, so a submenu
 // isn't left standing in the parent menu's taller box. These are the exact heights the classes below

package/dist/apps/shared/components/mail/MessageDetailPane.d.ts

@@ -1,7 +1,7 @@
 import React from "react";
-import { Attachment, Folder, Message } from "@rapidmx/react-shared/mail/mailApi.js";
-import { Label } from "@rapidmx/react-shared/mail/labelsApi.js";
-import type { MessageSecurityResult } from "@rapidmx/react-shared/crypto/messageSecurity.js";
+import { Attachment, Folder, Message } from "../../../../lib/mail/mailApi.js";
+import { Label } from "../../../../lib/mail/labelsApi.js";
+import type { MessageSecurityResult } from "../../../../lib/crypto/messageSecurity.js";
 /** The detail line under a `verified_at_first_open` badge. */
 export declare function verifiedAtFirstOpenMessage(result: MessageSecurityResult): string;
 export interface SenderNameCheck {

package/dist/apps/shared/components/mail/MessageDetailPane.js

@@ -5,26 +5,27 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
 ///////////////////////////////////////////////////////////////////////////////
 import { useEffect, useRef, useState } from "react";
 import { HiOutlineArchiveBox, HiOutlineArrowUturnLeft, HiOutlineArrowUturnRight, HiOutlineCheck, HiOutlineExclamationTriangle, HiOutlineFolderArrowDown, HiOutlineInboxArrowDown, HiOutlineLockClosed, HiOutlineMoon, HiOutlineNoSymbol, HiOutlineSun, } from "react-icons/hi2";
-import { ApiRequestError } from "@rapidmx/react-shared/util/api.js";
-import { approveReceipt, archiveMessage, attachmentContentUrl, cancelScheduledSend, declineReceipt, getMailbox, getMessage, getMessageRawContent, moveMessage, recallMessage, setMessageLabels, } from "@rapidmx/react-shared/mail/mailApi.js";
-import { buildForwardQuote, buildReplyQuote, buildReplyRecipients, buildReplyThreading, forwardSubject, replySubject, } from "@rapidmx/react-shared/mail/compose/composeQuoting.js";
+import { ApiRequestError } from "../../../../lib/util/api.js";
+import { approveReceipt, archiveMessage, attachmentContentUrl, cancelScheduledSend, declineReceipt, getMailbox, getMessage, getMessageRawContent, moveMessage, recallMessage, setMessageLabels, } from "../../../../lib/mail/mailApi.js";
+import { buildForwardQuote, buildReplyQuote, buildReplyRecipients, buildReplyThreading, forwardSubject, replySubject, } from "../../../../lib/mail/compose/composeQuoting.js";
 import MoveToFolderDialog from "./MoveToFolderDialog.js";
 import InviteCard from "./InviteCard.js";
 import { isCalendarAttachment } from "./invite/inviteFormat.js";
 import { useMessageInvite } from "./invite/inviteStore.js";
-import { getUnlockedKeys, subscribeKeySession } from "@rapidmx/react-shared/crypto/keySession.js";
-import { extractAddresses } from "@rapidmx/react-shared/crypto/mime.js";
-import { SignerKeyConflictError, signingKeyFingerprints, trustSigner } from "@rapidmx/react-shared/crypto/keyvaultApi.js";
-import { isLikelyMailingList } from "@rapidmx/react-shared/crypto/composeSecurity.js";
+import { getUnlockedKeys, subscribeKeySession } from "../../../../lib/crypto/keySession.js";
+import { extractAddresses } from "../../../../lib/crypto/mime.js";
+import { SignerKeyConflictError, signingKeyFingerprints, trustSigner } from "../../../../lib/crypto/keyvaultApi.js";
+import { isLikelyMailingList } from "../../../../lib/crypto/composeSecurity.js";
 import { clearPinnedSignerCache, getPinnedSignerFingerprints, getSignerKeyState } from "./pinnedSigners.js";
 import { currentVerificationSeal, getVaultGeneration, sendVerificationSeal } from "./verificationSeals.js";
-import { getMyMailboxAccess } from "@rapidmx/react-shared/mail/mailboxAccessApi.js";
+import { getMyMailboxAccess } from "../../../../lib/mail/mailboxAccessApi.js";
+import { useApiClient } from "../../../../lib/util/apiClientContext.js";
 import KeyChangeReview from "../contacts/KeyChangeReview.js";
 import { KEY_CHANGE_STALE_MESSAGE, sameFingerprint } from "../contacts/contactKeys.js";
 import { prefetchComposeWindow, useCompose } from "./compose/ComposeContext.js";
 import { loadOriginalMessage, prefetchOriginalMessage } from "./compose/quotedBody.js";
 import { formatRecipient } from "./compose/recipients.js";
-import { formatMailAddress } from "@rapidmx/react-shared/mail/mailAddress.js";
+import { formatMailAddress } from "../../../../lib/mail/mailAddress.js";
 import MailAddress, { RecipientLine } from "./MailAddress.js";
 import { useMailShell } from "./layout/MailShell.js";
 import { ariaKeyShortcuts, withHint } from "../../keyboard/format.js";
@@ -37,10 +38,10 @@ import { useNavigate } from "../../navigation/index.js";
 import { notify } from "../../notifications/store.js";
 import { notifyApiError } from "../../notifications/apiErrors.js";
 import { useMailboxUpdateAccess } from "../../mail/useMailboxUpdateAccess.js";
-import Modal from "@rapidmx/react-shared/components/overlays/Modal.js";
-import Alert from "@rapidmx/react-shared/components/feedback/Alert.js";
+import Modal from "../../../../lib/components/overlays/Modal.js";
+import Alert from "../../../../lib/components/feedback/Alert.js";
 import LabelMenuButton from "./labelMenu.js";
-import Button from "@rapidmx/react-shared/components/buttons/Button.js";
+import Button from "../../../../lib/components/buttons/Button.js";
 import EncryptedBody from "./reading/EncryptedBody.js";
 import { displaySubject } from "./reading/EncryptedPreview.js";
 import MessageBody, { BodySkeleton } from "./reading/MessageBody.js";
@@ -271,6 +272,7 @@ function MessageDetailContent({ message: messageProp, attachments, backHref, isS
     const [nowMs, setNowMs] = useState(() => Date.now());
     const { mailboxes, trackMessageChange } = useMailShell();
     const { requestUnlock } = useUnlockPrompt();
+    const client = useApiClient();
     // Bumped after a successful on-demand unlock to re-run the effect below - it's not a dependency the
     // effect could read reactively otherwise (getUnlockedKeys() is a plain module-level read, not React
     // state; see keySession.ts's own doc comment).
@@ -317,14 +319,14 @@ function MessageDetailContent({ message: messageProp, attachments, backHref, isS
         // mailbox's own signing keys when it sent the message itself. A failed lookup means no pins, which can only
         // ever make a signature "signer not verified", never verified.
         const senderAddress = message.from.address;
-        const pinsPromise = getPinnedSignerFingerprints(message.mailboxUid, senderAddress).then((fingerprints) => ({ loaded: true, fingerprints }), () => ({ loaded: false, fingerprints: [] }));
+        const pinsPromise = getPinnedSignerFingerprints(message.mailboxUid, senderAddress, client).then((fingerprints) => ({ loaded: true, fingerprints }), () => ({ loaded: false, fingerprints: [] }));
         // Verification seals (see `verificationSeals.ts`) need unlocked keys and the vault's current master key
         // generation; without either the message is evaluated exactly as before, with no seal. The sender's key records
         // are loaded alongside, so a seal can say when the signer key was later revoked as compromised.
         let keyStatePromise;
-        const loadKeyState = () => (keyStatePromise ?? (keyStatePromise = getSignerKeyState(message.mailboxUid, senderAddress).catch(() => undefined)));
+        const loadKeyState = () => (keyStatePromise ?? (keyStatePromise = getSignerKeyState(message.mailboxUid, senderAddress, client).catch(() => undefined)));
         const sealContextPromise = getUnlockedKeys(message.mailboxUid)
-            ? getVaultGeneration(message.mailboxUid).then(async (generation) => generation === undefined ? undefined : { generation, keyState: await loadKeyState() })
+            ? getVaultGeneration(message.mailboxUid, client).then(async (generation) => generation === undefined ? undefined : { generation, keyState: await loadKeyState() })
             : undefined;
         getMessageRawContent(message.uid)
             .then(async (rawMime) => {
@@ -333,7 +335,7 @@ function MessageDetailContent({ message: messageProp, attachments, backHref, isS
             }
             // The S/MIME code (PKI.js and the ASN.1/X.509 libraries) loads here, only for a message that is signed or
             // encrypted - it is over half a megabyte, and the pane opens plain messages without it.
-            const messageSecurity = await import("@rapidmx/react-shared/crypto/messageSecurity.js");
+            const messageSecurity = await import("../../../../lib/crypto/messageSecurity.js");
             const [primaryAddress, ...aliasAddresses] = readerAddressesKey ? readerAddressesKey.split(" ") : [];
             const ownAddresses = readerAddressesKey.toLowerCase().split(" ");
             const ownKeys = ownAddresses.includes(senderAddress.toLowerCase()) ? (readerMailbox.keys ?? []) : [];
@@ -362,7 +364,7 @@ function MessageDetailContent({ message: messageProp, attachments, backHref, isS
                 messageSecurity.evaluateMessageSecurity(rawMime, undefined, pinned, primaryAddress));
                 if (result.sealToWrite) {
                     // Best effort and in the background: never awaited, never shown.
-                    void sendVerificationSeal(message.uid, result.sealToWrite);
+                    void sendVerificationSeal(message.uid, result.sealToWrite, client);
                 }
             }
             else {
@@ -381,7 +383,7 @@ function MessageDetailContent({ message: messageProp, attachments, backHref, isS
             const keyChanged = signerKeyChanged(result);
             const [keyState, access] = await Promise.all([
                 keyChanged || (unpinned && UNVERIFIED_SIGNER_STATES.has(result.state)) ? loadKeyState() : undefined,
-                keyChanged ? getMyMailboxAccess(message.mailboxUid).then((a) => a.canUpdate, () => undefined) : undefined,
+                keyChanged ? getMyMailboxAccess(message.mailboxUid, client).then((a) => a.canUpdate, () => undefined) : undefined,
             ]);
             if (!cancelled) {
                 setSecurity(result);
@@ -398,7 +400,7 @@ function MessageDetailContent({ message: messageProp, attachments, backHref, isS
         return () => {
             cancelled = true;
         };
-    }, [message.uid, message.mailboxUid, message.from.address, message.encrypted, rawEvaluationNeeded, unlockRefresh, readerAddressesKey]);
+    }, [message.uid, message.mailboxUid, message.from.address, message.encrypted, rawEvaluationNeeded, unlockRefresh, readerAddressesKey, client]);
     // Whether the body is the locked state right now (an encrypted message this device holds no unlocked keys for), for the subscription below.
     const lockedRef = useRef(false);
     lockedRef.current = security?.decryptError !== undefined && !getUnlockedKeys(message.mailboxUid);
@@ -443,7 +445,7 @@ function MessageDetailContent({ message: messageProp, attachments, backHref, isS
     }, [sendInProgress, leaseExpiresMs, nowMs]);
     async function reloadMessage() {
         try {
-            setReloaded(await getMessage(message.uid));
+            setReloaded(await getMessage(message.uid, client));
             setNowMs(Date.now());
         }
         catch {
@@ -478,7 +480,7 @@ function MessageDetailContent({ message: messageProp, attachments, backHref, isS
         setTrusting(true);
         setTrustError(null);
         try {
-            await trustSigner(message.mailboxUid, { address, certificate });
+            await trustSigner(message.mailboxUid, { address, certificate }, client);
             clearPinnedSignerCache();
             setTrustConfirmOpen(false);
             setUnlockRefresh((n) => n + 1);
@@ -504,7 +506,7 @@ function MessageDetailContent({ message: messageProp, attachments, backHref, isS
     /** The replying mailbox's own addresses (primary and aliases), which a reply never goes to - from the mail shell's
      * mailbox list, else fetched; none when neither is available. */
     async function ownAddresses() {
-        const mailbox = readerMailbox ?? (await getMailbox(message.mailboxUid).catch(() => undefined));
+        const mailbox = readerMailbox ?? (await getMailbox(message.mailboxUid, {}, client).catch(() => undefined));
         return mailbox ? [mailbox.primarySmtpAddress, ...(mailbox.aliasAddresses ?? [])] : [];
     }
     /** Starts fetching what Reply/Reply All/Forward will need (the compose window's code, the original's body) as the
@@ -586,7 +588,7 @@ function MessageDetailContent({ message: messageProp, attachments, backHref, isS
         setRecalling(true);
         setError(null);
         try {
-            const updated = await recallMessage(message.uid);
+            const updated = await recallMessage(message.uid, client);
             setConfirming(false);
             onRecalled?.(updated);
         }
@@ -605,7 +607,7 @@ function MessageDetailContent({ message: messageProp, attachments, backHref, isS
         setCanceling(true);
         setCancelError(null);
         try {
-            const updated = await cancelScheduledSend(message, draftsFolderUid);
+            const updated = await cancelScheduledSend(message, draftsFolderUid, client);
             // Keeps a `folder:`-scoped Tier 2 local search from still finding it in its old folder.
             void moveLocalEntity(updated.mailboxUid, updated.uid, updated.folderUid);
             // Out of Outbox, into Drafts: both folders' badges.
@@ -632,7 +634,7 @@ function MessageDetailContent({ message: messageProp, attachments, backHref, isS
         setArchiving(true);
         setArchiveError(null);
         try {
-            const updated = await archiveMessage(message.uid);
+            const updated = await archiveMessage(message.uid, client);
             void moveLocalEntity(updated.mailboxUid, updated.uid, updated.folderUid);
             trackMessageChange(message, updated).settle();
             onArchived?.(updated);
@@ -656,7 +658,7 @@ function MessageDetailContent({ message: messageProp, attachments, backHref, isS
         setLabelsError(null);
         try {
             const base = message.version >= latestLabelsMessageRef.current.version ? message : latestLabelsMessageRef.current;
-            const updated = await setMessageLabels(base, labelUids);
+            const updated = await setMessageLabels(base, labelUids, client);
             latestLabelsMessageRef.current = updated;
             setLabelsMessage(updated);
             onLabelsChanged?.(updated);
@@ -678,7 +680,7 @@ function MessageDetailContent({ message: messageProp, attachments, backHref, isS
      * passes no `onMoved` would have had nothing moved while the prompt closed as if it had.
      */
     async function handleMove(folderUid) {
-        const updated = await moveMessage(message, folderUid);
+        const updated = await moveMessage(message, folderUid, client);
         // Move to, Delete and Report junk are all this: the source folder's badge goes down, the target's up.
         trackMessageChange(message, updated).settle();
         onMoved?.(updated);
@@ -730,7 +732,7 @@ function MessageDetailContent({ message: messageProp, attachments, backHref, isS
         setReceiptBusy(type);
         setReceiptError(null);
         try {
-            const updated = await (action === "approve" ? approveReceipt : declineReceipt)(message.uid, type);
+            const updated = await (action === "approve" ? approveReceipt : declineReceipt)(message.uid, type, client);
             onReceiptHandled?.(updated);
         }
         catch (err) {

package/dist/apps/shared/components/mail/MoveToFolderDialog.d.ts

@@ -1,5 +1,5 @@
 import React from "react";
-import { Folder } from "@rapidmx/react-shared/mail/mailApi.js";
+import { Folder } from "../../../../lib/mail/mailApi.js";
 /**
  * The folder types a message can be moved *into* - Outbox is a transient send queue the server owns, and
  * the non-mail folders (`calendar`/`contacts`/`tasks`/`notes`) aren't message folders at all, so neither is

package/dist/apps/shared/components/mail/MoveToFolderDialog.js

@@ -5,11 +5,12 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
 ///////////////////////////////////////////////////////////////////////////////
 import { useEffect, useRef, useState } from "react";
 import { HiOutlineFolder, HiOutlineFolderPlus } from "react-icons/hi2";
-import { ApiRequestError } from "@rapidmx/react-shared/util/api.js";
-import { createFolder } 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 Modal from "@rapidmx/react-shared/components/overlays/Modal.js";
+import { ApiRequestError } from "../../../../lib/util/api.js";
+import { createFolder } 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 Modal from "../../../../lib/components/overlays/Modal.js";
 /**
  * The folder types a message can be moved *into* - Outbox is a transient send queue the server owns, and
  * the non-mail folders (`calendar`/`contacts`/`tasks`/`notes`) aren't message folders at all, so neither is
@@ -58,6 +59,7 @@ export function folderNameError(name, existing) {
  * subfolder would be created into a hierarchy nothing here renders.
  */
 export default function MoveToFolderDialog({ open, onClose, mailboxUid, folders, currentFolderUid, count = 1, onMove, onFolderCreated, }) {
+    const client = useApiClient();
     const [filter, setFilter] = useState("");
     const [creating, setCreating] = useState(false);
     const [newName, setNewName] = useState("");
@@ -112,7 +114,7 @@ export default function MoveToFolderDialog({ open, onClose, mailboxUid, folders,
         setError(null);
         let created;
         try {
-            created = await createFolder({ mailboxUid, name: newName.trim(), type: "user" });
+            created = await createFolder({ mailboxUid, name: newName.trim(), type: "user" }, client);
         }
         catch (err) {
             setError(err instanceof ApiRequestError ? err.message : "Could not create that folder.");

package/dist/apps/shared/components/mail/OutboxRowStatus.d.ts

@@ -1,5 +1,5 @@
 import React from "react";
-import type { Message } from "@rapidmx/react-shared/mail/mailApi.js";
+import type { Message } from "../../../../lib/mail/mailApi.js";
 /**
  * The state line an Outbox list row carries under its subject: "Sending...", "Retrying (attempt 2, at 10:15)", "Not sent: <reason>" or
  * "Scheduled for ...". Read from the message's own `scheduledSend*` fields (see `outboxItemStatus()`), so it follows the list as the server's

package/dist/apps/shared/components/mail/PermanentDeleteDialog.js

@@ -1,6 +1,6 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import Button from "@rapidmx/react-shared/components/buttons/Button.js";
-import Modal from "@rapidmx/react-shared/components/overlays/Modal.js";
+import Button from "../../../../lib/components/buttons/Button.js";
+import Modal from "../../../../lib/components/overlays/Modal.js";
 /**
  * The confirmation in front of every permanent delete. A `Modal`, so Escape and the Cancel button dismiss it and Tab stays inside it. Focus
  * starts on the dialog itself, never on the destructive button, so pressing Enter (or the Delete key again) on a dialog the reader did not

package/dist/apps/shared/components/mail/compose/ComposeContext.d.ts

@@ -1,5 +1,6 @@
 import React, { PropsWithChildren } from "react";
-import { DraftThreading } from "@rapidmx/react-shared/mail/mailApi.js";
+import { DraftThreading } from "../../../../../lib/mail/mailApi.js";
+import { ApiClient } from "../../../../../lib/util/api.js";
 import { ResumeCompose } from "../../../mail/outbox/composeBridge.js";
 /** The CSS variable (on `<html>`) that holds how far down the screen the open compose windows start, in px. */
 export declare const COMPOSE_TOP_VAR = "--rr-compose-top";
@@ -95,6 +96,14 @@ export interface OpenComposeInput {
 export interface ComposeContextValue {
     /** Opens a new compose window, stacked alongside any already open (Gmail allows several at once). */
     openCompose: (input: OpenComposeInput) => void;
+    /**
+     * The active account's `ApiClient` (see `useApiClient()`'s own doc comment), resolved once here rather
+     * than by every compose component individually - `ComposeWindow` and everything it renders reach it
+     * through this context's own value instead of each calling `useApiClient()` for itself. `useApiClient()`
+     * remains independently callable (this is additive, not a replacement) - a future consumer that isn't a
+     * descendant of `ComposeProvider` (or doesn't want to depend on it) can still read it directly.
+     */
+    client?: ApiClient;
 }
 /** Opens the floating Compose window from anywhere inside `AppShell` (any of the four webmail apps). */
 export declare function useCompose(): ComposeContextValue;

package/dist/apps/shared/components/mail/compose/ComposeContext.js

@@ -4,7 +4,8 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 // SPDX-License-Identifier: MPL-2.0
 ///////////////////////////////////////////////////////////////////////////////
 import { createContext, useContext, useEffect, useMemo, useRef, useState } from "react";
-import useIsMobile from "@rapidmx/react-shared/util/useIsMobile.js";
+import { useApiClient } from "../../../../../lib/util/apiClientContext.js";
+import useIsMobile from "../../../../../lib/util/useIsMobile.js";
 import { registerComposeOpener } from "../../../mail/outbox/composeBridge.js";
 import { markComposePhase } from "./composePerf.js";
 import ComposeWindowPlaceholder from "./ComposeWindowPlaceholder.js";
@@ -81,6 +82,7 @@ export function useCompose() {
  */
 export default function ComposeProvider({ children, userUid, trusted }) {
     const [sessions, setSessions] = useState([]);
+    const client = useApiClient();
     const isMobile = useIsMobile();
     const { Component: ComposeWindow, failed, retry: retryLoad } = useComposeWindowComponent(sessions.length > 0);
     // The top edge of the compose windows, published as `--rr-compose-top` so the pop-up stack (`NotificationCenter`) can keep clear of them.
@@ -134,7 +136,7 @@ export default function ComposeProvider({ children, userUid, trusted }) {
     function toggleMinimize(id) {
         setSessions((prev) => prev.map((s) => (s.id === id ? { ...s, minimized: !s.minimized } : s)));
     }
-    const value = useMemo(() => ({ openCompose }), []);
+    const value = useMemo(() => ({ openCompose, client }), [client]);
     // Code with no React context - a failed send's "Open draft" pop-up - opens windows through this.
     useEffect(() => registerComposeOpener((input) => value.openCompose(input)), [value]);
     // On mobile, a non-minimized `ComposeWindow` renders full-screen (see that component's own doc

package/dist/apps/shared/components/mail/compose/ComposeWindow.js

@@ -5,17 +5,17 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
 ///////////////////////////////////////////////////////////////////////////////
 import { useEffect, useRef, useState } from "react";
 import { HiOutlineArrowsPointingIn, HiOutlineArrowsPointingOut, HiOutlineChevronDown, HiOutlineLockClosed, HiOutlineMinus, HiOutlinePaperClip, HiOutlineTrash, HiOutlineXMark, } from "react-icons/hi2";
-import { ApiRequestError } from "@rapidmx/react-shared/util/api.js";
-import { assembleDraft, attachmentContentUrl, createDraft, deleteMessage, getMailbox, getMessage, listFolders, listMailboxes, uploadAttachment, } from "@rapidmx/react-shared/mail/mailApi.js";
-import { listMailSignatures } from "@rapidmx/react-shared/mail/mailSignaturesApi.js";
-import { buildComposeBodyHtml } from "@rapidmx/react-shared/mail/compose/composeQuoting.js";
+import { ApiRequestError } from "../../../../../lib/util/api.js";
+import { assembleDraft, attachmentContentUrl, createDraft, deleteMessage, getMailbox, getMessage, listFolders, listMailboxes, uploadAttachment, } from "../../../../../lib/mail/mailApi.js";
+import { listMailSignatures } from "../../../../../lib/mail/mailSignaturesApi.js";
+import { buildComposeBodyHtml } from "../../../../../lib/mail/compose/composeQuoting.js";
 import { peekMailboxWritability, useMailboxWritability } from "../writableMailboxes.js";
 import { orderMailboxes, primaryMailboxUid } from "../../../mail/primaryMailbox.js";
-import { resolveRecipientEncryption } from "@rapidmx/react-shared/crypto/composeSecurity.js";
-import { getUnlockedKeys, subscribeKeySession } from "@rapidmx/react-shared/crypto/keySession.js";
-import { findActivePublicKey, getEncryptionPolicy, lookupKeys } from "@rapidmx/react-shared/crypto/keyvaultApi.js";
+import { resolveRecipientEncryption } from "../../../../../lib/crypto/composeSecurity.js";
+import { getUnlockedKeys, subscribeKeySession } from "../../../../../lib/crypto/keySession.js";
+import { findActivePublicKey, getEncryptionPolicy, lookupKeys } from "../../../../../lib/crypto/keyvaultApi.js";
 import { useUnlockPrompt } from "../../layout/UnlockPromptProvider.js";
-import useIsMobile from "@rapidmx/react-shared/util/useIsMobile.js";
+import useIsMobile from "../../../../../lib/util/useIsMobile.js";
 import { notify } from "../../../notifications/store.js";
 import { evaluateEncryptionRequirement } from "./encryptionRequirement.js";
 import { decideSend } from "../../../mail/outbox/sendDecision.js";
@@ -31,9 +31,9 @@ import RecipientInput from "./RecipientInput.js";
 import { parseRecipientList } from "./recipients.js";
 import RichTextEditor from "./RichTextEditor.js";
 import ScheduleSendPicker from "./ScheduleSendPicker.js";
-import Alert from "@rapidmx/react-shared/components/feedback/Alert.js";
-import Button from "@rapidmx/react-shared/components/buttons/Button.js";
-import Modal from "@rapidmx/react-shared/components/overlays/Modal.js";
+import Alert from "../../../../../lib/components/feedback/Alert.js";
+import Button from "../../../../../lib/components/buttons/Button.js";
+import Modal from "../../../../../lib/components/overlays/Modal.js";
 /** Debounce between the last edit and the draft autosave. */
 export const DEFAULT_AUTOSAVE_DELAY_MS = 2000;
 /** The longest an edit stays unsaved while the user keeps typing (the debounce above restarts on every keystroke, so it alone never fires then). */
@@ -119,7 +119,11 @@ export default function ComposeWindow({ session, onClose, onToggleMinimize, user
     const [hasUploads, setHasUploads] = useState(!!resume && resume.attachments.length > 0);
     const isMobile = useIsMobile();
     const { requestUnlock } = useUnlockPrompt();
-    const { openCompose } = useCompose();
+    // Resolved once by `ComposeProvider` (see `ComposeContext.tsx`'s own doc comment on `ComposeContextValue.client`)
+    // rather than calling `useApiClient()` again here - every REST call below (including `startSend()`'s own,
+    // see `sendJob.ts`) passes it through as the trailing `client` argument, `undefined` (the default global
+    // cookie-based fetch) for every existing caller.
+    const { openCompose, client } = useCompose();
     const keyEnv = useKeyEnvironment();
     // Bumped after a successful on-demand unlock to force a re-render - `getUnlockedKeys()` below is a
     // plain read from a module-level store, not React state, so nothing else would pick up the change.
@@ -219,7 +223,7 @@ export default function ComposeWindow({ session, onClose, onToggleMinimize, user
     // to apply - see the transition rules there.
     useEffect(() => {
         let cancelled = false;
-        listMailboxes({ limit: 100 })
+        listMailboxes({ limit: 100 }, client)
             .then((result) => {
             if (cancelled) {
                 return;
@@ -256,14 +260,14 @@ export default function ComposeWindow({ session, onClose, onToggleMinimize, user
         async function load() {
             await Promise.all([
                 mailboxLoaded ||
-                    getMailbox(mailboxUid).then((result) => {
+                    getMailbox(mailboxUid, {}, client).then((result) => {
                         mailboxLoaded = true;
                         if (!cancelled) {
                             setMailbox(result);
                         }
                     }, () => undefined),
                 policyLoaded ||
-                    getEncryptionPolicy().then((result) => {
+                    getEncryptionPolicy(client).then((result) => {
                         policyLoaded = true;
                         if (!cancelled) {
                             setEncryptionPolicy(result);
@@ -287,7 +291,7 @@ export default function ComposeWindow({ session, onClose, onToggleMinimize, user
         // Cancellable so a slow response for a mailbox the user has since switched away from can't point
         // the new draft at the wrong mailbox's Drafts folder.
         let cancelled = false;
-        listFolders(mailboxUid)
+        listFolders(mailboxUid, client)
             .then((folders) => {
             if (!cancelled) {
                 setDraftsFolderUid(folders.find((f) => f.type === "drafts")?.uid);
@@ -326,7 +330,7 @@ export default function ComposeWindow({ session, onClose, onToggleMinimize, user
         for (const recipient of unchecked) {
             const key = addressCacheKey(recipient.address);
             inFlight.add(key);
-            void lookupKeys(mailbox.uid, recipient.address)
+            void lookupKeys(mailbox.uid, recipient.address, client)
                 .then((lookup) => ({ lookup }), () => null)
                 .then((result) => {
                 inFlight.delete(key);
@@ -387,7 +391,7 @@ export default function ComposeWindow({ session, onClose, onToggleMinimize, user
         if (!mailboxUid || contentReady || defaultSignature) {
             return;
         }
-        listMailSignatures(mailboxUid)
+        listMailSignatures(mailboxUid, {}, client)
             .then((signatures) => {
             const signature = signatures.find((s) => signatureContext === "new" ? s.isDefaultForNewMessages : s.isDefaultForReplyForward);
             setDefaultSignature({ html: signature?.contentHtml });
@@ -419,11 +423,11 @@ export default function ComposeWindow({ session, onClose, onToggleMinimize, user
         // `In-Reply-To`/`References` and groups the message into the thread being answered. Recorded on
         // every draft this window creates, including the replacement one a From switch makes - the thread
         // doesn't change because the sending mailbox did.
-        createDraft(mailboxUid, draftsFolderUid, session.threading)
+        createDraft(mailboxUid, draftsFolderUid, session.threading, client)
             .then((created) => {
             if (cancelled) {
                 // The sender changed while this was in flight - discard the now-orphaned draft.
-                void deleteMessage(created.uid, created.version).catch(() => undefined);
+                void deleteMessage(created.uid, created.version, client).catch(() => undefined);
                 return;
             }
             setDraft(created);
@@ -463,13 +467,13 @@ export default function ComposeWindow({ session, onClose, onToggleMinimize, user
         // Once it's out of `supersededDraftsRef` a landing save can't update `superseded.version` any more.
         const version = saved?.uid === superseded.uid ? saved.version : superseded.version;
         try {
-            await deleteMessage(superseded.uid, version);
+            await deleteMessage(superseded.uid, version, client);
         }
         catch {
             try {
-                const fresh = await getMessage(superseded.uid);
+                const fresh = await getMessage(superseded.uid, client);
                 if (isStillDraft(fresh, superseded.folderUid)) {
-                    await deleteMessage(fresh.uid, fresh.version);
+                    await deleteMessage(fresh.uid, fresh.version, client);
                 }
             }
             catch {
@@ -602,7 +606,7 @@ export default function ComposeWindow({ session, onClose, onToggleMinimize, user
      * current version. */
     async function refreshDraftVersion(uid) {
         try {
-            const fresh = await getMessage(uid);
+            const fresh = await getMessage(uid, client);
             setDraft((prev) => (prev?.uid === fresh.uid && fresh.version > prev.version ? { ...prev, version: fresh.version } : prev));
         }
         catch {
@@ -713,7 +717,7 @@ export default function ComposeWindow({ session, onClose, onToggleMinimize, user
             }
             pendingSaveRef.current = false;
             finishedRef.current = true;
-            if (!startSend(request)) {
+            if (!startSend(request, client)) {
                 finishedRef.current = false;
                 setSendError("This message is already being sent.");
                 return;
@@ -778,7 +782,7 @@ export default function ComposeWindow({ session, onClose, onToggleMinimize, user
                     bcc: parseAddresses(current.bcc),
                     subject: current.subject,
                     html: current.html,
-                });
+                }, client);
                 lastSavedRef.current = savedKey;
                 saveErrorRef.current = null;
                 // A From switch may have replaced the draft while this was in flight - never resurrect it,
@@ -818,13 +822,13 @@ export default function ComposeWindow({ session, onClose, onToggleMinimize, user
         const saved = await saveInFlightRef.current;
         const version = Math.max(current.version, saved?.uid === current.uid ? saved.version : 0);
         try {
-            await deleteMessage(current.uid, version);
+            await deleteMessage(current.uid, version, client);
         }
         catch (err) {
             if (!(err instanceof ApiRequestError) || (err.status !== 404 && err.status !== 409)) {
                 throw err;
             }
-            const fresh = await getMessage(current.uid).catch((getErr) => {
+            const fresh = await getMessage(current.uid, client).catch((getErr) => {
                 if (getErr instanceof ApiRequestError && getErr.status === 404) {
                     return null;
                 }
@@ -837,7 +841,7 @@ export default function ComposeWindow({ session, onClose, onToggleMinimize, user
             if (!isStillDraft(fresh, current.folderUid)) {
                 throw new ApiRequestError(NO_LONGER_A_DRAFT_MESSAGE, 409);
             }
-            await deleteMessage(fresh.uid, fresh.version);
+            await deleteMessage(fresh.uid, fresh.version, client);
         }
     }
     /**
@@ -985,7 +989,7 @@ export default function ComposeWindow({ session, onClose, onToggleMinimize, user
             await previous;
             try {
                 // Its answer (the new version) is what a later delete waits for through `saveInFlightRef`, like any save's.
-                return await assembleDraft(target.uid, { to: [], cc: [], bcc: [], subject: "", html: "" });
+                return await assembleDraft(target.uid, { to: [], cc: [], bcc: [], subject: "", html: "" }, client);
             }
             catch {
                 notify({

package/dist/apps/shared/components/mail/compose/ComposeWindowPlaceholder.js

@@ -5,10 +5,10 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 ///////////////////////////////////////////////////////////////////////////////
 import { useEffect } from "react";
 import { HiOutlineMinus, HiOutlineXMark } from "react-icons/hi2";
-import Skeleton from "@rapidmx/react-shared/components/feedback/Skeleton.js";
-import Alert from "@rapidmx/react-shared/components/feedback/Alert.js";
-import Button from "@rapidmx/react-shared/components/buttons/Button.js";
-import useIsMobile from "@rapidmx/react-shared/util/useIsMobile.js";
+import Skeleton from "../../../../../lib/components/feedback/Skeleton.js";
+import Alert from "../../../../../lib/components/feedback/Alert.js";
+import Button from "../../../../../lib/components/buttons/Button.js";
+import useIsMobile from "../../../../../lib/util/useIsMobile.js";
 import { markComposePhase } from "./composePerf.js";
 /**
  * What stands in for the compose window in the moment between clicking Compose/Reply/Forward and the window's code being

package/dist/apps/shared/components/mail/compose/EmojiPicker.js

@@ -1,6 +1,6 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { EMOJI_CATEGORIES } from "@rapidmx/react-shared/mail/compose/emojiData.js";
-import PopoverPortal from "@rapidmx/react-shared/components/overlays/PopoverPortal.js";
+import { EMOJI_CATEGORIES } from "../../../../../lib/mail/compose/emojiData.js";
+import PopoverPortal from "../../../../../lib/components/overlays/PopoverPortal.js";
 const CATEGORY_LABELS = {
     people: "Smileys & People",
     nature: "Animals & Nature",

package/dist/apps/shared/components/mail/compose/GifPicker.js

@@ -4,9 +4,9 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 // SPDX-License-Identifier: MPL-2.0
 ///////////////////////////////////////////////////////////////////////////////
 import { useEffect, useState } from "react";
-import { ApiRequestError } from "@rapidmx/react-shared/util/api.js";
-import { searchGifs } from "@rapidmx/react-shared/mail/compose/giphyApi.js";
-import PopoverPortal from "@rapidmx/react-shared/components/overlays/PopoverPortal.js";
+import { ApiRequestError } from "../../../../../lib/util/api.js";
+import { searchGifs } from "../../../../../lib/mail/compose/giphyApi.js";
+import PopoverPortal from "../../../../../lib/components/overlays/PopoverPortal.js";
 const SEARCH_DEBOUNCE_MS = 350;
 const WIDTH = 288;
 const HEIGHT = 320;

package/dist/apps/shared/components/mail/compose/RecipientInput.d.ts

@@ -1,5 +1,5 @@
 import React from "react";
-import { type ContactSuggestionOptions, type RecipientSuggestion } from "@rapidmx/react-shared/mail/directoryApi.js";
+import { type ContactSuggestionOptions, type RecipientSuggestion } from "../../../../../lib/mail/directoryApi.js";
 /** How long typing must pause before suggestions are requested. */
 export declare const RECIPIENT_SUGGESTION_DEBOUNCE_MS = 150;
 export interface RecipientInputProps {

package/dist/apps/shared/components/mail/compose/RecipientInput.js

@@ -6,7 +6,7 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useEffect, useLayoutEffect, useRef, useState } from "react";
 import { createPortal } from "react-dom";
 import { HiOutlineXMark } from "react-icons/hi2";
-import { fetchRecipientSuggestions, RECIPIENT_SUGGESTION_MIN_QUERY_LENGTH, } from "@rapidmx/react-shared/mail/directoryApi.js";
+import { fetchRecipientSuggestions, RECIPIENT_SUGGESTION_MIN_QUERY_LENGTH, } from "../../../../../lib/mail/directoryApi.js";
 import { formatRecipient, isValidRecipientAddress, parseRecipient, splitRecipientList, splitTypedRecipients } from "./recipients.js";
 /** How long typing must pause before suggestions are requested. */
 export const RECIPIENT_SUGGESTION_DEBOUNCE_MS = 150;

package/dist/apps/shared/components/mail/compose/ScheduleSendPicker.js

@@ -4,7 +4,7 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 // SPDX-License-Identifier: MPL-2.0
 ///////////////////////////////////////////////////////////////////////////////
 import { useState } from "react";
-import PopoverPortal from "@rapidmx/react-shared/components/overlays/PopoverPortal.js";
+import PopoverPortal from "../../../../../lib/components/overlays/PopoverPortal.js";
 /**
  * The "Send later" popover next to Compose's Send button — same `PopoverPortal` shell
  * `EmojiPicker`/`GifPicker`/`ResourcePicker` already use, just holding a single `datetime-local` input