@blamejs/blamejs-shop 0.3.24 → 0.3.26

package/lib/asset-manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.3.24",
+  "version": "0.3.26",
   "assets": {
     "css/admin.css": {
       "integrity": "sha384-1SIn6oAf1DjECbRfKENZasdKHJiywGdXR58wn0hsFGcdVHzUmvfgMkEz5ANIAZJ3",

package/lib/storefront.js

@@ -3158,6 +3158,215 @@ function renderReturns(opts) {
   });
 }
 
+// Support ticket — the categories a shopper can pick when raising one,
+// and the human label for each. The values mirror the support-tickets
+// module's ALLOWED_CATEGORIES; the backend validates the submitted value
+// against its own allow-list, so a forged value is refused there.
+var SUPPORT_CATEGORIES = [
+  ["pre_sale",        "Pre-sale question"],
+  ["order_issue",     "Problem with an order"],
+  ["shipping",        "Shipping / delivery"],
+  ["billing",         "Billing"],
+  ["refund",          "Refund"],
+  ["account",         "My account"],
+  ["complaint",       "Complaint"],
+  ["feature_request", "Feature request"],
+  ["other",           "Something else"],
+];
+
+// Customer-facing status word for a ticket. The module's status enum is
+// operator vocabulary (new / in_progress / waiting_customer / resolved /
+// closed / reopened); these are the shopper-facing phrasings.
+var SUPPORT_STATUS_LABELS = {
+  "new":              "Received",
+  "in_progress":      "In progress",
+  "waiting_customer": "Awaiting your reply",
+  "resolved":         "Resolved",
+  "closed":           "Closed",
+  "reopened":         "Reopened",
+};
+
+function _supportStatusBadge(status) {
+  var esc = b.template.escapeHtml;
+  var label = SUPPORT_STATUS_LABELS[status] || status;
+  return "<span class=\"return-status return-status--" + esc(String(status)) + "\">" +
+    esc(String(label)) + "</span>";
+}
+
+function _supportCategoryLabel(value) {
+  for (var i = 0; i < SUPPORT_CATEGORIES.length; i += 1) {
+    if (SUPPORT_CATEGORIES[i][0] === value) return SUPPORT_CATEGORIES[i][1];
+  }
+  return value;
+}
+
+// The signed-in customer's support-ticket list. `opts.tickets` is the
+// ownership-scoped set (already filtered to this customer); each links to
+// its thread view.
+function renderSupportList(opts) {
+  var esc = b.template.escapeHtml;
+  var tickets = opts.tickets || [];
+  var rowsHtml = "";
+  for (var i = 0; i < tickets.length; i += 1) {
+    var t = tickets[i];
+    var date = t.opened_at ? new Date(Number(t.opened_at)).toISOString().slice(0, 10) : "";
+    rowsHtml +=
+      "<li class=\"return-card\">" +
+        "<div class=\"return-card__head\">" +
+          "<a class=\"return-card__rma\" href=\"/account/support/" + esc(String(t.id)) + "\">" + esc(String(t.subject)) + "</a>" +
+          _supportStatusBadge(t.status) +
+        "</div>" +
+        "<p class=\"return-card__meta\">" + esc(_supportCategoryLabel(t.category)) +
+          (date ? " &middot; <time datetime=\"" + esc(date) + "\">" + esc(date) + "</time>" : "") +
+        "</p>" +
+      "</li>";
+  }
+  var inner = rowsHtml
+    ? "<ul class=\"return-list\">" + rowsHtml + "</ul>"
+    : "<div class=\"account-empty\">" +
+        "<p class=\"account-empty__lede\">No support tickets yet. Raise one and we'll get back to you.</p>" +
+      "</div>";
+  var notice = "";
+  if (opts.created) {
+    notice = "<p class=\"form-notice form-notice--ok\" role=\"status\">Your ticket has been raised — we'll reply here.</p>";
+  }
+  var body =
+    "<section class=\"account-returns\">" +
+      "<nav class=\"breadcrumb\" aria-label=\"Breadcrumb\"><ol>" +
+        "<li><a href=\"/account\">Account</a></li>" +
+        "<li aria-current=\"page\">Support</li>" +
+      "</ol></nav>" +
+      "<header class=\"account-recently-viewed__head\">" +
+        "<h1 class=\"account-returns__title\">Support</h1>" +
+        "<a class=\"btn-primary\" href=\"/account/support/new\">Raise a ticket</a>" +
+      "</header>" +
+      notice +
+      inner +
+    "</section>";
+  return _wrap({
+    title:      "Support",
+    shop_name:  opts.shop_name || "blamejs.shop",
+    cart_count: opts.cart_count == null ? 0 : opts.cart_count,
+    theme_css:  opts.theme_css,
+    body:       body,
+  });
+}
+
+// The new-ticket form. `opts.orders` is the signed-in customer's recent
+// orders so they can attach one (optional). `opts.values` re-fills the
+// form after a validation bounce; `opts.notice` is the error to show.
+function renderSupportNew(opts) {
+  var esc = b.template.escapeHtml;
+  var v = opts.values || {};
+  var orders = opts.orders || [];
+  var categoryOpts = SUPPORT_CATEGORIES.map(function (c) {
+    var sel = v.category === c[0] ? " selected" : "";
+    return "<option value=\"" + esc(c[0]) + "\"" + sel + ">" + esc(c[1]) + "</option>";
+  }).join("");
+  var orderOptions = "<option value=\"\">No specific order</option>" +
+    orders.map(function (o) {
+      var sel = v.order_id === o.id ? " selected" : "";
+      var when = o.created_at ? new Date(Number(o.created_at)).toISOString().slice(0, 10) : "";
+      return "<option value=\"" + esc(String(o.id)) + "\"" + sel + ">" +
+        esc(String(o.id).slice(0, 8)) + (when ? " · " + esc(when) : "") + "</option>";
+    }).join("");
+  var orderField = orders.length
+    ? "<label class=\"form-field\"><span class=\"form-field__label\">Related order (optional)</span>" +
+        "<select name=\"order_id\">" + orderOptions + "</select></label>"
+    : "";
+  var notice = opts.notice
+    ? "<p class=\"form-notice form-notice--error\" role=\"alert\">" + esc(String(opts.notice)) + "</p>"
+    : "";
+  var body =
+    "<section class=\"return-form-page\">" +
+      "<nav class=\"breadcrumb\" aria-label=\"Breadcrumb\"><ol>" +
+        "<li><a href=\"/account\">Account</a></li>" +
+        "<li><a href=\"/account/support\">Support</a></li>" +
+        "<li aria-current=\"page\">Raise a ticket</li>" +
+      "</ol></nav>" +
+      "<h1 class=\"return-form-page__title\">Raise a support ticket</h1>" +
+      notice +
+      "<form class=\"return-form form-stack\" method=\"post\" action=\"/account/support\">" +
+        "<label class=\"form-field\"><span class=\"form-field__label\">Email for our reply</span>" +
+          "<input type=\"email\" name=\"customer_email\" value=\"" + esc(v.customer_email == null ? "" : String(v.customer_email)) + "\" required autocomplete=\"email\" maxlength=\"254\"></label>" +
+        "<label class=\"form-field\"><span class=\"form-field__label\">Category</span>" +
+          "<select name=\"category\" required>" + categoryOpts + "</select></label>" +
+        orderField +
+        "<label class=\"form-field\"><span class=\"form-field__label\">Subject</span>" +
+          "<input type=\"text\" name=\"subject\" value=\"" + esc(v.subject == null ? "" : String(v.subject)) + "\" required maxlength=\"200\"></label>" +
+        "<label class=\"form-field\"><span class=\"form-field__label\">How can we help?</span>" +
+          "<textarea name=\"body\" required maxlength=\"8000\" rows=\"6\">" + esc(v.body == null ? "" : String(v.body)) + "</textarea></label>" +
+        "<button type=\"submit\" class=\"btn-primary\">Send</button>" +
+      "</form>" +
+    "</section>";
+  return _wrap({
+    title:      "Raise a ticket",
+    shop_name:  opts.shop_name || "blamejs.shop",
+    cart_count: opts.cart_count == null ? 0 : opts.cart_count,
+    theme_css:  opts.theme_css,
+    body:       body,
+  });
+}
+
+// One ticket's thread view. `opts.ticket` is the row, `opts.messages` the
+// thread in created_at ASC. Internal operator notes (internal=1) are
+// filtered out by the route before rendering — they never reach the
+// customer. A non-closed ticket shows the reply box.
+function renderSupportTicket(opts) {
+  var esc = b.template.escapeHtml;
+  var t = opts.ticket;
+  var messages = opts.messages || [];
+  var msgHtml = "";
+  for (var i = 0; i < messages.length; i += 1) {
+    var m = messages[i];
+    var who = m.author === "operator" ? "Support" : m.author === "system" ? "System" : "You";
+    var when = m.created_at ? new Date(Number(m.created_at)).toISOString().slice(0, 16).replace("T", " ") : "";
+    msgHtml +=
+      "<li class=\"support-msg support-msg--" + esc(String(m.author)) + "\">" +
+        "<p class=\"support-msg__who\">" + esc(who) +
+          (when ? " <time class=\"support-msg__when\" datetime=\"" + esc(when) + "\">" + esc(when) + "</time>" : "") + "</p>" +
+        "<p class=\"support-msg__body\">" + esc(String(m.body)).replace(/\n/g, "<br>") + "</p>" +
+      "</li>";
+  }
+  var notice = opts.notice
+    ? "<p class=\"form-notice form-notice--error\" role=\"alert\">" + esc(String(opts.notice)) + "</p>"
+    : "";
+  var replyOk = opts.replied
+    ? "<p class=\"form-notice form-notice--ok\" role=\"status\">Your reply has been added.</p>"
+    : "";
+  var closed = t.status === "closed";
+  var replyForm = closed
+    ? "<p class=\"meta\">This ticket is closed. Raise a new one if you still need help.</p>"
+    : "<form class=\"return-form form-stack\" method=\"post\" action=\"/account/support/" + esc(String(t.id)) + "/reply\">" +
+        "<label class=\"form-field\"><span class=\"form-field__label\">Add a reply</span>" +
+          "<textarea name=\"body\" required maxlength=\"8000\" rows=\"5\"></textarea></label>" +
+        "<button type=\"submit\" class=\"btn-primary\">Send reply</button>" +
+      "</form>";
+  var body =
+    "<section class=\"account-returns\">" +
+      "<nav class=\"breadcrumb\" aria-label=\"Breadcrumb\"><ol>" +
+        "<li><a href=\"/account\">Account</a></li>" +
+        "<li><a href=\"/account/support\">Support</a></li>" +
+        "<li aria-current=\"page\">Ticket</li>" +
+      "</ol></nav>" +
+      "<header class=\"account-recently-viewed__head\">" +
+        "<h1 class=\"account-returns__title\">" + esc(String(t.subject)) + "</h1>" +
+        _supportStatusBadge(t.status) +
+      "</header>" +
+      "<p class=\"return-card__meta\">" + esc(_supportCategoryLabel(t.category)) + "</p>" +
+      replyOk + notice +
+      "<ul class=\"support-thread\">" + msgHtml + "</ul>" +
+      replyForm +
+    "</section>";
+  return _wrap({
+    title:      String(t.subject),
+    shop_name:  opts.shop_name || "blamejs.shop",
+    cart_count: opts.cart_count == null ? 0 : opts.cart_count,
+    theme_css:  opts.theme_css,
+    body:       body,
+  });
+}
+
 // Loyalty transaction-type pill — reuses the `pdp__badge` class the
 // theme already styles. The type is one of the ledger's closed enum
 // (earn / redeem / expire / adjust / tier-bonus).
