domma-cms 1.6.38 → 1.6.39

package/plugins/free-tier.lock.json

@@ -1,6 +1,6 @@
 {
   "note": "Written by `make sync-free-tier` in dcms-marketplace. Do not edit these plugins here - edit them there and sync.",
-  "source": "dcms-marketplace@e4f2659",
+  "source": "dcms-marketplace@0525295",
   "plugins": {
     "blog": {
       "version": "1.9.7",
@@ -118,14 +118,14 @@
       }
     },
     "feedback": {
-      "version": "1.1.7",
+      "version": "1.1.8",
       "files": {
-        "CLAUDE.md": "f06ec835ba056943a495eaaacd27d3bbe331e6c0fb5e46246a25f5918709d76e",
+        "CLAUDE.md": "8666d4ef8d8620f0fc20f544a4c1915cddc21370cbc27a7f854ebfe41f4cfe1d",
         "admin/css/index.css": "c8f827ad62386134e87bc05bd2c8e24f41184402b0a5a17e7250d749240c34c0",
         "admin/lib/kit.js": "502d2d090e8aaeda03034864b4e3cc0d9bbf7e8fba29b6e4916a8a758c0cd54d",
         "admin/lib/settings.js": "6e3fe9103fcbf7acb52211698ca408fac067e061100e580a9a3011cd76bdfba3",
         "admin/templates/feedback.html": "a366dce78f6c3e84a7cb0ac63eba53e1980a4eb44154496a0536f5214c5bb36f",
-        "admin/views/feedback.js": "2186a648b237b435f806d12fa963af9519e6f90d5691012d4fc2fb1c3bf10689",
+        "admin/views/feedback.js": "5aed85f09ef8af762d425912ca7fb4299ec129a21822863edf431af4f1a12e64",
         "admin/views/inbox.js": "20cc1bd16df59c775f0e2d398f4179d0e30683a3a76a942e250f59f7cbdce98a",
         "admin/views/send.js": "104290b8f58f7e8d75d86de0b3f5496bd38546b6bfb20ddff45e153e61f7d061",
         "collections/feedback-reports.json": "a072291b52463f7785a77f5f77d36b8238ba8f89cfc2672c6642eccdb3144486",
@@ -134,13 +134,13 @@
         "lib/attachments.js": "b23bda973c2e7723bc485c5f2840868363a3ac4e65c153cb5abd5a3c41dba3ad",
         "lib/cache.js": "6db2859c21a3dddcc2ec34e8380dd672fc99a6cb0d76a2b05b68086503f4ccce",
         "lib/receiver.js": "98aeea6712ba6aa576919520a86451f7f223e5154416a225a848e0c875923c8d",
-        "lib/sender.js": "5e1e1b0a052ac0488a68eb263d05b1bbc39120994a17d3aa67937f01c6704228",
+        "lib/sender.js": "58194d1ab562e55e7ac6a29aed6b5ec8316ec6932b40b44034bb347e8f799f79",
         "lib/shape.js": "47ccbbb95598023f8de03dd0f557205159375fd2bb61ee799a19c186c45bc4d9",
-        "plugin.js": "f261d429b9e3c1bcccb9e74af47c639ff380a718c55e1a56f861403e29a71bae",
-        "plugin.json": "1db9a277fcd079e226af5c75498dfd05e88ff57bab66257009360bdca09f41b0",
+        "plugin.js": "dd9cf5066e8491184a782112ed9463a211b37c2dbd93caf832edd65c2bb0e2a4",
+        "plugin.json": "9712d3eba3d81a0a8f5f85dfa168ea158d14b6ef9c0de6416314938c1b41f6ed",
         "tests/api.test.js": "67336ed4a034e21ead5876becefa1de2fa2229b06689385471516df92e198d33",
         "tests/settings.test.js": "3a50ac89a9d114c8466fc043a66f0f1bf373e7a7ad6dba45a995468c3332b374",
-        "tests/shape.test.js": "5d85759e51256a26ad0fea32fd4676b53ca45d023b93cb9cb295ad40df2bae43"
+        "tests/shape.test.js": "2e2e5e17ce059fbaa4dad8170ae45382d6c7e74bacf3b301814bb81a60ba98ba"
       }
     },
     "mail-reader": {
@@ -181,14 +181,14 @@
       }
     },
     "shopping-cart": {
-      "version": "1.6.2",
+      "version": "1.6.3",
       "files": {
-        "CLAUDE.md": "4783c7003984b7f43a1ac216d44f450d1459e800a00d68f816cac25808cc5ac2",
+        "CLAUDE.md": "1c881307d422beaeaef405b9d90ec4c71679fdebe0a919353fbd9c597e26b22b",
         "admin/css/index.css": "dcb2d30126c2e049b03a2e2b615082a067ab4dc911c87bf128029c900e6691b4",
         "admin/lib/chart.js": "b01ce5cfac773c8df8efccab50b67d3dfa99fbead0037d817553db4a6688d4d6",
         "admin/lib/kit.js": "d9aa90469b3f589beaff0c3fb6ad3d983ab3fd6d94c06965be639a665bfe052f",
         "admin/templates/shop.html": "c5bb03f1f7cbabfbd8202f3533783eb1848103755b1ba25fdcf1fd8e9478cb8e",
-        "admin/views/orders.js": "1ef4df77c392c8940e189db8bc40e25b3f7fcca202d815417f750d1fc8da34f2",
+        "admin/views/orders.js": "1c5b571027c78223f98dec2a39c1af8e33e0d810a9b34e0b176ebf85c5c9f486",
         "admin/views/overview.js": "97045c069c6560b3f67e1b2230bdc9c4133ed92ec6f732886470f886f11c755a",
         "admin/views/products.js": "e109660355aaec8db07eb65fa1169e7d2ec20bc2ec45293cc20e34f7c1bd62bf",
         "admin/views/sales.js": "da71b9fbb7d39e39ecd8be35b1187e88bc4b5b28f18baaeddc6ea4cd202bb330",
@@ -211,7 +211,7 @@
         "lib/shop.js": "baa5dfc4e410210e8ba13678997ee5752eb2ebe72fc4d3e449465d29b60b458d",
         "lib/summary.js": "cdb13ce3d1799d429059fa03f179281711dc00427ccf2eb6b8f8aa52fef26295",
         "plugin.js": "824dba8336846d443b2427ed9a5adeba11740570566fc6e89257f9847a488632",
-        "plugin.json": "116c9b7964398caf788ae0d1cd0ebb88517a35e404ad834ed3afb869676fc1c8",
+        "plugin.json": "475c64d3e5f07d0dd4f1480b65630d0e9ef362418653477de9be617aac13dc10",
         "plugin.public.js": "2f92e8340c9da653401c11dd99dab033dc6772d63fa2114489192c48e9e0be00",
         "public/account.js": "5f644016c098c7879c59948d662f5997cb61680996204ecb7897baab8945d434",
         "public/cart.js": "7338141392ec653ff616eb75688d2a2ad08cff8427d7020d381f540be0037b73",
@@ -237,22 +237,22 @@
         "tests/accounts.test.js": "e64adc2a855d4ca017682bba7f75b052534f826556d8d35d825fb79cbc66596a",
         "tests/api.test.js": "15c71751a3d31171707cbb3119d21b85c1c59fb7a67272b318dd4655809ac8d2",
         "tests/commission.test.js": "fbc4cf83e0ed6446a09e57e4ff37a9608c81947c633c78ac6049eb0aedf6cb58",
-        "tests/pure.test.js": "13620f708f21e2590979e8579e2e7788d6109e1682bf73d7b1eb64838da35196",
+        "tests/pure.test.js": "59a351c813784e8131b96a118c79de2e3858a2fba0fc5c0a6baed79e28cafda8",
         "tests/refunds.test.js": "0ae06afca3cf9fd1fe89f1fbc63b3676216c79e174dbcb83788180c01d078366",
         "tests/sales.test.js": "9025bc608b04bcc14f5bb2c98b4f7c35de99f3ddab4ffa59772d045795bf2cb7"
       }
     },
     "support": {
-      "version": "1.1.5",
+      "version": "1.1.6",
       "files": {
-        "CLAUDE.md": "1e7f80df50b81b472f353a935be547c773efefcf1f03e71c4adead8130134f77",
+        "CLAUDE.md": "65845bbf6a909cd523466896874e84a2a29d239fdc5da0840df5155913cdcf23",
         "admin/css/index.css": "6695029b1da2a2e4ff25db4abecd360895ed39e4a9bc7f0996857672faf2c426",
         "admin/lib/kit.js": "3d5a5fb5c53f7cc9ff98664803ff58701a4d8598068e9f1a16e9db0a72109c40",
         "admin/lib/settings.js": "3f0b7c4c5ab927b2785af2abb3872ffd9269d12b402468f79795c4198eb49ea0",
         "admin/templates/support.html": "2bb69d0443a367a402e6160fe68f4af3e8983b578cfff9575b4df9a534fcb480",
         "admin/views/desk.js": "4f3cffe3603592d715c6a9b553e02dc7331a2675cabaeddff709c91436531734",
         "admin/views/inbox.js": "8134d91e20a19eb2ca7b25edb604fa241e65b764e0d058ee5d8751f903a16c32",
-        "admin/views/support.js": "6f3f303cd498a2f396bbb995e24894bd710567b224d1bbbdc6eca04f389dfef8",
+        "admin/views/support.js": "d1c72cc2e35609e54be296791cdcceb43be9be016b6c307000ddb8a226ba6d92",
         "collections/support-tickets.json": "55a0856bacd66c2e8f1e3c85bdf3638e5ff826560943cda854a8f2d336a88905",
         "config.js": "eb7ccc1169fa8b2be52a213536825492fedaec5fa73fd749cba9f498dd54b503",
         "docs/guide.md": "bfe570f4f485f58ae3aab4f71039e5e426f85f6f348c96794dfcb2dc494fced1",
@@ -260,13 +260,13 @@
         "lib/cache.js": "70cc826b24cc5359597a5c83a990f6da43cadebf2ac34094aee42058240fb72d",
         "lib/mail.js": "d14aae3a59aad6af61451863cdaaf94fc4a87810b16e1dcb9c655dda6c803b3b",
         "lib/receiver.js": "c9401cc799e5eafd419c136c95826ca28a8455e32e99cea32f4821acc1fb6c26",
-        "lib/sender.js": "46abee3e2bd7ac8d763d1f56b385c2b9367012a223d61831694292a35bdaf142",
+        "lib/sender.js": "2b308422ac60a8a2801570e06319d5972797a601640c67beee95ccab9ac64092",
         "lib/shape.js": "d60b48410aa5582ea80451c3d831686b0e29525a958733a8bc9dfaae8eca94d2",
         "plugin.js": "91fff8d66bf5fa0fa4502bb177460ae234f0ed0494a4fbe6dd94d63e2f88b571",
-        "plugin.json": "a2e0d141b1548f95147f6d113a35bd46f9add485f4cb65d710ae5c8a12ffe5a7",
+        "plugin.json": "70bf4f117c4b2f9132365f73a1b1a38c3dfd5618d5273a8c899a2393323ebf43",
         "tests/api.test.js": "1af65f0cba8a83c080a6e3e65544abc86fc43c8e25ca05c7f3e1ab4e3f7ac5a2",
         "tests/settings.test.js": "434acbfd940eef800b1166a9aaf36363351af5652fcfb06527b8498866b7b964",
-        "tests/shape.test.js": "d68ad350fbf1335c436f0cb311adaa3268f25db61cb65b266ab3330c217047bf"
+        "tests/shape.test.js": "7866c6c1d140716bf0817449937d6d711d7c3b97be1db1e1eb33bde341e36296"
       }
     }
   }

