@rapidmx/web-client 0.20.0 → 0.22.0

package/dist/apps/www/settings/encryption/index.js

@@ -5,24 +5,25 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
 ///////////////////////////////////////////////////////////////////////////////
 import { pageTitle } from "../../../shared/navigation/pageTitle.js";
 import { useEffect, useState } from "react";
-import { ApiRequestError } from "@rapidmx/react-shared/util/api.js";
-import { addMasterKeyWrap, cancelSignEnrollment, findActivePublicKey, getCurrentSignEnrollment, getEscrowInfo, getKeyVault, rekey, removeMasterKeyWrap, startSignEnrollment, } from "@rapidmx/react-shared/crypto/keyvaultApi.js";
-import { ENCRYPTION_PRIVATE_KEY_AAD_PURPOSE, SIGNING_PRIVATE_KEY_AAD_PURPOSE, destroyUnlockedKeys, getUnlockedKeys, unlockWithPassword, } from "@rapidmx/react-shared/crypto/keySession.js";
-import { IDLE_TIMEOUT_OPTIONS_MINUTES, getIdleTimeoutMinutes, setIdleTimeoutMinutes } from "@rapidmx/react-shared/crypto/idleTimeout.js";
+import { ApiRequestError } from "../../../../lib/util/api.js";
+import { addMasterKeyWrap, cancelSignEnrollment, findActivePublicKey, getCurrentSignEnrollment, getEscrowInfo, getKeyVault, rekey, removeMasterKeyWrap, startSignEnrollment, } from "../../../../lib/crypto/keyvaultApi.js";
+import { ENCRYPTION_PRIVATE_KEY_AAD_PURPOSE, SIGNING_PRIVATE_KEY_AAD_PURPOSE, destroyUnlockedKeys, getUnlockedKeys, unlockWithPassword, } 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, { 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 from "../../../shared/components/settings/SigningCertificateCard.js";
 import { readStoredSignEnrollment, storeSignEnrollment } from "../../../shared/signing/enrollmentStorage.js";
 import { checkEnrollmentNow, forgetEnrollment, recordEnrollmentResult, useEnrollmentSnapshot, watchCurrentEnrollment, watchEnrollment, } from "../../../shared/signing/enrollmentTracker.js";
@@ -170,6 +171,7 @@ function EncryptionContent({ canManageKeys }) {
     const { mailboxUid, mailboxes } = useSettingsShell();
     const mailbox = mailboxes.find((mb) => mb.uid === mailboxUid);
     const { requestUnlock } = useUnlockPrompt();
+    const client = useApiClient();
     const [vault, setVault] = useState(null);
     const [loadError, setLoadError] = useState(null);
     const [removingMethod, setRemovingMethod] = useState(null);
@@ -245,7 +247,7 @@ function EncryptionContent({ canManageKeys }) {
      */
     async function verifiedUnlockedKeys() {
         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();
         }
@@ -274,9 +276,9 @@ function EncryptionContent({ canManageKeys }) {
         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) {
@@ -297,7 +299,7 @@ function EncryptionContent({ canManageKeys }) {
             release = watchEnrollment(mailboxUid, storedId);
         }
         else if (canManageKeys) {
-            getCurrentSignEnrollment(mailboxUid)
+            getCurrentSignEnrollment(mailboxUid, client)
                 .then((current) => {
                 if (!cancelled && current) {
                     if (current.status === "pending") {
@@ -340,7 +342,7 @@ function EncryptionContent({ canManageKeys }) {
         let timer;
         let attempts = 0;
         const refresh = () => {
-            getMailbox(mailboxUid)
+            getMailbox(mailboxUid, {}, client)
                 .then((refreshed) => {
                 if (cancelled) {
                     return;
@@ -365,7 +367,7 @@ function EncryptionContent({ canManageKeys }) {
         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.");
             }
@@ -408,7 +410,7 @@ function EncryptionContent({ canManageKeys }) {
             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" } });
@@ -431,7 +433,7 @@ function EncryptionContent({ canManageKeys }) {
         setLocalIndexByteBudgetState(bytes);
     }
     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."));
     }
@@ -456,7 +458,7 @@ function EncryptionContent({ canManageKeys }) {
         setRemovingMethod(key);
         setActionError(null);
         try {
-            await removeMasterKeyWrap(mailboxUid, wrap.method, wrap.methodId);
+            await removeMasterKeyWrap(mailboxUid, wrap.method, wrap.methodId, client);
             await loadVault();
         }
         catch (err) {
@@ -484,7 +486,7 @@ function EncryptionContent({ canManageKeys }) {
         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();
@@ -550,12 +552,12 @@ function EncryptionContent({ canManageKeys }) {
                 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]);
             }
@@ -563,7 +565,7 @@ function EncryptionContent({ canManageKeys }) {
                 addError = err;
                 if (removedForThis) {
                     try {
-                        await addMasterKeyWrap(mailboxUid, removedForThis);
+                        await addMasterKeyWrap(mailboxUid, removedForThis, undefined, client);
                         removedEarly--;
                     }
                     catch {
@@ -593,7 +595,7 @@ function EncryptionContent({ canManageKeys }) {
             let notRemoved = 0;
             for (const wrap of pendingOld) {
                 try {
-                    await removeMasterKeyWrap(mailboxUid, "recovery", wrap.methodId);
+                    await removeMasterKeyWrap(mailboxUid, "recovery", wrap.methodId, client);
                 }
                 catch {
                     notRemoved++;
@@ -654,7 +656,7 @@ function EncryptionContent({ canManageKeys }) {
         let codes;
         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))) {
@@ -673,7 +675,7 @@ function EncryptionContent({ canManageKeys }) {
             // 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) {
@@ -682,7 +684,7 @@ function EncryptionContent({ canManageKeys }) {
                     }
                 }
             }
-            await rekey(mailboxUid, { wrappedKeys: rewrapped.wrappedKeys, masterKeyWraps, keys });
+            await rekey(mailboxUid, { wrappedKeys: rewrapped.wrappedKeys, masterKeyWraps, keys }, client);
         }
         catch (err) {
             if (err instanceof UncoveredVaultKeysError) {

package/dist/apps/www/settings/filters/[uid].d.ts

@@ -9,5 +9,5 @@ declare function MailFilterDetailPage(props: MailFilterDetailPageProps): React.J
 export default MailFilterDetailPage;
 /** The tab's title: `Brand: Settings` (see `pageTitle()`). */
 export declare const title: (props: {
-    branding?: Pick<import("@rapidmx/react-shared/branding/brandingApi.js").Branding, "title" | "companyName"> | null;
+    branding?: Pick<import("../../../../lib/branding/brandingApi.js").Branding, "title" | "companyName"> | null;
 }) => string;

package/dist/apps/www/settings/filters/[uid].js

@@ -5,15 +5,16 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 ///////////////////////////////////////////////////////////////////////////////
 import { pageTitle } from "../../../shared/navigation/pageTitle.js";
 import { useEffect, useState } from "react";
-import { ApiRequestError } from "@rapidmx/react-shared/util/api.js";
-import { listFolders } from "@rapidmx/react-shared/mail/mailApi.js";
-import { getMailFilterRule, updateMailFilterRule, } from "@rapidmx/react-shared/mail/mailFilterRulesApi.js";
+import { ApiRequestError } from "../../../../lib/util/api.js";
+import { listFolders } from "../../../../lib/mail/mailApi.js";
+import { getMailFilterRule, updateMailFilterRule, } from "../../../../lib/mail/mailFilterRulesApi.js";
 import SettingsShell, { useSettingsShell } from "../../../shared/components/settings/layout/SettingsShell.js";
+import { useApiClient } from "../../../../lib/util/apiClientContext.js";
 import RuleBuilder, { hasConditions } 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 = "w-full text-sm py-2.5 px-3 border border-border rounded-sm bg-surface text-text focus:outline-none focus:border-primary";
 function MailFilterDetailPage(props) {
@@ -21,6 +22,7 @@ function MailFilterDetailPage(props) {
 }
 function MailFilterDetailContent({ uid }) {
     const { mailboxUid } = useSettingsShell();
+    const client = useApiClient();
     const [original, setOriginal] = useState(null);
     const [name, setName] = useState("");
     const [rule, setRule] = useState(null);
@@ -38,12 +40,12 @@ function MailFilterDetailContent({ uid }) {
         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) {
@@ -83,7 +85,7 @@ function MailFilterDetailContent({ uid }) {
                 version: original.version,
                 name: name.trim(),
                 ...rule,
-            });
+            }, client);
             setOriginal(updated);
             setSaved(true);
         }

package/dist/apps/www/settings/filters/_mailFilterRuleConfig.d.ts

@@ -1,5 +1,5 @@
-import { Folder } from "@rapidmx/react-shared/mail/mailApi.js";
-import { MailFilterAction } from "@rapidmx/react-shared/mail/mailFilterRulesApi.js";
+import { Folder } from "../../../../lib/mail/mailApi.js";
+import { MailFilterAction } from "../../../../lib/mail/mailFilterRulesApi.js";
 import { ActionTypeDef, ConditionFieldDef } from "../../../shared/components/rules/RuleBuilder.js";
 export declare const MAIL_FILTER_CONDITION_FIELDS: ConditionFieldDef[];
 /**

package/dist/apps/www/settings/filters/index.d.ts

@@ -5,5 +5,5 @@ declare function SettingsFiltersPage(props: SettingsFiltersPageProps): React.JSX
 export default SettingsFiltersPage;
 /** The tab's title: `Brand: Settings` (see `pageTitle()`). */
 export declare const title: (props: {
-    branding?: Pick<import("@rapidmx/react-shared/branding/brandingApi.js").Branding, "title" | "companyName"> | null;
+    branding?: Pick<import("../../../../lib/branding/brandingApi.js").Branding, "title" | "companyName"> | null;
 }) => string;

package/dist/apps/www/settings/filters/index.js

@@ -5,11 +5,11 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 ///////////////////////////////////////////////////////////////////////////////
 import { pageTitle } from "../../../shared/navigation/pageTitle.js";
 import { useEffect, useState } from "react";
-import { ApiRequestError } from "@rapidmx/react-shared/util/api.js";
-import { listMailFilterRules } from "@rapidmx/react-shared/mail/mailFilterRulesApi.js";
+import { ApiRequestError } from "../../../../lib/util/api.js";
+import { listMailFilterRules } from "../../../../lib/mail/mailFilterRulesApi.js";
 import SettingsShell, { 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";
 function SettingsFiltersPage(props) {
     return (_jsx(SettingsShell, { ...props, active: "filters", children: _jsx(FiltersContent, {}) }));
 }

package/dist/apps/www/settings/filters/new/index.d.ts

@@ -5,5 +5,5 @@ declare function NewMailFilterPage(props: NewMailFilterPageProps): React.JSX.Ele
 export default NewMailFilterPage;
 /** The tab's title: `Brand: Settings` (see `pageTitle()`). */
 export declare const title: (props: {
-    branding?: Pick<import("@rapidmx/react-shared/branding/brandingApi.js").Branding, "title" | "companyName"> | null;
+    branding?: Pick<import("../../../../../lib/branding/brandingApi.js").Branding, "title" | "companyName"> | null;
 }) => string;

package/dist/apps/www/settings/filters/new/index.js

@@ -6,15 +6,16 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { pageTitle } from "../../../../shared/navigation/pageTitle.js";
 import { useNavigate } from "../../../../shared/navigation/index.js";
 import { useEffect, useState } from "react";
-import { ApiRequestError } from "@rapidmx/react-shared/util/api.js";
-import { listFolders } from "@rapidmx/react-shared/mail/mailApi.js";
-import { createMailFilterRule, } from "@rapidmx/react-shared/mail/mailFilterRulesApi.js";
+import { ApiRequestError } from "../../../../../lib/util/api.js";
+import { listFolders } from "../../../../../lib/mail/mailApi.js";
+import { createMailFilterRule, } from "../../../../../lib/mail/mailFilterRulesApi.js";
 import SettingsShell, { useSettingsShell } from "../../../../shared/components/settings/layout/SettingsShell.js";
+import { useApiClient } from "../../../../../lib/util/apiClientContext.js";
 import RuleBuilder, { hasConditions } 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 = "w-full text-sm py-2.5 px-3 border border-border rounded-sm bg-surface text-text focus:outline-none focus:border-primary";
 function NewMailFilterPage(props) {
@@ -40,6 +41,7 @@ function prefillFromSearch(search) {
 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.
@@ -60,7 +62,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]);
@@ -78,7 +80,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) {

package/dist/apps/www/settings/labels/index.d.ts

@@ -5,5 +5,5 @@ declare function SettingsLabelsPage(props: SettingsLabelsPageProps): React.JSX.E
 export default SettingsLabelsPage;
 /** The tab's title: `Brand: Settings` (see `pageTitle()`). */
 export declare const title: (props: {
-    branding?: Pick<import("@rapidmx/react-shared/branding/brandingApi.js").Branding, "title" | "companyName"> | null;
+    branding?: Pick<import("../../../../lib/branding/brandingApi.js").Branding, "title" | "companyName"> | null;
 }) => string;

package/dist/apps/www/settings/labels/index.js

@@ -5,19 +5,21 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 ///////////////////////////////////////////////////////////////////////////////
 import { pageTitle } from "../../../shared/navigation/pageTitle.js";
 import { useEffect, useState } from "react";
-import { ApiRequestError } from "@rapidmx/react-shared/util/api.js";
-import { createLabel, deleteLabel, listLabels, updateLabel } from "@rapidmx/react-shared/mail/labelsApi.js";
+import { ApiRequestError } from "../../../../lib/util/api.js";
+import { createLabel, deleteLabel, listLabels, updateLabel } from "../../../../lib/mail/labelsApi.js";
 import SettingsShell, { 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";
 function SettingsLabelsPage(props) {
     return (_jsx(SettingsShell, { ...props, active: "labels", children: _jsx(LabelsContent, {}) }));
 }
 const DEFAULT_COLOR = "#6366f1";
 function LabelsContent() {
     const { mailboxUid } = useSettingsShell();
+    const client = useApiClient();
     const [labels, setLabels] = useState([]);
     const [loading, setLoading] = useState(true);
     const [error, setError] = useState(null);
@@ -34,7 +36,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));
@@ -58,11 +60,11 @@ 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);
@@ -78,7 +80,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);
         }

package/dist/apps/www/settings/privacy/index.d.ts

@@ -5,5 +5,5 @@ declare function SettingsPrivacyPage(props: SettingsPrivacyPageProps): React.JSX
 export default SettingsPrivacyPage;
 /** The tab's title: `Brand: Settings` (see `pageTitle()`). */
 export declare const title: (props: {
-    branding?: Pick<import("@rapidmx/react-shared/branding/brandingApi.js").Branding, "title" | "companyName"> | null;
+    branding?: Pick<import("../../../../lib/branding/brandingApi.js").Branding, "title" | "companyName"> | null;
 }) => string;

package/dist/apps/www/settings/privacy/index.js

@@ -5,15 +5,16 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
 ///////////////////////////////////////////////////////////////////////////////
 import { pageTitle } from "../../../shared/navigation/pageTitle.js";
 import { useEffect, useRef, useState } from "react";
-import { ApiRequestError } from "@rapidmx/react-shared/util/api.js";
-import { createExportRequest, exportRequestDownloadUrl, listExportRequests, } from "@rapidmx/react-shared/mail/dataExportApi.js";
-import { listImportRequests, uploadMailboxImport, } from "@rapidmx/react-shared/mail/mailboxImportApi.js";
-import { createErasureRequest, listErasureRequests, } from "@rapidmx/react-shared/mail/erasureRequestApi.js";
-import { listFolders } from "@rapidmx/react-shared/mail/mailApi.js";
+import { ApiRequestError } from "../../../../lib/util/api.js";
+import { createExportRequest, exportRequestDownloadUrl, listExportRequests, } from "../../../../lib/mail/dataExportApi.js";
+import { listImportRequests, uploadMailboxImport, } from "../../../../lib/mail/mailboxImportApi.js";
+import { createErasureRequest, listErasureRequests, } from "../../../../lib/mail/erasureRequestApi.js";
+import { listFolders } from "../../../../lib/mail/mailApi.js";
+import { useApiClient } from "../../../../lib/util/apiClientContext.js";
 import SettingsShell, { 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"]);
 function importFormatFromFilename(filename) {
@@ -65,6 +66,7 @@ function OwnMailboxOnlyNotice({ ownedMailboxCount, ownMailboxLabel }) {
     return (_jsxs("div", { children: [_jsx("h2", { className: "text-sm font-semibold mb-2", children: "Export, import, or delete my data" }), _jsxs("p", { className: "text-xs text-text-muted", children: ["Exporting your data, importing mail, and deleting your account only apply to your own mailbox, not one shared with you. ", detail] })] }));
 }
 function ExportSection({ mailboxUid, mailboxLabel }) {
+    const client = useApiClient();
     const [requests, setRequests] = useState([]);
     const [loading, setLoading] = useState(true);
     const [loadError, setLoadError] = useState(null);
@@ -76,7 +78,7 @@ function ExportSection({ mailboxUid, mailboxLabel }) {
     const loadSeq = useRef(0);
     function loadRequests() {
         const seq = ++loadSeq.current;
-        return listExportRequests()
+        return listExportRequests({}, client)
             .then((data) => {
             if (seq === loadSeq.current) {
                 setRequests(data);
@@ -95,7 +97,7 @@ function ExportSection({ mailboxUid, mailboxLabel }) {
         e.preventDefault();
         setCreating(true);
         try {
-            await createExportRequest({ format });
+            await createExportRequest({ format }, client);
             await loadRequests();
         }
         catch (err) {
@@ -108,6 +110,7 @@ function ExportSection({ mailboxUid, mailboxLabel }) {
     return (_jsxs("div", { children: [_jsx("h2", { className: "text-sm font-semibold mb-2", children: "Export my data" }), _jsxs("p", { className: "text-xs text-text-muted mb-3", children: ["Requests a copy of ", _jsx("strong", { children: mailboxLabel }), "\u2019s messages, contacts, calendar, tasks, and notes. This runs in the background and can take a few minutes \u2014 check back here for a download link once it\u2019s ready."] }), _jsxs("form", { onSubmit: handleCreate, className: "flex items-end gap-3 mb-5", children: [_jsxs("label", { className: "flex flex-col gap-1.5 text-sm", children: [_jsx("span", { className: "font-semibold", children: "Format" }), _jsxs("select", { "aria-label": "Export format", className: "text-sm border border-border rounded-sm py-1.5 px-2 bg-surface", value: format, onChange: (e) => setFormat(e.target.value), children: [_jsx("option", { value: "json", children: "JSON" }), _jsx("option", { value: "mbox", children: "Mbox" })] })] }), _jsx(Button, { type: "submit", variant: "secondary", className: "!w-auto", loading: creating, disabled: creating, children: "Request export" })] }), loadError && _jsx(Alert, { children: loadError }), loading ? (_jsx("p", { className: "text-sm text-text-muted", children: "Loading\u2026" })) : requests.length === 0 ? (_jsx("p", { className: "text-sm text-text-muted", children: "No export requests yet." })) : (_jsx("ul", { className: "flex flex-col gap-2", children: requests.map((request) => (_jsxs("li", { className: "flex items-center justify-between gap-3 text-sm py-1.5 px-3 bg-surface-alt rounded-sm", children: [_jsxs("span", { children: [request.format.toUpperCase(), " \u00B7 ", new Date(request.dateCreated).toLocaleString(), request.status === "failed" && request.errorMessage && (_jsxs("span", { className: "text-danger", children: [" \u2014 ", request.errorMessage] }))] }), _jsxs("span", { className: "flex items-center gap-3", children: [_jsx("span", { className: `text-xs font-bold uppercase tracking-wide py-0.5 px-2 rounded-pill ${statusBadgeClass(request.status)}`, children: statusLabel(request.status) }), request.status === "ready" && (_jsx("a", { href: exportRequestDownloadUrl(request.uid), className: "text-primary-dark hover:underline font-medium", children: "Download" }))] })] }, request.uid))) }))] }));
 }
 function ImportSection({ mailboxUid }) {
+    const client = useApiClient();
     const [folders, setFolders] = useState([]);
     const [targetFolderUid, setTargetFolderUid] = useState("");
     const [foldersError, setFoldersError] = useState(null);
@@ -122,7 +125,7 @@ function ImportSection({ mailboxUid }) {
     const loadSeq = useRef(0);
     function loadRequests() {
         const seq = ++loadSeq.current;
-        return listImportRequests()
+        return listImportRequests({}, client)
             .then((data) => {
             if (seq === loadSeq.current) {
                 setRequests(data);
@@ -138,7 +141,7 @@ function ImportSection({ mailboxUid }) {
         // 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);
@@ -163,6 +166,7 @@ function ImportSection({ mailboxUid }) {
     return (_jsxs("div", { children: [_jsx("h2", { className: "text-sm font-semibold mb-2", children: "Import mail" }), _jsx("p", { className: "text-xs text-text-muted mb-3", children: "Uploads an Mbox or PST archive and imports every message it contains into the folder you choose below. This runs in the background \u2014 check back here for its progress." }), folders.length > 0 && (_jsxs("label", { className: "flex flex-col gap-1.5 text-sm mb-3 max-w-xs", children: [_jsx("span", { className: "font-semibold", children: "Destination folder" }), _jsx("select", { "aria-label": "Destination folder", className: "text-sm border border-border rounded-sm py-1.5 px-2 bg-surface", value: targetFolderUid, onChange: (e) => setTargetFolderUid(e.target.value), children: folders.map((folder) => (_jsx("option", { value: folder.uid, children: folder.name }, folder.uid))) })] })), _jsx(Button, { type: "button", variant: "secondary", className: "!w-auto mb-3", loading: uploading, disabled: uploading || !targetFolderUid, onClick: () => fileInputRef.current?.click(), children: "Upload Mbox or PST file" }), _jsx("input", { ref: fileInputRef, type: "file", accept: ".mbox,.pst", "aria-label": "Upload mail archive", className: "hidden", onChange: handleFileChange }), foldersError && _jsx(Alert, { children: foldersError }), loadError && _jsx(Alert, { children: loadError }), loading ? (_jsx("p", { className: "text-sm text-text-muted", children: "Loading\u2026" })) : requests.length === 0 ? (_jsx("p", { className: "text-sm text-text-muted", children: "No import requests yet." })) : (_jsx("ul", { className: "flex flex-col gap-2", children: requests.map((request) => (_jsxs("li", { className: "flex items-center justify-between gap-3 text-sm py-1.5 px-3 bg-surface-alt rounded-sm", children: [_jsxs("span", { children: [request.format.toUpperCase(), " \u00B7 ", new Date(request.dateCreated).toLocaleString(), request.status === "completed" && (_jsxs("span", { className: "text-text-muted", children: [" ", "\u2014 ", request.importedCount ?? 0, " imported", request.failedCount ? `, ${request.failedCount} failed` : ""] })), request.status === "failed" && request.errorMessage && (_jsxs("span", { className: "text-danger", children: [" \u2014 ", request.errorMessage] }))] }), _jsx("span", { className: `text-xs font-bold uppercase tracking-wide py-0.5 px-2 rounded-pill ${statusBadgeClass(request.status)}`, children: statusLabel(request.status) })] }, request.uid))) }))] }));
 }
 function ErasureSection({ mailboxLabel }) {
+    const client = useApiClient();
     const [requests, setRequests] = useState([]);
     const [loading, setLoading] = useState(true);
     const [loadError, setLoadError] = useState(null);
@@ -170,7 +174,7 @@ function ErasureSection({ mailboxLabel }) {
     const [creating, setCreating] = useState(false);
     const [createError, setCreateError] = useState(null);
     function loadRequests() {
-        return listErasureRequests()
+        return listErasureRequests({}, client)
             .then(setRequests)
             .catch((err) => setLoadError(err instanceof ApiRequestError ? err.message : "Could not load your erasure requests."));
     }
@@ -185,7 +189,7 @@ function ErasureSection({ mailboxLabel }) {
         setCreateError(null);
         setCreating(true);
         try {
-            await createErasureRequest();
+            await createErasureRequest(client);
             setConfirming(false);
             await loadRequests();
         }

package/dist/apps/www/settings/profile/index.d.ts

@@ -5,5 +5,5 @@ declare function SettingsProfilePage(props: SettingsProfilePageProps): React.JSX
 export default SettingsProfilePage;
 /** The tab's title: `Brand: Settings` (see `pageTitle()`). */
 export declare const title: (props: {
-    branding?: Pick<import("@rapidmx/react-shared/branding/brandingApi.js").Branding, "title" | "companyName"> | null;
+    branding?: Pick<import("../../../../lib/branding/brandingApi.js").Branding, "title" | "companyName"> | null;
 }) => string;

package/dist/apps/www/settings/profile/index.js

@@ -5,11 +5,12 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 ///////////////////////////////////////////////////////////////////////////////
 import { pageTitle } from "../../../shared/navigation/pageTitle.js";
 import { useMemo, useState } from "react";
-import { freeBusyVisibilityOf, isSharedWithMe, updateMailbox } from "@rapidmx/react-shared/mail/mailApi.js";
-import { DEFAULT_TIME_ZONE, deviceTimeZone, timeZoneOptions } from "@rapidmx/react-shared/util/timeZone.js";
+import { freeBusyVisibilityOf, isSharedWithMe, updateMailbox } from "../../../../lib/mail/mailApi.js";
+import { DEFAULT_TIME_ZONE, deviceTimeZone, timeZoneOptions } from "../../../../lib/util/timeZone.js";
 import SettingsShell, { 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";
 const INPUT_CLASS = "w-full text-sm py-2.5 px-3 border border-border rounded-sm bg-surface text-text focus:outline-none focus:border-primary";
 const SELECT_CLASS = "text-sm py-2.5 px-3 border border-border rounded-sm bg-surface text-text focus:outline-none focus:border-primary";
@@ -47,6 +48,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.
     const [savedName, setSavedName] = useState(mailbox.displayName);
@@ -92,7 +94,7 @@ function ProfileContent() {
                 ...(nameChanged && { displayName: name }),
                 ...(zoneChanged && { timezone }),
                 ...(freeBusyChanged && { freeBusyVisibility: freeBusy }),
-            });
+            }, client);
             setVersion(updated.version);
             setSavedName(name);
             setSavedZone(timezone);

package/dist/apps/www/settings/read-receipts/index.d.ts

@@ -5,5 +5,5 @@ declare function SettingsReadReceiptsPage(props: SettingsReadReceiptsPageProps):
 export default SettingsReadReceiptsPage;
 /** The tab's title: `Brand: Settings` (see `pageTitle()`). */
 export declare const title: (props: {
-    branding?: Pick<import("@rapidmx/react-shared/branding/brandingApi.js").Branding, "title" | "companyName"> | null;
+    branding?: Pick<import("../../../../lib/branding/brandingApi.js").Branding, "title" | "companyName"> | null;
 }) => string;