@rapidmx/web-client 0.20.0 → 0.22.0

package/dist/apps/shared/components/layout/UserMenu.js

@@ -5,10 +5,11 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 ///////////////////////////////////////////////////////////////////////////////
 import { useContext, useEffect, useLayoutEffect, useRef, useState } from "react";
 import { createPortal } from "react-dom";
-import useIsMobile from "@rapidmx/react-shared/util/useIsMobile.js";
+import useIsMobile from "../../../../lib/util/useIsMobile.js";
 import { HiOutlineArrowUturnLeft, HiOutlineShieldCheck } from "react-icons/hi2";
-import { formatProfileName, getMyProfile, getMyUsername, profileInitials } from "@rapidmx/react-shared/auth/profileApi.js";
-import { listMailboxes } from "@rapidmx/react-shared/mail/mailApi.js";
+import { formatProfileName, getMyProfile, getMyUsername, profileInitials } from "../../../../lib/auth/profileApi.js";
+import { listMailboxes } from "../../../../lib/mail/mailApi.js";
+import { useApiClient } from "../../../../lib/util/apiClientContext.js";
 import { accountUrlOf } from "../../auth/accountUrl.js";
 import { DEFAULT_TRUSTED_ROLES, lookUpAdminAccess } from "../../auth/adminAccess.js";
 import { ariaKeyShortcuts } from "../../keyboard/format.js";
