@rapidmx/web-client 0.21.0 → 0.22.0

package/apps/www/settings/encryption/index.tsx

@@ -4,7 +4,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 import { pageTitle } from "../../../shared/navigation/pageTitle.js";
 import React, { FormEvent, useEffect, useState } from "react";
-import { ApiRequestError } from "@rapidmx/react-shared/util/api.js";
+import { ApiRequestError } from "../../../../lib/util/api.js";
 import {
     KeyVault,
     MasterKeyWrap,
@@ -19,7 +19,7 @@ import {
     rekey,
     removeMasterKeyWrap,
     startSignEnrollment,
-} from "@rapidmx/react-shared/crypto/keyvaultApi.js";
+} from "../../../../lib/crypto/keyvaultApi.js";
 import {
     ENCRYPTION_PRIVATE_KEY_AAD_PURPOSE,
     SIGNING_PRIVATE_KEY_AAD_PURPOSE,
@@ -27,27 +27,28 @@ import {
     destroyUnlockedKeys,
     getUnlockedKeys,
     unlockWithPassword,
-} from "@rapidmx/react-shared/crypto/keySession.js";
-import { IDLE_TIMEOUT_OPTIONS_MINUTES, getIdleTimeoutMinutes, setIdleTimeoutMinutes } from "@rapidmx/react-shared/crypto/idleTimeout.js";
+} from "../../../../lib/crypto/keySession.js";
+import { IDLE_TIMEOUT_OPTIONS_MINUTES, getIdleTimeoutMinutes, setIdleTimeoutMinutes } from "../../../../lib/crypto/idleTimeout.js";
 import {
     LOCAL_INDEX_SIZE_OPTIONS,
     getDefaultLocalIndexByteBudget,
     getLocalIndexByteBudget,
     setLocalIndexByteBudget,
 } from "../../../shared/search/localIndexSizePreference.js";