@@ -5978,6 +6187,7 @@ var ACCOUNT_DASH_PAGE =
   "      <a class=\"btn-secondary\" href=\"/account/recently-viewed\">Recently viewed</a>\n" +
   "      <a class=\"btn-secondary\" href=\"/account/addresses\">Addresses</a>\n" +
   "      <a class=\"btn-secondary\" href=\"/account/returns\">Returns</a>\n" +
+  "      <a class=\"btn-secondary\" href=\"/account/support\">Support</a>\n" +
   "      <a class=\"btn-secondary\" href=\"/account/loyalty\">Rewards</a>\n" +
   "      <a class=\"btn-secondary\" href=\"/account/referrals\">Refer a friend</a>\n" +
   "      <a class=\"btn-secondary\" href=\"/account/subscriptions\">Subscriptions</a>\n" +
@@ -10531,6 +10741,212 @@ function mount(router, deps) {
       });
     }
 
+    // Support tickets — the signed-in customer raises a ticket, lists
+    // their own, reads a thread, and replies. EVERY route is login-gated
+    // AND scoped to the session customer's id: the support primitive
+    // stores `customer_id` on each ticket, so a ticket whose customer_id
+    // doesn't match the signed-in shopper is a 404 (never a cross-customer
+    // reveal — the IDOR defense). The raw email is never on disk, so the
+    // intake form collects a reply-to address (the backend validates +
+    // hashes it); the list / view / reply paths key on the session
+    // customer_id alone, independent of any email.
+    if (deps.supportTickets) {
+      var support = deps.supportTickets;
+
+      function _supportAuth(req, res) {
+        var auth;
+        try { auth = _currentCustomer(req); }
+        catch (e) {
+          if (e && e.code === "vault/not-initialized") { _serviceUnavailable(res, "auth not configured"); return null; }
+          throw e;
+        }
+        if (!auth) {
+          res.status(303); res.setHeader && res.setHeader("location", "/account/login");
+          res.end ? res.end() : res.send("");
+          return null;
+        }
+        return auth;
+      }
+
+      // Load the ticket named in :id and confirm it belongs to the
+      // signed-in customer. A malformed id (guardUuid TypeError from
+      // support.get), a missing ticket, or a ticket owned by someone else
+      // ALL return 404 — never a 500, never a leak of another customer's
+      // ticket. This single helper is the ownership gate every per-ticket
+      // route funnels through.
+      async function _ownedTicket(req, res, auth) {
+        var ticket;
+        try { ticket = await support.get(req.params && req.params.id); }
+        catch (e) {
+          if (e instanceof TypeError) { _send(res, 404, renderNotFound({ shop_name: shopName, theme: theme })); return null; }
+          throw e;
+        }
+        if (!ticket || ticket.customer_id !== auth.customer_id) {
+          _send(res, 404, renderNotFound({ shop_name: shopName, theme: theme }));
+          return null;
+        }
+        return ticket;
+      }
+
+      // The customer's own ticket list, scoped to their session customer_id.
+      router.get("/account/support", async function (req, res) {
+        var auth = _supportAuth(req, res); if (!auth) return;
+        var tickets = await support.listByCustomerId(auth.customer_id, { limit: 100 });
+        var cartCount = await _cartCountForReq(req);
+        var url = req.url ? new URL(req.url, "http://localhost") : null;
+        _send(res, 200, renderSupportList({
+          tickets:    tickets,
+          created:    url && url.searchParams.get("ok") === "1",
+          shop_name:  shopName,
+          cart_count: cartCount,
+        }));
+      });
+
+      // The new-ticket form. Offers the customer's recent orders as an
+      // optional attachment.
+      router.get("/account/support/new", async function (req, res) {
+        var auth = _supportAuth(req, res); if (!auth) return;
+        var orders = [];
+        if (deps.order) {
+          try {
+            var page = await deps.order.listForCustomer(auth.customer_id, { limit: 20 });
+            orders = page.rows;
+          } catch (_e) { orders = []; }
+        }
+        var cartCount = await _cartCountForReq(req);
+        _send(res, 200, renderSupportNew({
+          orders:     orders,
+          shop_name:  shopName,
+          cart_count: cartCount,
+        }));
+      });
+
+      // Create the ticket as the session customer. customer_id is pinned
+      // to the session — never read off the form — so a shopper can only
+      // ever open a ticket against their own account. An optional order_id
+      // is accepted only after confirming the order belongs to this
+      // customer (so a forged id can't attach a stranger's order); a
+      // non-owned / unknown order is dropped silently rather than failing
+      // the ticket. The backend validates subject / body / category /
+      // email shape and surfaces a TypeError on bad input as a clean
+      // re-render, never a 500.
+      router.post("/account/support", async function (req, res) {
+        var auth = _supportAuth(req, res); if (!auth) return;
+        var body = req.body || {};
+        var cartCount = await _cartCountForReq(req);
+
+        async function _orders() {
+          if (!deps.order) return [];
+          try { return (await deps.order.listForCustomer(auth.customer_id, { limit: 20 })).rows; }
+          catch (_e) { return []; }
+        }
+
+        // Only attach an order the requesting customer actually owns.
+        var orderId;
+        if (body.order_id && deps.order) {
+          try {
+            var ord = await deps.order.get(body.order_id);
+            if (ord && ord.customer_id === auth.customer_id) orderId = ord.id;
+          } catch (_e) { /* malformed / unknown order id — attach nothing */ }
+        }
+
+        var opened;
+        try {
+          opened = await support.open({
+            customer_id:    auth.customer_id,
+            customer_email: body.customer_email,
+            subject:        body.subject,
+            body:           body.body,
+            category:       body.category,
+            order_id:       orderId,
+          });
+        } catch (e) {
+          if (e instanceof TypeError) {
+            return _send(res, 400, renderSupportNew({
+              orders:     await _orders(),
+              values:     body,
+              notice:     (e && e.message || "").replace(/^supportTickets[.:]\s*/, "") || "Please check your ticket and try again.",
+              shop_name:  shopName,
+              cart_count: cartCount,
+            }));
+          }
+          throw e;
+        }
+        res.status(303);
+        res.setHeader && res.setHeader("location", "/account/support/" + encodeURIComponent(opened.id) + "?ok=1");
+        return res.end ? res.end() : res.send("");
+      });
+
+      // One ticket's thread. Ownership-scoped (foreign / unknown → 404).
+      // Internal operator notes are filtered out before render — the
+      // customer never sees an internal=1 message.
+      router.get("/account/support/:id", async function (req, res) {
+        var auth = _supportAuth(req, res); if (!auth) return;
+        var ticket = await _ownedTicket(req, res, auth); if (!ticket) return;
+        var thread = await support.thread(ticket.id);
+        var visible = (thread.messages || []).filter(function (m) { return Number(m.internal) !== 1; });
+        var cartCount = await _cartCountForReq(req);
+        var url = req.url ? new URL(req.url, "http://localhost") : null;
+        _send(res, 200, renderSupportTicket({
+          ticket:     thread.ticket,
+          messages:   visible,
+          replied:    url && url.searchParams.get("ok") === "1",
+          shop_name:  shopName,
+          cart_count: cartCount,
+        }));
+      });
+
+      // Append a customer reply. Ownership-scoped; refused on a closed
+      // ticket (the backend rejects a closed-ticket reply with a typed
+      // SUPPORT_TICKET_CLOSED error — surfaced as a 409 re-render, never a
+      // 500). author is pinned to "customer".
+      router.post("/account/support/:id/reply", async function (req, res) {
+        var auth = _supportAuth(req, res); if (!auth) return;
+        var ticket = await _ownedTicket(req, res, auth); if (!ticket) return;
+        var body = req.body || {};
+        var cartCount = await _cartCountForReq(req);
+
+        // A closed ticket can't take a reply — short-circuit to a
+        // re-render with a notice rather than calling the backend (which
+        // would also refuse, but this keeps the message customer-readable).
+        if (ticket.status === "closed") {
+          var closedThread = await support.thread(ticket.id);
+          return _send(res, 409, renderSupportTicket({
+            ticket:     closedThread.ticket,
+            messages:   (closedThread.messages || []).filter(function (m) { return Number(m.internal) !== 1; }),
+            notice:     "This ticket is closed — raise a new one if you still need help.",
+            shop_name:  shopName,
+            cart_count: cartCount,
+          }));
+        }
+
+        try {
+          await support.reply({
+            ticket_id: ticket.id,
+            author:    "customer",
+            author_id: auth.customer_id,
+            body:      body.body,
+          });
+        } catch (e) {
+          if (e instanceof TypeError || (e && e.code === "SUPPORT_TICKET_CLOSED")) {
+            var againThread = await support.thread(ticket.id);
+            var status = (e && e.code === "SUPPORT_TICKET_CLOSED") ? 409 : 400;
+            return _send(res, status, renderSupportTicket({
+              ticket:     againThread.ticket,
+              messages:   (againThread.messages || []).filter(function (m) { return Number(m.internal) !== 1; }),
+              notice:     (e && e.message || "").replace(/^supportTickets[.:]\s*/, "") || "Please check your reply and try again.",
+              shop_name:  shopName,
+              cart_count: cartCount,
+            }));
+          }
+          throw e;
+        }
+        res.status(303);
+        res.setHeader && res.setHeader("location", "/account/support/" + encodeURIComponent(ticket.id) + "?ok=1");
+        return res.end ? res.end() : res.send("");
+      });
+    }
+
     // Loyalty — the signed-in customer's points balance + tier, the
     // earn/redeem ledger, how points are earned, and (when a reward
     // catalog + redemption primitive are wired) a redeem-a-reward