@@ -42,6 +43,7 @@ function Avatar({ profile, initials, large }) {
  */
 export default function UserMenu({ userUid, authServerUrl, onSignOut, showAdminLink, detectAdmin, trustedRoles = DEFAULT_TRUSTED_ROLES, showSettingsLink, showNotificationSettings, onShowShortcuts, placement = "down", onShowNotifications, showMailLink, unseenErrors = 0, }) {
     const env = useKeyEnvironment();
+    const client = useApiClient();
     // A phone has no keyboard to speak of, so the shortcuts list (and the dialog it opens) has nothing to offer there.
     const isMobile = useIsMobile();
     const [open, setOpen] = useState(false);
@@ -93,7 +95,7 @@ export default function UserMenu({ userUid, authServerUrl, onSignOut, showAdminL
         }
         let cancelled = false;
         // A failure (no mail server, no access) is just "no mailbox name" - the username is asked for next.
-        listMailboxes({ limit: 50 }).then((list) => !cancelled && setOwnListing(Array.isArray(list) ? list : []), () => !cancelled && setOwnListing([]));
+        listMailboxes({ limit: 50 }, client).then((list) => !cancelled && setOwnListing(Array.isArray(list) ? list : []), () => !cancelled && setOwnListing([]));
         return () => {
             cancelled = true;
         };

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

@@ -1,6 +1,6 @@
 import React from "react";
-import { Message } from "@rapidmx/react-shared/mail/mailApi.js";
-import { ConversationSummary } from "@rapidmx/react-shared/mail/conversationsApi.js";
+import { Message } from "../../../../lib/mail/mailApi.js";
+import { ConversationSummary } from "../../../../lib/mail/conversationsApi.js";
 /** A conversation row of the list. `mailboxUid` is set only by a view that merges several mailboxes ("All Mailboxes"), whose rows are
  * each from a different one; a list of one mailbox's own leaves it out and every row is that mailbox's. */
 export type ListedConversation = ConversationSummary & {

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

@@ -5,11 +5,12 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 ///////////////////////////////////////////////////////////////////////////////
 import { useState } from "react";
 import { HiChevronDown, HiChevronRight, HiOutlineFlag, HiOutlinePaperClip } from "react-icons/hi2";
-import { ApiRequestError } from "@rapidmx/react-shared/util/api.js";
-import { formatMailAddress } from "@rapidmx/react-shared/mail/mailAddress.js";
+import { ApiRequestError } from "../../../../lib/util/api.js";
+import { formatMailAddress } from "../../../../lib/mail/mailAddress.js";
 import MailAddress from "./MailAddress.js";
 import { EncryptedPreview, conversationLooksEncrypted } from "./reading/EncryptedPreview.js";
-import { listConversationMessages } from "@rapidmx/react-shared/mail/conversationsApi.js";
+import { listConversationMessages } from "../../../../lib/mail/conversationsApi.js";
+import { useApiClient } from "../../../../lib/util/apiClientContext.js";
 import { ROW_FOCUS_CLASS, UnreadBar, UnreadLabel, dateClass, isUnread, rowClass, senderClass, subjectClass } from "./unreadStyle.js";
 import SwipeRow from "./SwipeRow.js";
 import InviteRowChip from "./invite/InviteRowChip.js";
@@ -35,6 +36,7 @@ function participantList(conversation) {
  * its own name.
  */
 export default function ConversationList({ conversations, mailboxUid, selectedUid, onOpenMessage, messageOverrides, onMeetingResponded, selectMode, selectedConversationIds, onToggleSelected, swipe, newestFirst, }) {
+    const client = useApiClient();
     const [expanded, setExpanded] = useState(new Set());
     const [messagesById, setMessagesById] = useState({});
     const [loadingIds, setLoadingIds] = useState(new Set());
@@ -65,7 +67,7 @@ export default function ConversationList({ conversations, mailboxUid, selectedUi
             delete next[id];
             return next;
         });
-        listConversationMessages(conversation.mailboxUid ?? mailboxUid, conversation.conversationId)
+        listConversationMessages(conversation.mailboxUid ?? mailboxUid, conversation.conversationId, {}, client)
             .then((loaded) => setMessagesById((prev) => ({ ...prev, [id]: loaded })))
             .catch((err) => setErrorsById((prev) => ({
             ...prev,

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

@@ -1,7 +1,7 @@
 import React from "react";
-import { Folder, Message } from "@rapidmx/react-shared/mail/mailApi.js";
-import { ConversationSummary } from "@rapidmx/react-shared/mail/conversationsApi.js";
-import { Label } from "@rapidmx/react-shared/mail/labelsApi.js";
+import { Folder, Message } from "../../../../lib/mail/mailApi.js";
+import { ConversationSummary } from "../../../../lib/mail/conversationsApi.js";
+import { Label } from "../../../../lib/mail/labelsApi.js";
 /** One request's worth of the thread. The server's own default for `listConversationMessages()`. */
 export declare const THREAD_PAGE_SIZE = 100;
 /**

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

@@ -5,10 +5,11 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
 ///////////////////////////////////////////////////////////////////////////////
 import { useEffect, useLayoutEffect, useRef, useState } from "react";
 import { flushSync } from "react-dom";
-import { ApiRequestError } from "@rapidmx/react-shared/util/api.js";
-import { listAttachments } from "@rapidmx/react-shared/mail/mailApi.js";
-import { listConversationMessages } from "@rapidmx/react-shared/mail/conversationsApi.js";
-import Alert from "@rapidmx/react-shared/components/feedback/Alert.js";
+import { ApiRequestError } from "../../../../lib/util/api.js";
+import { listAttachments } from "../../../../lib/mail/mailApi.js";
+import { listConversationMessages } from "../../../../lib/mail/conversationsApi.js";
+import { useApiClient } from "../../../../lib/util/apiClientContext.js";
+import Alert from "../../../../lib/components/feedback/Alert.js";
 import MessageDetailPane from "./MessageDetailPane.js";
 import { EncryptedPreview, displaySubject } from "./reading/EncryptedPreview.js";
 import { CollapsedCard, SkeletonCards, SubjectCard } from "./reading/MessageCard.js";
@@ -65,14 +66,14 @@ function scrollingAncestor(node) {
  * The pane reads newest first always, whatever the *list* is sorted by: it is the reading order for mail,
  * and it means the message a conversation row stands for is the entry at the top.
  */
-async function loadThread(mailboxUid, conversationId) {
+async function loadThread(mailboxUid, conversationId, client) {
     const messages = [];
     let more = true;
     while (more && messages.length < THREAD_MESSAGE_LIMIT) {
         const page = await listConversationMessages(mailboxUid, conversationId, {
             page: messages.length / THREAD_PAGE_SIZE,
             limit: THREAD_PAGE_SIZE,
-        });
+        }, client);
         messages.push(...page);
         // A short page is the last one; a full page means asking for another.
         more = page.length === THREAD_PAGE_SIZE;
@@ -123,6 +124,7 @@ function hasFocusRing(element) {
  */
 export default function ConversationThreadPane({ conversation, mailboxUid, selectedUid, folders, labels, onMessagePatched, onMessageRemoved, onLabelCreated, onFolderCreated, shortcuts, }) {
     const { trackMessageChange, live } = useMailShell();
+    const client = useApiClient();
     // The replies and forwards this tab has sent, drawn at the top of the thread they continue until the server's own copy is in it.
     const outgoing = useOutgoingReplies();
     const [messages, setMessages] = useState([]);
@@ -181,7 +183,7 @@ export default function ConversationThreadPane({ conversation, mailboxUid, selec
             return;
         }
         setLoading(true);
-        loadThread(mailboxUid, conversationId)
+        loadThread(mailboxUid, conversationId, client)
             .then((loaded) => {
             if (generation !== generationRef.current)
                 return;
@@ -200,7 +202,7 @@ export default function ConversationThreadPane({ conversation, mailboxUid, selec
             if (generation === generationRef.current)
                 setLoading(false);
         });
-    }, [conversationId, mailboxUid]);
+    }, [conversationId, mailboxUid, client]);
     // Opening the thread, and opening a different message of the same thread, both set the run of expanded
     // messages and ask for that message to be scrolled to. `messages` is a dependency because the thread's
     // messages arrive after the click that selected one of them; the ref guard keeps a later change to
@@ -277,7 +279,7 @@ export default function ConversationThreadPane({ conversation, mailboxUid, selec
                 continue;
             if (message.hasAttachments && !attachmentsRequestedRef.current.has(uid)) {
                 attachmentsRequestedRef.current.add(uid);
-                listAttachments(message.folderUid, uid)
+                listAttachments(message.folderUid, uid, client)
                     .then((loaded) => {
                     if (generation === generationRef.current) {
                         setAttachmentsByUid((prev) => ({ ...prev, [uid]: loaded }));
@@ -311,7 +313,7 @@ export default function ConversationThreadPane({ conversation, mailboxUid, selec
                 });
             }
         }
-    }, [expandedUids, messages]);
+    }, [expandedUids, messages, client]);
     /**
      * Reads the thread again, quietly: what is on screen stays until the answer is here (a read that fails changes nothing), a message that arrived
      * is added at the top, and the reader's expanded and collapsed cards are left as they are. A message this tab sent - which the server has
@@ -324,7 +326,7 @@ export default function ConversationThreadPane({ conversation, mailboxUid, selec
             return;
         }
         const generation = generationRef.current;
-        loadThread(mailboxUid, id).then((loaded) => {
+        loadThread(mailboxUid, id, client).then((loaded) => {
             if (generation !== generationRef.current)
                 return;
             const current = loaded.messages.filter((message) => !removedRef.current.has(message.uid));

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

@@ -5,10 +5,11 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
 ///////////////////////////////////////////////////////////////////////////////
 import { useId, useState } from "react";
 import { HiOutlineCalendarDays, HiOutlineCheck } from "react-icons/hi2";
-import { acceptProposal, proposeNewTime, removeMessageInvite, respondToMessageInvite, } from "@rapidmx/react-shared/calendar/inviteApi.js";
-import { guestPermissionsOf } from "@rapidmx/react-shared/calendar/calendarApi.js";
-import { formatMailAddress } from "@rapidmx/react-shared/mail/mailAddress.js";
-import Button from "@rapidmx/react-shared/components/buttons/Button.js";
+import { acceptProposal, proposeNewTime, removeMessageInvite, respondToMessageInvite, } from "../../../../lib/calendar/inviteApi.js";
+import { guestPermissionsOf } from "../../../../lib/calendar/calendarApi.js";
+import { formatMailAddress } from "../../../../lib/mail/mailAddress.js";
+import { useApiClient } from "../../../../lib/util/apiClientContext.js";
+import Button from "../../../../lib/components/buttons/Button.js";
 import EventDescriptionView from "../calendar/EventDescriptionView.js";
 import RequestChangeForm from "../calendar/RequestChangeForm.js";
 import { VISIBILITY_LABEL, describeGuestPermissions } from "../calendar/eventFormat.js";
@@ -68,6 +69,7 @@ function attendeeSummary(attendees) {
  * An answer that arrives after the message changed or this was unmounted is dropped.
  */
 export default function InviteCard({ messageUid, headingLevel = 2 }) {
+    const client = useApiClient();
     const { invite, setInvite } = useMessageInvite(messageUid);
     const [pending, setPending] = useState(null);
     const [proposing, setProposing] = useState(false);
@@ -96,7 +98,7 @@ export default function InviteCard({ messageUid, headingLevel = 2 }) {
         }
     }
     async function sendProposal(proposal) {
-        if (await run("propose", "Couldn't send the proposed time", () => proposeNewTime(messageUid, proposal))) {
+        if (await run("propose", "Couldn't send the proposed time", () => proposeNewTime(messageUid, proposal, client))) {
             setProposing(false);
             setProposed(true);
         }
@@ -129,10 +131,10 @@ export default function InviteCard({ messageUid, headingLevel = 2 }) {
         (invite.onCalendar && !!invite.calendarEventUid);
     return (_jsxs("section", { "aria-labelledby": headingId, className: "rounded-sm border border-border bg-surface-alt px-3 py-3 flex flex-col gap-2 text-sm text-text", children: [_jsxs(Heading, { id: headingId, className: "flex items-center gap-2 text-sm font-semibold", children: [_jsx(HiOutlineCalendarDays, { size: 16, "aria-hidden": "true", className: "shrink-0" }), changeRequest ? CHANGE_REQUEST_HEADING : (HEADINGS[method] ?? "Calendar event")] }), isReply && (_jsxs("p", { className: "break-words", children: [_jsx("span", { className: "font-semibold", children: senderName }), " ", (sender?.responseStatus && REPLY_VERBS[sender.responseStatus]) ?? "responded", "."] })), isCounter && !changeRequest && (_jsxs("p", { className: "break-words", children: [_jsx("span", { className: "font-semibold", children: senderName }), " proposed a new time", when ? _jsxs(_Fragment, { children: [": ", when] }) : "."] })), changeRequest && (_jsx("p", { className: "break-words", children: changeRequest.applied ? (_jsxs(_Fragment, { children: [_jsx("span", { className: "font-semibold", children: senderName }), "\u2019s change was applied."] })) : (_jsxs(_Fragment, { children: [_jsx("span", { className: "font-semibold", children: senderName }), " requested a change."] })) })), _jsx("p", { className: "font-medium break-words", children: title }), !isReply && (_jsxs("dl", { className: "grid grid-cols-[auto_minmax(0,1fr)] gap-x-3 gap-y-1", children: [when && (!isCounter || !!changeRequest) && (_jsxs(_Fragment, { children: [_jsx("dt", { className: "text-text-muted", children: "When" }), _jsxs("dd", { className: "break-words", children: [when, invite.recurring && _jsx("span", { className: "text-text-muted", children: " (Repeats)" })] })] })), invite.location && (_jsxs(_Fragment, { children: [_jsx("dt", { className: "text-text-muted", children: "Where" }), _jsx("dd", { className: "break-words", children: invite.location })] })), hasDescription && (!isCounter || !!changeRequest) && (_jsxs(_Fragment, { children: [_jsx("dt", { className: "text-text-muted", children: "Description" }), _jsx("dd", { className: "break-words", children: _jsx(EventDescriptionView, { html: invite.descriptionHtml, text: invite.description }) })] })), invite.organizer && !isCounter && (_jsxs(_Fragment, { children: [_jsx("dt", { className: "text-text-muted", children: "Organizer" }), _jsx("dd", { className: "break-words", children: formatMailAddress(invite.organizer) })] })), attendees && (!isCounter || !!changeRequest) && (_jsxs(_Fragment, { children: [_jsx("dt", { className: "text-text-muted", children: "Attendees" }), _jsx("dd", { className: "break-words", children: attendees })] })), visibility && !isCounter && (_jsxs(_Fragment, { children: [_jsx("dt", { className: "text-text-muted", children: "Visibility" }), _jsx("dd", { className: "break-words", children: visibility })] }))] })), isReply && when && _jsx("p", { className: "text-text-muted break-words", children: when }), conflicts && (_jsxs("p", { className: "text-danger break-words", children: [_jsx("span", { className: "font-medium", children: "Conflicts with:" }), " ", conflicts] })), invite.guestPermissions && !isReply && !isCounter && method !== "CANCEL" && (_jsx("p", { className: "text-xs text-text-muted break-words", children: describeGuestPermissions(permissions) })), invite.isOrganizer && !isReply && !isCounter && _jsx("p", { className: "text-text-muted", children: "You are the organizer of this meeting." }), method === "CANCEL" && _jsx("p", { className: "font-medium text-danger", children: "This meeting was canceled." }), invite.response && !invite.isOrganizer && !isReply && !isCounter && (_jsx("p", { role: "status", className: `font-medium ${ANSWER_CLASS[invite.response]}`, children: ANSWER_TEXT[invite.response] })), isCounter && invite.response === "accepted" && !changeRequest?.applied && (_jsx("p", { role: "status", className: "font-medium text-success", children: "You accepted the proposed time." })), proposed && (_jsx("p", { role: "status", className: "font-medium text-text", children: "Your proposed time was sent to the organizer." })), requested && (_jsx("p", { role: "status", className: "font-medium text-text", children: "Your change was sent to the organizer." })), invite.outdated && _jsx("p", { className: "text-xs text-text-muted", children: "A newer version of this meeting is already on your calendar." }), hasActions && (_jsxs("div", { className: "flex flex-wrap items-center gap-2", children: [showResponses && (_jsx("div", { role: "group", "aria-label": "Respond to this meeting", "aria-busy": busy || undefined, className: "flex flex-wrap gap-2", children: RESPONSES.map(({ response, label, failure }) => {
                             const current = invite.response === response;
-                            return (_jsxs(Button, { type: "button", variant: "secondary", className: ["!w-auto", current ? "!bg-primary/10 !border-primary disabled:!opacity-100" : ""].join(" "), "aria-pressed": current, "aria-busy": pending === response || undefined, loading: pending === response, disabled: busy || current, onClick: () => void run(response, failure, () => respondToMessageInvite(messageUid, response)), children: [current && _jsx(HiOutlineCheck, { size: 14, "aria-hidden": "true" }), label] }, response));
-                        }) })), invite.canPropose && !proposing && (_jsx(Button, { type: "button", variant: "text", disabled: busy, onClick: () => setProposing(true), children: "Propose new time" })), canRequest && !requesting && (_jsx(Button, { type: "button", variant: "secondary", className: "!w-auto", disabled: busy, onClick: () => setRequesting(true), children: invite.canRequestChange ? "Request a change" : "Add guests" })), invite.canAcceptProposal && invite.response !== "accepted" && (_jsx(Button, { type: "button", variant: "secondary", className: "!w-auto", "aria-busy": pending === "acceptProposal" || undefined, loading: pending === "acceptProposal", disabled: busy, onClick: () => void run("acceptProposal", "Couldn't accept the proposed time", () => acceptProposal(messageUid)), children: "Accept proposal" })), invite.canAdd && (_jsx(Button, { type: "button", variant: "secondary", className: "!w-auto", "aria-busy": pending === "add" || undefined, loading: pending === "add", disabled: busy, 
+                            return (_jsxs(Button, { type: "button", variant: "secondary", className: ["!w-auto", current ? "!bg-primary/10 !border-primary disabled:!opacity-100" : ""].join(" "), "aria-pressed": current, "aria-busy": pending === response || undefined, loading: pending === response, disabled: busy || current, onClick: () => void run(response, failure, () => respondToMessageInvite(messageUid, response, client)), children: [current && _jsx(HiOutlineCheck, { size: 14, "aria-hidden": "true" }), label] }, response));
+                        }) })), invite.canPropose && !proposing && (_jsx(Button, { type: "button", variant: "text", disabled: busy, onClick: () => setProposing(true), children: "Propose new time" })), canRequest && !requesting && (_jsx(Button, { type: "button", variant: "secondary", className: "!w-auto", disabled: busy, onClick: () => setRequesting(true), children: invite.canRequestChange ? "Request a change" : "Add guests" })), invite.canAcceptProposal && invite.response !== "accepted" && (_jsx(Button, { type: "button", variant: "secondary", className: "!w-auto", "aria-busy": pending === "acceptProposal" || undefined, loading: pending === "acceptProposal", disabled: busy, onClick: () => void run("acceptProposal", "Couldn't accept the proposed time", () => acceptProposal(messageUid, client)), children: "Accept proposal" })), invite.canAdd && (_jsx(Button, { type: "button", variant: "secondary", className: "!w-auto", "aria-busy": pending === "add" || undefined, loading: pending === "add", disabled: busy, 
                         // A published event has no organizer to answer, so adding it is accepting it: the server sends no reply.
-                        onClick: () => void run("add", "Couldn't add this event to your calendar", () => respondToMessageInvite(messageUid, "accepted")), children: "Add to calendar" })), invite.canRemove && (_jsx(Button, { type: "button", variant: "secondary", className: "!w-auto", "aria-busy": pending === "remove" || undefined, loading: pending === "remove", disabled: busy, onClick: () => void run("remove", "Couldn't remove this meeting from your calendar", () => removeMessageInvite(messageUid)), children: "Remove from calendar" })), invite.onCalendar && invite.calendarEventUid && (_jsx("a", { href: calendarHref(invite), className: "text-sm font-medium text-primary-dark hover:underline", children: "Open in Calendar" }))] })), requesting && (_jsx("div", { className: "rounded-md bg-surface p-3", children: _jsx(RequestChangeForm, { subject: {
+                        onClick: () => void run("add", "Couldn't add this event to your calendar", () => respondToMessageInvite(messageUid, "accepted", client)), children: "Add to calendar" })), invite.canRemove && (_jsx(Button, { type: "button", variant: "secondary", className: "!w-auto", "aria-busy": pending === "remove" || undefined, loading: pending === "remove", disabled: busy, onClick: () => void run("remove", "Couldn't remove this meeting from your calendar", () => removeMessageInvite(messageUid, client)), children: "Remove from calendar" })), invite.onCalendar && invite.calendarEventUid && (_jsx("a", { href: calendarHref(invite), className: "text-sm font-medium text-primary-dark hover:underline", children: "Open in Calendar" }))] })), requesting && (_jsx("div", { className: "rounded-md bg-surface p-3", children: _jsx(RequestChangeForm, { subject: {
                         uid: invite.calendarEventUid,
                         title: invite.summary ?? "",
                         location: invite.location,

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

@@ -4,8 +4,8 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 // SPDX-License-Identifier: MPL-2.0
 ///////////////////////////////////////////////////////////////////////////////
 import { useEffect, useState } from "react";
-import Alert from "@rapidmx/react-shared/components/feedback/Alert.js";
-import Button from "@rapidmx/react-shared/components/buttons/Button.js";
+import Alert from "../../../../lib/components/feedback/Alert.js";
+import Button from "../../../../lib/components/buttons/Button.js";
 import { ReadingPaneSkeleton } from "./reading/MessageCard.js";
 /**
  * The reading pane (`MessageDetailPane`, and the thread pane that stacks it) is only rendered once a message is selected, and

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

@@ -1,5 +1,5 @@
 import React from "react";
-import { MailAddressLike } from "@rapidmx/react-shared/mail/mailAddress.js";
+import { MailAddressLike } from "../../../../lib/mail/mailAddress.js";
 export interface MailAddressProps {
     /** A message's `from`, a recipient, a conversation participant. */
     recipient: MailAddressLike;

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

@@ -4,7 +4,7 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
 // SPDX-License-Identifier: MPL-2.0
 ///////////////////////////////////////////////////////////////////////////////
 import React, { useState } from "react";
-import { formatMailAddress, splitMailAddress } from "@rapidmx/react-shared/mail/mailAddress.js";
+import { formatMailAddress, splitMailAddress } from "../../../../lib/mail/mailAddress.js";
 /**
  * A sender or recipient as one compact line for a dense row: the name, when there is one, with the real address in muted
  * type after it - `Jean-Philippe  <jp@example.com>` - or the bare address without a name. The address is never left out,

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

@@ -1,6 +1,6 @@
 import React from "react";
-import { MessageListFilter, MessageListSort, MessageSortOrder } from "@rapidmx/react-shared/mail/mailApi.js";
-import { Label } from "@rapidmx/react-shared/mail/labelsApi.js";
+import { MessageListFilter, MessageListSort, MessageSortOrder } from "../../../../lib/mail/mailApi.js";
+import { Label } from "../../../../lib/mail/labelsApi.js";
 export interface MailListToolbarProps {
     sortBy: MessageListSort;
     sortOrder: MessageSortOrder;

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;