@tokenoftrust/storefront-runner 2.5.4 → 2.5.6

package/apps/storefront/src/components/catalog/storefront/islands/ImageGallery.tsx

@@ -18,8 +18,25 @@ import type { CatalogImage } from "@tot/public-runtime";
 import { placeholderDataUri, isUsableImageUrl } from "@/lib/content/shared/placeholder";
 import { resolveImage } from "@/lib/assets/shared/imageAttrs";
 
+export type PublicGalleryImage = Pick<CatalogImage,
+  "id" | "url" | "alt" | "position" | "width" | "height" | "variant_ids" | "rehosted">;
+
+/** Project before Astro serializes props; private provenance stays in the catalog. */
+export function publicGalleryImages(images: readonly CatalogImage[]): PublicGalleryImage[] {
+  return images.map((image) => ({
+    id: image.id,
+    url: image.url,
+    position: image.position,
+    ...(image.alt !== undefined ? { alt: image.alt } : {}),
+    ...(image.width !== undefined ? { width: image.width } : {}),
+    ...(image.height !== undefined ? { height: image.height } : {}),
+    ...(image.variant_ids !== undefined ? { variant_ids: [...image.variant_ids] } : {}),
+    ...(image.rehosted !== undefined ? { rehosted: image.rehosted } : {}),
+  }));
+}
+
 interface Props {
-  images: CatalogImage[];
+  images: PublicGalleryImage[];
   title: string;
   productHandle: string;
   activeImageId?: string;
@@ -36,7 +53,7 @@ const isShopifyCdnUrl = (url: string): boolean =>
  * decision (same as <Img> on the PLP) so rehosted images use the same
  * provider-neutral shared-CDN URL on Cloudflare and CloudFront.
  */
-function mainImage(img: CatalogImage, title: string): { src: string; srcset?: string } {
+function mainImage(img: PublicGalleryImage, title: string): { src: string; srcset?: string } {
   return resolveImage({
     src: img.url,
     rehosted: img.rehosted,
@@ -53,7 +70,7 @@ function mainImage(img: CatalogImage, title: string): { src: string; srcset?: st
  * URLs draw a deterministic placeholder.
  */
 const THUMB_WIDTH = 160;
-function thumbSrc(img: CatalogImage, title: string): string {
+function thumbSrc(img: PublicGalleryImage, title: string): string {
   if (!isUsableImageUrl(img.url, img.rehosted)) {
     return placeholderDataUri({
       seed: img.id || title,

package/apps/storefront/src/lib/content/storyblok/provider.ts

@@ -718,8 +718,10 @@ export class PublishedContentProvider implements ContentProvider {
     return page ?? ((await this.usesVersionedContent()) ? null : this.base.getPage(slug));
   }
   async listPages(): Promise<EditorialPage[]> {
+    // Editorial enumeration follows its source, not the generic artifact fallback.
+    if (!(await this.usesVersionedContent())) return this.base.listPages();
     const paths = await this.listArtifactPaths("pages/");
-    if (paths === null) return this.base.listPages();
+    if (paths === null) return [];
     const pages = await Promise.all(
       paths
         .filter((path) => path.endsWith(".json"))
@@ -728,8 +730,10 @@ export class PublishedContentProvider implements ContentProvider {
     return pages.filter((page): page is EditorialPage => page !== null);
   }
 
-  readArtifact(relative: string): Promise<string | null> {
-    return this.publishedRaw(relative);
+  async readArtifact(relative: string): Promise<string | null> {
+    const raw = await this.publishedRaw(relative);
+    if (raw !== null) return raw;
+    return (await this.usesVersionedContent()) ? null : this.base.readArtifact(relative);
   }
 
   async derivedArtifact(name: string): Promise<DerivedArtifact | null> {
@@ -743,8 +747,9 @@ export class PublishedContentProvider implements ContentProvider {
   async listArtifactPaths(prefix = ""): Promise<string[] | null> {
     const root = contentArtifactPath(this.tenantId, "");
     const paths = await this.versionedPaths();
-    return paths?.filter((path) => path.startsWith(`${root}${prefix}`))
-      .map((path) => path.slice(root.length)) ?? null;
+    if (paths === null) return this.base.listArtifactPaths(prefix);
+    return paths.filter((path) => path.startsWith(`${root}${prefix}`))
+      .map((path) => path.slice(root.length));
   }
 }
 

package/apps/storefront/src/lib/publication/shared/routedApiParam.ts

@@ -0,0 +1,28 @@
+import type { APIContext } from "astro";
+
+const ROUTES = {
+  "pipeline-job": { path: /^\/api\/pipeline\/jobs\/([A-Za-z0-9._:-]{1,128})\/?$/, param: "jobId" },
+  "fulfillment-order": { path: /^\/api\/admin\/fulfillment\/orders\/([A-Za-z0-9._:-]{1,128})\/?$/, param: "id" },
+  "fulfillment-address": { path: /^\/api\/admin\/fulfillment\/orders\/([A-Za-z0-9._:-]{1,128})\/address\/?$/, param: "id" },
+} as const;
+
+export type RoutedApiKind = keyof typeof ROUTES;
+
+/** Resolve an opaque resource inside the server-routed tenant, including rewritten endpoints. */
+export function routedApiParam(context: APIContext, kind: RoutedApiKind): string | undefined {
+  if (!Object.hasOwn(ROUTES, kind)) return undefined;
+  const tenant = context.locals.tenant?.appDomain;
+  const prefix = context.locals.apiBasePath;
+  if (typeof tenant !== "string" || !/^[A-Za-z0-9][A-Za-z0-9.-]{0,252}$/.test(tenant)) return undefined;
+  if (typeof prefix !== "string" || (prefix !== "" && !/^\/[A-Za-z0-9][A-Za-z0-9.-]{0,252}$/.test(prefix))) return undefined;
+  let pathname: string;
+  try { pathname = new URL(context.request.url).pathname; } catch { return undefined; }
+  if (prefix && !pathname.startsWith(`${prefix}/`)) return undefined;
+  const relative = pathname.slice(prefix.length);
+  const route = ROUTES[kind];
+  const id = route.path.exec(relative)?.[1];
+  if (!id || id === "." || id === "..") return undefined;
+  const param = context.params[route.param];
+  if (param !== undefined && param !== "" && param !== id) return undefined;
+  return id;
+}

package/apps/storefront/src/pages/api/admin/fulfillment/orders/[id]/address.ts

@@ -1,3 +1,4 @@
+import { routedApiParam } from "@/lib/publication/shared/routedApiParam";
 /**
  * Owner-only retrieval of a stored ship-to address.
  * The read runs only after the owner gate admits the caller.
@@ -24,8 +25,8 @@ export async function GET(context: APIContext): Promise<Response> {
       },
     });
   }
-  const orderId = context.params.id ?? "";
-  if (!isOpaqueId(orderId)) return fulfillmentResultResponse({ ok: false, code: "not-found" }, () => ({}));
+  const orderId = routedApiParam(context, "fulfillment-address");
+  if (!orderId || !isOpaqueId(orderId)) return fulfillmentResultResponse({ ok: false, code: "not-found" }, () => ({}));
   const opened = await openFulfillment(context);
   if (!opened.ok) return opened.response;
   return fulfillmentResultResponse(await opened.service.readAddress(opened.actor, orderId), (address) => address);

package/apps/storefront/src/pages/api/admin/fulfillment/orders/[id].ts

@@ -1,3 +1,4 @@
+import { routedApiParam } from "@/lib/publication/shared/routedApiParam";
 /**
  * Authenticated owner API for one order's fulfillment commands.
  * The response is state codes and the fulfillment view. It never returns an address.
@@ -53,8 +54,8 @@ function fail(code: string): Response {
 export async function GET(context: APIContext): Promise<Response> {
   const refused = await requireOwner(context);
   if (refused) return refused;
-  const orderId = context.params.id ?? "";
-  if (!isOpaqueId(orderId)) return fail("not-found");
+  const orderId = routedApiParam(context, "fulfillment-order");
+  if (!orderId || !isOpaqueId(orderId)) return fail("not-found");
   const opened = await openFulfillment(context);
   if (!opened.ok) return opened.response;
   return fulfillmentResultResponse(await opened.service.get(opened.actor, orderId), (view) => view);
@@ -63,8 +64,8 @@ export async function GET(context: APIContext): Promise<Response> {
 export async function POST(context: APIContext): Promise<Response> {
   const refused = await requireOwner(context);
   if (refused) return refused;
-  const orderId = context.params.id ?? "";
-  if (!isOpaqueId(orderId)) return fail("not-found");
+  const orderId = routedApiParam(context, "fulfillment-order");
+  if (!orderId || !isOpaqueId(orderId)) return fail("not-found");
   const raw = await readJsonBody(context.request);
   if (!raw.ok) return fulfillmentResultResponse(raw, () => ({}));
   const parsed = parseFulfillmentBody(raw.value);

package/apps/storefront/src/pages/products/[handle].astro

@@ -11,7 +11,7 @@ import { homeCrumbLabel, siteTrail } from "@/lib/content/shared/breadcrumbs";
 import Badge from "@/components/content/storefront/Badge.astro";
 import ProductCard from "@/components/catalog/storefront/ProductCard.astro";
 import Section from "@/components/content/storefront/Section.astro";
-import ImageGallery from "@/components/catalog/storefront/islands/ImageGallery.tsx";
+import ImageGallery, { publicGalleryImages } from "@/components/catalog/storefront/islands/ImageGallery.tsx";
 import VariantSelector, { publicSelectorVariants } from "@/components/catalog/storefront/islands/VariantSelector.tsx";
 import CheckoutComplianceGate from "@/components/compliance/storefront/islands/CheckoutComplianceGate.tsx";
 import RecentlyViewed from "@/components/catalog/storefront/islands/RecentlyViewed.tsx";
@@ -345,7 +345,7 @@ const structuredData = {
     <div>
       <ImageGallery
         client:idle
-        images={product.images}
+        images={publicGalleryImages(product.images)}
         title={product.title}
         productHandle={product.handle}
       />
@@ -420,7 +420,12 @@ const structuredData = {
           productTitle={product.title}
           checkoutCart={checkoutCart}
           pricing={pricing}
-          handoffUrl={sampleHandoff ? undefined : cartApiPath}
+          handoffUrl={
+            !sampleHandoff &&
+            (Astro.locals.browserEnvironment.environment === "live" || Astro.locals.browserEnvironment.environment === "local")
+              ? cartApiPath
+              : undefined
+          }
         />
         {/* Regulated-tenant checkout ENFORCEMENT gate. Intercepts the
             managed-cart handoff to clear age + ship-to compliance server-side

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tokenoftrust/storefront-runner",
-  "version": "2.5.4",
+  "version": "2.5.6",
   "license": "SEE LICENSE IN LICENSE",
   "description": "World-shareable storefront runner: multi-tenant renderer on Astro/Cloudflare. No control plane.",
   "packageManager": "pnpm@11.9.0",