@anthusai/papyrus 5.19.1 → 5.21.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/amplify/data/resource.js +1 -0
- package/amplify/data/resource.ts +1 -0
- package/amplify/data/schema.js +1 -0
- package/amplify/data/schema.ts +1 -0
- package/amplify/functions/assignment-action/data-access.js +2 -0
- package/amplify/functions/assignment-action/data-access.ts +2 -0
- package/amplify/functions/assignment-action/handler.ts +1 -1
- package/amplify/functions/content-actions/handler.py +20 -2
- package/amplify/functions/shared/editorial-context.ts +63 -4
- package/amplify/plugins/newsletter/config.js +195 -0
- package/amplify/plugins/newsletter/config.ts +240 -0
- package/amplify/plugins/newsletter/function/handler.py +6 -0
- package/amplify/plugins/newsletter/function/requirements.txt +5 -0
- package/amplify/plugins/newsletter/ops/handler.py +12 -0
- package/amplify/plugins/newsletter/ops/resource.js +27 -0
- package/amplify/plugins/newsletter/ops/resource.ts +37 -0
- package/amplify/plugins/newsletter/papyrus.plugin.js +260 -0
- package/amplify/plugins/newsletter/papyrus.plugin.ts +308 -0
- package/amplify/plugins/newsletter/schema.js +56 -0
- package/amplify/plugins/newsletter/schema.ts +61 -0
- package/amplify/plugins/newsletter/secure-string-parameter.js +107 -0
- package/amplify/plugins/newsletter/secure-string-parameter.ts +120 -0
- package/amplify/plugins/newsletter/sending.js +140 -0
- package/amplify/plugins/newsletter/sending.ts +186 -0
- package/amplify/plugins/reader-steering/config.js +162 -0
- package/amplify/plugins/reader-steering/config.ts +248 -0
- package/amplify/plugins/reader-steering/function/ai_moderation.py +230 -0
- package/amplify/plugins/reader-steering/function/handler.py +1363 -0
- package/amplify/plugins/reader-steering/function/moderation-prompt.md +27 -0
- package/amplify/plugins/reader-steering/function/moderation.py +316 -0
- package/amplify/plugins/reader-steering/function/resource.js +27 -0
- package/amplify/plugins/reader-steering/function/resource.ts +35 -0
- package/amplify/plugins/reader-steering/papyrus.plugin.js +175 -0
- package/amplify/plugins/reader-steering/papyrus.plugin.ts +201 -0
- package/amplify/plugins/reader-steering/schema.js +140 -0
- package/amplify/plugins/reader-steering/schema.ts +142 -0
- package/amplify/plugins/registry.js +4 -0
- package/amplify/plugins/registry.ts +4 -0
- package/amplify/plugins/types.ts +5 -0
- package/amplify/plugins/wire.js +1 -0
- package/amplify/plugins/wire.ts +1 -0
- package/app/api/newsletter/confirm/route.ts +13 -0
- package/app/api/newsletter/preferences/route.ts +13 -0
- package/app/api/newsletter/subscribe/route.ts +9 -0
- package/app/api/newsletter/unsubscribe/route.ts +13 -0
- package/app/api/reader/comment/delete/route.ts +9 -0
- package/app/api/reader/comment/edit/route.ts +9 -0
- package/app/api/reader/comment/route.ts +9 -0
- package/app/api/reader/handle/route.ts +9 -0
- package/app/api/reader/me/route.ts +9 -0
- package/app/api/reader/rating/route.ts +9 -0
- package/app/api/reader/report/route.ts +9 -0
- package/app/api/reader/retired/route.ts +9 -0
- package/app/api/reader/submit/route.ts +9 -0
- package/app/api/reader/vote/route.ts +9 -0
- package/components/moderation-panel.tsx +248 -0
- package/components/newsletter-panel.tsx +474 -0
- package/components/newsletter-sections.tsx +163 -0
- package/components/newsroom-organizer.css +14 -0
- package/components/reference-cyclotron-priming.tsx +54 -15
- package/components/topic-steering-workspace.tsx +42 -5
- package/infra/amplify-app-shell.js +15 -1
- package/infra/amplify-app-shell.ts +17 -1
- package/infra/site-config.js +12 -2
- package/infra/site-config.ts +19 -2
- package/lib/editorial-checks.ts +6 -2
- package/lib/newsletter-api.ts +391 -0
- package/lib/newsletter-client.ts +46 -0
- package/lib/newsletter-fixture.ts +184 -0
- package/lib/newsletter-model.ts +202 -0
- package/lib/newsletter-pages.ts +264 -0
- package/lib/prospectus-session.ts +1 -0
- package/lib/prospectus-sign-in-routes.ts +2 -2
- package/lib/prospectus-site-identity.ts +24 -1
- package/lib/reader-api.ts +145 -0
- package/lib/reader-moderation.ts +220 -0
- package/lib/reader-retirement-route.ts +89 -0
- package/lib/reader-subject.md +29 -0
- package/lib/reader-subject.ts +53 -0
- package/package.json +27 -1
- package/routes.manifest.json +158 -1
|
@@ -0,0 +1,202 @@
|
|
|
1
|
+
/** Shapes and wording for the newsroom Newsletter panel. `src/papyrus_content/newsletter/` (panel.py, issues.py) produces them. */
|
|
2
|
+
import { getNewsroomNavHref } from "./newsroom-nav";
|
|
3
|
+
import { csvCell } from "./signup-csv";
|
|
4
|
+
|
|
5
|
+
export type NewsletterCounts = Partial<Record<"queued" | "sent" | "failed" | "suppressed" | "skipped" | "delivered" | "bounced" | "complained" | "softBounced", number>>;
|
|
6
|
+
|
|
7
|
+
export type NewsletterList = { id: string; name: string; kind: string; confirmed: number; pending: number; unsubscribed: number; timezone?: string };
|
|
8
|
+
|
|
9
|
+
export type NewsletterEvent = { type: string; at: string; issue?: string; list?: string; detail?: string };
|
|
10
|
+
|
|
11
|
+
export type NewsletterOverview = {
|
|
12
|
+
lists: NewsletterList[];
|
|
13
|
+
totals: { confirmed: number; pending: number; unsubscribed: number };
|
|
14
|
+
suppressed: number;
|
|
15
|
+
paused: { paused: boolean; reason?: string; pausedAt?: string; resumedAt?: string };
|
|
16
|
+
events: NewsletterEvent[];
|
|
17
|
+
};
|
|
18
|
+
|
|
19
|
+
export type NewsletterIssue = {
|
|
20
|
+
issueId: string;
|
|
21
|
+
listId: string;
|
|
22
|
+
listName?: string;
|
|
23
|
+
kind: string;
|
|
24
|
+
itemId?: string;
|
|
25
|
+
subject: string;
|
|
26
|
+
status: string;
|
|
27
|
+
sendAt?: string;
|
|
28
|
+
approvedBy?: string;
|
|
29
|
+
approvedAt?: string;
|
|
30
|
+
sentAt?: string;
|
|
31
|
+
counts: NewsletterCounts;
|
|
32
|
+
note?: string;
|
|
33
|
+
archiveUrl?: string;
|
|
34
|
+
editedSinceApproval?: boolean;
|
|
35
|
+
};
|
|
36
|
+
|
|
37
|
+
export type NewsletterPreview = { subject: string; html: string; text: string; bytes: number; postalAddress: boolean };
|
|
38
|
+
|
|
39
|
+
export type NewsletterDelivery = { address: string; status: string; at: string; eventAt?: string; error?: string };
|
|
40
|
+
|
|
41
|
+
export type NewsletterSubscriber = { email: string; status: string; lists: { id: string; status: string }[]; createdAt: string; confirmedAt?: string };
|
|
42
|
+
|
|
43
|
+
export type NewsletterExportRow = {
|
|
44
|
+
email: string;
|
|
45
|
+
status: string;
|
|
46
|
+
lists: string;
|
|
47
|
+
createdAt: string;
|
|
48
|
+
consentRequestedAt: string;
|
|
49
|
+
consentConfirmedAt: string;
|
|
50
|
+
consentFormId: string;
|
|
51
|
+
consentPageUrl: string;
|
|
52
|
+
consentWording: string;
|
|
53
|
+
};
|
|
54
|
+
|
|
55
|
+
export type NewsletterFailure = { ok: false; error: string; message?: string };
|
|
56
|
+
|
|
57
|
+
/** The newsroom words for the statuses the functions write. A status this panel does not know is shown as written, never hidden. */
|
|
58
|
+
const STATUS_LABELS: Record<string, string> = {
|
|
59
|
+
draft: "Draft",
|
|
60
|
+
awaiting_approval: "Awaiting approval",
|
|
61
|
+
scheduled: "Scheduled",
|
|
62
|
+
sending: "Sending",
|
|
63
|
+
sent: "Sent",
|
|
64
|
+
stopped: "Stopped",
|
|
65
|
+
cancelled: "Cancelled",
|
|
66
|
+
blocked: "Blocked",
|
|
67
|
+
};
|
|
68
|
+
/** A mark beside the word, so no status relies on colour alone. */
|
|
69
|
+
const STATUS_MARKS: Record<string, string> = { draft: "✎", awaiting_approval: "?", scheduled: "◷", sending: "▶", sent: "✓", stopped: "■", cancelled: "–", blocked: "!" };
|
|
70
|
+
|
|
71
|
+
export function statusLabel(status: string): string {
|
|
72
|
+
if (STATUS_LABELS[status]) return STATUS_LABELS[status];
|
|
73
|
+
const words = status.replace(/_/g, " ").trim();
|
|
74
|
+
return words ? words.charAt(0).toUpperCase() + words.slice(1) : "Unknown";
|
|
75
|
+
}
|
|
76
|
+
|
|
77
|
+
export function statusMark(status: string): string {
|
|
78
|
+
return STATUS_MARKS[status] ?? "·";
|
|
79
|
+
}
|
|
80
|
+
|
|
81
|
+
export const ISSUE_STATUS_FILTERS = ["draft", "awaiting_approval", "scheduled", "sending", "sent", "blocked", "stopped", "cancelled"] as const;
|
|
82
|
+
|
|
83
|
+
/** Approval accepts a draft, an alert awaiting approval, a scheduled issue (a new time) and a blocked one (cause fixed). */
|
|
84
|
+
export function canApprove(status: string): boolean {
|
|
85
|
+
return status === "draft" || status === "awaiting_approval" || status === "scheduled" || status === "blocked";
|
|
86
|
+
}
|
|
87
|
+
export const canCancel = (status: string): boolean => status === "scheduled";
|
|
88
|
+
export const canStop = (status: string): boolean => status === "sending";
|
|
89
|
+
|
|
90
|
+
export function issueEditorHref(itemId: string, demo?: boolean): string {
|
|
91
|
+
return getNewsroomNavHref(`/newsroom/articles/${encodeURIComponent(itemId)}`, demo);
|
|
92
|
+
}
|
|
93
|
+
|
|
94
|
+
const ERROR_WORDS: Record<string, string> = {
|
|
95
|
+
forbidden: "Your role cannot do this.",
|
|
96
|
+
not_found: "That issue no longer exists.",
|
|
97
|
+
invalid_state: "The issue changed state. Refresh and try again.",
|
|
98
|
+
item_missing: "The issue's item no longer exists.",
|
|
99
|
+
render_failed: "The issue cannot be rendered. Open it in the editor and fix the body.",
|
|
100
|
+
bad_request: "The request was not understood.",
|
|
101
|
+
no_address: "Your account has no email address to send a test to.",
|
|
102
|
+
unavailable: "The newsletter service could not be reached. Try again in a minute.",
|
|
103
|
+
};
|
|
104
|
+
|
|
105
|
+
/** One sentence for a failed operation. A missing postal address is an operator task, so the panel says where it is set. */
|
|
106
|
+
export function failureText(failure: NewsletterFailure): string {
|
|
107
|
+
if (failure.error === "postal_address_missing") {
|
|
108
|
+
return "This site has no postal address for the email footer, and mail law requires one. An operator sets it in the site's AWS configuration (an SSM parameter); it cannot be set from the newsroom.";
|
|
109
|
+
}
|
|
110
|
+
return ERROR_WORDS[failure.error] ?? failure.message ?? "The request failed.";
|
|
111
|
+
}
|
|
112
|
+
|
|
113
|
+
// -- times ---------------------------------------------------------------------------------------------------------------
|
|
114
|
+
|
|
115
|
+
export function formatUtc(iso: string | null | undefined): string {
|
|
116
|
+
if (!iso) return "never";
|
|
117
|
+
const match = /^(\d{4}-\d{2}-\d{2})T(\d{2}:\d{2})/.exec(iso);
|
|
118
|
+
return match ? `${match[1]} ${match[2]} UTC` : iso;
|
|
119
|
+
}
|
|
120
|
+
|
|
121
|
+
export function validTimeZone(zone: string | null | undefined): string | null {
|
|
122
|
+
if (!zone) return null;
|
|
123
|
+
try {
|
|
124
|
+
new Intl.DateTimeFormat("en-US", { timeZone: zone });
|
|
125
|
+
return zone;
|
|
126
|
+
} catch {
|
|
127
|
+
return null;
|
|
128
|
+
}
|
|
129
|
+
}
|
|
130
|
+
|
|
131
|
+
function wallParts(instant: Date, zone: string): { year: number; month: number; day: number; hour: number; minute: number } {
|
|
132
|
+
const parts = new Intl.DateTimeFormat("en-US", {
|
|
133
|
+
timeZone: zone, hourCycle: "h23", year: "numeric", month: "2-digit", day: "2-digit", hour: "2-digit", minute: "2-digit",
|
|
134
|
+
}).formatToParts(instant);
|
|
135
|
+
const pick = (type: string) => Number(parts.find((part) => part.type === type)?.value ?? "0");
|
|
136
|
+
return { year: pick("year"), month: pick("month"), day: pick("day"), hour: pick("hour") % 24, minute: pick("minute") };
|
|
137
|
+
}
|
|
138
|
+
|
|
139
|
+
/** Minutes the zone is ahead of UTC at that instant. */
|
|
140
|
+
function offsetMinutes(instant: Date, zone: string): number {
|
|
141
|
+
const wall = wallParts(instant, zone);
|
|
142
|
+
const asUtc = Date.UTC(wall.year, wall.month - 1, wall.day, wall.hour, wall.minute);
|
|
143
|
+
return Math.round((asUtc - Math.floor(instant.getTime() / 60000) * 60000) / 60000);
|
|
144
|
+
}
|
|
145
|
+
|
|
146
|
+
const pad = (value: number) => String(value).padStart(2, "0");
|
|
147
|
+
|
|
148
|
+
/** Local wall time `YYYY-MM-DDTHH:mm` (a datetime-local value) as an ISO instant, for the given zone. */
|
|
149
|
+
export function zonedInputToIso(local: string, zone: string): string | null {
|
|
150
|
+
const match = /^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2})$/.exec(local);
|
|
151
|
+
if (!match) return null;
|
|
152
|
+
const [, year, month, day, hour, minute] = match.map(Number) as unknown as number[];
|
|
153
|
+
const wallAsUtc = Date.UTC(year, month - 1, day, hour, minute);
|
|
154
|
+
let guess = wallAsUtc - offsetMinutes(new Date(wallAsUtc), zone) * 60000;
|
|
155
|
+
guess = wallAsUtc - offsetMinutes(new Date(guess), zone) * 60000; // once more: the offset can differ across a clock change
|
|
156
|
+
const instant = new Date(guess);
|
|
157
|
+
return Number.isNaN(instant.getTime()) ? null : instant.toISOString().replace(".000Z", "Z");
|
|
158
|
+
}
|
|
159
|
+
|
|
160
|
+
/** The next whole hour on the zone's clock, as a datetime-local value. */
|
|
161
|
+
export function nextWholeHourInput(now: Date, zone: string): string {
|
|
162
|
+
const wall = wallParts(now, zone);
|
|
163
|
+
const next = new Date(Date.UTC(wall.year, wall.month - 1, wall.day, wall.hour + 1, 0));
|
|
164
|
+
return `${next.getUTCFullYear()}-${pad(next.getUTCMonth() + 1)}-${pad(next.getUTCDate())}T${pad(next.getUTCHours())}:00`;
|
|
165
|
+
}
|
|
166
|
+
|
|
167
|
+
/** An ISO instant as a datetime-local value in the zone. */
|
|
168
|
+
export function isoToZonedInput(iso: string, zone: string): string {
|
|
169
|
+
const wall = wallParts(new Date(iso), zone);
|
|
170
|
+
return `${wall.year}-${pad(wall.month)}-${pad(wall.day)}T${pad(wall.hour)}:${pad(wall.minute)}`;
|
|
171
|
+
}
|
|
172
|
+
|
|
173
|
+
/** `2027-01-15 09:00 EST` in the zone. */
|
|
174
|
+
export function formatInZone(iso: string | null | undefined, zone: string): string {
|
|
175
|
+
if (!iso) return "not set";
|
|
176
|
+
const instant = new Date(iso);
|
|
177
|
+
if (Number.isNaN(instant.getTime())) return iso;
|
|
178
|
+
const label = new Intl.DateTimeFormat("en-US", { timeZone: zone, timeZoneName: "short" }).formatToParts(instant).find((part) => part.type === "timeZoneName")?.value ?? zone;
|
|
179
|
+
return `${isoToZonedInput(iso, zone).replace("T", " ")} ${label}`;
|
|
180
|
+
}
|
|
181
|
+
|
|
182
|
+
// -- counts and CSV ------------------------------------------------------------------------------------------------------
|
|
183
|
+
|
|
184
|
+
/** "12 sent, 2 delivered, 1 bounced"; only counters above zero, in reading order. */
|
|
185
|
+
export function countsText(counts: NewsletterCounts): string {
|
|
186
|
+
const order: [keyof NewsletterCounts, string][] = [
|
|
187
|
+
["queued", "queued"], ["sent", "sent"], ["delivered", "delivered"], ["bounced", "bounced"], ["complained", "complained"],
|
|
188
|
+
["failed", "failed"], ["suppressed", "suppressed"], ["skipped", "skipped"], ["softBounced", "soft bounced"],
|
|
189
|
+
];
|
|
190
|
+
const parts = order.filter(([name]) => (counts[name] ?? 0) > 0).map(([name, label]) => `${counts[name]} ${label}`);
|
|
191
|
+
return parts.length ? parts.join(", ") : "nothing sent yet";
|
|
192
|
+
}
|
|
193
|
+
|
|
194
|
+
export const NEWSLETTER_CSV_HEADER = [
|
|
195
|
+
"email", "status", "lists", "createdAt", "consentRequestedAt", "consentConfirmedAt", "consentFormId", "consentPageUrl", "consentWording",
|
|
196
|
+
] as const;
|
|
197
|
+
|
|
198
|
+
/** Every cell goes through the formula neutraliser: addresses and consent wording are text people typed. */
|
|
199
|
+
export function subscribersToCsv(rows: NewsletterExportRow[]): string {
|
|
200
|
+
const lines = rows.map((row) => NEWSLETTER_CSV_HEADER.map((column) => csvCell(String(row[column] ?? ""))).join(","));
|
|
201
|
+
return `${[NEWSLETTER_CSV_HEADER.join(","), ...lines].join("\r\n")}\r\n`;
|
|
202
|
+
}
|
|
@@ -0,0 +1,264 @@
|
|
|
1
|
+
import { NextResponse } from "next/server";
|
|
2
|
+
|
|
3
|
+
/**
|
|
4
|
+
* The small server-rendered pages of the newsletter plugin (confirm prompt, confirmed, expired).
|
|
5
|
+
* Plain HTML, no scripts, themed from the plugin's public settings. Every dynamic value is escaped, the token never
|
|
6
|
+
* reaches a link, and the pages are never cached or indexed.
|
|
7
|
+
*/
|
|
8
|
+
export type NewsletterPageTheme = { accent: string; text: string; background: string; surface: string; muted: string; fontFamily: string };
|
|
9
|
+
|
|
10
|
+
export const DEFAULT_PAGE_THEME: NewsletterPageTheme = {
|
|
11
|
+
accent: "#1a4d8f",
|
|
12
|
+
text: "#1b1b1b",
|
|
13
|
+
background: "#ffffff",
|
|
14
|
+
surface: "#f4f4f4",
|
|
15
|
+
muted: "#555555",
|
|
16
|
+
fontFamily: "Georgia, 'Times New Roman', serif",
|
|
17
|
+
};
|
|
18
|
+
|
|
19
|
+
const UNSAFE_CSS = /[<>{};"\\`]|url\(|expression\(|@import/i;
|
|
20
|
+
const MAXIMUM_LISTS_SHOWN = 20;
|
|
21
|
+
|
|
22
|
+
export function escapeHtml(value: string): string {
|
|
23
|
+
return value.replace(/[&<>"']/g, (character) => `&#${character.charCodeAt(0)};`);
|
|
24
|
+
}
|
|
25
|
+
|
|
26
|
+
/** Theme tokens from `custom.papyrusPlugins.newsletter.theme`; a missing or unsafe value falls back to the default. */
|
|
27
|
+
export function pageTheme(raw: unknown): NewsletterPageTheme {
|
|
28
|
+
const theme: NewsletterPageTheme = { ...DEFAULT_PAGE_THEME };
|
|
29
|
+
if (typeof raw !== "object" || raw === null) return theme;
|
|
30
|
+
for (const key of Object.keys(theme) as Array<keyof NewsletterPageTheme>) {
|
|
31
|
+
const value = (raw as Record<string, unknown>)[key];
|
|
32
|
+
if (typeof value === "string" && value.length > 0 && value.length <= 200 && !UNSAFE_CSS.test(value)) theme[key] = value;
|
|
33
|
+
}
|
|
34
|
+
return theme;
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
export type FormSpec = {
|
|
38
|
+
action: string;
|
|
39
|
+
/** Hidden fields, such as the token. */
|
|
40
|
+
hidden: Record<string, string>;
|
|
41
|
+
checkboxes?: Array<{ name: string; value: string; label: string; checked: boolean }>;
|
|
42
|
+
/** Every button says what it does in words. `secondary` only changes how it looks. */
|
|
43
|
+
buttons: Array<{ label: string; name?: string; value?: string; secondary?: boolean }>;
|
|
44
|
+
};
|
|
45
|
+
|
|
46
|
+
export type PageContent = {
|
|
47
|
+
siteName: string;
|
|
48
|
+
theme: NewsletterPageTheme;
|
|
49
|
+
heading: string;
|
|
50
|
+
/** A short status line shown above the text (for example "Saved"), as words. */
|
|
51
|
+
notice?: string;
|
|
52
|
+
paragraphs: string[];
|
|
53
|
+
lists?: string[];
|
|
54
|
+
forms?: FormSpec[];
|
|
55
|
+
links?: Array<{ href: string; label: string }>;
|
|
56
|
+
};
|
|
57
|
+
|
|
58
|
+
function renderForm(form: FormSpec): string {
|
|
59
|
+
const hidden = Object.entries(form.hidden)
|
|
60
|
+
.map(([name, value]) => `<input type="hidden" name="${escapeHtml(name)}" value="${escapeHtml(value)}">`)
|
|
61
|
+
.join("");
|
|
62
|
+
const boxes = (form.checkboxes ?? [])
|
|
63
|
+
.map(
|
|
64
|
+
(box, index) =>
|
|
65
|
+
`<p class="box"><input type="checkbox" id="c${index}" name="${escapeHtml(box.name)}" value="${escapeHtml(box.value)}"${box.checked ? " checked" : ""}> <label for="c${index}">${escapeHtml(box.label)}</label></p>`,
|
|
66
|
+
)
|
|
67
|
+
.join("");
|
|
68
|
+
const buttons = form.buttons
|
|
69
|
+
.map(
|
|
70
|
+
(button) =>
|
|
71
|
+
`<button type="submit"${button.name ? ` name="${escapeHtml(button.name)}" value="${escapeHtml(button.value ?? "")}"` : ""}${button.secondary ? ' class="secondary"' : ""}>${escapeHtml(button.label)}</button>`,
|
|
72
|
+
)
|
|
73
|
+
.join(" ");
|
|
74
|
+
return `<form method="post" action="${escapeHtml(form.action)}">${hidden}${boxes}<p class="actions">${buttons}</p></form>`;
|
|
75
|
+
}
|
|
76
|
+
|
|
77
|
+
export function renderPage(page: PageContent): string {
|
|
78
|
+
const { theme } = page;
|
|
79
|
+
const lists = (page.lists ?? []).slice(0, MAXIMUM_LISTS_SHOWN);
|
|
80
|
+
const links = (page.links ?? []).map((link) => `<p><a href="${escapeHtml(link.href)}">${escapeHtml(link.label)}</a></p>`).join("\n");
|
|
81
|
+
return `<!doctype html>
|
|
82
|
+
<html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width, initial-scale=1">
|
|
83
|
+
<meta name="robots" content="noindex"><meta name="referrer" content="no-referrer">
|
|
84
|
+
<title>${escapeHtml(page.heading)} - ${escapeHtml(page.siteName)}</title>
|
|
85
|
+
<style>
|
|
86
|
+
body{margin:0;background:${theme.background};color:${theme.text};font-family:${theme.fontFamily};line-height:1.5}
|
|
87
|
+
main{max-width:34rem;margin:0 auto;padding:3rem 1.25rem}
|
|
88
|
+
.site{color:${theme.muted};font-size:.95rem;margin:0 0 1.5rem}
|
|
89
|
+
h1{font-size:1.6rem;line-height:1.2;margin:0 0 1rem}
|
|
90
|
+
.notice{background:${theme.surface};border-left:4px solid ${theme.accent};padding:.5rem .75rem;font-weight:bold}
|
|
91
|
+
ul{background:${theme.surface};margin:1rem 0;padding:.75rem 1.25rem 1rem 2rem}
|
|
92
|
+
.box{margin:.6rem 0}
|
|
93
|
+
input[type=checkbox]{width:1.1rem;height:1.1rem;vertical-align:middle}
|
|
94
|
+
.actions{margin:1.25rem 0}
|
|
95
|
+
button{background:${theme.accent};color:#fff;border:2px solid ${theme.accent};font:inherit;font-weight:bold;padding:.7rem 1.4rem;cursor:pointer;border-radius:4px;margin:0 .5rem .5rem 0}
|
|
96
|
+
button.secondary{background:${theme.background};color:${theme.accent}}
|
|
97
|
+
button:focus-visible,a:focus-visible,input:focus-visible{outline:3px solid ${theme.text};outline-offset:2px}
|
|
98
|
+
a{color:${theme.accent}}
|
|
99
|
+
</style></head><body><main>
|
|
100
|
+
<p class="site">${escapeHtml(page.siteName)}</p>
|
|
101
|
+
<h1>${escapeHtml(page.heading)}</h1>
|
|
102
|
+
${page.notice ? `<p class="notice" role="status">${escapeHtml(page.notice)}</p>` : ""}
|
|
103
|
+
${page.paragraphs.map((paragraph) => `<p>${escapeHtml(paragraph)}</p>`).join("\n")}
|
|
104
|
+
${lists.length > 0 ? `<ul>${lists.map((name) => `<li>${escapeHtml(name)}</li>`).join("")}</ul>` : ""}
|
|
105
|
+
${(page.forms ?? []).map(renderForm).join("\n")}
|
|
106
|
+
${links}
|
|
107
|
+
</main></body></html>`;
|
|
108
|
+
}
|
|
109
|
+
|
|
110
|
+
export const PAGE_HEADERS = {
|
|
111
|
+
"content-type": "text/html; charset=utf-8",
|
|
112
|
+
"cache-control": "no-store",
|
|
113
|
+
"referrer-policy": "no-referrer",
|
|
114
|
+
"x-content-type-options": "nosniff",
|
|
115
|
+
"content-security-policy": "default-src 'none'; style-src 'unsafe-inline'; form-action 'self'; base-uri 'none'; frame-ancestors 'none'",
|
|
116
|
+
} as const;
|
|
117
|
+
|
|
118
|
+
export function pageResponse(page: PageContent, status = 200): NextResponse {
|
|
119
|
+
return new NextResponse(renderPage(page), { status, headers: PAGE_HEADERS });
|
|
120
|
+
}
|
|
121
|
+
|
|
122
|
+
export const CONFIRM_PATH = "/api/newsletter/confirm";
|
|
123
|
+
|
|
124
|
+
type Base = Pick<PageContent, "siteName" | "theme">;
|
|
125
|
+
const home = (base: Base) => ({ href: "/", label: `Back to ${base.siteName}` });
|
|
126
|
+
|
|
127
|
+
export function confirmPromptPage(base: Base, lists: string[], token: string): PageContent {
|
|
128
|
+
return {
|
|
129
|
+
...base,
|
|
130
|
+
heading: "Confirm your subscription",
|
|
131
|
+
paragraphs: [`Press the button to start getting email from ${base.siteName}.${lists.length > 0 ? " You are signing up for:" : ""}`],
|
|
132
|
+
lists,
|
|
133
|
+
forms: [{ action: CONFIRM_PATH, hidden: { t: token }, buttons: [{ label: "Confirm subscription" }] }],
|
|
134
|
+
};
|
|
135
|
+
}
|
|
136
|
+
|
|
137
|
+
export function confirmedPage(base: Base, lists: string[], preferencesHref?: string): PageContent {
|
|
138
|
+
return {
|
|
139
|
+
...base,
|
|
140
|
+
heading: "You are subscribed",
|
|
141
|
+
paragraphs: [lists.length > 0 ? "Thank you. You will get:" : "Thank you. Your subscription is confirmed."],
|
|
142
|
+
lists,
|
|
143
|
+
links: [...(preferencesHref ? [{ href: preferencesHref, label: "Manage your subscriptions" }] : []), home(base)],
|
|
144
|
+
};
|
|
145
|
+
}
|
|
146
|
+
|
|
147
|
+
export function expiredPage(base: Base): PageContent {
|
|
148
|
+
return {
|
|
149
|
+
...base,
|
|
150
|
+
heading: "This link has expired",
|
|
151
|
+
paragraphs: [
|
|
152
|
+
"This confirmation link has expired or was already used. If you already confirmed, you are all set.",
|
|
153
|
+
"If you did not finish signing up, go back to the site and sign up again to get a new link.",
|
|
154
|
+
],
|
|
155
|
+
links: [home(base)],
|
|
156
|
+
};
|
|
157
|
+
}
|
|
158
|
+
|
|
159
|
+
export function unavailablePage(base: Base): PageContent {
|
|
160
|
+
return {
|
|
161
|
+
...base,
|
|
162
|
+
heading: "Something went wrong",
|
|
163
|
+
paragraphs: ["We could not complete this just now. Open the link in your email again in a minute."],
|
|
164
|
+
links: [home(base)],
|
|
165
|
+
};
|
|
166
|
+
}
|
|
167
|
+
|
|
168
|
+
export const UNSUBSCRIBE_PATH = "/api/newsletter/unsubscribe";
|
|
169
|
+
export const PREFERENCES_PATH = "/api/newsletter/preferences";
|
|
170
|
+
|
|
171
|
+
export function preferencesHref(token: string): string {
|
|
172
|
+
return `${PREFERENCES_PATH}?t=${encodeURIComponent(token)}`;
|
|
173
|
+
}
|
|
174
|
+
|
|
175
|
+
export function invalidManagePage(base: Base): PageContent {
|
|
176
|
+
return {
|
|
177
|
+
...base,
|
|
178
|
+
heading: "This link is not valid",
|
|
179
|
+
paragraphs: ["This link is not valid, or the subscription it belongs to has been deleted. Use the link in a recent email from us."],
|
|
180
|
+
links: [home(base)],
|
|
181
|
+
};
|
|
182
|
+
}
|
|
183
|
+
|
|
184
|
+
export function unsubscribePromptPage(base: Base, token: string, listId: string | null, listName: string | null): PageContent {
|
|
185
|
+
return {
|
|
186
|
+
...base,
|
|
187
|
+
heading: "Unsubscribe",
|
|
188
|
+
paragraphs: [listName ? `Stop getting "${listName}" from ${base.siteName}?` : `Stop getting all email from ${base.siteName}?`],
|
|
189
|
+
forms: [
|
|
190
|
+
{
|
|
191
|
+
action: UNSUBSCRIBE_PATH,
|
|
192
|
+
hidden: { t: token, ...(listId ? { l: listId } : {}), page: "1" },
|
|
193
|
+
buttons: [{ label: listName ? "Unsubscribe from this list" : "Unsubscribe from everything" }],
|
|
194
|
+
},
|
|
195
|
+
],
|
|
196
|
+
links: [{ href: preferencesHref(token), label: "Choose which lists you get instead" }],
|
|
197
|
+
};
|
|
198
|
+
}
|
|
199
|
+
|
|
200
|
+
export function unsubscribedPage(base: Base, names: string[], token: string | null): PageContent {
|
|
201
|
+
return {
|
|
202
|
+
...base,
|
|
203
|
+
heading: "You are unsubscribed",
|
|
204
|
+
paragraphs: [names.length > 0 ? `You will no longer get these from ${base.siteName}:` : `You will no longer get this email from ${base.siteName}.`],
|
|
205
|
+
lists: names,
|
|
206
|
+
links: [...(token ? [{ href: preferencesHref(token), label: "Change your mind? Manage your subscriptions" }] : []), home(base)],
|
|
207
|
+
};
|
|
208
|
+
}
|
|
209
|
+
|
|
210
|
+
export type PreferenceList = { id: string; name: string; description: string; subscribed: boolean };
|
|
211
|
+
|
|
212
|
+
export function preferencesPage(base: Base, input: { token: string; email: string; lists: PreferenceList[]; notice?: string }): PageContent {
|
|
213
|
+
return {
|
|
214
|
+
...base,
|
|
215
|
+
heading: "Your subscriptions",
|
|
216
|
+
notice: input.notice,
|
|
217
|
+
paragraphs: [`Email preferences for ${input.email}. Tick the lists you want.`],
|
|
218
|
+
forms: [
|
|
219
|
+
{
|
|
220
|
+
action: PREFERENCES_PATH,
|
|
221
|
+
hidden: { t: input.token },
|
|
222
|
+
checkboxes: input.lists.map((list) => ({
|
|
223
|
+
name: "l",
|
|
224
|
+
value: list.id,
|
|
225
|
+
label: list.description ? `${list.name}: ${list.description}` : list.name,
|
|
226
|
+
checked: list.subscribed,
|
|
227
|
+
})),
|
|
228
|
+
buttons: [
|
|
229
|
+
{ label: "Save preferences", name: "action", value: "save" },
|
|
230
|
+
{ label: "Unsubscribe from everything", name: "action", value: "unsubscribe_all", secondary: true },
|
|
231
|
+
{ label: "Delete my data", name: "action", value: "delete", secondary: true },
|
|
232
|
+
],
|
|
233
|
+
},
|
|
234
|
+
],
|
|
235
|
+
links: [home(base)],
|
|
236
|
+
};
|
|
237
|
+
}
|
|
238
|
+
|
|
239
|
+
export function deleteConfirmPage(base: Base, token: string): PageContent {
|
|
240
|
+
return {
|
|
241
|
+
...base,
|
|
242
|
+
heading: "Delete your data?",
|
|
243
|
+
paragraphs: [
|
|
244
|
+
`This erases your address and everything ${base.siteName} holds about your subscriptions. You will not get any more email. This cannot be undone.`,
|
|
245
|
+
],
|
|
246
|
+
forms: [
|
|
247
|
+
{
|
|
248
|
+
action: PREFERENCES_PATH,
|
|
249
|
+
hidden: { t: token, action: "delete", confirm: "1" },
|
|
250
|
+
buttons: [{ label: "Yes, delete my data" }],
|
|
251
|
+
},
|
|
252
|
+
],
|
|
253
|
+
links: [{ href: preferencesHref(token), label: "No, go back" }],
|
|
254
|
+
};
|
|
255
|
+
}
|
|
256
|
+
|
|
257
|
+
export function deletedPage(base: Base): PageContent {
|
|
258
|
+
return {
|
|
259
|
+
...base,
|
|
260
|
+
heading: "Your data is deleted",
|
|
261
|
+
paragraphs: ["Your address and subscriptions have been erased. You will not get any more email from us."],
|
|
262
|
+
links: [home(base)],
|
|
263
|
+
};
|
|
264
|
+
}
|
|
@@ -166,6 +166,7 @@ async function completeCallback(
|
|
|
166
166
|
personId: signedIn.person.id,
|
|
167
167
|
accessToken: signedIn.accessToken,
|
|
168
168
|
accessTokenExpiresAt: signedIn.accessTokenExpiresAt,
|
|
169
|
+
...(signedIn.person.siteSubject ? { siteSubject: signedIn.person.siteSubject } : {}),
|
|
169
170
|
};
|
|
170
171
|
const response = NextResponse.redirect(new URL(pendingSignIn.returnPath, siteOriginFor(request, options)), { status: 303, headers: NO_STORE_HEADERS });
|
|
171
172
|
response.cookies.set(
|
|
@@ -198,11 +199,10 @@ async function handleProspectusSessionReadRoute(request: NextRequest, options: P
|
|
|
198
199
|
return response;
|
|
199
200
|
}
|
|
200
201
|
const publishingAccounts = publishingAccountsForSite(directory.accounts, siteProductFor(options));
|
|
202
|
+
// Only what the UI reads: no person id, siteSubject or account list ever goes to the browser.
|
|
201
203
|
return NextResponse.json(
|
|
202
204
|
{
|
|
203
205
|
signedIn: true,
|
|
204
|
-
person: directory.person,
|
|
205
|
-
accounts: directory.accounts,
|
|
206
206
|
cyclotronLabAccess: directory.accounts.some((account) =>
|
|
207
207
|
account.products.some((product) => product.product === CYCLOTRON_LAB_PRODUCT && product.status === "active"),
|
|
208
208
|
),
|
|
@@ -24,6 +24,7 @@ export type ProspectusOperation = "console:read" | "console:write" | "members:re
|
|
|
24
24
|
export interface ProspectusPerson {
|
|
25
25
|
id: string;
|
|
26
26
|
createdAt: string;
|
|
27
|
+
siteSubject?: string;
|
|
27
28
|
}
|
|
28
29
|
|
|
29
30
|
export interface ProspectusAccountAuthorization {
|
|
@@ -36,6 +37,20 @@ export interface ProspectusAccountAuthorization {
|
|
|
36
37
|
revision: number;
|
|
37
38
|
}
|
|
38
39
|
|
|
40
|
+
/** One retired reader site subject, from `GET /v1/accounts/site-subjects/retired` (reader sites only). */
|
|
41
|
+
export interface ProspectusRetiredSiteSubject {
|
|
42
|
+
siteSubject: string;
|
|
43
|
+
reason: "deleted" | "merged";
|
|
44
|
+
survivingSiteSubject?: string;
|
|
45
|
+
retiredAt: string;
|
|
46
|
+
}
|
|
47
|
+
|
|
48
|
+
export interface ProspectusRetiredSiteSubjectsPage {
|
|
49
|
+
retired: ProspectusRetiredSiteSubject[];
|
|
50
|
+
cursor: string;
|
|
51
|
+
more: boolean;
|
|
52
|
+
}
|
|
53
|
+
|
|
39
54
|
export interface ProspectusDirectoryAccount {
|
|
40
55
|
id: string;
|
|
41
56
|
name: string;
|
|
@@ -100,8 +115,10 @@ export function signedProspectusTransport(options: SignedProspectusTransportOpti
|
|
|
100
115
|
...(payload ? { "content-type": "application/json" } : {}),
|
|
101
116
|
};
|
|
102
117
|
const signer = new SignatureV4({ service: "execute-api", region: options.region, credentials, sha256: Sha256 });
|
|
118
|
+
// The query string is part of what API Gateway verifies, so it has to be signed as well as sent.
|
|
119
|
+
const query: Record<string, string> = Object.fromEntries(url.searchParams.entries());
|
|
103
120
|
const signed = await signer.sign(
|
|
104
|
-
new HttpRequest({ protocol: url.protocol, hostname: url.hostname, path: url.pathname, method, headers, body: payload }),
|
|
121
|
+
new HttpRequest({ protocol: url.protocol, hostname: url.hostname, path: url.pathname, method, headers, body: payload, query }),
|
|
105
122
|
);
|
|
106
123
|
const response = await fetcher(url, { method, headers: signed.headers, body: payload, cache: "no-store", redirect: "error" });
|
|
107
124
|
const responseBody = await response.json().catch(() => ({}));
|
|
@@ -156,6 +173,12 @@ export class ProspectusSiteAccounts {
|
|
|
156
173
|
}) as Promise<{ account: { id: string; name: string; role: ProspectusRole } }>;
|
|
157
174
|
}
|
|
158
175
|
|
|
176
|
+
/** The calling site's retired reader subjects since `since` (omit it the first time): at most 100, oldest first. */
|
|
177
|
+
retiredSiteSubjects(since?: string): Promise<ProspectusRetiredSiteSubjectsPage> {
|
|
178
|
+
const query = since ? `?since=${encodeURIComponent(since)}` : "";
|
|
179
|
+
return this.transport({ path: `/v1/accounts/site-subjects/retired${query}`, method: "GET" }) as Promise<ProspectusRetiredSiteSubjectsPage>;
|
|
180
|
+
}
|
|
181
|
+
|
|
159
182
|
accountDirectory(humanAccessToken: string): Promise<{ person: ProspectusPerson | null; accounts: ProspectusDirectoryAccount[] }> {
|
|
160
183
|
return this.transport({ path: "/v1/account-directory", method: "GET", humanAccessToken }) as Promise<{
|
|
161
184
|
person: ProspectusPerson | null;
|