@semics-tech/emdash-events-suite 1.0.0-rc.3 → 1.0.0-rc.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@semics-tech/emdash-events-suite",
-  "version": "1.0.0-rc.3",
+  "version": "1.0.0-rc.4",
   "type": "module",
   "description": "Links semics Events and E-sign on one EmDash site: one config call and a booking flow with inline waiver signing",
   "license": "MIT",
@@ -22,8 +22,8 @@
     "src/astro"
   ],
   "dependencies": {
-    "@semics-tech/emdash-events": "1.0.0-rc.3",
-    "@semics-tech/emdash-esign": "1.0.0-rc.3"
+    "@semics-tech/emdash-esign": "1.0.0-rc.4",
+    "@semics-tech/emdash-events": "1.0.0-rc.4"
   },
   "peerDependencies": {
     "emdash": ">=1.2.0 <2"

package/src/astro/WaiverPage.astro

@@ -10,7 +10,7 @@ import SigningCeremony from "@semics-tech/emdash-esign/astro/SigningCeremony.ast
 import { ceremonyCsp } from "@semics-tech/emdash-esign/astro/lib/csp";
 import { crossSiteResponse } from "@semics-tech/emdash-events/astro/lib/checkout-form";
 
-import { handleWaiverRequest } from "./lib/flow";
+import { handleWaiverRequest, leavesSite } from "./lib/flow";
 import { WAIVER_MESSAGES, WAIVER_PATH } from "./lib/form";
 import { waiverSlot } from "./lib/slot";
 
@@ -23,7 +23,9 @@ const outcome = await handleWaiverRequest(
 if (outcome.type === "forbidden") return crossSiteResponse();
 const cookies = outcome.type === "redirect" || outcome.type === "render" ? outcome.cookies : [];
 for (const cookie of cookies) Astro.cookies.set(cookie.name, cookie.value, cookie.options);
-if (outcome.type === "redirect") return Astro.redirect(outcome.location, 303);
+if (outcome.type === "redirect" && !leavesSite(outcome.location, Astro.url)) return Astro.redirect(outcome.location, 303);
+// The payment page is another site, which the CSP below stops a post redirecting to (T155): a page goes there instead.
+const payment = outcome.type === "redirect" ? outcome.location : undefined;
 
 Astro.response.headers.set("Referrer-Policy", "no-referrer");
 Astro.response.headers.set("Cache-Control", "private, no-store");
@@ -54,9 +56,16 @@ const signer = render?.view.kind === "ready" ? render.view.session.signer : unde
 		<meta name="viewport" content="width=device-width, initial-scale=1" />
 		<meta name="robots" content="noindex" />
 		<meta name="referrer" content="no-referrer" />
-		<title>Sign the waiver</title>
+		<title>{payment ? "Continue to payment" : "Sign the waiver"}</title>
+		{payment && <meta http-equiv="refresh" content={`0;url=${payment}`} data-testid="waiver-pay-refresh" />}
 	</head>
 	<body>
+		{payment ? (
+			<main class="semics-esign semics-sign" data-testid="waiver-page" data-step="pay">
+				<h1>Continue to payment</h1>
+				<p><a href={payment} data-testid="waiver-pay-link">Go to the payment page</a></p>
+			</main>
+		) : (
 		<main class="semics-esign semics-sign" data-testid="waiver-page" data-step={render ? "sign" : "error"}>
 			<h1>Sign the waiver</h1>
 			{error && <p role="alert" data-testid="waiver-error">{error}</p>}
@@ -89,5 +98,6 @@ const signer = render?.view.kind === "ready" ? render.view.session.signer : unde
 			)}
 			{ref && <p><a href={`/booking?ref=${ref}`}>Back to your booking</a></p>}
 		</main>
+		)}
 	</body>
 </html>

package/src/astro/lib/flow.ts

@@ -100,6 +100,14 @@ export interface BookingAnswer {
 	waiver?: { refs: string[]; voids?: Record<string, string> };
 }
 
+/**
+ * Whether a redirect leaves this site (T155). A form on the signing page cannot be redirected there:
+ * its CSP's `form-action 'self'` also covers where the post redirects, so the browser stops on the page.
+ */
+export function leavesSite(location: string, site: URL): boolean {
+	return new URL(location, site).origin !== site.origin;
+}
+
 /** Booking statuses with nothing left to sign for: the places are gone (T151). */
 const ENDED = ["expired", "cancelled", "declined", "refunded", "refunded_unavailable"];