package/plugins/shopping-cart/CLAUDE.md

@@ -243,3 +243,10 @@ Cart only READS it (`lib/commission.js currentCommission`, re-read when the file
 `saveSettings` move it too. `GET /count` (every admin tab, every minute, all orders + products) keeps one answer for
 60 s unless the generation moved; an answer worked out across a write is not kept. `services.writeGeneration` lets
 extensions (Takeaway 0.4.2) cache their own order reads the same way - feature-detect it, older Carts lack it.
+
+## 1.6.3 (2026-10-13): the Refund form was empty
+`E.confirm` sanitises its message (preset basic), which strips `<input>` - so 1.6.2's Refund dialog showed only the words,
+no amount, reason or restock box, and OK refunded the WHOLE order. `refund()` in `admin/views/orders.js` is now a small
+slideover (`openPanel`, like Fulfil): amount (prefilled with what is left), reason, restock box (greyed out unless the
+amount is all that is left), a Refund button. Never put form fields in `E.confirm` / `E.alert`.
+`tests/pure.test.js` "admin: no form fields inside E.confirm" guards it across the admin views.

package/plugins/shopping-cart/admin/views/orders.js

@@ -172,54 +172,74 @@ export async function mount(root, ctx) {
     /** Money already given back on an order (legacy whole-order refunds included). */
     const refundedOf = (d) => Array.isArray(d.refunds) ? d.refunds.reduce((n, r) => n + (Number(r.amount) || 0), 0) : d.status === 'refunded' ? d.total || 0 : 0;
 
-    async function refund(o) {
-        const d = o.data;
-        const via = {stripe: 'through Stripe', paypal: 'through PayPal'}[d.provider];
-        const left = Math.max(0, (d.total || 0) - refundedOf(d));
-        const before = refundedOf(d);
-        const html = `<p>Refund ${esc(orderLabel(d))}${before ? ` - <strong>${esc(money(left))}</strong> of ${esc(money(d.total))} is left to refund (${esc(money(before))} already refunded).` : `, <strong>${esc(money(d.total))}</strong>.`}</p>
-<label class="form-label" for="shp-refund-amount">Amount <span data-help="Leave the whole amount for a full refund. A smaller amount is a part refund: the order stays as it is, with what was given back on it, and you can refund the rest later."></span></label>
-<input class="form-input" id="shp-refund-amount" inputmode="decimal" value="${esc(moneyIn(left))}" aria-describedby="shp-refund-hint">
-<p class="shp-muted" id="shp-refund-hint">${via && d.paymentRef ? `The money goes back ${via} straight away.` : 'This only records the refund - give the money back the way it came.'}</p>
-<label class="form-label" for="shp-refund-note">Reason <span class="shp-muted">(optional, kept on the order)</span></label>
-<input class="form-input" id="shp-refund-note" maxlength="200" placeholder="Damaged in the post, one item missing…">
-<label class="shp-check"><input type="checkbox" id="shp-restock" ${d.stockTaken ? 'checked' : 'disabled'}> Put the items back in stock <span class="shp-muted">(full refund only)</span></label>`;
-        let restock = Boolean(d.stockTaken);
-        let amountText = moneyIn(left);
-        let note = '';
-        const onChange = (e) => {
-            if (e.target.id === 'shp-restock') restock = e.target.checked;
-            if (e.target.id === 'shp-refund-amount') {
-                amountText = e.target.value;
-                // Stock only comes back when the whole order is refunded, so the box greys out on a part refund.
-                const box = document.getElementById('shp-restock');
-                const full = moneyOut(amountText) === left;
-                if (box && d.stockTaken) { box.disabled = !full; if (!full) box.checked = false; else box.checked = restock; }
-            }
-            if (e.target.id === 'shp-refund-note') note = e.target.value;
-        };
-        document.addEventListener('input', onChange);
-        document.addEventListener('change', onChange);
-        const ok = await E.confirm(html);
-        document.removeEventListener('input', onChange);
-        document.removeEventListener('change', onChange);
-        if (!ok) return null;
-        const amount = moneyOut(amountText);
-        if (!Number.isInteger(amount) || amount <= 0 || amount > left) {
-            E.toast(`Enter an amount between ${money(1)} and ${money(left)}.`, {type: 'error'});
-            return null;
-        }
-        const full = amount === left;
-        try {
-            const r = await api.orders.refund(o.id, {amount: full ? undefined : amount, restock: full && restock, note});
-            replace(r.order);
-            refreshBadge();
-            E.toast(`${orderLabel(d)} ${r.how}.`, {type: 'success'});
-            return r.order;
-        } catch (err) {
-            E.toast(err.message || String(err), {type: 'error'});
-            return null;
-        }
+    /**
+     * Refund - all that is left, or part of it - in a small form of its own. (Not E.confirm: its message is
+     * sanitised, which strips inputs, so the amount, reason and restock box never showed and OK refunded it all.)
+     */
+    function refund(o) {
+        return new Promise((resolve) => {
+            const d = o.data;
+            const via = {stripe: 'through Stripe', paypal: 'through PayPal'}[d.provider];
+            const before = refundedOf(d);
+            const left = Math.max(0, (d.total || 0) - before);
+            const f = {amount: M.observable(moneyIn(left)), note: M.observable(''), saving: M.observable(false)};
+            let restock = Boolean(d.stockTaken);
+            const full = () => moneyOut(f.amount.peek()) === left;
+            let panel = null;
+            let box = null;
+            // Stock only comes back when the whole order is refunded, so the box greys out on a part refund.
+            const syncBox = () => { if (box && d.stockTaken) { box.disabled = !full(); box.checked = full() && restock; } };
+            const stop = M.effect(() => { f.amount.value; syncBox(); });
+            openPanel({
+                title: `${before ? 'Refund more of' : 'Refund'} ${orderLabel(d)}`,
+                size: 'sm',
+                model: f,
+                html: `<div class="shp-form">
+  <p class="shp-note">${before ? `<strong>${esc(money(left))}</strong> of ${esc(money(d.total))} is left to refund (${esc(money(before))} already refunded).` : `The order came to <strong>${esc(money(d.total))}</strong>.`}</p>
+  <label class="form-label" for="shp-refund-amount">Amount <span data-help="Leave the whole amount for a full refund. A smaller amount is a part refund: the order stays as it is, with what was given back on it, and you can refund the rest later."></span></label>
+  <input class="form-input" id="shp-refund-amount" inputmode="decimal" data-model="amount.value" aria-describedby="shp-refund-hint">
+  <p class="shp-muted" id="shp-refund-hint">${via && d.paymentRef ? `The money goes back ${via} straight away.` : 'This only records the refund - give the money back the way it came.'}</p>
+  <label class="form-label" for="shp-refund-note">Reason <span class="shp-muted">(optional, kept on the order)</span></label>
+  <input class="form-input" id="shp-refund-note" maxlength="200" data-model="note.value" placeholder="Damaged in the post, one item missing…">
+  <label class="shp-check"><input type="checkbox" id="shp-restock"> Put the items back in stock <span class="shp-muted">(full refund only)</span></label>
+  <div class="shp-actions"><span class="shp-spacer"></span>
+    <button type="button" class="btn btn-sm btn-ghost" data-on-click="cancel">Cancel</button>
+    <button type="button" class="btn btn-sm btn-danger" data-on-click="save" data-bind-disabled="saving.value"><span data-icon="credit-card" data-icon-size="13"></span> Refund</button></div>
+</div>`,
+                before: (el) => {
+                    box = el.querySelector('#shp-restock');
+                    if (!d.stockTaken) box.disabled = true;
+                    box.addEventListener('change', () => { restock = box.checked; });
+                    syncBox();
+                },
+                cleanup: () => { stop?.(); resolve(null); },
+                methods: {
+                    cancel: () => panel?.close(true),
+                    async save() {
+                        if (f.saving.peek()) return;
+                        const amount = moneyOut(f.amount.peek());
+                        if (!Number.isInteger(amount) || amount <= 0 || amount > left) {
+                            E.toast(`Enter an amount between ${money(1)} and ${money(left)}.`, {type: 'error'});
+                            return;
+                        }
+                        const all = amount === left;
+                        f.saving.value = true;
+                        try {
+                            const r = await api.orders.refund(o.id, {amount: all ? undefined : amount, restock: all && restock, note: f.note.peek()});
+                            replace(r.order);
+                            refreshBadge();
+                            E.toast(`${orderLabel(d)} ${r.how}.`, {type: 'success'});
+                            resolve(r.order);
+                            panel?.close(true);
+                        } catch (err) {
+                            E.toast(err.message || String(err), {type: 'error'});
+                        } finally {
+                            f.saving.value = false;
+                        }
+                    }
+                }
+            }).then(p => { panel = p; p.panel.querySelector('#shp-refund-amount')?.focus(); });
+        });
     }
 
     async function remove(o) {

package/plugins/shopping-cart/plugin.json

@@ -1,7 +1,7 @@
 {
   "name": "shopping-cart",
   "displayName": "Shopping Cart",
-  "version": "1.6.2",
+  "version": "1.6.3",
   "tier": "free",
   "description": "Sell from your site: products with options, stock and pictures, a storefront and a cart that follows shoppers from page to page, and checkout with Stripe, PayPal or payment offline. Orders to fulfil in the sidebar, refunds from the order.",
   "author": "Domma CMS",

package/plugins/shopping-cart/tests/pure.test.js

@@ -313,3 +313,19 @@ test('payments: Stripe refunds and sessions carry an Idempotency-Key, so a retry
         assert.equal(seen[2].init.headers['Idempotency-Key'], 'shop-session-o1');
     } finally { globalThis.fetch = realFetch; }
 });
+
+test('admin: no form fields inside E.confirm (its message is sanitised; inputs vanish)', async () => {
+    const {readFileSync, readdirSync} = await import('node:fs');
+    const dir = new URL('../admin/views/', import.meta.url);
+    for (const f of readdirSync(dir).filter(n => n.endsWith('.js'))) {
+        const src = readFileSync(new URL(f, dir), 'utf8');
+        for (const m of src.matchAll(/E\.confirm\(\s*([A-Za-z_$][\w$]*)\s*[,)]/g)) {
+            // A variable passed to E.confirm: find its last assignment before the call and refuse form fields in it.
+            const before = src.slice(0, m.index);
+            const at = before.lastIndexOf(`${m[1]} =`);
+            const assigned = at < 0 ? '' : before.slice(at, at + 4000);
+            assert.ok(!/<(input|select|textarea)\b/.test(assigned), `${f}: E.confirm(${m[1]}) carries form fields`);
+        }
+        for (const m of src.matchAll(/E\.confirm\(`([^`]*)`/g)) assert.ok(!/<(input|select|textarea)\b/.test(m[1]), `${f}: E.confirm with form fields`);
+    }
+});

package/plugins/support/CLAUDE.md

@@ -133,3 +133,10 @@ copy of the pure rules (lib/shape.js) and the store (lib/attachments.js) since e
 - `admin/lib/settings.js`: the cog, added by `support.js` once the mode is known, only when the silent
   `GET /settings` answers; slideover through kit's `openPanel`, M bindings, data-help per field, discard guard,
   Ctrl+Enter. Test: tests/settings.test.js.
+
+## 1.1.6 (2026-10-13) - a request deleted on the manager takes the site's files with it
+The site keeps a copy of each file it sent (`outbox.files`, newest 2000) to draw its own thread, and the prune spared
+every id on that list - so a request Domma deleted left its screenshots on the site for good. `remember(remote)` now
+narrows `files` with `keepFiles(files, remote, items)` (PURE, tested): only ids in a message of a request the manager
+still holds (its `/fleet/mine` is complete for the site) or named by an outbox item. The next prune (older than a day)
+removes the rest. Found on the dcm click-through.

package/plugins/support/admin/views/support.js

@@ -15,7 +15,7 @@ import {api, loadKit} from '../lib/kit.js';
 import {addSettingsCog} from '../lib/settings.js';
 
 const ROUTE = /^#\/plugins\/support(\/|$)/;
-const V = '1.1.5';
+const V = '1.1.6';
 let lifetime = null;
 
 export const supportView = {

package/plugins/support/lib/sender.js

@@ -139,6 +139,9 @@ export function createOutbox(dataDir) {
                     const known = latest.has(ref);
                     if ((!known && !local.has(ref)) || (known && (latest.get(ref) || '') !== (entry.dommaAt || ''))) delete s.shelf[ref];
                 }
+                // Files this site keeps to show its own thread: only those the manager still has (a request
+                // deleted there takes its files with it) or an item here still names. The next prune removes the rest.
+                s.files = keepFiles(s.files, remote, s.items);
                 const byRef = new Map(remote.map(t => [t.ref, t]));
                 const have = new Set(remote.flatMap(t => [t.ref, ...(t.messages || []).map(m => m.id)]));
                 s.items = s.items.filter((i) => {
@@ -157,6 +160,18 @@ export function createOutbox(dataDir) {
     };
 }
 
+/**
+ * Of the file ids this site kept after sending them, those still wanted: in a message of a request the
+ * manager still holds (its list for this site is complete), or named by an outbox item. PURE.
+ */
+export function keepFiles(files, remote, items = []) {
+    const live = new Set([
+        ...(remote || []).flatMap(t => (t.messages || []).flatMap(m => (m.attachments || []).map(a => a.id))),
+        ...(items || []).flatMap(i => (i.payload?.attachments || []).map(a => a.id))
+    ]);
+    return (files || []).filter(id => live.has(id));
+}
+
 /** Has every file an item announced been sent, or given up on? */
 const filesDone = (i) => {
     const done = new Set([...(i.filesSent || []), ...(i.filesRefused || [])]);

package/plugins/support/plugin.json

@@ -1,7 +1,7 @@
 {
   "name": "support",
   "displayName": "Support",
-  "version": "1.1.5",
+  "version": "1.1.6",
   "tier": "free",
   "description": "Get help from Domma straight from your admin: our email, phone and hours always to hand, and a conversation with the Domma team for anything you need - urgent requests first. Right-click a request to archive, resolve or remove it.",
   "author": "Domma CMS",
@@ -61,7 +61,7 @@
     ],
     "views": {
       "plugin-support": {
-        "entry": "support/admin/views/support.js?v=1.1.5",
+        "entry": "support/admin/views/support.js?v=1.1.6",
         "exportName": "supportView"
       }
     }

package/plugins/support/tests/shape.test.js

@@ -5,7 +5,7 @@ import {
     addTurn, buildMessagePayload, buildTicketPayload, cleanRequest, cleanUpdate, contactCard, createThrottle, lastDommaAt,
     receivedTicket, senderView, telHref, toCustomerEmail, toDommaEmail
 } from '../lib/shape.js';
-import {applyShelf, createOutbox, flush, mergeTickets} from '../lib/sender.js';
+import {applyShelf, createOutbox, flush, keepFiles, mergeTickets} from '../lib/sender.js';
 import fs from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
@@ -237,3 +237,27 @@ test('a sent message stays in the outbox until its files have gone', () => {
         assert.ok(ob.fileIds().has(file(1).id), 'the file itself is still wanted: the thread shows it');
     } finally { fs.rmSync(dir, {recursive: true, force: true}); }
 });
+
+test('files kept for the thread go when the manager no longer has their request', () => {
+    const remote = [{ref: 't1', messages: [{id: 'm1', attachments: [{id: 'f1'}]}, {id: 'm2'}]}];
+    const items = [{ref: 'm9', payload: {attachments: [{id: 'f3'}]}}];
+    assert.deepEqual(keepFiles(['f1', 'f2', 'f3'], remote, items), ['f1', 'f3'], 'f2 was on a request deleted at the manager');
+    assert.deepEqual(keepFiles(['f1'], [], []), []);
+    assert.deepEqual(keepFiles(undefined, remote), []);
+});
+
+test('remember(): a deleted request takes its files out of the keep list', () => {
+    const dir = fs.mkdtempSync(path.join(os.tmpdir(), 'sup-outbox-'));
+    try {
+        const box = createOutbox(dir);
+        box.add('ticket', {ref: 't1', attachments: [{id: 'f1'}]});
+        box.mark('t1', {state: 'sent'});
+        box.fileSent('t1', 'f1');
+        box.remember([{ref: 't1', messages: [{id: 't1', attachments: [{id: 'f1'}]}]}], null);
+        assert.ok(box.fileIds().has('f1'), 'still on the manager: kept');
+        box.remember([], null);
+        assert.equal(box.fileIds().has('f1'), false, 'deleted on the manager: no longer kept');
+    } finally {
+        fs.rmSync(dir, {recursive: true, force: true});
+    }
+});

package/server/routes/outreach-public.js

@@ -40,7 +40,7 @@ const badLink = () => page('Unsubscribe', '<h1>That link is not right.</h1><p>Us
 
 /** The confirm page: the same e and k, posted back by one button. */
 function confirmPage(email, e, k) {
-    return page('Unsubscribe', `<h1>Unsubscribe?</h1><p>${esc(email)} will get no more campaign or survey emails from this site.</p>`
+    return page('Unsubscribe', `<h1>Unsubscribe?</h1><p>${esc(email)} will get no more campaign, survey or onboarding emails from this site.</p>`
         + `<form method="post" action="${UNSUBSCRIBE_PATH}"><input type="hidden" name="e" value="${esc(e)}"><input type="hidden" name="k" value="${esc(k)}">`
         + `<button type="submit" class="btn btn-primary">Unsubscribe</button></form>`);
 }
@@ -107,6 +107,6 @@ export async function outreachPublicRoutes(fastify, opts = {}) {
         if (!opts.col) await ensureList();
         await suppression.add(email, 'unsubscribe-link');
         return html(reply).send(page('Unsubscribed',
-            `<h1>You are unsubscribed.</h1><p>${esc(email)} will get no more campaign or survey emails from this site.</p>`));
+            `<h1>You are unsubscribed.</h1><p>${esc(email)} will get no more campaign, survey or onboarding emails from this site.</p>`));
     });
 }

package/server/services/request-log.js

@@ -12,7 +12,9 @@
  */
 
 /** Parameter names redacted whatever their case. */
-const SENSITIVE = new Set(['token', 't', 'key', 'hostkey', 'invitekey']);
+// `code` and `state`: an OAuth2 callback (the mail sign-in) carries a live
+// authorisation code and its one-time ticket in the query string.
+const SENSITIVE = new Set(['token', 't', 'key', 'hostkey', 'invitekey', 'code', 'state']);
 
 /** Anything with secret or password in the name is redacted too. */
 const SENSITIVE_PATTERN = /secret|password|passwd/i;