@mohasinac/appkit 4.29.1 → 4.30.1

package/dist/features/admin/components/AdminUserEditorView.js

@@ -113,6 +113,7 @@ export function AdminUserEditorView({ open, onClose, userId, displayName, photoU
     const invalidate = () => queryClient.invalidateQueries({ queryKey: ["admin", "users"] });
     // --- Mutations ------------------------------------------------------------
     const saveMutation = useApiMutation({
+        errorMessage: "Failed to update user.",
         mutationFn: async () => {
             // ST-2 — build publicProfile partial only when something changed; keeps
             // the PATCH payload minimal and avoids overwriting unrelated subkeys.
@@ -150,11 +151,9 @@ export function AdminUserEditorView({ open, onClose, userId, displayName, photoU
             invalidate();
             onClose();
         },
-        onError: (err) => {
-            showToast(err?.message ?? "Failed to update user.", "error");
-        },
     });
     const deleteMutation = useApiMutation({
+        errorMessage: "Failed to delete user.",
         mutationFn: async () => {
             await apiClient.delete(ADMIN_ENDPOINTS.USER_BY_ID(userId));
         },
@@ -164,11 +163,9 @@ export function AdminUserEditorView({ open, onClose, userId, displayName, photoU
             setDeleteOpen(false);
             onClose();
         },
-        onError: (err) => {
-            showToast(err?.message ?? "Failed to delete user.", "error");
-        },
     });
     const hardBanMutation = useApiMutation({
+        errorMessage: "Failed to ban user.",
         mutationFn: async (reason) => {
             await apiClient.post(ADMIN_ENDPOINTS.USER_HARD_BAN(userId), { reason });
         },
@@ -179,11 +176,9 @@ export function AdminUserEditorView({ open, onClose, userId, displayName, photoU
             setHardBanReasonInput("");
             onClose();
         },
-        onError: (err) => {
-            showToast(err?.message ?? "Failed to ban user.", "error");
-        },
     });
     const unbanMutation = useApiMutation({
+        errorMessage: "Failed to unban user.",
         mutationFn: async () => {
             await apiClient.post(ADMIN_ENDPOINTS.USER_UNBAN(userId), {});
         },
@@ -192,11 +187,9 @@ export function AdminUserEditorView({ open, onClose, userId, displayName, photoU
             invalidate();
             onClose();
         },
-        onError: (err) => {
-            showToast(err?.message ?? "Failed to unban user.", "error");
-        },
     });
     const softBanMutation = useApiMutation({
+        errorMessage: "Failed to apply soft ban.",
         mutationFn: async (payload) => {
             await apiClient.post(ADMIN_ENDPOINTS.USER_SOFT_BAN(userId), payload);
         },
@@ -208,11 +201,9 @@ export function AdminUserEditorView({ open, onClose, userId, displayName, photoU
             setSoftBanReason("");
             setSoftBanExpiry("");
         },
-        onError: (err) => {
-            showToast(err?.message ?? "Failed to apply soft ban.", "error");
-        },
     });
     const liftSoftBanMutation = useApiMutation({
+        errorMessage: "Failed to lift soft ban.",
         mutationFn: async (action) => {
             await apiClient.delete(ADMIN_ENDPOINTS.USER_SOFT_BAN_LIFT(userId, action));
         },
@@ -220,9 +211,6 @@ export function AdminUserEditorView({ open, onClose, userId, displayName, photoU
             showToast("Soft ban lifted.", "success");
             invalidate();
         },
-        onError: (err) => {
-            showToast(err?.message ?? "Failed to lift soft ban.", "error");
-        },
     });
     const isHardBanned = currentIsHardBanned ?? false;
     const softBans = currentSoftBans ?? [];

package/dist/features/admin/components/AdminUsersView.js

@@ -52,6 +52,7 @@ export function AdminUsersView({ children, ...props }) {
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [banJobEvent.status]);
     const banUser = useApiMutation({
+        errorMessage: "Failed to start hard-ban.",
         mutationFn: () => {
             if (!banTargetId)
                 throw new Error("No user selected");
@@ -60,9 +61,6 @@ export function AdminUsersView({ children, ...props }) {
         onSuccess: (result) => {
             banJobEvent.subscribe(result.jobId, result.customToken);
         },
-        onError: () => {
-            toast.showToast("Failed to start hard-ban.", "error");
-        },
     });
     const bulkUsers = useBulkAction({
         mutationFn: (payload) => apiClient.post(ADMIN_ENDPOINTS.USERS_BULK, payload),
@@ -75,14 +73,12 @@ export function AdminUsersView({ children, ...props }) {
         },
     });
     const unbanUser = useApiMutation({
+        errorMessage: "Failed to lift ban.",
         mutationFn: (uid) => apiClient.post(ADMIN_ENDPOINTS.USER_UNBAN(uid), {}),
         onSuccess: () => {
             toast.showToast("Ban lifted.", "success");
             void queryClient.invalidateQueries({ queryKey: ["admin", "users", "listing"] });
         },
-        onError: () => {
-            toast.showToast("Failed to lift ban.", "error");
-        },
     });
     const handleManageBulkClick = (selection) => {
         const rowId = selection.selectedIds[0];

package/dist/features/admin/components/BrandQuickCreateForm.js

@@ -8,7 +8,7 @@ import { apiClient } from "../../../http";
 import { ADMIN_ENDPOINTS } from "../../../constants/api-endpoints";
 import { quickCreateTaxonomySchema } from "../schemas/small-forms";
 import { FormErrorSummary } from "../../../ui/forms/FormErrorSummary";
-import { applyZodIssues } from "../../../ui/forms/FormShell";
+import { applyZodIssues } from "../../../ui/forms/apply-zod-issues";
 function toBrandSlug(str) {
     const base = str.toLowerCase().trim().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "");
     return base.startsWith("brand-") ? base : `brand-${base}`;
@@ -19,6 +19,7 @@ export function BrandQuickCreateForm({ onSaved, onCancel }) {
     const [isActive, setIsActive] = React.useState(true);
     const { showToast } = useToast();
     const mutation = useApiMutation({
+        errorMessage: "Failed to create brand.",
         mutationFn: async () => apiClient.post(ADMIN_ENDPOINTS.BRANDS, {
             name,
             slug: toBrandSlug(name),
@@ -29,9 +30,6 @@ export function BrandQuickCreateForm({ onSaved, onCancel }) {
             const id = res?.data?.id ?? res?.id ?? "";
             onSaved(id, name);
         },
-        onError: (err) => {
-            showToast(err?.message ?? "Failed to create brand.", "error");
-        },
     });
     return (_jsx(Form, { schema: quickCreateTaxonomySchema, onSubmit: (e) => e.preventDefault(), spacing: "md", children: ({ setFieldError, clearErrors }) => (_jsxs(_Fragment, { children: [_jsx(FormErrorSummary, {}), _jsx(Input, { label: "Brand name", value: name, onChange: (e) => setName(e.target.value), required: true, placeholder: "e.g. Hot Wheels", autoFocus: true }), _jsx(Input, { label: "Description", value: description, onChange: (e) => setDescription(e.target.value), placeholder: "Optional brief description" }), _jsx(Toggle, { label: "Active", checked: isActive, onChange: setIsActive }), _jsxs(Row, { gap: "3", padding: "t-xs", children: [_jsx(Button, { type: "submit", isLoading: mutation.isPending, disabled: mutation.isPending, onClick: () => {
                                 clearErrors();

package/dist/features/admin/components/CategoryQuickCreateForm.js

@@ -8,7 +8,7 @@ import { apiClient } from "../../../http";
 import { ADMIN_ENDPOINTS } from "../../../constants/api-endpoints";
 import { quickCreateTaxonomySchema } from "../schemas/small-forms";
 import { FormErrorSummary } from "../../../ui/forms/FormErrorSummary";
-import { applyZodIssues } from "../../../ui/forms/FormShell";
+import { applyZodIssues } from "../../../ui/forms/apply-zod-issues";
 function toCategorySlug(str) {
     return str.toLowerCase().trim().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "");
 }
@@ -18,6 +18,7 @@ export function CategoryQuickCreateForm({ onSaved, onCancel }) {
     const [isActive, setIsActive] = React.useState(true);
     const { showToast } = useToast();
     const mutation = useApiMutation({
+        errorMessage: "Failed to create category.",
         mutationFn: async () => apiClient.post(ADMIN_ENDPOINTS.CATEGORIES, {
             name,
             slug: toCategorySlug(name),
@@ -28,9 +29,6 @@ export function CategoryQuickCreateForm({ onSaved, onCancel }) {
             const id = res?.data?.id ?? res?.id ?? "";
             onSaved(id, name);
         },
-        onError: (err) => {
-            showToast(err?.message ?? "Failed to create category.", "error");
-        },
     });
     return (_jsx(Form, { schema: quickCreateTaxonomySchema, onSubmit: (e) => e.preventDefault(), spacing: "md", children: ({ setFieldError, clearErrors }) => (_jsxs(_Fragment, { children: [_jsx(FormErrorSummary, {}), _jsx(Input, { label: "Category name", value: name, onChange: (e) => setName(e.target.value), required: true, placeholder: "e.g. Trading Cards", autoFocus: true }), _jsx(Input, { label: "Description", value: description, onChange: (e) => setDescription(e.target.value), placeholder: "Optional brief description" }), _jsx(Toggle, { label: "Active", checked: isActive, onChange: setIsActive }), _jsxs(Row, { gap: "3", padding: "t-xs", children: [_jsx(Button, { type: "submit", isLoading: mutation.isPending, disabled: mutation.isPending, onClick: () => {
                                 clearErrors();

package/dist/features/auctions/components/PlaceBidFormClient.js

@@ -7,7 +7,7 @@ import { isAuthError } from "../../../utils/auth-error";
 import { Button, CountdownDisplay, Div, LoginRequiredModal, Modal, Row, Span, Stack, Text } from "../../../ui";
 import { Form } from "../../../ui/components/Form";
 import { FieldInput } from "../../../ui/forms/FieldInput";
-import { applyZodIssues } from "../../../ui/forms/FormShell";
+import { applyZodIssues } from "../../../ui/forms/apply-zod-issues";
 import { placeBidSchema } from "../schemas/bid-input";
 import { useLiveAuctionBid } from "../hooks/useLiveAuctionBid";
 import { AUCTION_BUYOUT_WINDOW_MINUTES } from "../../../_internal/shared/checkout/lanes";

package/dist/features/auth/components/ForgotPasswordView.js

@@ -5,7 +5,7 @@ import { useState } from "react";
 import { Alert, Button, Div, Heading, Row, Stack, Text, useToast } from "../../../ui";
 import { Form } from "../../../ui/components/Form";
 import { FieldInput } from "../../../ui/forms/FieldInput";
-import { applyZodIssues } from "../../../ui/forms/FormShell";
+import { applyZodIssues } from "../../../ui/forms/apply-zod-issues";
 import { forgotPasswordSchema } from "../schemas";
 import { FormErrorSummary } from "../../../ui/forms/FormErrorSummary";
 export function ForgotPasswordView({ onSubmit, isLoading = false, error, success, labels = {}, renderBackLink, className = "", }) {

package/dist/features/auth/components/LoginForm.js

@@ -6,7 +6,7 @@ import { Alert, Button, Div, Heading, Row, SiteMark, Stack, Text, useToast } fro
 import { Form } from "../../../ui/components/Form";
 import { FieldInput } from "../../../ui/forms/FieldInput";
 import { FieldCheckbox } from "../../../ui/forms/FieldCheckbox";
-import { applyZodIssues } from "../../../ui/forms/FormShell";
+import { applyZodIssues } from "../../../ui/forms/apply-zod-issues";
 import { loginSchema } from "../schemas";
 import { SocialAuthButtons } from "./SocialAuthButtons";
 import { FormErrorSummary } from "../../../ui/forms/FormErrorSummary";

package/dist/features/auth/components/RegisterForm.js

@@ -7,7 +7,7 @@ import { Alert, Button, Div, Heading, Row, SiteMark, Stack, Text, useToast } fro
 import { Form } from "../../../ui/components/Form";
 import { FieldInput } from "../../../ui/forms/FieldInput";
 import { FieldCheckbox } from "../../../ui/forms/FieldCheckbox";
-import { applyZodIssues } from "../../../ui/forms/FormShell";
+import { applyZodIssues } from "../../../ui/forms/apply-zod-issues";
 import { registerSchema, registerPasswordSchema } from "../schemas";
 import { FormErrorSummary } from "../../../ui/forms/FormErrorSummary";
 const registerClientSchema = registerSchema.extend({

package/dist/features/auth/components/ResetPasswordView.js

@@ -6,7 +6,7 @@ import { z } from "zod";
 import { Alert, Button, Div, Heading, Row, Stack, Text, useToast } from "../../../ui";
 import { Form } from "../../../ui/components/Form";
 import { FieldInput } from "../../../ui/forms/FieldInput";
-import { applyZodIssues } from "../../../ui/forms/FormShell";
+import { applyZodIssues } from "../../../ui/forms/apply-zod-issues";
 import { FormErrorSummary } from "../../../ui/forms/FormErrorSummary";
 const resetClientSchema = z.object({
     password: z.string().min(6, "Password must be at least 6 characters"),

package/dist/features/auth/components/SocialAuthButtons.js

@@ -1,5 +1,5 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { Button, Div, Row, Span } from "../../../ui";
 export function SocialAuthButtons({ onGoogle, disabled, dividerLabel, googleLabel, }) {
-    return (_jsxs(_Fragment, { children: [_jsxs(Div, { className: "relative", children: [_jsx(Row, { className: "absolute inset-0", align: "center", children: _jsx(Div, { className: "w-full border-t border-neutral-200" }) }), _jsx(Row, { textSize: "sm", className: "relative", justify: "center", children: _jsx(Span, { padding: "x-xs", surface: "default", color: "muted", children: dividerLabel }) })] }), _jsx(Div, { layout: "grid", gap: "3", className: "grid-cols-1", children: _jsxs(Button, { rounded: "md", type: "button", onClick: onGoogle, disabled: disabled, variant: "outline", paddingX: "md", paddingY: "sm", textSize: "sm", weight: "medium", className: "inline- justify-[center] border border-[var(--appkit-color-border)] bg-[var(--appkit-color-surface)] bg-[var(--appkit-color-surface)] text-[var(--appkit-color-text)] dark:text-[var(--appkit-color-text)] hover:bg-surface-hover disabled:cursor-not-allowed disabled:opacity-50", children: [_jsxs("svg", { className: "mr-2 h-5 w-5", viewBox: "0 0 24 24", "aria-hidden": "true", children: [_jsx("path", { fill: "currentColor", d: "M22.56 12.25c0-.78-.07-1.53-.2-2.25H12v4.26h5.92c-.26 1.37-1.04 2.53-2.21 3.31v2.77h3.57c2.08-1.92 3.28-4.74 3.28-8.09z" }), _jsx("path", { fill: "currentColor", d: "M12 23c2.97 0 5.46-.98 7.28-2.66l-3.57-2.77c-.98.66-2.23 1.06-3.71 1.06-2.86 0-5.29-1.93-6.16-4.53H2.18v2.84C3.99 20.53 7.7 23 12 23z" }), _jsx("path", { fill: "currentColor", d: "M5.84 14.09c-.22-.66-.35-1.36-.35-2.09s.13-1.43.35-2.09V7.07H2.18C1.43 8.55 1 10.22 1 12s.43 3.45 1.18 4.93l2.85-2.22.81-.62z" }), _jsx("path", { fill: "currentColor", d: "M12 5.38c1.62 0 3.06.56 4.21 1.64l3.15-3.15C17.45 2.09 14.97 1 12 1 7.7 1 3.99 3.47 2.18 7.07l3.66 2.84c.87-2.6 3.3-4.53 6.16-4.53z" })] }), googleLabel] }) })] }));
+    return (_jsxs(_Fragment, { children: [_jsxs(Div, { className: "relative", children: [_jsx(Row, { className: "absolute inset-0", align: "center", children: _jsx(Div, { className: "w-full border-t border-neutral-200" }) }), _jsx(Row, { textSize: "sm", className: "relative", justify: "center", children: _jsx(Span, { padding: "x-xs", surface: "default", color: "muted", children: dividerLabel }) })] }), _jsx(Div, { layout: "grid", gap: "3", className: "grid-cols-1", children: _jsxs(Button, { rounded: "md", type: "button", onClick: onGoogle, disabled: disabled, variant: "outline", paddingX: "md", paddingY: "sm", textSize: "sm", weight: "medium", className: "inline- justify-[center] border border-[var(--appkit-color-border)] bg-[var(--appkit-color-surface)] bg-[var(--appkit-color-surface)] text-[var(--appkit-color-text)] dark:text-[var(--appkit-color-text)] hover:bg-surface-hover disabled:cursor-not-allowed disabled:opacity-50", children: [_jsxs("svg", { className: "mr-2 h-5 w-5 shrink-0", viewBox: "0 0 24 24", "aria-hidden": "true", children: [_jsx("path", { fill: "currentColor", d: "M22.56 12.25c0-.78-.07-1.53-.2-2.25H12v4.26h5.92c-.26 1.37-1.04 2.53-2.21 3.31v2.77h3.57c2.08-1.92 3.28-4.74 3.28-8.09z" }), _jsx("path", { fill: "currentColor", d: "M12 23c2.97 0 5.46-.98 7.28-2.66l-3.57-2.77c-.98.66-2.23 1.06-3.71 1.06-2.86 0-5.29-1.93-6.16-4.53H2.18v2.84C3.99 20.53 7.7 23 12 23z" }), _jsx("path", { fill: "currentColor", d: "M5.84 14.09c-.22-.66-.35-1.36-.35-2.09s.13-1.43.35-2.09V7.07H2.18C1.43 8.55 1 10.22 1 12s.43 3.45 1.18 4.93l2.85-2.22.81-.62z" }), _jsx("path", { fill: "currentColor", d: "M12 5.38c1.62 0 3.06.56 4.21 1.64l3.15-3.15C17.45 2.09 14.97 1 12 1 7.7 1 3.99 3.47 2.18 7.07l3.66 2.84c.87-2.6 3.3-4.53 6.16-4.53z" })] }), googleLabel] }) })] }));
 }

package/dist/features/auth/repository/session.repository.js

@@ -57,8 +57,20 @@ export class SessionRepository extends BaseRepository {
     async updateActivity(sessionId, data) {
         const updateData = {
             lastActivity: new Date(),
-            ...(data?.location && { location: data.location }),
         };
+        // Firestore `.update()` REPLACES a map field wholesale — it does not merge.
+        // Passing `location` straight through therefore destroyed whichever of
+        // `{ country, city }` the caller happened to omit, and `location.city` is
+        // PII-encrypted, so the loss is unrecoverable. Same footgun the profile
+        // route documents for `uiPreferences`.
+        //
+        // Latent rather than live: both current callers pass no `data` at all, so
+        // this branch never runs today. It costs one read, and only on the branch
+        // that supplies a location — the hot activity ping stays a single write.
+        if (data?.location) {
+            const current = await this.findById(sessionId); // mapDoc → already decrypted
+            updateData.location = { ...(current?.location ?? {}), ...data.location };
+        }
         try {
             await this.update(sessionId, updateData);
         }

package/dist/features/auth/repository/token.repository.d.ts

@@ -3,8 +3,23 @@ import { BaseRepository } from "../../../providers/db-firebase";
 import { type EmailVerificationTokenDocument, type PasswordResetTokenDocument } from "../schemas";
 export declare class EmailVerificationTokenRepository extends BaseRepository<EmailVerificationTokenDocument> {
     constructor();
+    /**
+     * Declared, not hand-rolled in a `create` override.
+     *
+     * The override this replaces computed `encryptPiiFields(...)` and then
+     * OVERWROTE the result with `addPiiIndices(data, MAP)` — which returns
+     * `{...plaintext, ...indices}` — so the ciphertext was discarded and every
+     * verification token's email was written to Firestore in CLEARTEXT. It was
+     * invisible because `mapDoc` decrypts on read and `decryptPiiFields` passes
+     * plaintext straight through, so reads looked identical either way.
+     *
+     * `applyWriteHooks` covers create/createWithId/update and the `*InTx` /
+     * `*InBatch` family, so no write path can skip encryption the way an
+     * override of `create` alone did.
+     */
+    protected piiFields: readonly ["email"];
+    protected piiIndexMap: Record<string, string>;
     protected mapDoc<D = EmailVerificationTokenDocument>(snap: DocumentSnapshot): D;
-    create(data: Partial<EmailVerificationTokenDocument>): Promise<EmailVerificationTokenDocument>;
     findByToken(token: string): Promise<EmailVerificationTokenDocument | null>;
     findByUserId(userId: string): Promise<EmailVerificationTokenDocument[]>;
     findByEmail(email: string): Promise<EmailVerificationTokenDocument[]>;
@@ -15,8 +30,16 @@ export declare class EmailVerificationTokenRepository extends BaseRepository<Ema
 }
 export declare class PasswordResetTokenRepository extends BaseRepository<PasswordResetTokenDocument> {
     constructor();
+    /**
+     * Same defect as its sibling above, one spread further along: the override
+     * this replaces built `{...encrypted, ...addPiiIndices(data, MAP)}`, and
+     * because `addPiiIndices` returns `{...plaintext, ...indices}` the plaintext
+     * `email` was spread back OVER the ciphertext. Reset-token emails were
+     * written in cleartext too.
+     */
+    protected piiFields: readonly ["email"];
+    protected piiIndexMap: Record<string, string>;
     protected mapDoc<D = PasswordResetTokenDocument>(snap: DocumentSnapshot): D;
-    create(data: Partial<PasswordResetTokenDocument>): Promise<PasswordResetTokenDocument>;
     findByToken(token: string): Promise<PasswordResetTokenDocument | null>;
     findByUserId(userId: string): Promise<PasswordResetTokenDocument[]>;
     findByEmail(email: string): Promise<PasswordResetTokenDocument[]>;

package/dist/features/auth/repository/token.repository.js

@@ -1,12 +1,28 @@
 import { normalizeError } from "../../../errors/normalize";
 import { DatabaseError } from "../../../errors";
 import { BaseRepository } from "../../../providers/db-firebase";
-import { TOKEN_PII_FIELDS, TOKEN_PII_INDEX_MAP, addPiiIndices, decryptPiiFields, encryptPiiFields, piiBlindIndex, } from "../../../security";
+import { TOKEN_PII_FIELDS, TOKEN_PII_INDEX_MAP, decryptPiiFields, piiBlindIndex, } from "../../../security";
 import { resolveDate } from "../../../utils";
 import { EMAIL_VERIFICATION_COLLECTION, PASSWORD_RESET_COLLECTION, TOKEN_FIELDS, } from "../schemas";
 export class EmailVerificationTokenRepository extends BaseRepository {
     constructor() {
         super(EMAIL_VERIFICATION_COLLECTION);
+        /**
+         * Declared, not hand-rolled in a `create` override.
+         *
+         * The override this replaces computed `encryptPiiFields(...)` and then
+         * OVERWROTE the result with `addPiiIndices(data, MAP)` — which returns
+         * `{...plaintext, ...indices}` — so the ciphertext was discarded and every
+         * verification token's email was written to Firestore in CLEARTEXT. It was
+         * invisible because `mapDoc` decrypts on read and `decryptPiiFields` passes
+         * plaintext straight through, so reads looked identical either way.
+         *
+         * `applyWriteHooks` covers create/createWithId/update and the `*InTx` /
+         * `*InBatch` family, so no write path can skip encryption the way an
+         * override of `create` alone did.
+         */
+        this.piiFields = TOKEN_PII_FIELDS;
+        this.piiIndexMap = TOKEN_PII_INDEX_MAP;
     }
     mapDoc(snap) {
         const raw = super.mapDoc(snap);
@@ -14,15 +30,6 @@ export class EmailVerificationTokenRepository extends BaseRepository {
             ...TOKEN_PII_FIELDS,
         ]);
     }
-    async create(data) {
-        let encrypted = encryptPiiFields(data, [...TOKEN_PII_FIELDS]);
-        encrypted = addPiiIndices(data, TOKEN_PII_INDEX_MAP);
-        const merged = {
-            ...encrypted,
-            ...addPiiIndices(data, TOKEN_PII_INDEX_MAP),
-        };
-        return super.create(merged);
-    }
     async findByToken(token) {
         return this.findOneBy(TOKEN_FIELDS.TOKEN, token);
     }
@@ -80,6 +87,15 @@ export class EmailVerificationTokenRepository extends BaseRepository {
 export class PasswordResetTokenRepository extends BaseRepository {
     constructor() {
         super(PASSWORD_RESET_COLLECTION);
+        /**
+         * Same defect as its sibling above, one spread further along: the override
+         * this replaces built `{...encrypted, ...addPiiIndices(data, MAP)}`, and
+         * because `addPiiIndices` returns `{...plaintext, ...indices}` the plaintext
+         * `email` was spread back OVER the ciphertext. Reset-token emails were
+         * written in cleartext too.
+         */
+        this.piiFields = TOKEN_PII_FIELDS;
+        this.piiIndexMap = TOKEN_PII_INDEX_MAP;
     }
     mapDoc(snap) {
         const raw = super.mapDoc(snap);
@@ -87,14 +103,6 @@ export class PasswordResetTokenRepository extends BaseRepository {
             ...TOKEN_PII_FIELDS,
         ]);
     }
-    async create(data) {
-        let encrypted = encryptPiiFields(data, [...TOKEN_PII_FIELDS]);
-        encrypted = {
-            ...encrypted,
-            ...addPiiIndices(data, TOKEN_PII_INDEX_MAP),
-        };
-        return super.create(encrypted);
-    }
     async findByToken(token) {
         return this.findOneBy(TOKEN_FIELDS.TOKEN, token);
     }

package/dist/features/blog/actions/blog-actions.d.ts

@@ -11,10 +11,10 @@ export declare const createBlogPostSchema: z.ZodObject<{
     isFeatured: z.ZodDefault<z.ZodBoolean>;
     status: z.ZodDefault<z.ZodEnum<["draft", "published", "archived"]>>;
     coverImage: z.ZodOptional<z.ZodNullable<z.ZodUnion<[z.ZodObject<{
-        url: z.ZodString;
+        url: z.ZodEffects<z.ZodString, string, string>;
         type: z.ZodEnum<["image", "video", "file"]>;
         alt: z.ZodOptional<z.ZodString>;
-        thumbnailUrl: z.ZodOptional<z.ZodString>;
+        thumbnailUrl: z.ZodOptional<z.ZodEffects<z.ZodString, string, string>>;
     }, "strip", z.ZodTypeAny, {
         type: "video" | "image" | "file";
         url: string;
@@ -25,15 +25,15 @@ export declare const createBlogPostSchema: z.ZodObject<{
         url: string;
         alt?: string | undefined;
         thumbnailUrl?: string | undefined;
-    }>, z.ZodEffects<z.ZodString, {
+    }>, z.ZodEffects<z.ZodEffects<z.ZodString, string, string>, {
         url: string;
         type: "image";
     }, string>]>>>;
     contentImages: z.ZodDefault<z.ZodOptional<z.ZodArray<z.ZodObject<{
-        url: z.ZodString;
+        url: z.ZodEffects<z.ZodString, string, string>;
         type: z.ZodEnum<["image", "video", "file"]>;
         alt: z.ZodOptional<z.ZodString>;
-        thumbnailUrl: z.ZodOptional<z.ZodString>;
+        thumbnailUrl: z.ZodOptional<z.ZodEffects<z.ZodString, string, string>>;
     }, "strip", z.ZodTypeAny, {
         type: "video" | "image" | "file";
         url: string;
@@ -46,10 +46,10 @@ export declare const createBlogPostSchema: z.ZodObject<{
         thumbnailUrl?: string | undefined;
     }>, "many">>>;
     additionalImages: z.ZodDefault<z.ZodOptional<z.ZodArray<z.ZodObject<{
-        url: z.ZodString;
+        url: z.ZodEffects<z.ZodString, string, string>;
         type: z.ZodEnum<["image", "video", "file"]>;
         alt: z.ZodOptional<z.ZodString>;
-        thumbnailUrl: z.ZodOptional<z.ZodString>;
+        thumbnailUrl: z.ZodOptional<z.ZodEffects<z.ZodString, string, string>>;
     }, "strip", z.ZodTypeAny, {
         type: "video" | "image" | "file";
         url: string;
@@ -150,10 +150,10 @@ export declare const updateBlogPostSchema: z.ZodObject<{
     isFeatured: z.ZodOptional<z.ZodDefault<z.ZodBoolean>>;
     status: z.ZodOptional<z.ZodDefault<z.ZodEnum<["draft", "published", "archived"]>>>;
     coverImage: z.ZodOptional<z.ZodOptional<z.ZodNullable<z.ZodUnion<[z.ZodObject<{
-        url: z.ZodString;
+        url: z.ZodEffects<z.ZodString, string, string>;
         type: z.ZodEnum<["image", "video", "file"]>;
         alt: z.ZodOptional<z.ZodString>;
-        thumbnailUrl: z.ZodOptional<z.ZodString>;
+        thumbnailUrl: z.ZodOptional<z.ZodEffects<z.ZodString, string, string>>;
     }, "strip", z.ZodTypeAny, {
         type: "video" | "image" | "file";
         url: string;
@@ -164,15 +164,15 @@ export declare const updateBlogPostSchema: z.ZodObject<{
         url: string;
         alt?: string | undefined;
         thumbnailUrl?: string | undefined;
-    }>, z.ZodEffects<z.ZodString, {
+    }>, z.ZodEffects<z.ZodEffects<z.ZodString, string, string>, {
         url: string;
         type: "image";
     }, string>]>>>>;
     contentImages: z.ZodOptional<z.ZodDefault<z.ZodOptional<z.ZodArray<z.ZodObject<{
-        url: z.ZodString;
+        url: z.ZodEffects<z.ZodString, string, string>;
         type: z.ZodEnum<["image", "video", "file"]>;
         alt: z.ZodOptional<z.ZodString>;
-        thumbnailUrl: z.ZodOptional<z.ZodString>;
+        thumbnailUrl: z.ZodOptional<z.ZodEffects<z.ZodString, string, string>>;
     }, "strip", z.ZodTypeAny, {
         type: "video" | "image" | "file";
         url: string;
@@ -185,10 +185,10 @@ export declare const updateBlogPostSchema: z.ZodObject<{
         thumbnailUrl?: string | undefined;
     }>, "many">>>>;
     additionalImages: z.ZodOptional<z.ZodDefault<z.ZodOptional<z.ZodArray<z.ZodObject<{
-        url: z.ZodString;
+        url: z.ZodEffects<z.ZodString, string, string>;
         type: z.ZodEnum<["image", "video", "file"]>;
         alt: z.ZodOptional<z.ZodString>;
-        thumbnailUrl: z.ZodOptional<z.ZodString>;
+        thumbnailUrl: z.ZodOptional<z.ZodEffects<z.ZodString, string, string>>;
     }, "strip", z.ZodTypeAny, {
         type: "video" | "image" | "file";
         url: string;

package/dist/features/blog/actions/blog-actions.js

@@ -1,5 +1,6 @@
 import { sortBy } from "@mohasinac/appkit";
 import { z } from "zod";
+import { mediaUrlSchema } from "../../../validation/schemas";
 import { serverLogger } from "../../../monitoring";
 import { blogRepository } from "../repository/blog.repository";
 import { coerceMediaField, getMediaUrl } from "../../../utils";
@@ -8,23 +9,20 @@ import { finalizeStagedMediaField, finalizeStagedMediaObject, finalizeStagedMedi
 const singleImageMediaSchema = z
     .union([
     z.object({
-        url: z.string().url(),
+        url: mediaUrlSchema,
         type: z.enum(["image", "video", "file"]),
         alt: z.string().optional(),
-        thumbnailUrl: z.string().url().optional(),
+        thumbnailUrl: mediaUrlSchema.optional(),
     }),
-    z
-        .string()
-        .url()
-        .transform((url) => ({ url, type: "image" })),
+    mediaUrlSchema.transform((url) => ({ url, type: "image" })),
 ])
     .nullable()
     .optional();
 const mediaFieldSchema = z.object({
-    url: z.string().url(),
+    url: mediaUrlSchema,
     type: z.enum(["image", "video", "file"]),
     alt: z.string().optional(),
-    thumbnailUrl: z.string().url().optional(),
+    thumbnailUrl: mediaUrlSchema.optional(),
 });
 export const createBlogPostSchema = z.object({
     title: z.string().min(1),

package/dist/features/blog/schemas/index.d.ts

@@ -267,7 +267,7 @@ export declare const blogPostSchema: z.ZodObject<{
         thumbnailUrl?: string | undefined;
         youtubeId?: string | undefined;
         duration?: number | undefined;
-    }>, z.ZodEffects<z.ZodString, {
+    }>, z.ZodEffects<z.ZodEffects<z.ZodString, string, string>, {
         url: string;
         type: "image";
     }, string>]>>>, {

package/dist/features/blog/schemas/index.js

@@ -1,5 +1,6 @@
 export * from "./firestore";
 import { z } from "zod";
+import { mediaUrlSchema } from "../../../validation/schemas";
 import { mediaFieldSchema } from "../../media/types/index";
 import { auditTimestampsShape, firestoreDateSchema } from "../../../schemas/firestore-helpers";
 // ─── Firestore document schema (W2) ───────────────────────────────────────────
@@ -31,10 +32,7 @@ export const blogPostFirestoreSchema = z.object({
 const blogCoverImageSchema = z
     .union([
     mediaFieldSchema,
-    z
-        .string()
-        .url()
-        .transform((url) => ({ url, type: "image" })),
+    mediaUrlSchema.transform((url) => ({ url, type: "image" })),
 ])
     .nullable()
     .optional()

package/dist/features/categories/api/[id]/route.js

@@ -10,6 +10,7 @@
  */
 import { NextResponse } from "next/server.js";
 import { z } from "zod";
+import { mediaUrlSchema } from "../../../../validation/schemas";
 import { getProviders } from "../../../../contracts";
 import { createRouteHandler } from "../../../../next";
 import { normalizeError } from "../../../../errors/normalize";
@@ -48,7 +49,7 @@ const categoryUpdateSchema = z
     tier: z.number().int().min(0).optional(),
     order: z.number().int().min(0).optional(),
     description: z.string().optional(),
-    imageUrl: z.string().url().optional(),
+    imageUrl: mediaUrlSchema.optional(),
     isFeatured: z.boolean().optional(),
     showOnHomepage: z.boolean().optional(),
     isActive: z.boolean().optional(),

package/dist/features/categories/api/route.js

@@ -14,6 +14,7 @@
  */
 import { NextResponse } from "next/server.js";
 import { z } from "zod";
+import { mediaUrlSchema } from "../../../validation/schemas";
 import { getProviders } from "../../../contracts";
 import { createRouteHandler } from "../../../next";
 import { normalizeError } from "../../../errors/normalize";
@@ -177,7 +178,7 @@ const categoryCreateSchema = z
     tier: z.number().int().min(0).optional(),
     order: z.number().int().min(0).optional(),
     description: z.string().optional(),
-    imageUrl: z.string().url().optional(),
+    imageUrl: mediaUrlSchema.optional(),
     isFeatured: z.boolean().optional(),
     showOnHomepage: z.boolean().optional(),
 })

package/dist/features/events/schemas/index.d.ts

@@ -467,7 +467,7 @@ export declare const eventItemSchema: z.ZodObject<{
         thumbnailUrl?: string | undefined;
         youtubeId?: string | undefined;
         duration?: number | undefined;
-    }>, z.ZodEffects<z.ZodString, {
+    }>, z.ZodEffects<z.ZodEffects<z.ZodString, string, string>, {
         url: string;
         type: "image";
     }, string>]>>>, {

package/dist/features/events/schemas/index.js

@@ -1,13 +1,11 @@
 export * from "./firestore";
 import { z } from "zod";
+import { mediaUrlSchema } from "../../../validation/schemas";
 import { mediaFieldSchema } from "../../media/types/index";
 const eventCoverImageSchema = z
     .union([
     mediaFieldSchema,
-    z
-        .string()
-        .url()
-        .transform((url) => ({ url, type: "image" })),
+    mediaUrlSchema.transform((url) => ({ url, type: "image" })),
 ])
     .nullable()
     .optional()

package/dist/features/faq/components/ContactCTA.js

@@ -6,5 +6,5 @@ const __P = {
 const CLS_CONTACT_CARD = "flex items-center gap-[var(--appkit-space-3)] rounded-lg border border-[var(--appkit-color-border)] bg-[var(--appkit-color-surface-elevated)] px-[var(--appkit-space-4)] py-[var(--appkit-space-3)] hover:border-primary/40 transition-colors";
 const CLS_CONTACT_LABEL = "text-[length:var(--appkit-text-xs)] text-[var(--appkit-color-text-muted)]";
 export function ContactCTA({ email, phone, contactHref, labels, }) {
-    return (_jsxs(Card, { variant: "outlined", padding: "lg", className: "text-center", children: [_jsx(Row, { className: "mb-6", justify: "center", children: _jsx(Div, { className: `bg-primary/10 ${__P.p8}`, rounded: "full", children: _jsx("svg", { className: "h-12 w-12 text-primary", fill: "none", stroke: "currentColor", viewBox: "0 0 24 24", children: _jsx("path", { strokeLinecap: "round", strokeLinejoin: "round", strokeWidth: 2, d: "M3 8l7.89 5.26a2 2 0 002.22 0L21 8M5 19h14a2 2 0 002-2V7a2 2 0 00-2-2H5a2 2 0 00-2 2v10a2 2 0 002 2z" }) }) }) }), _jsx(Heading, { level: 2, className: "mb-3", size: "2xl", weight: "semibold", children: labels?.title ?? "Need More Help?" }), _jsx(Text, { className: "mx-auto mb-6 max-w-2xl", color: "muted", children: labels?.description ?? "Our support team is here to help you." }), _jsxs(Div, { layout: "grid", gap: "4", className: "mb-8 grid-cols-1 md:grid-cols-3", children: [_jsxs(TextLink, { href: `mailto:${email}`, variant: "none", className: CLS_CONTACT_CARD, children: [_jsx(Text, { className: CLS_CONTACT_LABEL, children: labels?.emailUs ?? "Email Us" }), _jsx(Text, { size: "xs", color: "muted", children: email })] }), _jsxs(TextLink, { href: `tel:${phone}`, variant: "none", className: CLS_CONTACT_CARD, children: [_jsx(Text, { className: CLS_CONTACT_LABEL, children: labels?.callUs ?? "Call Us" }), _jsx(Text, { size: "xs", color: "muted", children: phone })] }), _jsxs(TextLink, { href: contactHref, className: CLS_CONTACT_CARD, children: [_jsx(Text, { className: CLS_CONTACT_LABEL, children: labels?.contactForm ?? "Contact Form" }), _jsx(Text, { size: "xs", color: "muted", children: labels?.submitRequest ?? "Submit a request" })] })] }), _jsxs(TextLink, { rounded: "xl", href: contactHref, layout: "inline-flex", align: "center", gap: "sm", className: "bg-primary p-[1.5rem] text-white transition-colors hover:bg-primary/90", weight: "medium", children: [_jsx(Span, { children: labels?.contactTeam ?? "Contact Team" }), _jsx("svg", { className: "h-5 w-5", fill: "none", stroke: "currentColor", viewBox: "0 0 24 24", children: _jsx("path", { strokeLinecap: "round", strokeLinejoin: "round", strokeWidth: 2, d: "M9 5l7 7-7 7" }) })] })] }));
+    return (_jsxs(Card, { variant: "outlined", padding: "lg", className: "text-center", children: [_jsx(Row, { className: "mb-6", justify: "center", children: _jsx(Div, { className: `bg-primary/10 ${__P.p8}`, rounded: "full", children: _jsx("svg", { className: "h-12 w-12 text-primary", fill: "none", stroke: "currentColor", viewBox: "0 0 24 24", children: _jsx("path", { strokeLinecap: "round", strokeLinejoin: "round", strokeWidth: 2, d: "M3 8l7.89 5.26a2 2 0 002.22 0L21 8M5 19h14a2 2 0 002-2V7a2 2 0 00-2-2H5a2 2 0 00-2 2v10a2 2 0 002 2z" }) }) }) }), _jsx(Heading, { level: 2, className: "mb-3", size: "2xl", weight: "semibold", children: labels?.title ?? "Need More Help?" }), _jsx(Text, { className: "mx-auto mb-6 max-w-2xl", color: "muted", children: labels?.description ?? "Our support team is here to help you." }), _jsxs(Div, { layout: "grid", gap: "4", className: "mb-8 grid-cols-1 md:grid-cols-3", children: [_jsxs(TextLink, { href: `mailto:${email}`, variant: "none", className: CLS_CONTACT_CARD, children: [_jsx(Text, { className: CLS_CONTACT_LABEL, children: labels?.emailUs ?? "Email Us" }), _jsx(Text, { size: "xs", color: "muted", children: email })] }), _jsxs(TextLink, { href: `tel:${phone}`, variant: "none", className: CLS_CONTACT_CARD, children: [_jsx(Text, { className: CLS_CONTACT_LABEL, children: labels?.callUs ?? "Call Us" }), _jsx(Text, { size: "xs", color: "muted", children: phone })] }), _jsxs(TextLink, { href: contactHref, className: CLS_CONTACT_CARD, children: [_jsx(Text, { className: CLS_CONTACT_LABEL, children: labels?.contactForm ?? "Contact Form" }), _jsx(Text, { size: "xs", color: "muted", children: labels?.submitRequest ?? "Submit a request" })] })] }), _jsxs(TextLink, { rounded: "xl", href: contactHref, layout: "inline-flex", align: "center", gap: "sm", className: "bg-primary p-[1.5rem] text-white transition-colors hover:bg-primary/90", weight: "medium", children: [_jsx(Span, { children: labels?.contactTeam ?? "Contact Team" }), _jsx("svg", { className: "h-5 w-5 shrink-0", fill: "none", stroke: "currentColor", viewBox: "0 0 24 24", children: _jsx("path", { strokeLinecap: "round", strokeLinejoin: "round", strokeWidth: 2, d: "M9 5l7 7-7 7" }) })] })] }));
 }