package/lib/support-tickets.js

@@ -755,6 +755,60 @@ function create(opts) {
       return r.rows.map(_hydrate);
     },
 
+    // Customer-account-scoped list — every ticket whose `customer_id`
+    // matches, newest-opened first, optionally narrowed to one status.
+    // Keyed on the row's `customer_id` (NOT the email hash) so the
+    // storefront, which holds only the session customer id (the raw
+    // email is never on disk), can list + ownership-gate a signed-in
+    // shopper's tickets without re-deriving the email hash. Composes the
+    // same id / status / limit validators as the rest of the surface.
+    listByCustomerId: async function (customerId, listOpts) {
+      customerId = _uuid(customerId, "customer_id");
+      listOpts = listOpts || {};
+      var limit = _limit(listOpts.limit);
+      var where  = ["customer_id = ?1"];
+      var params = [customerId];
+      var idx    = 2;
+      if (listOpts.status_filter != null) {
+        where.push("status = ?" + idx);
+        params.push(_status(listOpts.status_filter, "status_filter"));
+        idx += 1;
+      }
+      params.push(limit);
+      var sql = "SELECT * FROM support_tickets WHERE " + where.join(" AND ") +
+                " ORDER BY opened_at DESC, id DESC LIMIT ?" + idx;
+      var r = await query(sql, params);
+      return r.rows.map(_hydrate);
+    },
+
+    // Operator queue across every assignment state — newest-stale first
+    // (oldest last_action_at), optionally narrowed to one status. The
+    // status filter drives the admin console's status chips; absent a
+    // filter it surfaces the whole board (every status, including
+    // resolved / closed) so the operator can audit history, capped at
+    // `limit`.
+    list: async function (listOpts) {
+      listOpts = listOpts || {};
+      var limit = _limit(listOpts.limit);
+      var where  = [];
+      var params = [];
+      var idx    = 1;
+      if (listOpts.status_filter != null) {
+        where.push("status = ?" + idx);
+        params.push(_status(listOpts.status_filter, "status_filter"));
+        idx += 1;
+      }
+      params.push(limit);
+      var sql = "SELECT * FROM support_tickets" +
+                (where.length ? " WHERE " + where.join(" AND ") : "") +
+                " ORDER BY CASE priority " +
+                "  WHEN 'urgent' THEN 0 WHEN 'high' THEN 1 " +
+                "  WHEN 'normal' THEN 2 WHEN 'low' THEN 3 ELSE 4 END, " +
+                "last_action_at ASC LIMIT ?" + idx;
+      var r = await query(sql, params);
+      return r.rows.map(_hydrate);
+    },
+
     // Full thread view — ticket + every message in created_at ASC
     // order so the caller can render the conversation top-to-bottom.
     thread: async function (ticketId) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blamejs/blamejs-shop",
-  "version": "0.3.24",
+  "version": "0.3.26",
   "description": "Open-source framework built on blamejs. Vendored stack, zero npm runtime deps, PQC-first crypto, security-on by default.",
   "main": "lib/index.js",
   "scripts": {