-import { fromBase64 } from "@rapidmx/react-shared/crypto/encoding.js";
-import { KeysLockedError, buildAad, generateMasterKey, openWithKey, sealWithKey } from "@rapidmx/react-shared/crypto/masterKey.js";
-import { buildEscrowWrap, buildPasswordWrap, buildRecoveryWraps } from "@rapidmx/react-shared/crypto/masterKeyWraps.js";
-import { exportPrivateKeyPkcs8, generateKeyPairWithCsr } from "@rapidmx/react-shared/crypto/keys.js";
-import { getMailbox } from "@rapidmx/react-shared/mail/mailApi.js";
+import { fromBase64 } from "../../../../lib/crypto/encoding.js";
+import { KeysLockedError, buildAad, generateMasterKey, openWithKey, sealWithKey } from "../../../../lib/crypto/masterKey.js";
+import { buildEscrowWrap, buildPasswordWrap, buildRecoveryWraps } from "../../../../lib/crypto/masterKeyWraps.js";
+import { exportPrivateKeyPkcs8, generateKeyPairWithCsr } from "../../../../lib/crypto/keys.js";
+import { getMailbox } from "../../../../lib/mail/mailApi.js";
+import { useApiClient } from "../../../../lib/util/apiClientContext.js";
 import SettingsShell, { SettingsShellProps, useSettingsShell } from "../../../shared/components/settings/layout/SettingsShell.js";
 import KeyEnrollmentGate from "../../../shared/components/layout/KeyEnrollmentGate.js";
 import { useUnlockPrompt } from "../../../shared/components/layout/UnlockPromptProvider.js";
 import { destroyLocalIndex } from "../../../shared/search/localIndexRpcClient.js";
 import { notifyApiError } from "../../../shared/notifications/apiErrors.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";
 import SigningCertificateCard, { SigningCertificateMode } from "../../../shared/components/settings/SigningCertificateCard.js";
 import { readStoredSignEnrollment, storeSignEnrollment } from "../../../shared/signing/enrollmentStorage.js";
 import {
@@ -235,6 +236,7 @@ function EncryptionContent({ canManageKeys }: { canManageKeys: boolean }) {
     const { mailboxUid, mailboxes } = useSettingsShell();
     const mailbox = mailboxes.find((mb) => mb.uid === mailboxUid)!;
     const { requestUnlock } = useUnlockPrompt();
+    const client = useApiClient();
 
     const [vault, setVault] = useState<KeyVault | null>(null);
     const [loadError, setLoadError] = useState<string | null>(null);
@@ -323,7 +325,7 @@ function EncryptionContent({ canManageKeys }: { canManageKeys: boolean }) {
      */
     async function verifiedUnlockedKeys(): Promise<{ current: UnlockedKeys; freshVault: KeyVault }> {
         const current = await currentUnlockedKeys();
-        const freshVault = await getKeyVault(mailboxUid!);
+        const freshVault = await getKeyVault(mailboxUid!, client);
         if (!(await masterKeyOpensVault(mailboxUid!, current.masterKey, freshVault))) {
             throw new StaleSessionKeysError();
         }
@@ -355,9 +357,9 @@ function EncryptionContent({ canManageKeys }: { canManageKeys: boolean }) {
         try {
             // Only reachable when mailbox.escrowScopeId is set (see the render guard below).
             const { current } = await verifiedUnlockedKeys();
-            const escrowInfo = await getEscrowInfo(mailboxUid!);
+            const escrowInfo = await getEscrowInfo(mailboxUid!, client);
             const wrap = await buildEscrowWrap(current.masterKey, escrowInfo.escrowScopeId, fromBase64(escrowInfo.publicKey.publicKey));
-            await addMasterKeyWrap(mailboxUid!, wrap);
+            await addMasterKeyWrap(mailboxUid!, wrap, undefined, client);
             await loadVault();
         } catch (err) {
             setEscrowError(errorMessage(err, "Could not add escrow protection for this mailbox."));
@@ -376,7 +378,7 @@ function EncryptionContent({ canManageKeys }: { canManageKeys: boolean }) {
             setSigningStatus("checking");
             release = watchEnrollment(mailboxUid!, storedId);
         } else if (canManageKeys) {
-            getCurrentSignEnrollment(mailboxUid!)
+            getCurrentSignEnrollment(mailboxUid!, client)
                 .then((current) => {
                     if (!cancelled && current) {
                         if (current.status === "pending") {
@@ -420,7 +422,7 @@ function EncryptionContent({ canManageKeys }: { canManageKeys: boolean }) {
         let timer: ReturnType<typeof setTimeout> | undefined;
         let attempts = 0;
         const refresh = () => {
-            getMailbox(mailboxUid!)
+            getMailbox(mailboxUid!, {}, client)
                 .then((refreshed) => {
                     if (cancelled) {
                         return;
@@ -446,7 +448,7 @@ function EncryptionContent({ canManageKeys }: { canManageKeys: boolean }) {
         setCancelEnrollmentError(null);
         setCancelingEnrollment(true);
         try {
-            const result = await cancelSignEnrollment(mailboxUid!, enrollmentId);
+            const result = await cancelSignEnrollment(mailboxUid!, enrollmentId, client);
             if (result.status === "pending") {
                 setCancelEnrollmentError("The enrollment couldn't be cancelled yet. Try again.");
             } else if (result.status === "failed") {
@@ -486,10 +488,14 @@ function EncryptionContent({ canManageKeys }: { canManageKeys: boolean }) {
                 privateKeyRaw,
                 buildAad(mailboxUid!, SIGNING_PRIVATE_KEY_AAD_PURPOSE),
             );
-            const { enrollmentId } = await startSignEnrollment(mailboxUid!, {
-                csr: csrPem,
-                wrappedKey: { ciphertext: wrappedKeySealed.ciphertext, nonce: wrappedKeySealed.nonce, algorithm: "AES-256-GCM" },
-            });
+            const { enrollmentId } = await startSignEnrollment(
+                mailboxUid!,
+                {
+                    csr: csrPem,
+                    wrappedKey: { ciphertext: wrappedKeySealed.ciphertext, nonce: wrappedKeySealed.nonce, algorithm: "AES-256-GCM" },
+                },
+                client,
+            );
             storeSignEnrollment(mailboxUid!, enrollmentId);
             // Followed from now on (and after this page is left): the server has just accepted it, so it is pending - no need to ask first.
             watchEnrollment(mailboxUid!, enrollmentId, { initial: { status: "pending" } });
@@ -514,7 +520,7 @@ function EncryptionContent({ canManageKeys }: { canManageKeys: boolean }) {
     }
 
     function loadVault() {
-        return getKeyVault(mailboxUid!)
+        return getKeyVault(mailboxUid!, client)
             .then(setVault)
             .catch((err) => setLoadError(err instanceof ApiRequestError ? err.message : "Could not load your key vault."));
     }
@@ -543,7 +549,7 @@ function EncryptionContent({ canManageKeys }: { canManageKeys: boolean }) {
         setRemovingMethod(key);
         setActionError(null);
         try {
-            await removeMasterKeyWrap(mailboxUid!, wrap.method, wrap.methodId);
+            await removeMasterKeyWrap(mailboxUid!, wrap.method, wrap.methodId, client);
             await loadVault();
         } catch (err) {
             // A pop-up (the confirmation is already closed); `actionError` keeps the guidance tied to the forms below.
@@ -570,7 +576,7 @@ function EncryptionContent({ canManageKeys }: { canManageKeys: boolean }) {
         try {
             const { current } = await verifiedUnlockedKeys();
             const wrap = await buildPasswordWrap(mailboxUid!, current.masterKey, newPassword);
-            await addMasterKeyWrap(mailboxUid!, wrap);
+            await addMasterKeyWrap(mailboxUid!, wrap, undefined, client);
             setNewPassword("");
             setConfirmNewPassword("");
             await loadVault();
@@ -636,19 +642,19 @@ function EncryptionContent({ canManageKeys }: { canManageKeys: boolean }) {
                 if (free <= 0) {
                     // Guaranteed non-empty by the shortfall check above.
                     const old = pendingOld.shift()!;
-                    await removeMasterKeyWrap(mailboxUid!, "recovery", old.methodId);
+                    await removeMasterKeyWrap(mailboxUid!, "recovery", old.methodId, client);
                     removedForThis = old;
                     removedEarly++;
                     free++;
                 }
-                await addMasterKeyWrap(mailboxUid!, { ...built.wraps[i], methodId: `recovery-${batch}-${i + 1}` });
+                await addMasterKeyWrap(mailboxUid!, { ...built.wraps[i], methodId: `recovery-${batch}-${i + 1}` }, undefined, client);
                 free--;
                 savedCodes.push(built.codes[i]);
             } catch (err) {
                 addError = err;
                 if (removedForThis) {
                     try {
-                        await addMasterKeyWrap(mailboxUid!, removedForThis);
+                        await addMasterKeyWrap(mailboxUid!, removedForThis, undefined, client);
                         removedEarly--;
                     } catch {
                         // Still counted in removedEarly, which the messages below report.
@@ -682,7 +688,7 @@ function EncryptionContent({ canManageKeys }: { canManageKeys: boolean }) {
             let notRemoved = 0;
             for (const wrap of pendingOld) {
                 try {
-                    await removeMasterKeyWrap(mailboxUid!, "recovery", wrap.methodId);
+                    await removeMasterKeyWrap(mailboxUid!, "recovery", wrap.methodId, client);
                 } catch {
                     notRemoved++;
                 }
@@ -744,7 +750,7 @@ function EncryptionContent({ canManageKeys }: { canManageKeys: boolean }) {
         let codes: string[];
         try {
             const current = await currentUnlockedKeys();
-            const [freshVault, freshMailbox] = await Promise.all([getKeyVault(mailboxUid!), getMailbox(mailboxUid!)]);
+            const [freshVault, freshMailbox] = await Promise.all([getKeyVault(mailboxUid!, client), getMailbox(mailboxUid!, {}, client)]);
             keys = freshMailbox.keys ?? [];
             // A session key that opens nothing is stale (rotated elsewhere) rather than missing some keys.
             if (!(await masterKeyOpensVault(mailboxUid!, current.masterKey, freshVault))) {
@@ -763,7 +769,7 @@ function EncryptionContent({ canManageKeys }: { canManageKeys: boolean }) {
             // rotating without it would end escrow coverage. restapi's own 409 stays the final word.
             if (freshVault.masterKeyWraps.some((w) => w.method === "escrow")) {
                 try {
-                    const escrowInfo = await getEscrowInfo(mailboxUid!);
+                    const escrowInfo = await getEscrowInfo(mailboxUid!, client);
                     masterKeyWraps.push(await buildEscrowWrap(mk, escrowInfo.escrowScopeId, fromBase64(escrowInfo.publicKey.publicKey)));
                 } catch (err) {
                     if (!(err instanceof ApiRequestError && err.status === 404)) {
@@ -771,7 +777,7 @@ function EncryptionContent({ canManageKeys }: { canManageKeys: boolean }) {
                     }
                 }
             }
-            await rekey(mailboxUid!, { wrappedKeys: rewrapped.wrappedKeys, masterKeyWraps, keys });
+            await rekey(mailboxUid!, { wrappedKeys: rewrapped.wrappedKeys, masterKeyWraps, keys }, client);
         } catch (err) {
             if (err instanceof UncoveredVaultKeysError) {
                 setActionError(

package/apps/www/settings/filters/[uid].tsx

@@ -4,21 +4,22 @@
 ///////////////////////////////////////////////////////////////////////////////
 import { pageTitle } from "../../../shared/navigation/pageTitle.js";
 import React, { FormEvent, useEffect, useState } from "react";
-import { ApiRequestError } from "@rapidmx/react-shared/util/api.js";
-import { Folder, listFolders } from "@rapidmx/react-shared/mail/mailApi.js";
+import { ApiRequestError } from "../../../../lib/util/api.js";
+import { Folder, listFolders } from "../../../../lib/mail/mailApi.js";
 import {
     MailFilterAction,
     MailFilterConditions,
     MailFilterRule,
     getMailFilterRule,
     updateMailFilterRule,
-} from "@rapidmx/react-shared/mail/mailFilterRulesApi.js";
+} from "../../../../lib/mail/mailFilterRulesApi.js";
 import SettingsShell, { SettingsShellProps, useSettingsShell } from "../../../shared/components/settings/layout/SettingsShell.js";
+import { useApiClient } from "../../../../lib/util/apiClientContext.js";
 import RuleBuilder, { hasConditions, RuleBuilderValue } from "../../../shared/components/rules/RuleBuilder.js";
 import { MAIL_FILTER_CONDITION_FIELDS, buildMailFilterActionTypes } from "./_mailFilterRuleConfig.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 Alert from "../../../../lib/components/feedback/Alert.js";
+import Button from "../../../../lib/components/buttons/Button.js";
+import FormField from "../../../../lib/components/forms/FormField.js";
 import { notifyApiError } from "../../../shared/notifications/apiErrors.js";
 
 const INPUT_CLASS =
@@ -36,6 +37,7 @@ function MailFilterDetailPage(props: MailFilterDetailPageProps) {
 
 function MailFilterDetailContent({ uid }: { uid: string }) {
     const { mailboxUid } = useSettingsShell();
+    const client = useApiClient();
     const [original, setOriginal] = useState<MailFilterRule | null>(null);
     const [name, setName] = useState("");
     const [rule, setRule] = useState<RuleBuilderValue<MailFilterConditions, MailFilterAction> | null>(null);
@@ -54,13 +56,13 @@ function MailFilterDetailContent({ uid }: { uid: string }) {
         if (!ruleMailboxUid) {
             return;
         }
-        listFolders(ruleMailboxUid).then(setFolders).catch(() => setFolders([]));
+        listFolders(ruleMailboxUid, client).then(setFolders).catch(() => setFolders([]));
     }, [ruleMailboxUid]);
 
     useEffect(() => {
         setLoading(true);
         setError(null);
-        getMailFilterRule(uid)
+        getMailFilterRule(uid, client)
             .then((loaded) => {
                 setOriginal(loaded);
                 if (loaded) {
@@ -98,12 +100,15 @@ function MailFilterDetailContent({ uid }: { uid: string }) {
         setSaving(true);
         setSaved(false);
         try {
-            const updated = await updateMailFilterRule({
-                uid: original!.uid,
-                version: original!.version,
-                name: name.trim(),
-                ...rule!,
-            });
+            const updated = await updateMailFilterRule(
+                {
+                    uid: original!.uid,
+                    version: original!.version,
+                    name: name.trim(),
+                    ...rule!,
+                },
+                client,
+            );
             setOriginal(updated);
             setSaved(true);
         } catch (err) {

package/apps/www/settings/filters/_mailFilterRuleConfig.tsx

@@ -3,8 +3,8 @@
 // SPDX-License-Identifier: MPL-2.0
 ///////////////////////////////////////////////////////////////////////////////
 import React from "react";
-import { Folder, FolderType } from "@rapidmx/react-shared/mail/mailApi.js";
-import { MailFilterAction } from "@rapidmx/react-shared/mail/mailFilterRulesApi.js";
+import { Folder, FolderType } from "../../../../lib/mail/mailApi.js";
+import { MailFilterAction } from "../../../../lib/mail/mailFilterRulesApi.js";
 import { ActionTypeDef, ConditionFieldDef } from "../../../shared/components/rules/RuleBuilder.js";
 
 const FIELD_INPUT_CLASS =

package/apps/www/settings/filters/index.tsx

@@ -4,11 +4,11 @@
 ///////////////////////////////////////////////////////////////////////////////
 import { pageTitle } from "../../../shared/navigation/pageTitle.js";
 import React, { useEffect, useState } from "react";
-import { ApiRequestError } from "@rapidmx/react-shared/util/api.js";
-import { MailFilterRule, listMailFilterRules } from "@rapidmx/react-shared/mail/mailFilterRulesApi.js";
+import { ApiRequestError } from "../../../../lib/util/api.js";
+import { MailFilterRule, listMailFilterRules } from "../../../../lib/mail/mailFilterRulesApi.js";
 import SettingsShell, { SettingsShellProps, useSettingsShell } from "../../../shared/components/settings/layout/SettingsShell.js";
-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";
 
 export type SettingsFiltersPageProps = Omit<SettingsShellProps, "active">;
 

package/apps/www/settings/filters/new/index.tsx

@@ -5,19 +5,20 @@
 import { pageTitle } from "../../../../shared/navigation/pageTitle.js";
 import { useNavigate } from "../../../../shared/navigation/index.js";
 import React, { FormEvent, useEffect, useState } from "react";
-import { ApiRequestError } from "@rapidmx/react-shared/util/api.js";
-import { Folder, listFolders } from "@rapidmx/react-shared/mail/mailApi.js";
+import { ApiRequestError } from "../../../../../lib/util/api.js";
+import { Folder, listFolders } from "../../../../../lib/mail/mailApi.js";
 import {
     MailFilterAction,
     MailFilterConditions,
     createMailFilterRule,
-} from "@rapidmx/react-shared/mail/mailFilterRulesApi.js";
+} from "../../../../../lib/mail/mailFilterRulesApi.js";
 import SettingsShell, { SettingsShellProps, useSettingsShell } from "../../../../shared/components/settings/layout/SettingsShell.js";
+import { useApiClient } from "../../../../../lib/util/apiClientContext.js";
 import RuleBuilder, { hasConditions, RuleBuilderValue } from "../../../../shared/components/rules/RuleBuilder.js";
 import { MAIL_FILTER_CONDITION_FIELDS, buildMailFilterActionTypes } from "../_mailFilterRuleConfig.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 Alert from "../../../../../lib/components/feedback/Alert.js";
+import Button from "../../../../../lib/components/buttons/Button.js";
+import FormField from "../../../../../lib/components/forms/FormField.js";
 import { notifyApiError } from "../../../../shared/notifications/apiErrors.js";
 
 const INPUT_CLASS =
@@ -54,6 +55,7 @@ function prefillFromSearch(search: string): { name: string; conditions: MailFilt
 function NewMailFilterForm() {
     const navigate = useNavigate();
     const { mailboxUid } = useSettingsShell();
+    const client = useApiClient();
     // Read once, when the form opens, and what the reader then edits is theirs. From the browser's own location rather than the router's (which a shallow
     // navigation could change under the form): this form is only mounted once the shell has fetched the mailbox, in the browser, so there is no
     // server render for the two to disagree with.
@@ -75,7 +77,7 @@ function NewMailFilterForm() {
     // `SettingsShell` only ever renders its children once `mailboxUid` has resolved — same established
     // non-null pattern as `apps/www/settings/auto-reply/index.tsx`.
     useEffect(() => {
-        listFolders(mailboxUid!)
+        listFolders(mailboxUid!, client)
             .then(setFolders)
             .catch((err) => setFolderError(err instanceof ApiRequestError ? err.message : "Could not load this mailbox's folders."));
     }, [mailboxUid]);
@@ -96,7 +98,7 @@ function NewMailFilterForm() {
 
         setSaving(true);
         try {
-            const created = await createMailFilterRule({ mailboxUid: mailboxUid!, name: name.trim(), ...rule });
+            const created = await createMailFilterRule({ mailboxUid: mailboxUid!, name: name.trim(), ...rule }, client);
             navigate(`/settings/filters/${encodeURIComponent(created.uid)}?mailboxUid=${encodeURIComponent(mailboxUid!)}`);
         } catch (err) {
             // A pop-up: `error` above is only the form's own validation.

package/apps/www/settings/labels/index.tsx

@@ -4,13 +4,14 @@
 ///////////////////////////////////////////////////////////////////////////////
 import { pageTitle } from "../../../shared/navigation/pageTitle.js";
 import React, { useEffect, useState } from "react";
-import { ApiRequestError } from "@rapidmx/react-shared/util/api.js";
-import { Label, createLabel, deleteLabel, listLabels, updateLabel } from "@rapidmx/react-shared/mail/labelsApi.js";
+import { ApiRequestError } from "../../../../lib/util/api.js";
+import { Label, createLabel, deleteLabel, listLabels, updateLabel } from "../../../../lib/mail/labelsApi.js";
 import SettingsShell, { SettingsShellProps, useSettingsShell } from "../../../shared/components/settings/layout/SettingsShell.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 Modal from "@rapidmx/react-shared/components/overlays/Modal.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 FormField from "../../../../lib/components/forms/FormField.js";
+import Modal from "../../../../lib/components/overlays/Modal.js";
 
 export type SettingsLabelsPageProps = Omit<SettingsShellProps, "active">;
 
@@ -26,6 +27,7 @@ const DEFAULT_COLOR = "#6366f1";
 
 function LabelsContent() {
     const { mailboxUid } = useSettingsShell();
+    const client = useApiClient();
     const [labels, setLabels] = useState<Label[]>([]);
     const [loading, setLoading] = useState(true);
     const [error, setError] = useState<string | null>(null);
@@ -45,7 +47,7 @@ function LabelsContent() {
     // `SettingsShell` only ever renders its children once `mailboxUid` has resolved — same established
     // non-null pattern as `apps/www/settings/auto-reply/index.tsx`.
     useEffect(() => {
-        listLabels(mailboxUid!)
+        listLabels(mailboxUid!, {}, client)
             .then(setLabels)
             .catch((err) => setError(err instanceof ApiRequestError ? err.message : "Could not load labels."))
             .finally(() => setLoading(false));
@@ -72,10 +74,10 @@ function LabelsContent() {
         setFormError(null);
         try {
             if (editing) {
-                const updated = await updateLabel({ uid: editing.uid, version: editing.version, name: formName, color: formColor });
+                const updated = await updateLabel({ uid: editing.uid, version: editing.version, name: formName, color: formColor }, client);
                 setLabels((prev) => prev.map((l) => (l.uid === updated.uid ? updated : l)));
             } else {
-                const created = await createLabel({ mailboxUid: mailboxUid!, name: formName, color: formColor });
+                const created = await createLabel({ mailboxUid: mailboxUid!, name: formName, color: formColor }, client);
                 setLabels((prev) => [...prev, created]);
             }
             setFormOpen(false);
@@ -90,7 +92,7 @@ function LabelsContent() {
         setDeleteBusy(true);
         setDeleteError(null);
         try {
-            await deleteLabel(deleting!.uid, deleting!.version);
+            await deleteLabel(deleting!.uid, deleting!.version, client);
             setLabels((prev) => prev.filter((l) => l.uid !== deleting!.uid));
             setDeleting(null);
         } catch (err) {

package/apps/www/settings/privacy/index.tsx

@@ -4,30 +4,31 @@
 ///////////////////////////////////////////////////////////////////////////////
 import { pageTitle } from "../../../shared/navigation/pageTitle.js";
 import React, { ChangeEvent, FormEvent, useEffect, useRef, useState } from "react";
-import { ApiRequestError } from "@rapidmx/react-shared/util/api.js";
+import { ApiRequestError } from "../../../../lib/util/api.js";
 import {
     DataExportFormat,
     DataExportRequest,
     createExportRequest,
     exportRequestDownloadUrl,
     listExportRequests,
-} from "@rapidmx/react-shared/mail/dataExportApi.js";
+} from "../../../../lib/mail/dataExportApi.js";
 import {
     MailboxImportFormat,
     MailboxImportRequest,
     listImportRequests,
     uploadMailboxImport,
-} from "@rapidmx/react-shared/mail/mailboxImportApi.js";
+} from "../../../../lib/mail/mailboxImportApi.js";
 import {
     DataSubjectErasureRequest,
     createErasureRequest,
     listErasureRequests,
-} from "@rapidmx/react-shared/mail/erasureRequestApi.js";
-import { Folder, listFolders } from "@rapidmx/react-shared/mail/mailApi.js";
+} from "../../../../lib/mail/erasureRequestApi.js";
+import { Folder, listFolders } from "../../../../lib/mail/mailApi.js";
+import { useApiClient } from "../../../../lib/util/apiClientContext.js";
 import SettingsShell, { SettingsShellProps, useSettingsShell } from "../../../shared/components/settings/layout/SettingsShell.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";
 import { notifyApiError } from "../../../shared/notifications/apiErrors.js";
 
 const NON_MAIL_FOLDER_TYPES = new Set(["calendar", "contacts", "tasks", "notes"]);
@@ -121,6 +122,7 @@ function OwnMailboxOnlyNotice({ ownedMailboxCount, ownMailboxLabel }: { ownedMai
 }
 
 function ExportSection({ mailboxUid, mailboxLabel }: { mailboxUid?: string; mailboxLabel: string }) {
+    const client = useApiClient();
     const [requests, setRequests] = useState<DataExportRequest[]>([]);
     const [loading, setLoading] = useState(true);
     const [loadError, setLoadError] = useState<string | null>(null);
@@ -133,7 +135,7 @@ function ExportSection({ mailboxUid, mailboxLabel }: { mailboxUid?: string; mail
     const loadSeq = useRef(0);
     function loadRequests() {
         const seq = ++loadSeq.current;
-        return listExportRequests()
+        return listExportRequests({}, client)
             .then((data) => {
                 if (seq === loadSeq.current) {
                     setRequests(data);
@@ -154,7 +156,7 @@ function ExportSection({ mailboxUid, mailboxLabel }: { mailboxUid?: string; mail
         e.preventDefault();
         setCreating(true);
         try {
-            await createExportRequest({ format });
+            await createExportRequest({ format }, client);
             await loadRequests();
         } catch (err) {
             notifyApiError(err, "Couldn't start the export");
@@ -233,6 +235,7 @@ function ExportSection({ mailboxUid, mailboxLabel }: { mailboxUid?: string; mail
 }
 
 function ImportSection({ mailboxUid }: { mailboxUid?: string }) {
+    const client = useApiClient();
     const [folders, setFolders] = useState<Folder[]>([]);
     const [targetFolderUid, setTargetFolderUid] = useState("");
     const [foldersError, setFoldersError] = useState<string | null>(null);
@@ -248,7 +251,7 @@ function ImportSection({ mailboxUid }: { mailboxUid?: string }) {
     const loadSeq = useRef(0);
     function loadRequests() {
         const seq = ++loadSeq.current;
-        return listImportRequests()
+        return listImportRequests({}, client)
             .then((data) => {
                 if (seq === loadSeq.current) {
                     setRequests(data);
@@ -265,7 +268,7 @@ function ImportSection({ mailboxUid }: { mailboxUid?: string }) {
         // Only reachable once mailboxUid is resolved - SettingsShell never renders this page's children
         // until then, the same invariant every other settings page in this codebase already relies on.
         void Promise.all([
-            listFolders(mailboxUid!)
+            listFolders(mailboxUid!, client)
                 .then((all) => {
                     const mailFolders = all.filter((f) => !NON_MAIL_FOLDER_TYPES.has(f.type));
                     setFolders(mailFolders);
@@ -377,6 +380,7 @@ function ImportSection({ mailboxUid }: { mailboxUid?: string }) {
 }
 
 function ErasureSection({ mailboxLabel }: { mailboxLabel: string }) {
+    const client = useApiClient();
     const [requests, setRequests] = useState<DataSubjectErasureRequest[]>([]);
     const [loading, setLoading] = useState(true);
     const [loadError, setLoadError] = useState<string | null>(null);
@@ -385,7 +389,7 @@ function ErasureSection({ mailboxLabel }: { mailboxLabel: string }) {
     const [createError, setCreateError] = useState<string | null>(null);
 
     function loadRequests() {
-        return listErasureRequests()
+        return listErasureRequests({}, client)
             .then(setRequests)
             .catch((err) => setLoadError(err instanceof ApiRequestError ? err.message : "Could not load your erasure requests."));
     }
@@ -404,7 +408,7 @@ function ErasureSection({ mailboxLabel }: { mailboxLabel: string }) {
         setCreateError(null);
         setCreating(true);
         try {
-            await createErasureRequest();
+            await createErasureRequest(client);
             setConfirming(false);
             await loadRequests();
         } catch (err) {

package/apps/www/settings/profile/index.tsx

@@ -4,11 +4,12 @@
 ///////////////////////////////////////////////////////////////////////////////
 import { pageTitle } from "../../../shared/navigation/pageTitle.js";
 import React, { FormEvent, useMemo, useState } from "react";
-import { FreeBusyVisibility, freeBusyVisibilityOf, isSharedWithMe, updateMailbox } from "@rapidmx/react-shared/mail/mailApi.js";
-import { DEFAULT_TIME_ZONE, deviceTimeZone, timeZoneOptions } from "@rapidmx/react-shared/util/timeZone.js";
+import { FreeBusyVisibility, freeBusyVisibilityOf, isSharedWithMe, updateMailbox } from "../../../../lib/mail/mailApi.js";
+import { DEFAULT_TIME_ZONE, deviceTimeZone, timeZoneOptions } from "../../../../lib/util/timeZone.js";
 import SettingsShell, { SettingsShellProps, useSettingsShell } from "../../../shared/components/settings/layout/SettingsShell.js";
-import Button from "@rapidmx/react-shared/components/buttons/Button.js";
-import FormField from "@rapidmx/react-shared/components/forms/FormField.js";
+import { useApiClient } from "../../../../lib/util/apiClientContext.js";
+import Button from "../../../../lib/components/buttons/Button.js";
+import FormField from "../../../../lib/components/forms/FormField.js";
 import { notifyApiError } from "../../../shared/notifications/apiErrors.js";
 
 export type SettingsProfilePageProps = Omit<SettingsShellProps, "active">;
@@ -60,6 +61,7 @@ function ProfileContent() {
     // `SettingsShell` only ever renders its children once `mailboxes` has loaded and `mailboxUid` has
     // resolved to one of them — same established non-null pattern as `apps/www/settings/auto-reply/index.tsx`.
     const mailbox = mailboxes.find((mb) => mb.uid === mailboxUid)!;
+    const client = useApiClient();
 
     const deviceZone = useMemo(() => deviceTimeZone(), []);
     // What the server holds, which is what "changed" is measured against - moved along by each successful save.
@@ -107,13 +109,16 @@ function ProfileContent() {
 
         setSaving(true);
         try {
-            const updated = await updateMailbox({
-                uid: mailbox.uid,
-                version,
-                ...(nameChanged && { displayName: name }),
-                ...(zoneChanged && { timezone }),
-                ...(freeBusyChanged && { freeBusyVisibility: freeBusy }),
-            });
+            const updated = await updateMailbox(
+                {
+                    uid: mailbox.uid,
+                    version,
+                    ...(nameChanged && { displayName: name }),
+                    ...(zoneChanged && { timezone }),
+                    ...(freeBusyChanged && { freeBusyVisibility: freeBusy }),
+                },
+                client,
+            );
             setVersion(updated.version);
             setSavedName(name);
             setSavedZone(timezone);