From aba596729e277e928acc6791620cbdb061b08318 Mon Sep 17 00:00:00 2001 From: Claude Date: Sat, 17 Oct 2026 06:45:06 +0000 Subject: [PATCH 001/163] Allow spaces in registration first and last names The constrained_name domain and the registration form both rejected any whitespace in names, to stop people registering with a blank name. That also blocked real names like "Anna Maria" or "von Wright". Now only names that are empty or whitespace-only are rejected, the form trims surrounding spaces before submitting, and the name prefill from the user profile keeps every word instead of dropping the third one onwards. Co-Authored-By: Claude Opus 5.5 (1M context) Claude-Session: https://claude.ai/code/session_0126Kq6TYvUgHFmDYaQL7hp7 --- .../event/[slug]/register/[quotaId]/index.tsx | 7 +++- .../src/translations/en/register_event.json | 1 - .../src/translations/fi/register_event.json | 1 - .../src/translations/se/register_event.json | 1 - @app/components/src/EventRegistrationForm.tsx | 27 +++++------- .../current/3-allow-spaces-in-names.sql | 17 ++++++++ .../createRegistration.test.ts.snap | 30 ++++++++++++- .../mutations/createRegistration.test.ts | 42 ++++++++++++++++++- data/schema.sql | 4 +- 9 files changed, 103 insertions(+), 27 deletions(-) create mode 100644 @app/db/migrations/current/3-allow-spaces-in-names.sql diff --git a/@app/client/src/pages/event/[slug]/register/[quotaId]/index.tsx b/@app/client/src/pages/event/[slug]/register/[quotaId]/index.tsx index 47ebd8ff1..3ef478d21 100644 --- a/@app/client/src/pages/event/[slug]/register/[quotaId]/index.tsx +++ b/@app/client/src/pages/event/[slug]/register/[quotaId]/index.tsx @@ -37,8 +37,11 @@ const EventRegistrationPage: NextPage = () => { const { name, primaryEmail } = currentUser || {} // TODO: The users table schema could be changed to include first - // and last names. For now infer first and last name like this... - const [firstName, lastName] = name ? name.split(" ") : [] + // and last names. For now infer them like this: the last word is the last + // name and everything before it is the first name (e.g. "Anna Maria"). + const nameParts = name ? name.trim().split(/\s+/) : [] + const lastName = nameParts.length > 1 ? nameParts.pop() : undefined + const firstName = nameParts.length ? nameParts.join(" ") : undefined const formInitialValues = { firstName, diff --git a/@app/client/src/translations/en/register_event.json b/@app/client/src/translations/en/register_event.json index ffb1a98df..33f4214db 100644 --- a/@app/client/src/translations/en/register_event.json +++ b/@app/client/src/translations/en/register_event.json @@ -15,7 +15,6 @@ "rules": { "emailEmpty": "Please input your E-mail", "emailValid": "The input is not valid E-mail", - "nameContainsSpace": "Name cannot contain spaces", "provideAnswer": "Please answer the question", "provideFirstName": "Please enter your first name", "provideLastName": "Please enter your last name" diff --git a/@app/client/src/translations/fi/register_event.json b/@app/client/src/translations/fi/register_event.json index 4c439c23f..a4ce356c5 100644 --- a/@app/client/src/translations/fi/register_event.json +++ b/@app/client/src/translations/fi/register_event.json @@ -15,7 +15,6 @@ "rules": { "emailEmpty": "Sähköpostiosoite ei voi olla tyhjä", "emailValid": "Tarkista sähköpostiosoite", - "nameContainsSpace": "Nimi ei saa sisältää välilyöntejä", "provideAnswer": "Vastaus vaaditaan", "provideFirstName": "Anna etunimi", "provideLastName": "Anna sukunimi" diff --git a/@app/client/src/translations/se/register_event.json b/@app/client/src/translations/se/register_event.json index f003ddc37..b2ff94537 100644 --- a/@app/client/src/translations/se/register_event.json +++ b/@app/client/src/translations/se/register_event.json @@ -15,7 +15,6 @@ "rules": { "emailEmpty": "Ange din e-post", "emailValid": "Inmatningen är inte giltig e-post", - "nameContainsSpace": "Namnet kan inte innehålla mellanslag", "provideAnswer": "Snälla svara på frågan", "provideFirstName": "Ange ditt förnamn", "provideLastName": "Ange ditt efternamn" diff --git a/@app/components/src/EventRegistrationForm.tsx b/@app/components/src/EventRegistrationForm.tsx index 98e46d589..a2bbaa362 100644 --- a/@app/components/src/EventRegistrationForm.tsx +++ b/@app/components/src/EventRegistrationForm.tsx @@ -28,8 +28,6 @@ import { CombinedError, useMutation } from "urql" import { ErrorAlert, useTranslation } from "." -import type { Rule } from "antd/lib/form" - const { Text } = Typography interface EventRegistrationFormProps { @@ -156,16 +154,23 @@ export const EventRegistrationForm: React.FC = memo( async (values) => { setFormError(null) try { + // Names may contain spaces (e.g. "Anna Maria"), but strip the ones + // around them + const trimmedValues = { + ...values, + firstName: values.firstName?.trim(), + lastName: values.lastName?.trim(), + } const input = type === "create" ? { - ...values, + ...trimmedValues, eventId, quotaId, registrationToken, } : { - ...values, + ...trimmedValues, updateToken, } const { error } = await formMutation({ input }) @@ -205,16 +210,6 @@ export const EventRegistrationForm: React.FC = memo( ] ) - const validateName: Rule = () => ({ - validator(_, value) { - // firstName and lastName are not allowed to contain spaces - if (/\s/.test(value)) { - return Promise.reject(new Error(t("forms.rules.nameContainsSpace"))) - } - return Promise.resolve() - }, - }) - const showAdminEmptyAnswersNote = useMemo(() => { if (!isAdmin) return false @@ -246,9 +241,9 @@ export const EventRegistrationForm: React.FC = memo( rules={[ { required: true, + whitespace: true, message: t("forms.rules.provideFirstName"), }, - validateName, ]} hasFeedback > @@ -260,9 +255,9 @@ export const EventRegistrationForm: React.FC = memo( rules={[ { required: true, + whitespace: true, message: t("forms.rules.provideLastName"), }, - validateName, ]} hasFeedback > diff --git a/@app/db/migrations/current/3-allow-spaces-in-names.sql b/@app/db/migrations/current/3-allow-spaces-in-names.sql new file mode 100644 index 000000000..b338a785d --- /dev/null +++ b/@app/db/migrations/current/3-allow-spaces-in-names.sql @@ -0,0 +1,17 @@ +/* + * `constrained_name` used to reject any whitespace, which made multi-part + * first and last names (e.g. "Anna Maria" or "von Wright") impossible to + * register with. The intent was only to stop registrations whose name is + * nothing but spaces, so require at least one non-whitespace character + * instead. Null is still allowed because claimRegistrationToken creates a + * registration before the names are known. + */ + +alter domain app_public.constrained_name + drop constraint if exists constrained_name_check; + +alter domain app_public.constrained_name + add constraint constrained_name_check check (value ~ '\S'); + +comment on domain app_public.constrained_name is + E'A name field which must not be empty or contain only whitespace'; diff --git a/@app/server/__tests__/mutations/__snapshots__/createRegistration.test.ts.snap b/@app/server/__tests__/mutations/__snapshots__/createRegistration.test.ts.snap index fd3e90c73..72213bac3 100644 --- a/@app/server/__tests__/mutations/__snapshots__/createRegistration.test.ts.snap +++ b/@app/server/__tests__/mutations/__snapshots__/createRegistration.test.ts.snap @@ -1,5 +1,31 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP +exports[`CreateRegistration can create a registration with spaces in first and last name 1`] = ` +{ + "data": { + "createRegistration": { + "registration": { + "createdAt": "[timestamp-1]", + "event": { + "id": "[id-3]", + "slug": "[random-3]", + }, + "fullName": "Anna Maria von Wright", + "id": "[id-1]", + "position": 1, + "quota": { + "id": "[id-2]", + "position": 0, + "size": "[random-2]", + "title": "[random-1]", + }, + "status": "IN_QUOTA", + }, + }, + }, +} +`; + exports[`CreateRegistration can create registration 1`] = ` { "data": { @@ -26,7 +52,7 @@ exports[`CreateRegistration can create registration 1`] = ` } `; -exports[`CreateRegistration can't create a registration if first or last name contains spaces 1`] = ` +exports[`CreateRegistration can't create a registration if first or last name is blank 1`] = ` { "data": { "createRegistration": null, @@ -69,7 +95,7 @@ PL/pgSQL function app_public.create_registration(text,uuid,uuid,text,text,citext } `; -exports[`CreateRegistration can't create a registration if first or last name contains spaces 2`] = ` +exports[`CreateRegistration can't create a registration if first or last name is blank 2`] = ` { "data": { "createRegistration": null, diff --git a/@app/server/__tests__/mutations/createRegistration.test.ts b/@app/server/__tests__/mutations/createRegistration.test.ts index c36e82bf2..8d12c53bd 100644 --- a/@app/server/__tests__/mutations/createRegistration.test.ts +++ b/@app/server/__tests__/mutations/createRegistration.test.ts @@ -373,7 +373,7 @@ describe("CreateRegistration", () => { ) }) - it("can't create a registration if first or last name contains spaces", async () => { + it("can't create a registration if first or last name is blank", async () => { const { quotas, events } = await createEventDataAndLogin({ questionOptions: { create: false }, registrationOptions: { create: false }, @@ -426,7 +426,7 @@ describe("CreateRegistration", () => { quotaId, registrationToken, firstName: "Testname", - lastName: "Last name", + lastName: " ", email: "testuser@example.com", }, }, @@ -448,6 +448,44 @@ describe("CreateRegistration", () => { ) }) + it("can create a registration with spaces in first and last name", async () => { + const { quotas, events } = await createEventDataAndLogin({ + questionOptions: { create: false }, + registrationOptions: { create: false }, + }) + const eventId = events[0].id + const quotaId = quotas[0].id + + const { registrationToken } = await claimRegistrationToken(eventId, quotaId) + + await runGraphQLQuery( + CreateEventRegistrationDocument, + + // GraphQL variables: + { + input: { + eventId, + quotaId, + registrationToken, + firstName: "Anna Maria", + lastName: "von Wright", + email: "testuser@example.com", + }, + }, + + // Additional props to add to `req` (e.g. `user: {sessionId: '...'}`) + {}, + + // This function runs all your test assertions: + async (json) => { + expect(json.errors).toBeFalsy() + + const registration = json.data!.createRegistration.registration + expect(registration.fullName).toEqual("Anna Maria von Wright") + } + ) + }) + it("can't create a registration if a registration already exists with the same email", async () => { const { quotas, events, registrations } = await createEventDataAndLogin({ questionOptions: { create: false }, diff --git a/data/schema.sql b/data/schema.sql index 80709ee2a..c63b095d6 100644 --- a/data/schema.sql +++ b/data/schema.sql @@ -117,14 +117,14 @@ CREATE TYPE app_public.claim_registration_token_output AS ( -- CREATE DOMAIN app_public.constrained_name AS text - CONSTRAINT constrained_name_check CHECK ((VALUE !~ '\s'::text)); + CONSTRAINT constrained_name_check CHECK ((VALUE ~ '\S'::text)); -- -- Name: DOMAIN constrained_name; Type: COMMENT; Schema: app_public; Owner: - -- -COMMENT ON DOMAIN app_public.constrained_name IS 'A field which must not contain spaces'; +COMMENT ON DOMAIN app_public.constrained_name IS 'A name field which must not be empty or contain only whitespace'; -- From b370960958c6dfc225e1992c82d185d030317709 Mon Sep 17 00:00:00 2001 From: Claude Date: Sat, 17 Oct 2026 06:48:10 +0000 Subject: [PATCH 002/163] Keep schema.sql in sync with committed migrations only CI dumps data/schema.sql from committed migrations, so changes in migrations/current must not be reflected there until they are committed. Co-Authored-By: Claude Opus 5.5 (1M context) Claude-Session: https://claude.ai/code/session_0126Kq6TYvUgHFmDYaQL7hp7 --- data/schema.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/schema.sql b/data/schema.sql index c63b095d6..80709ee2a 100644 --- a/data/schema.sql +++ b/data/schema.sql @@ -117,14 +117,14 @@ CREATE TYPE app_public.claim_registration_token_output AS ( -- CREATE DOMAIN app_public.constrained_name AS text - CONSTRAINT constrained_name_check CHECK ((VALUE ~ '\S'::text)); + CONSTRAINT constrained_name_check CHECK ((VALUE !~ '\s'::text)); -- -- Name: DOMAIN constrained_name; Type: COMMENT; Schema: app_public; Owner: - -- -COMMENT ON DOMAIN app_public.constrained_name IS 'A name field which must not be empty or contain only whitespace'; +COMMENT ON DOMAIN app_public.constrained_name IS 'A field which must not contain spaces'; -- From 085f1362006a7ddc06fae4f348c2d4eea9dfc4e9 Mon Sep 17 00:00:00 2001 From: Risto Virtaharju Date: Sat, 17 Oct 2026 07:30:29 +0000 Subject: [PATCH 003/163] perf: maintain registration positions per event instead of refreshing a global materialized view Co-Authored-By: Claude Opus 5.5 --- @app/__tests__/helpers.ts | 8 - .../registrations_status_and_position.test.ts | 253 ++++++++++++++++++ .../3-registration-positions-table.sql | 181 +++++++++++++ @app/server/__tests__/helpers.ts | 3 - 4 files changed, 434 insertions(+), 11 deletions(-) create mode 100644 @app/db/migrations/current/3-registration-positions-table.sql diff --git a/@app/__tests__/helpers.ts b/@app/__tests__/helpers.ts index 404e11dc5..03a93e80a 100644 --- a/@app/__tests__/helpers.ts +++ b/@app/__tests__/helpers.ts @@ -195,14 +195,6 @@ export async function claimRegistrationToken(eventId: string, quotaId: string) { } } -export const refreshMaterializedView = async (client: PoolClient) => { - // Become root - await client.query("reset role") - client.query( - "refresh materialized view app_hidden.registrations_status_and_position" - ) -} - export const getEmails = () => global["TEST_EMAILS"] export const clearEmails = () => { diff --git a/@app/db/__tests__/app_public/views/registrations_status_and_position.test.ts b/@app/db/__tests__/app_public/views/registrations_status_and_position.test.ts index f8e33311f..365812efe 100644 --- a/@app/db/__tests__/app_public/views/registrations_status_and_position.test.ts +++ b/@app/db/__tests__/app_public/views/registrations_status_and_position.test.ts @@ -2,12 +2,17 @@ import { PoolClient } from "pg" import { becomeRoot, + becomeUser, createEventCategories, createEvents, createOrganizations, createQuotas, createRegistrations, + createUsers, deleteTestData, + getJobs, + poolFromUrl, + TEST_DATABASE_URL, withUserDb, } from "../../helpers" @@ -166,4 +171,252 @@ describe("registrations_status_and_position", () => { expect(sorted[8].position).toEqual(2) expect(sorted[9].position).toEqual(4) })) + + describe("maintained per event", () => { + afterAll(deleteTestData) + + // Registers `count` people one transaction at a time so that each + // registration gets a distinct created_at. + async function registerInOrder( + client: PoolClient, + count: number, + eventId: string, + quotaId: string + ) { + const registrations = [] + for (let i = 0; i < count; i++) { + const [reg] = await createRegistrations(client, 1, eventId, quotaId, []) + await client.query("commit") + registrations.push(reg) + } + return registrations + } + + async function positionsOf(client: PoolClient, ids: string[]) { + const { rows } = await client.query( + `select id, status, position + from app_hidden.registrations_status_and_position + where id = any($1::uuid[])`, + [ids] + ) + return ids.map((id) => { + const row = rows.find((r) => r.id === id) + return row ? { status: row.status, position: row.position } : null + }) + } + + it("is current right after each registration is inserted", () => + withUserDb(async (client) => { + const { event, quotas } = await setupData(client, { + openQuotaSize: 0, + numQuotas: 1, + quotaSize: 2, + }) + const registrations = await registerInOrder( + client, + 3, + event.id, + quotas[0].id + ) + + expect( + await positionsOf( + client, + registrations.map((r) => r.id) + ) + ).toEqual([ + { status: "IN_QUOTA", position: 1 }, + { status: "IN_QUOTA", position: 2 }, + { status: "IN_QUEUE", position: 1 }, + ]) + })) + + it("leaves other events' rows untouched", () => + withUserDb(async (client) => { + const a = await setupData(client, { + openQuotaSize: 0, + numQuotas: 1, + quotaSize: 1, + }) + const b = await setupData(client, { + openQuotaSize: 0, + numQuotas: 1, + quotaSize: 1, + }) + await registerInOrder(client, 2, a.event.id, a.quotas[0].id) + + const rowsOfA = async () => + ( + await client.query( + `select id, status, position, xmin::text as xmin + from app_hidden.registrations_status_and_position + where event_id = $1 + order by id`, + [a.event.id] + ) + ).rows + const before = await rowsOfA() + expect(before).toHaveLength(2) + + await registerInOrder(client, 2, b.event.id, b.quotas[0].id) + + expect(await rowsOfA()).toEqual(before) + })) + + it("recomputes positions when a quota grows", () => + withUserDb(async (client) => { + const { event, quotas } = await setupData(client, { + openQuotaSize: 0, + numQuotas: 1, + quotaSize: 2, + }) + const registrations = await registerInOrder( + client, + 3, + event.id, + quotas[0].id + ) + + await client.query( + "update app_public.quotas set size = 3 where id = $1", + [quotas[0].id] + ) + + expect(await positionsOf(client, [registrations[2].id])).toEqual([ + { status: "IN_QUOTA", position: 3 }, + ]) + })) + + it("recomputes positions when the open quota size changes", () => + withUserDb(async (client) => { + const { event, quotas } = await setupData(client, { + openQuotaSize: 0, + numQuotas: 1, + quotaSize: 1, + }) + const registrations = await registerInOrder( + client, + 2, + event.id, + quotas[0].id + ) + + await client.query( + "update app_public.events set open_quota_size = 1 where id = $1", + [event.id] + ) + + expect(await positionsOf(client, [registrations[1].id])).toEqual([ + { status: "IN_OPEN_QUOTA", position: 1 }, + ]) + })) + + it("enqueues the first queued person when a full quota loses a registration", () => + withUserDb(async (client) => { + const { event, quotas } = await setupData(client, { + openQuotaSize: 0, + numQuotas: 1, + quotaSize: 2, + }) + const registrations = await registerInOrder( + client, + 3, + event.id, + quotas[0].id + ) + + await client.query( + "delete from app_public.registrations where id = $1", + [registrations[1].id] + ) + + const jobs = await getJobs(client, "registration__process_queue") + expect(jobs).toHaveLength(1) + expect(jobs[0].payload).toMatchObject({ + receivedSpot: { + id: registrations[2].id, + event_id: event.id, + quota_id: quotas[0].id, + status: "IN_QUEUE", + position: 1, + }, + }) + expect( + await positionsOf(client, [registrations[0].id, registrations[2].id]) + ).toEqual([ + { status: "IN_QUOTA", position: 1 }, + { status: "IN_QUOTA", position: 2 }, + ]) + })) + + it("keeps both of two concurrent claims with correct positions", async () => { + const pool = poolFromUrl(TEST_DATABASE_URL) + const setupClient = await pool.connect() + let event, quota + try { + await setupClient.query("begin") + const [user] = await createUsers(setupClient, 1) + await becomeUser(setupClient, user.id) + ;({ + event, + quotas: [quota], + } = await setupData(setupClient, { + openQuotaSize: 0, + numQuotas: 1, + quotaSize: 5, + })) + await setupClient.query("commit") + } finally { + await setupClient.query("rollback") + setupClient.release() + } + + const client1 = await pool.connect() + const client2 = await pool.connect() + try { + await client1.query("begin") + await client1.query( + "select * from app_public.claim_registration_token($1, $2)", + [event.id, quota.id] + ) + + await client2.query("begin") + let claim2Done = false + const claim2 = client2 + .query("select * from app_public.claim_registration_token($1, $2)", [ + event.id, + quota.id, + ]) + .then((result) => { + claim2Done = true + return result + }) + + // Give the second claim time to reach the per-event lock. + await new Promise((resolve) => setTimeout(resolve, 300)) + expect(claim2Done).toBe(false) + + await client1.query("commit") + await claim2 + await client2.query("commit") + } finally { + await client1.query("rollback").catch(() => {}) + await client2.query("rollback").catch(() => {}) + client1.release() + client2.release() + } + + const { rows } = await pool.query( + `select status, position + from app_hidden.registrations_status_and_position + where event_id = $1 + order by position`, + [event.id] + ) + expect(rows).toEqual([ + { status: "IN_QUOTA", position: 1 }, + { status: "IN_QUOTA", position: 2 }, + ]) + }) + }) }) diff --git a/@app/db/migrations/current/3-registration-positions-table.sql b/@app/db/migrations/current/3-registration-positions-table.sql new file mode 100644 index 000000000..386a21f41 --- /dev/null +++ b/@app/db/migrations/current/3-registration-positions-table.sql @@ -0,0 +1,181 @@ +/* + * Registration statuses and positions are kept in a table that is maintained + * per event. Every change to an event's registrations, quota sizes or open + * quota size recomputes the positions of that event only, inside the same + * transaction, so readers always see current positions and a change to one + * event never touches the rows of another. + */ + +drop trigger if exists _700_refresh_mat_view on app_public.registrations; +drop trigger if exists _300_refresh_mat_view on app_public.events; +drop trigger if exists _300_refresh_mat_view on app_public.quotas; +drop function if exists app_private.tg__refresh_materialized_view(); + +drop trigger if exists _700_refresh_registration_positions on app_public.registrations; +drop trigger if exists _701_refresh_registration_positions on app_public.registrations; +drop trigger if exists _300_refresh_registration_positions on app_public.events; +drop trigger if exists _301_refresh_registration_positions on app_public.events; +drop trigger if exists _300_refresh_registration_positions on app_public.quotas; +drop trigger if exists _301_refresh_registration_positions on app_public.quotas; +drop function if exists app_private.tg__refresh_registration_positions(); +drop function if exists app_private.refresh_registration_positions(uuid); + +do $$ +begin + if exists ( + select 1 from pg_matviews + where schemaname = 'app_hidden' and matviewname = 'registrations_status_and_position' + ) then + drop materialized view app_hidden.registrations_status_and_position; + end if; +end +$$; +drop table if exists app_hidden.registrations_status_and_position; + +create table app_hidden.registrations_status_and_position ( + id uuid primary key, + event_id uuid, + quota_id uuid, + status app_public.registration_status, + position integer +); +create index on app_hidden.registrations_status_and_position(event_id); +create index on app_hidden.registrations_status_and_position(quota_id); +alter table app_hidden.registrations_status_and_position enable row level security; + +create policy select_all on app_hidden.registrations_status_and_position + for select using (true); +grant select on app_hidden.registrations_status_and_position to :DATABASE_VISITOR; + +comment on table app_hidden.registrations_status_and_position is + E'Rank and position of registrations, maintained per event by app_private.refresh_registration_positions.'; + +/* + * Recomputes the statuses and positions of one event's registrations. + * + * The advisory lock serializes recomputes of the same event until the end of + * the transaction. In READ COMMITTED each following statement takes a fresh + * snapshot, so a recompute that waited for the lock sees every registration + * committed by the transaction that held it. + */ +create function app_private.refresh_registration_positions(p_event_id uuid) +returns void as $$ +begin + perform pg_advisory_xact_lock(hashtext('registration_positions:' || p_event_id::text)); + + delete from app_hidden.registrations_status_and_position + where event_id = p_event_id; + + insert into app_hidden.registrations_status_and_position(id, event_id, quota_id, status, position) + with cte1 as ( + select + r.id, + size, + r.event_id, + r.quota_id, + e.open_quota_size, + r.created_at, + row_number() over (partition by r.quota_id order by r.created_at asc) as tmp_pos_quota + from app_public.registrations r + left join app_public.quotas q + on r.quota_id = q.id + left join app_public.events e + on r.event_id = e.id + where r.event_id = p_event_id + ), cte2 as ( + select + tmp.*, + row_number() over (partition by event_id, tmp_status order by created_at asc) as tmp_pos_status + from ( + select + *, + case + when tmp_pos_quota <= size then 'IN_QUOTA'::text + else 'OPEN_OR_QUEUE'::text + end as tmp_status + from cte1 + ) as tmp + ), cte3 as ( + select + *, + case + when tmp_status = 'OPEN_OR_QUEUE'::text and tmp_pos_status <= open_quota_size then 'IN_OPEN_QUOTA'::app_public.registration_status + when tmp_status = 'OPEN_OR_QUEUE'::text then 'IN_QUEUE'::app_public.registration_status + else 'IN_QUOTA'::app_public.registration_status + end as status + from cte2 + ) select + id, + event_id, + quota_id, + status, + case + -- row_number() returns bigint but we cast it to integer to avoid + -- introducing another type to our GraphQL API. Besides, we are not + -- expecting to have that many registrations in the system. + when status = 'IN_QUOTA'::app_public.registration_status then cast(row_number() over (partition by quota_id, status order by created_at asc) as integer) + else cast(row_number() over (partition by event_id, status order by created_at asc) as integer) + end as position + from cte3; +end; +$$ language plpgsql volatile security definer set search_path to pg_catalog, public, pg_temp; +revoke all on function app_private.refresh_registration_positions(uuid) from public; +comment on function app_private.refresh_registration_positions(uuid) is + E'Recomputes app_hidden.registrations_status_and_position for the registrations of one event.'; + +/* + * Recomputes positions for the event(s) a row of app_public.[registrations, + * quotas,events] belongs to before and after the change. + */ +create function app_private.tg__refresh_registration_positions() + returns trigger as $$ +begin + if TG_TABLE_NAME = 'events' then + perform app_private.refresh_registration_positions(coalesce(NEW.id, OLD.id)); + return null; + end if; + + if TG_OP in ('UPDATE', 'DELETE') then + perform app_private.refresh_registration_positions(OLD.event_id); + end if; + if TG_OP = 'INSERT' or (TG_OP = 'UPDATE' and NEW.event_id is distinct from OLD.event_id) then + perform app_private.refresh_registration_positions(NEW.event_id); + end if; + return null; +end; +$$ language plpgsql volatile security definer set search_path to pg_catalog, public, pg_temp; +revoke all on function app_private.tg__refresh_registration_positions() from public; + +-- Updates recompute only when a rank input changes. +create trigger _700_refresh_registration_positions + after insert or delete on app_public.registrations for each row + execute procedure app_private.tg__refresh_registration_positions(); +create trigger _701_refresh_registration_positions + after update on app_public.registrations for each row + when ( + OLD.created_at is distinct from NEW.created_at or + OLD.quota_id is distinct from NEW.quota_id or + OLD.event_id is distinct from NEW.event_id + ) + execute procedure app_private.tg__refresh_registration_positions(); + +create trigger _300_refresh_registration_positions + after insert or delete on app_public.quotas for each row + execute procedure app_private.tg__refresh_registration_positions(); +create trigger _301_refresh_registration_positions + after update on app_public.quotas for each row + when ( + OLD.size is distinct from NEW.size or + OLD.event_id is distinct from NEW.event_id + ) + execute procedure app_private.tg__refresh_registration_positions(); + +create trigger _300_refresh_registration_positions + after insert or delete on app_public.events for each row + execute procedure app_private.tg__refresh_registration_positions(); +create trigger _301_refresh_registration_positions + after update on app_public.events for each row + when (OLD.open_quota_size is distinct from NEW.open_quota_size) + execute procedure app_private.tg__refresh_registration_positions(); + +select app_private.refresh_registration_positions(id) from app_public.events; diff --git a/@app/server/__tests__/helpers.ts b/@app/server/__tests__/helpers.ts index d806b6b86..48970629d 100644 --- a/@app/server/__tests__/helpers.ts +++ b/@app/server/__tests__/helpers.ts @@ -30,7 +30,6 @@ import { createSession, createUsers, poolFromUrl, - refreshMaterializedView, TEST_DATABASE_URL, } from "../../__tests__/helpers" import { getPostGraphileOptions } from "../src/middleware/installPostGraphile" @@ -227,8 +226,6 @@ export async function createEventDataAndLogin(args?: CreateEventDataAndLogin) { ) } - await refreshMaterializedView(client) - await client.query("commit") return { users, From d552198c773ebd865484080eb130646621ae7159 Mon Sep 17 00:00:00 2001 From: Risto Virtaharju Date: Sat, 17 Oct 2026 07:38:45 +0000 Subject: [PATCH 004/163] fix: bound Postgres pools to the connection budget and fail fast on exhaustion Co-Authored-By: Claude Opus 5.5 --- @app/client/src/pages/event/[slug]/index.tsx | 12 +-- .../server/__tests__/utils/poolConfig.test.ts | 75 +++++++++++++++++++ @app/server/package.json | 1 - .../src/middleware/installDatabasePools.ts | 5 ++ .../src/middleware/installPostGraphile.ts | 14 ++-- @app/server/src/utils/poolConfig.ts | 51 +++++++++++++ @app/worker/package.json | 2 +- pnpm-lock.yaml | 43 ----------- scripts/_setup_utils.mjs | 16 +++- 9 files changed, 154 insertions(+), 65 deletions(-) create mode 100644 @app/server/__tests__/utils/poolConfig.test.ts create mode 100644 @app/server/src/utils/poolConfig.ts diff --git a/@app/client/src/pages/event/[slug]/index.tsx b/@app/client/src/pages/event/[slug]/index.tsx index 4d5918f31..2c5be696d 100644 --- a/@app/client/src/pages/event/[slug]/index.tsx +++ b/@app/client/src/pages/event/[slug]/index.tsx @@ -98,14 +98,10 @@ const EventPageInner: React.FC = ({ }, [router, event]) const handleSignupState = useCallback((time, startTime, endTime) => { - // This page uses Postgraphile live queries (https://www.graphile.org/postgraphile/live-queries/) - // to automaticaly update information (registrations, quota sizes, description etc.). - // We cannot rely on event.signup* since those fields are exposed to the API - // using Postgraphile computed columns (https://www.graphile.org/postgraphile/computed-columns/). - // Computed columns are a known limitation of the @graphile/subscriptions-lds plugin - // which uses wal2json to detect updates in the database. It cannot detect updates on - // computed column fields. This is why we replicate the signup* fields on the frontend - // based on a timestamp fetched from the server. + // The EventPage subscription delivers the event once per page load, so + // event.signup* (computed columns, https://www.graphile.org/postgraphile/computed-columns/) + // would not change while the page is open. This is why we replicate the + // signup* fields on the frontend based on a timestamp fetched from the server. if (time.isBefore(startTime)) { setSignupState({ upcoming: true, open: false, closed: false }) } else if (time.isAfter(startTime) && time.isBefore(endTime)) { diff --git a/@app/server/__tests__/utils/poolConfig.test.ts b/@app/server/__tests__/utils/poolConfig.test.ts new file mode 100644 index 000000000..c0d456468 --- /dev/null +++ b/@app/server/__tests__/utils/poolConfig.test.ts @@ -0,0 +1,75 @@ +import { Pool } from "pg" + +import { TEST_DATABASE_URL } from "../../../__tests__/helpers" +import { poolConfig } from "../../src/utils/poolConfig" + +const ENV_VARS = [ + "DATABASE_POOL_MAX_ROOT", + "DATABASE_POOL_MAX_AUTH", + "DATABASE_POOL_ACQUIRE_TIMEOUT_MS", +] + +describe("poolConfig", () => { + const saved: Record = {} + + beforeEach(() => { + for (const name of ENV_VARS) { + saved[name] = process.env[name] + delete process.env[name] + } + }) + + afterEach(() => { + for (const name of ENV_VARS) { + if (saved[name] === undefined) { + delete process.env[name] + } else { + process.env[name] = saved[name] + } + } + }) + + it("defaults the auth pool to 5 connections and a 5 s acquire timeout", () => { + expect(poolConfig("auth")).toEqual({ + max: 5, + connectionTimeoutMillis: 5000, + }) + }) + + it("defaults the root pool to 2 connections", () => { + expect(poolConfig("root").max).toEqual(2) + }) + + it("reads the pool size from the environment", () => { + process.env.DATABASE_POOL_MAX_AUTH = "7" + expect(poolConfig("auth").max).toEqual(7) + }) + + it("reads the acquire timeout from the environment", () => { + process.env.DATABASE_POOL_ACQUIRE_TIMEOUT_MS = "250" + expect(poolConfig("root").connectionTimeoutMillis).toEqual(250) + }) + + it("rejects a non-numeric value, naming the variable", () => { + process.env.DATABASE_POOL_MAX_ROOT = "lots" + expect(() => poolConfig("root")).toThrow(/DATABASE_POOL_MAX_ROOT/) + }) + + it("fails to acquire from an exhausted pool within the timeout", async () => { + const pool = new Pool({ + ...poolConfig("root"), + connectionString: TEST_DATABASE_URL, + max: 1, + connectionTimeoutMillis: 200, + }) + const client = await pool.connect() + try { + const start = Date.now() + await expect(pool.connect()).rejects.toThrow(/timeout/i) + expect(Date.now() - start).toBeLessThan(1000) + } finally { + client.release() + await pool.end() + } + }) +}) diff --git a/@app/server/package.json b/@app/server/package.json index ca28ad3d7..ef17814a9 100644 --- a/@app/server/package.json +++ b/@app/server/package.json @@ -27,7 +27,6 @@ "@graphile-contrib/pg-simplify-inflector": "^6.1.0", "@graphile/persisted-operations": "^0.1.1", "@graphile/pg-pubsub": "^4.12.3", - "@graphile/subscriptions-lds": "^4.12.3", "@types/graphql-upload": "^8.0.11", "@zxcvbn-ts/core": "^2.0.4", "@zxcvbn-ts/language-common": "^2.0.1", diff --git a/@app/server/src/middleware/installDatabasePools.ts b/@app/server/src/middleware/installDatabasePools.ts index b85c7d758..94e8f2b63 100644 --- a/@app/server/src/middleware/installDatabasePools.ts +++ b/@app/server/src/middleware/installDatabasePools.ts @@ -2,6 +2,8 @@ import { FastifyPluginAsync } from "fastify" import fp from "fastify-plugin" import { Pool } from "pg" +import { poolConfig } from "../utils/poolConfig" + declare module "fastify" { export interface FastifyInstance { authPgPool: Pool @@ -24,13 +26,16 @@ function swallowPoolError(_error: Error) { const DatabasePools: FastifyPluginAsync = async (app) => { // This pool runs as the database owner, so it can do anything. const rootPgPool = new Pool({ + ...poolConfig("root"), connectionString: process.env.DATABASE_URL, }) rootPgPool.on("error", swallowPoolError) app.decorate("rootPgPool", rootPgPool) // This pool runs as the unprivileged user, it's what PostGraphile uses. + // @graphile/pg-pubsub holds one of its connections for LISTEN. const authPgPool = new Pool({ + ...poolConfig("auth"), connectionString: process.env.AUTH_DATABASE_URL, }) authPgPool.on("error", swallowPoolError) diff --git a/@app/server/src/middleware/installPostGraphile.ts b/@app/server/src/middleware/installPostGraphile.ts index 594c0213b..0bd610b1e 100644 --- a/@app/server/src/middleware/installPostGraphile.ts +++ b/@app/server/src/middleware/installPostGraphile.ts @@ -3,7 +3,6 @@ import { IncomingMessage } from "http" import { FastifyRedis } from "@fastify/redis" import PersistedOperationsPlugin from "@graphile/persisted-operations" import PgPubsub from "@graphile/pg-pubsub" -import PgSubscriptionsLds from "@graphile/subscriptions-lds" import PgSimplifyInflectorPlugin from "@graphile-contrib/pg-simplify-inflector" import { parse } from "cookie" import { FastifyInstance, FastifyPluginAsync, FastifyRequest } from "fastify" @@ -127,8 +126,8 @@ export function getPostGraphileOptions({ // This is for PostGraphile server plugins: https://www.graphile.org/postgraphile/plugins/ pluginHook, - // This is so that PostGraphile installs the watch fixtures, it's also needed to enable live queries - ownerConnectionString: process.env.DATABASE_URL, + // This is so that PostGraphile installs the watch fixtures in watch mode + ownerConnectionString: isDev ? process.env.DATABASE_URL : undefined, // On production we still want to start even if the database isn't available. // On development, we want to deal nicely with issues in the database. @@ -140,7 +139,9 @@ export function getPostGraphileOptions({ websockets: ["v1"], websocketMiddlewares, - // Support for Postgraphile live queries @graphile/subscriptions-lds + // Exposes the Query fields on the Subscription type, which the event page + // subscribes to. No live source plugin is installed, so such a + // subscription delivers its result once. live: !isJestTest, // We don't enable query batching since urql doesn't support it, and we don't really need it @@ -286,11 +287,6 @@ export function getPostGraphileOptions({ // Adds realtime features to our GraphQL schema SubscriptionsPlugin, - // Support for live queries https://www.graphile.org/postgraphile/live-queries/ - // PgSubscriptionsLds pjolls for changes every 500ms, so in order for jest tests - // to cleanly exit we have to exclude this plugin when running tests. - !isJestTest ? PgSubscriptionsLds : null, - // Adds custom orders to our GraphQL schema OrdersPlugin, ].filter(Boolean), diff --git a/@app/server/src/utils/poolConfig.ts b/@app/server/src/utils/poolConfig.ts new file mode 100644 index 000000000..c2bd912c0 --- /dev/null +++ b/@app/server/src/utils/poolConfig.ts @@ -0,0 +1,51 @@ +export type PoolKind = "root" | "auth" + +export interface PoolConfig { + max: number + connectionTimeoutMillis: number +} + +/* + * The defaults fit the server and worker into a budget of 10 Postgres + * connections: root 2 + auth 5 (one of which is held by @graphile/pg-pubsub + * for LISTEN) + worker 2 (WORKER_POOL_MAX). + */ +const DEFAULT_MAX: Record = { + root: 2, + auth: 5, +} +const DEFAULT_ACQUIRE_TIMEOUT_MS = 5000 + +const MAX_ENV_VAR: Record = { + root: "DATABASE_POOL_MAX_ROOT", + auth: "DATABASE_POOL_MAX_AUTH", +} +const ACQUIRE_TIMEOUT_ENV_VAR = "DATABASE_POOL_ACQUIRE_TIMEOUT_MS" + +function positiveIntFromEnv(name: string, fallback: number): number { + const raw = process.env[name] + if (raw === undefined || raw === "") { + return fallback + } + const value = Number(raw) + if (!Number.isInteger(value) || value <= 0) { + throw new Error( + `process.env.${name} must be a positive integer, got '${raw}'` + ) + } + return value +} + +/** + * Size and acquire timeout for a `pg` Pool. A request that cannot get a + * connection within the timeout fails instead of waiting indefinitely. + */ +export function poolConfig(kind: PoolKind): PoolConfig { + return { + max: positiveIntFromEnv(MAX_ENV_VAR[kind], DEFAULT_MAX[kind]), + connectionTimeoutMillis: positiveIntFromEnv( + ACQUIRE_TIMEOUT_ENV_VAR, + DEFAULT_ACQUIRE_TIMEOUT_MS + ), + } +} diff --git a/@app/worker/package.json b/@app/worker/package.json index 9408d7ae6..d9a2d64f6 100644 --- a/@app/worker/package.json +++ b/@app/worker/package.json @@ -3,7 +3,7 @@ "private": true, "version": "0.0.0", "scripts": { - "gw": "cd dist && NODE_OPTIONS=\"-r @app/config/env.js\" graphile-worker --crontab ../crontab", + "gw": "cd dist && NODE_OPTIONS=\"-r @app/config/env.js\" graphile-worker --crontab ../crontab --max-pool-size ${WORKER_POOL_MAX:-2}", "build": "tsc -b", "start": "pnpm gw", "dev": "cd dist && nodemon --signal SIGINT --watch '**/*.js' -x \"node --inspect -r @app/config/env.js -r source-map-support/register ../../../node_modules/graphile-worker/dist/cli.js --crontab ../crontab\"", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d935534db..2ea1112b4 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -565,9 +565,6 @@ importers: '@graphile/pg-pubsub': specifier: ^4.12.3 version: 4.14.1(graphile-build@4.14.1(graphql@15.10.2))(graphql@15.10.2)(postgraphile@4.14.1(bufferutil@4.1.0)(utf-8-validate@5.0.10)) - '@graphile/subscriptions-lds': - specifier: ^4.12.3 - version: 4.14.1(bufferutil@4.1.0)(postgraphile-core@4.14.1(graphql@15.10.2)(pg@8.20.0))(utf-8-validate@5.0.10) '@types/graphql-upload': specifier: ^8.0.11 version: 8.0.12 @@ -1694,10 +1691,6 @@ packages: '@graphile-contrib/pg-simplify-inflector@6.1.0': resolution: {integrity: sha512-3eI2FP4ulu/fxwkJBNXhR6XEzqVz4wJWFr4LfeyUNNArUtLFx0DpP6YdcARCYgwLExFcIQNE8fnul3JKiciYIw==} - '@graphile/lds@4.14.1': - resolution: {integrity: sha512-JDsQ8Z05kkO6GGPDZ3nCkNLLvd1BR83/ps9Ipu17+nMKJqQLXgmcLvl8J9Xc9EKvPBNS5zL+dG06pXc7TWau5w==} - hasBin: true - '@graphile/logger@0.2.0': resolution: {integrity: sha512-jjcWBokl9eb1gVJ85QmoaQ73CQ52xAaOCF29ukRbYNl6lY+ts0ErTaDYOBlejcbUs2OpaiqYLO5uDhyLFzWw4w==} @@ -1718,11 +1711,6 @@ packages: graphql: 15.x postgraphile: ^4.4.0-beta.10 - '@graphile/subscriptions-lds@4.14.1': - resolution: {integrity: sha512-rl1gt3eALKdIA2xGm+h6tdTPFJoM9XL//LDcIrG13D4RAjlSsWDLAFrXpx73cYjWRIttsB0KbbuaeS/QPEka0A==} - peerDependencies: - postgraphile-core: '>4.3.1 <5' - '@graphql-codegen/add@5.0.3': resolution: {integrity: sha512-SxXPmramkth8XtBlAHu4H4jYcYXM/o3p01+psU+0NADQowA8jtYkK6MW5rV6T+CxkEaNZItfSmZRPgIuypcqnA==} peerDependencies: @@ -3454,9 +3442,6 @@ packages: '@types/tedious@4.0.14': resolution: {integrity: sha512-KHPsfX/FoVbUGbyYvk1q9MMQHLPeRZhRJZdO45Q4YjvFkv4hMNghCWTvy7rdKessBsmtz4euWCWAB6/tVpI1Iw==} - '@types/ws@6.0.4': - resolution: {integrity: sha512-PpPrX7SZW9re6+Ha8ojZG4Se8AZXgf0GK6zmfqEuCsY49LFDNXO3SByp44X3dFEqtB73lkCDAdUazhAjVPiNwg==} - '@types/ws@7.4.7': resolution: {integrity: sha512-JQbbmxZTZehdc2iszGKs5oC3NFnjeay7mtAWrdt7qNtAVK0g19muApzAy4bm9byz79xa2ZnO/BOBC2R8RC5Lww==} @@ -10718,18 +10703,6 @@ snapshots: '@graphile-contrib/pg-simplify-inflector@6.1.0': {} - '@graphile/lds@4.14.1(bufferutil@4.1.0)(utf-8-validate@5.0.10)': - dependencies: - '@types/pg': 8.20.0 - '@types/ws': 6.0.4 - pg: 8.20.0 - tslib: 2.8.1 - ws: 7.5.10(bufferutil@4.1.0)(utf-8-validate@5.0.10) - transitivePeerDependencies: - - bufferutil - - pg-native - - utf-8-validate - '@graphile/logger@0.2.0': {} '@graphile/lru@4.11.0': @@ -10753,18 +10726,6 @@ snapshots: transitivePeerDependencies: - supports-color - '@graphile/subscriptions-lds@4.14.1(bufferutil@4.1.0)(postgraphile-core@4.14.1(graphql@15.10.2)(pg@8.20.0))(utf-8-validate@5.0.10)': - dependencies: - '@graphile/lds': 4.14.1(bufferutil@4.1.0)(utf-8-validate@5.0.10) - '@types/ws': 6.0.4 - postgraphile-core: 4.14.1(graphql@15.10.2)(pg@8.20.0) - tslib: 2.8.1 - ws: 7.5.10(bufferutil@4.1.0)(utf-8-validate@5.0.10) - transitivePeerDependencies: - - bufferutil - - pg-native - - utf-8-validate - '@graphql-codegen/add@5.0.3(graphql@15.10.2)': dependencies: '@graphql-codegen/plugin-helpers': 5.1.1(graphql@15.10.2) @@ -12974,10 +12935,6 @@ snapshots: dependencies: '@types/node': 18.19.130 - '@types/ws@6.0.4': - dependencies: - '@types/node': 18.19.130 - '@types/ws@7.4.7': dependencies: '@types/node': 18.19.130 diff --git a/scripts/_setup_utils.mjs b/scripts/_setup_utils.mjs index 9e56b4acd..b80901c80 100644 --- a/scripts/_setup_utils.mjs +++ b/scripts/_setup_utils.mjs @@ -145,12 +145,22 @@ export function updateDotenv(add, answers) { ) add( - "LD_TABLE_PATTERN", - "app_public.*", + "DATABASE_POOL_MAX_ROOT", + "2", `\ -# Allows us to ignore changes in tables you don't care about. Used in conjunction with @graphile/subscriptions-lds` +# Postgres connection budget. The server's owner pool (DATABASE_POOL_MAX_ROOT), +# its PostGraphile pool (DATABASE_POOL_MAX_AUTH, one connection of which is held +# for LISTEN) and the worker (WORKER_POOL_MAX) together must fit in the +# connections the database server has free. A request that cannot get a +# connection within DATABASE_POOL_ACQUIRE_TIMEOUT_MS fails.` ) + add("DATABASE_POOL_MAX_AUTH", "5") + + add("DATABASE_POOL_ACQUIRE_TIMEOUT_MS", "5000") + + add("WORKER_POOL_MAX", "2") + add( "NEXT_TRANSLATE_PATH", "../client", From 1c778b575ad7fae40656172941b75fcb981635c6 Mon Sep 17 00:00:00 2001 From: Risto Virtaharju Date: Sat, 17 Oct 2026 07:42:35 +0000 Subject: [PATCH 005/163] perf: coalesce eventRegistrations notifications to one per event per second Co-Authored-By: Claude Opus 5.5 --- .../__tests__/utils/throttleTopic.test.ts | 66 ++++++++++++++++ @app/server/package.json | 1 + .../server/src/plugins/SubscriptionsPlugin.ts | 44 +++++++---- @app/server/src/utils/throttleTopic.ts | 78 +++++++++++++++++++ pnpm-lock.yaml | 3 + 5 files changed, 176 insertions(+), 16 deletions(-) create mode 100644 @app/server/__tests__/utils/throttleTopic.test.ts create mode 100644 @app/server/src/utils/throttleTopic.ts diff --git a/@app/server/__tests__/utils/throttleTopic.test.ts b/@app/server/__tests__/utils/throttleTopic.test.ts new file mode 100644 index 000000000..aab077bcd --- /dev/null +++ b/@app/server/__tests__/utils/throttleTopic.test.ts @@ -0,0 +1,66 @@ +import { PubSub } from "graphql-subscriptions" + +import { throttledTopic } from "../../src/utils/throttleTopic" + +const SOURCE = "graphql:eventRegistrations:6c568ce8-2ee9-442a-b5d3-83454279e308" + +describe("throttledTopic", () => { + let pubsub: PubSub + let received: unknown[] + + beforeEach(async () => { + jest.useFakeTimers() + pubsub = new PubSub() + received = [] + const topic = throttledTopic(pubsub, SOURCE, 1000) + await pubsub.subscribe(topic, (payload) => received.push(payload)) + }) + + afterEach(() => { + jest.useRealTimers() + }) + + it("delivers the first message at once and the last one at the end of the window", () => { + for (let i = 1; i <= 50; i++) { + pubsub.publish(SOURCE, { event: "registrationUpdated", subject: i }) + jest.advanceTimersByTime(2) + } + expect(received).toEqual([{ event: "registrationUpdated", subject: 1 }]) + + jest.advanceTimersByTime(1000) + expect(received).toEqual([ + { event: "registrationUpdated", subject: 1 }, + { event: "registrationUpdated", subject: 50 }, + ]) + + jest.advanceTimersByTime(5000) + expect(received).toHaveLength(2) + }) + + it("delivers a message after a quiet period at once", () => { + pubsub.publish(SOURCE, { subject: "first" }) + jest.advanceTimersByTime(1500) + pubsub.publish(SOURCE, { subject: "second" }) + + expect(received).toEqual([{ subject: "first" }, { subject: "second" }]) + }) + + it("relays each source topic once", () => { + const listeners = () => + ( + pubsub as unknown as { ee: { listenerCount(n: string): number } } + ).ee.listenerCount(SOURCE) + + expect(listeners()).toEqual(1) + expect(throttledTopic(pubsub, SOURCE, 1000)).toEqual( + throttledTopic(pubsub, SOURCE, 1000) + ) + expect(listeners()).toEqual(1) + }) + + it("names the throttled topic within Postgres' 63 character channel limit", () => { + const topic = throttledTopic(pubsub, SOURCE, 1000) + expect(topic).not.toEqual(SOURCE) + expect(topic.length).toBeLessThanOrEqual(63) + }) +}) diff --git a/@app/server/package.json b/@app/server/package.json index ef17814a9..67ccd361e 100644 --- a/@app/server/package.json +++ b/@app/server/package.json @@ -70,6 +70,7 @@ "@types/node": "^18.6.5", "@types/nunjucks": "^3.2.1", "@types/pg": "^8.11.10", + "graphql-subscriptions": "^1.2.1", "jest": "^29.7.0", "mock-req": "^0.2.0", "slugify": "^1.6.5", diff --git a/@app/server/src/plugins/SubscriptionsPlugin.ts b/@app/server/src/plugins/SubscriptionsPlugin.ts index bacd11dd7..2fdc670d9 100644 --- a/@app/server/src/plugins/SubscriptionsPlugin.ts +++ b/@app/server/src/plugins/SubscriptionsPlugin.ts @@ -8,6 +8,7 @@ import { } from "graphile-utils" import { OurGraphQLContext } from "../middleware/installPostGraphile" +import { RelayPubSub, throttledTopic } from "../utils/throttleTopic" // graphile-utils doesn't export this yet import type { GraphQLResolveInfo } from "graphql" @@ -46,22 +47,33 @@ const currentUserTopicFromContext = async ( throw new Error("You're not logged in") } -const eventRegistrationsTopicFromContext = async ( - args: { eventId: string }, - context: { [key: string]: any }, - _resolveInfo: GraphQLResolveInfo -) => { - const { - rows: [event], - } = await context.pgClient.query( - "select id from app_public.events where id = $1", - [args.eventId] - ) - if (event) { - return `graphql:eventRegistrations:${event.id}` +// How often a single event's eventRegistrations subscribers are notified at +// most. Each notification makes every subscriber query the database, so a +// burst of registrations is coalesced into one notification per interval. +const EVENT_REGISTRATIONS_THROTTLE_INTERVAL = 1000 + +const makeEventRegistrationsTopicFromContext = + (pubsub: RelayPubSub | undefined) => + async ( + args: { eventId: string }, + context: { [key: string]: any }, + _resolveInfo: GraphQLResolveInfo + ) => { + const { + rows: [event], + } = await context.pgClient.query( + "select id from app_public.events where id = $1", + [args.eventId] + ) + if (event) { + const topic = `graphql:eventRegistrations:${event.id}` + // pubsub is not available in tests and one off scripts + return pubsub + ? throttledTopic(pubsub, topic, EVENT_REGISTRATIONS_THROTTLE_INTERVAL) + : topic + } + throw new Error("Invalid event ID.") } - throw new Error("Invalid event ID.") -} /* * This plugin adds a number of custom subscriptions to our schema. By making @@ -116,7 +128,7 @@ const SubscriptionsPlugin = makeExtendSchemaPlugin((build, { pubsub }) => { """Triggered when new event registrations are created or updated. Each event has its own subscription topic.""" eventRegistrations(eventId: UUID!): EventRegistrationsSubscriptionPayload! @pgSubscription(topic: ${embed( - eventRegistrationsTopicFromContext + makeEventRegistrationsTopicFromContext(pubsub) )}) """Returns the server time every second.""" diff --git a/@app/server/src/utils/throttleTopic.ts b/@app/server/src/utils/throttleTopic.ts new file mode 100644 index 000000000..ee55af70e --- /dev/null +++ b/@app/server/src/utils/throttleTopic.ts @@ -0,0 +1,78 @@ +import { createHash } from "node:crypto" + +/* + * The slice of a graphql-subscriptions PubSubEngine the relay uses. With + * @graphile/pg-pubsub, subscribing to a topic LISTENs on the Postgres channel + * of the same name using its single shared listening connection. + */ +export interface RelayPubSub { + publish(topic: string, payload: any): unknown + subscribe(topic: string, onMessage: (payload: any) => void): unknown +} + +const relays = new WeakMap>() + +/* + * Postgres truncates channel names to 63 characters, and @graphile/pg-pubsub + * LISTENs on every topic subscribed through it, so the throttled topic gets a + * short name of its own that cannot collide with a real channel. + */ +function throttledTopicName(sourceTopic: string): string { + const digest = createHash("sha1").update(sourceTopic).digest("hex") + return `throttled:${digest}` +} + +/** + * Relays `sourceTopic` to a throttled topic that publishes at most once per + * `intervalMs`: the first message of a burst goes out immediately and the last + * message received during the window goes out when the window ends. Returns the + * throttled topic's name. The relay is created on the first call for a source + * topic and shared by later calls. + */ +export function throttledTopic( + pubsub: RelayPubSub, + sourceTopic: string, + intervalMs: number +): string { + let topics = relays.get(pubsub) + if (!topics) { + topics = new Map() + relays.set(pubsub, topics) + } + const existing = topics.get(sourceTopic) + if (existing) { + return existing + } + + const topic = throttledTopicName(sourceTopic) + topics.set(sourceTopic, topic) + + let windowOpen = false + let hasPending = false + let pending: unknown + + const closeWindow = () => { + if (hasPending) { + const payload = pending + hasPending = false + pending = undefined + pubsub.publish(topic, payload) + setTimeout(closeWindow, intervalMs) + } else { + windowOpen = false + } + } + + pubsub.subscribe(sourceTopic, (payload) => { + if (windowOpen) { + pending = payload + hasPending = true + return + } + windowOpen = true + pubsub.publish(topic, payload) + setTimeout(closeWindow, intervalMs) + }) + + return topic +} diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 2ea1112b4..20889bc7b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -689,6 +689,9 @@ importers: '@types/pg': specifier: ^8.11.10 version: 8.20.0 + graphql-subscriptions: + specifier: ^1.2.1 + version: 1.2.1(graphql@15.10.2) jest: specifier: ^29.7.0 version: 29.7.0(@types/node@18.19.130)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@18.19.130)(typescript@5.9.3)) From 74c54145ede637b26dae15506f95098c3d492cdd Mon Sep 17 00:00:00 2001 From: Risto Virtaharju Date: Sat, 17 Oct 2026 07:54:17 +0000 Subject: [PATCH 006/163] test: add registration stampede stress harness A production-like stack (Postgres with wal_level=replica and 10 slots for ilmo roles, server pinned to two cores) driven by k6 bots that load the event page, claim at opening and submit after filling the form. A checker reports failures, latencies, connection usage and ordering fairness. Co-Authored-By: Claude Opus 5.5 --- package.json | 1 + stress/.env.stress | 34 +++++ stress/.gitignore | 2 + stress/build-image.sh | 34 +++++ stress/check-results.mjs | 182 ++++++++++++++++++++++++ stress/docker-compose.yml | 71 ++++++++++ stress/k6/registration.js | 266 +++++++++++++++++++++++++++++++++++ stress/postgres/init.sql | 18 +++ stress/run.sh | 67 +++++++++ stress/sample-connections.sh | 18 +++ stress/seed.sh | 60 ++++++++ 11 files changed, 753 insertions(+) create mode 100644 stress/.env.stress create mode 100644 stress/.gitignore create mode 100755 stress/build-image.sh create mode 100644 stress/check-results.mjs create mode 100644 stress/docker-compose.yml create mode 100644 stress/k6/registration.js create mode 100644 stress/postgres/init.sql create mode 100755 stress/run.sh create mode 100755 stress/sample-connections.sh create mode 100755 stress/seed.sh diff --git a/package.json b/package.json index d0a24e6f6..38cfa3c05 100644 --- a/package.json +++ b/package.json @@ -10,6 +10,7 @@ "start": "node ./scripts/start.mjs", "test": "node scripts/test.mjs", "test:watch": "node scripts/test.mjs --watch", + "stress": "bash stress/run.sh", "lint": "tsc -b && pnpm prettier:all --check && pnpm eslint .", "lint:fix": "pnpm eslint --fix . && pnpm prettier:all --write && jsonsort @app/client/src/translations", "eslint": "eslint", diff --git a/stress/.env.stress b/stress/.env.stress new file mode 100644 index 000000000..451649287 --- /dev/null +++ b/stress/.env.stress @@ -0,0 +1,34 @@ +# Environment for the stress stack. Mirrors the production env template in +# infra-prodeko (ansible/roles/ilmo/templates/env.production.j2) minus +# external integrations (SendGrid, Azure storage/translate, Keycloak, OAuth). +NODE_ENV=production +TZ=Europe/Helsinki +ROOT_URL=http://localhost:5678 +PORT=5678 +GRAPHILE_TURBO=1 +LD_TABLE_PATTERN=app_public.* +NEXT_TRANSLATE_PATH=../client +DATABASE_HOST=db +DATABASE_NAME=ilmo +DATABASE_OWNER=ilmo +DATABASE_OWNER_PASSWORD=stress +DATABASE_AUTHENTICATOR=ilmo_authenticator +DATABASE_AUTHENTICATOR_PASSWORD=stress +DATABASE_VISITOR=ilmo_visitor +DATABASE_URL=postgres://ilmo:stress@db/ilmo +AUTH_DATABASE_URL=postgres://ilmo_authenticator:stress@db/ilmo +ROOT_DATABASE_URL=postgres://postgres:postgres@db/template1 +SHADOW_DATABASE_URL=postgres://ilmo:stress@db/ilmo_shadow +REDIS_URL=redis://redis:6379 +SECRET=aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +JWT_SECRET=stress-jwt-secret-stress-jwt-secret +PRIVACY_URL=http://localhost:5678/privacy +DATABASE_POOL_MAX_ROOT=2 +DATABASE_POOL_MAX_AUTH=5 +DATABASE_POOL_ACQUIRE_TIMEOUT_MS=5000 +WORKER_POOL_MAX=2 +AZURE_DB_OWNER=ilmo +# Required at startup; never called by the registration flow. +AZURE_TRANSLATE_API_URL=http://localhost:9/translate +AZURE_TRANSLATE_SUBSCRIPTION_KEY=stress +AZURE_STORAGE_CONNECTION_STRING=DefaultEndpointsProtocol=http;AccountName=stress;AccountKey=c3RyZXNz;BlobEndpoint=http://localhost:9/stress; diff --git a/stress/.gitignore b/stress/.gitignore new file mode 100644 index 000000000..7acfe2b85 --- /dev/null +++ b/stress/.gitignore @@ -0,0 +1,2 @@ +results/ +.cache/ diff --git a/stress/build-image.sh b/stress/build-image.sh new file mode 100755 index 000000000..ae93909f4 --- /dev/null +++ b/stress/build-image.sh @@ -0,0 +1,34 @@ +#!/usr/bin/env bash +# Builds the production image of a source tree for the stress stack. +# +# sharp 0.30 downloads its native binaries from GitHub during `pnpm install` +# and gives up on slow links, so they are fetched once into stress/.cache +# and handed to the build as local prebuilds. The app's Dockerfile is used +# as-is apart from that injection. +# +# Usage: stress/build-image.sh +set -euo pipefail +here="$(cd "$(dirname "$0")" && pwd)" +src=$(cd "$1" && pwd) +tag=$2 + +cache="$here/.cache/sharp" +libvips="$cache/v8.12.2/libvips-8.12.2-linux-x64.tar.br" +binary="$cache/sharp-v0.30.7-napi-v5-linux-x64.tar.gz" +mkdir -p "$(dirname "$libvips")" +[[ -s $libvips ]] || curl -fsSL --retry 3 -o "$libvips" \ + https://github.com/lovell/sharp-libvips/releases/download/v8.12.2/libvips-8.12.2-linux-x64.tar.br +[[ -s $binary ]] || curl -fsSL --retry 3 -o "$binary" \ + https://github.com/lovell/sharp/releases/download/v0.30.7/sharp-v0.30.7-napi-v5-linux-x64.tar.gz + +dockerfile="$here/.cache/Dockerfile.$$" +sed '/^WORKDIR \/app$/a\ +COPY --from=sharp . /sharp-prebuilds/\ +ENV npm_config_sharp_libvips_local_prebuilds=/sharp-prebuilds\ +ENV npm_config_sharp_local_prebuilds=/sharp-prebuilds' "$src/Dockerfile" > "$dockerfile" +trap 'rm -f "$dockerfile"' EXIT + +docker build \ + --build-context sharp="$cache" \ + --build-arg ROOT_URL=http://localhost:5678 \ + -f "$dockerfile" -t "$tag" "$src" diff --git a/stress/check-results.mjs b/stress/check-results.mjs new file mode 100644 index 000000000..faf39cfa3 --- /dev/null +++ b/stress/check-results.mjs @@ -0,0 +1,182 @@ +#!/usr/bin/env node +// Summarises one stress run: failures, latencies, connection usage and how +// fairly spots were handed out compared with the order people clicked in. +// +// Usage: node stress/check-results.mjs +import { execFileSync } from "node:child_process" +import { readFileSync, writeFileSync } from "node:fs" +import { dirname, join } from "node:path" +import { fileURLToPath } from "node:url" + +// Registrations further than this from their click-order rank count as +// displaced. Smaller inversions are network jitter. +const DISPLACEMENT_TOLERANCE = 5 + +const dir = process.argv[2] +const stressDir = dirname(fileURLToPath(import.meta.url)) +const seed = JSON.parse(readFileSync(join(dir, "seed.json"), "utf8")) + +const results = readFileSync(join(dir, "k6.log"), "utf8") + .split("\n") + .filter(Boolean) + .flatMap((line) => { + try { + const { msg } = JSON.parse(line) + return msg?.startsWith("RESULT ") ? [JSON.parse(msg.slice(7))] : [] + } catch { + return [] + } + }) + +const rows = JSON.parse( + execFileSync( + "docker", + [ + "compose", + "exec", + "-T", + "db", + "psql", + "-U", + "postgres", + "-d", + "ilmo", + "-At", + "-c", + `select coalesce(json_agg(json_build_object( + 'email', r.email, + 'quotaId', r.quota_id, + 'createdAt', r.created_at, + 'status', app_public.registrations_status(r), + 'position', app_public.registrations_position(r) + )), '[]') + from app_public.registrations r + where r.event_id = '${seed.eventId}' and r.is_finished`, + ], + { cwd: stressDir, encoding: "utf8" } + ) +) + +// Failures grouped by step and message. +const errorCounts = {} +for (const r of results) { + for (const e of r.errors) { + const key = e.length > 140 ? e.slice(0, 140) + "…" : e + errorCounts[key] = (errorCounts[key] || 0) + 1 + } +} + +// Fairness: within each quota, compare rank by click time with rank by the +// registration's created_at, and check whether the first `size` clickers +// were the ones who got IN_QUOTA. +const byEmail = new Map(rows.map((r) => [r.email, r])) +const quotaSize = Object.fromEntries( + JSON.parse( + execFileSync( + "docker", + [ + "compose", + "exec", + "-T", + "db", + "psql", + "-U", + "postgres", + "-d", + "ilmo", + "-At", + "-c", + `select json_agg(json_build_array(id, size)) from app_public.quotas where event_id = '${seed.eventId}'`, + ], + { cwd: stressDir, encoding: "utf8" } + ) + ) +) +let maxDisplacement = 0 +let displaced = 0 +let deservedButMissed = 0 +for (const quotaId of seed.quotaIds) { + const clicked = results + .filter((r) => r.clickedAtMs && byEmail.get(r.email)?.quotaId === quotaId) + .sort((a, b) => a.clickedAtMs - b.clickedAtMs) + const byCreated = [...clicked].sort( + (a, b) => + Date.parse(byEmail.get(a.email).createdAt) - + Date.parse(byEmail.get(b.email).createdAt) + ) + clicked.forEach((r, clickRank) => { + const d = Math.abs(clickRank - byCreated.indexOf(r)) + maxDisplacement = Math.max(maxDisplacement, d) + if (d > DISPLACEMENT_TOLERANCE) displaced++ + }) + // Of everyone who clicked for this quota (including those whose claim or + // submit failed), the earliest `size` clickers deserved a spot. + const allClickers = results + .filter( + (r) => + r.clickedAtMs && + seed.quotaIds[r.vu % seed.quotaIds.length] === quotaId + ) + .sort((a, b) => a.clickedAtMs - b.clickedAtMs) + for (const r of allClickers.slice(0, quotaSize[quotaId])) { + if (byEmail.get(r.email)?.status !== "IN_QUOTA") deservedButMissed++ + } +} + +// Connections: peak of the per-sample total across ilmo roles. +const perSample = {} +const perSampleActive = {} +for (const line of readFileSync(join(dir, "connections.csv"), "utf8") + .split("\n") + .filter(Boolean)) { + const [ts, , state, count] = line.split(",") + perSample[ts] = (perSample[ts] || 0) + Number(count) + if (state !== "idle") { + perSampleActive[ts] = (perSampleActive[ts] || 0) + Number(count) + } +} +const peak = (o) => Math.max(0, ...Object.values(o)) + +const serverLog = readFileSync(join(dir, "server.log"), "utf8") +const slotErrors = (serverLog.match(/remaining connection slots/g) || []) + .length +const poolTimeouts = ( + serverLog.match(/timeout exceeded when trying to connect/gi) || [] +).length + +const k6 = JSON.parse(readFileSync(join(dir, "k6-summary.json"), "utf8")) +const trend = (name) => { + const m = k6.metrics[name] + if (!m) return "n/a" + const f = (v) => (v === undefined ? "n/a" : `${Math.round(v)}ms`) + return `p50 ${f(m["p(50)"])} p95 ${f(m["p(95)"])} p99 ${f(m["p(99)"])} max ${f(m.max)}` +} + +const count = (pred) => results.filter(pred).length +const lines = [ + `run: ${dir}`, + `bots reporting: ${results.length}`, + `claims ok: ${count((r) => r.claimOk)} / ${count((r) => r.clickedAtMs)}`, + `submits ok: ${count((r) => r.submitOk)} / ${count((r) => r.claimOk)}`, + `finished registrations in DB: ${rows.length}`, + ``, + `register page query: ${trend("register_page_query_duration")}`, + `claim: ${trend("claim_duration")}`, + `submit: ${trend("submit_duration")}`, + ``, + `peak ilmo connections: ${peak(perSample)} (non-idle ${peak(perSampleActive)})`, + `"remaining connection slots" in server log: ${slotErrors}`, + `pool acquire timeouts in server log: ${poolTimeouts}`, + ``, + `max displacement (click rank vs created_at rank): ${maxDisplacement}`, + `displaced by > ${DISPLACEMENT_TOLERANCE}: ${displaced}`, + `earliest clickers per quota who did not end up IN_QUOTA: ${deservedButMissed}`, + ``, + `failures by message:`, + ...Object.entries(errorCounts) + .sort((a, b) => b[1] - a[1]) + .map(([m, n]) => ` ${String(n).padStart(4)} ${m}`), +] +const summary = lines.join("\n") + "\n" +writeFileSync(join(dir, "summary.txt"), summary) +process.stdout.write(summary) diff --git a/stress/docker-compose.yml b/stress/docker-compose.yml new file mode 100644 index 000000000..34c0e4459 --- /dev/null +++ b/stress/docker-compose.yml @@ -0,0 +1,71 @@ +# Production-like stack for the registration stress test. +# +# Postgres runs with wal_level=replica (as on Azure, so live queries are +# unavailable) and 10 connection slots for the ilmo roles: +# max_connections=13 minus superuser_reserved_connections=3. +# +# IMAGE selects the ilmo build under test, e.g. IMAGE=ilmo-stress:before. +name: ilmo-stress + +services: + db: + image: postgres:14 + environment: + POSTGRES_PASSWORD: postgres + volumes: + - ./postgres/init.sql:/docker-entrypoint-initdb.d/init.sql:ro + command: > + postgres -c wal_level=replica -c max_connections=13 + -c superuser_reserved_connections=3 + ports: + - "6544:5432" + healthcheck: + test: ["CMD", "pg_isready", "-U", "postgres"] + interval: 1s + retries: 30 + + redis: + image: redis:6-alpine + + migrate: + image: ${IMAGE:-ilmo-stress:after} + env_file: .env.stress + command: > + bash -c "cd /app/@app/worker && mkdir -p dist && cd dist + && NODE_OPTIONS='-r @app/config/env.js' /app/node_modules/.bin/graphile-worker --schema-only + && cd /app/@app/db && NODE_OPTIONS='-r @app/config/env' pnpm exec graphile-migrate migrate + && NODE_OPTIONS='-r @app/config/env' pnpm exec graphile-migrate watch --once" + depends_on: + db: + condition: service_healthy + + finalize: + image: postgres:14 + environment: + PGPASSWORD: postgres + command: psql -h db -U postgres -c "alter role ilmo nosuperuser" + depends_on: + migrate: + condition: service_completed_successfully + + server: + image: ${IMAGE:-ilmo-stress:after} + env_file: .env.stress + # Two cores, like the production B2ls_v2. Pinned with taskset because + # cgroup CPU limits are unavailable in nested VMs. + command: ["taskset", "-c", "0,1", "pnpm", "--filter", "@app/server", "run", "start"] + ports: + - "5678:5678" + depends_on: + finalize: + condition: service_completed_successfully + redis: + condition: service_started + + worker: + image: ${IMAGE:-ilmo-stress:after} + env_file: .env.stress + command: ["pnpm", "--filter", "@app/worker", "run", "start"] + depends_on: + finalize: + condition: service_completed_successfully diff --git a/stress/k6/registration.js b/stress/k6/registration.js new file mode 100644 index 000000000..dc1f8f7e1 --- /dev/null +++ b/stress/k6/registration.js @@ -0,0 +1,266 @@ +// One VU = one person trying to get into a contested event. +// +// Flow: load the event page some time before opening and hold its websocket +// subscriptions (EventPage, CurrentTime), then at opening + 0-1 s jitter do +// what the register page does on mount (page query, EventRegistrations +// subscription, ClaimRegistrationToken), fill in the form for 5-20 s and +// submit CreateEventRegistration. +// +// Env: BASE_URL, SEED (JSON from seed.sh), REPO (repo root inside the +// container), VUS. +import { sleep } from "k6" +import http from "k6/http" +import ws from "k6/ws" +import exec from "k6/execution" +import { Counter, Trend } from "k6/metrics" + +const BASE_URL = __ENV.BASE_URL || "http://localhost:5678" +const WS_URL = BASE_URL.replace(/^http/, "ws") + "/graphql" +const SEED = JSON.parse(__ENV.SEED) +const VUS = parseInt(__ENV.VUS || "400", 10) +const REPO = __ENV.REPO || "/repo" +const OPENS_AT_MS = Date.parse(SEED.registrationStartTime) + +const hashes = JSON.parse(open(`${REPO}/@app/graphql/client.json`)) +// The server accepts unpersisted mutations and subscriptions only when the +// text starts with the operation keyword, as urql sends them, while the +// persisted files list fragments first. +const documentOf = (name) => { + const doc = open( + `${REPO}/@app/graphql/.persisted_operations/${hashes[name]}.graphql` + ) + const start = doc.search(/^(query|mutation|subscription)\b/m) + const rest = doc.slice(start) + const end = rest.search(/^fragment\b/m) + const operation = end === -1 ? rest : rest.slice(0, end) + return operation + "\n" + doc.slice(0, start) + (end === -1 ? "" : rest.slice(end)) +} +const EVENT_PAGE_DOC = documentOf("EventPage") +const CURRENT_TIME_DOC = documentOf("CurrentTime") +const EVENT_REGISTRATIONS_DOC = documentOf("EventRegistrations") +const CLAIM_DOC = documentOf("ClaimRegistrationToken") +const CREATE_DOC = documentOf("CreateEventRegistration") + +const claimDuration = new Trend("claim_duration", true) +const submitDuration = new Trend("submit_duration", true) +const pageQueryDuration = new Trend("register_page_query_duration", true) +const failures = new Counter("failures") + +export const options = { + scenarios: { + stampede: { + executor: "per-vu-iterations", + vus: VUS, + iterations: 1, + maxDuration: "5m", + }, + }, + summaryTrendStats: ["p(50)", "p(95)", "p(99)", "max", "count"], +} + +// 10% of VUs sit in the guild room behind one shared address. +function clientIp(vu) { + if (vu % 10 === 0) return "10.99.0.1" + return `10.${(vu >> 16) & 255}.${(vu >> 8) & 255}.${vu & 255}` +} + +function randomBetween(min, max) { + return min + Math.random() * (max - min) +} + +// Production cookies are Secure, which k6's jar will not send over plain +// http, so cookies are tracked by hand. +function absorbCookies(jar, res) { + for (const [name, values] of Object.entries(res.cookies || {})) { + if (values.length) jar[name] = values[values.length - 1].value + } +} + +function cookieHeader(jar) { + return Object.entries(jar) + .map(([k, v]) => `${k}=${v}`) + .join("; ") +} + +function graphqlErrors(res) { + if (res.status !== 200) return [`HTTP ${res.status}`] + let body + try { + body = res.json() + } catch (e) { + return ["invalid JSON response"] + } + return (body.errors || []).map((e) => e.message) +} + +export default function () { + const vu = exec.vu.idInTest + const ip = clientIp(vu) + const jar = {} + const result = { + vu, + email: `bot-${vu}@stress.test`, + clickedAtMs: null, + claimOk: false, + submitOk: false, + errors: [], + } + const fail = (step, message) => { + failures.add(1, { step }) + result.errors.push(`${step}: ${message}`) + } + + // Arrive on the event page some time in the window before opening. + const arriveBy = OPENS_AT_MS - 5000 + const waitMs = Math.max(0, randomBetween(0, arriveBy - Date.now())) + if (waitMs > 0) sleep(waitMs / 1000) + + const page = http.get(`${BASE_URL}/event/${SEED.slug}`, { + headers: { "X-Forwarded-For": ip }, + tags: { name: "event_page" }, + }) + absorbCookies(jar, page) + if (page.status !== 200) fail("event_page", `HTTP ${page.status}`) + + const post = (operationName, body, tag) => { + const res = http.post(`${BASE_URL}/graphql`, JSON.stringify(body), { + headers: { + "Content-Type": "application/json", + "CSRF-Token": jar.csrfToken || "", + Cookie: cookieHeader(jar), + "X-Forwarded-For": ip, + }, + tags: { name: tag }, + timeout: "60s", + }) + absorbCookies(jar, res) + return res + } + + const quotaId = SEED.quotaIds[vu % SEED.quotaIds.length] + let nextId = 1 + const subscribe = (socket, query, variables) => { + socket.send( + JSON.stringify({ + id: String(nextId++), + type: "subscribe", + payload: { query, variables }, + }) + ) + } + + const wsRes = ws.connect( + WS_URL, + { + headers: { + "Sec-WebSocket-Protocol": "graphql-transport-ws", + Cookie: cookieHeader(jar), + "X-Forwarded-For": ip, + }, + tags: { name: "graphql_ws" }, + }, + (socket) => { + socket.on("open", () => { + socket.send(JSON.stringify({ type: "connection_init", payload: {} })) + }) + + socket.on("message", (raw) => { + const msg = JSON.parse(raw) + if (msg.type === "connection_ack") { + subscribe(socket, EVENT_PAGE_DOC, { slug: SEED.slug }) + subscribe(socket, CURRENT_TIME_DOC, {}) + const untilOpen = OPENS_AT_MS - Date.now() + randomBetween(0, 1000) + socket.setTimeout(() => register(socket), Math.max(0, untilOpen)) + } else if (msg.type === "error") { + fail("subscription", JSON.stringify(msg.payload)) + } else if (msg.type === "next" && msg.payload && msg.payload.errors) { + for (const e of msg.payload.errors) fail("subscription", e.message) + } + }) + + socket.on("error", (e) => fail("websocket", String(e.error()))) + + // Safety net: never hold a VU beyond the scenario. + socket.setTimeout(() => socket.close(), 4 * 60 * 1000) + } + ) + if (!wsRes || wsRes.status !== 101) { + fail("websocket", `handshake status ${wsRes && wsRes.status}`) + } + + function register(socket) { + const pageQuery = post( + "CreateEventRegistrationPage", + { + operationName: "CreateEventRegistrationPage", + variables: { slug: SEED.slug, quotaId }, + extensions: { + persistedQuery: { + version: 1, + sha256Hash: hashes.CreateEventRegistrationPage, + }, + }, + }, + "register_page_query" + ) + pageQueryDuration.add(pageQuery.timings.duration) + for (const e of graphqlErrors(pageQuery)) fail("register_page_query", e) + + subscribe(socket, EVENT_REGISTRATIONS_DOC, { + eventId: SEED.eventId, + after: new Date().toISOString(), + }) + + result.clickedAtMs = Date.now() + const claim = post( + "ClaimRegistrationToken", + { + operationName: "ClaimRegistrationToken", + query: CLAIM_DOC, + variables: { input: { eventId: SEED.eventId, quotaId } }, + }, + "claim" + ) + claimDuration.add(claim.timings.duration) + const claimErrors = graphqlErrors(claim) + for (const e of claimErrors) fail("claim", e) + if (claimErrors.length) { + socket.close() + return + } + const token = + claim.json().data.claimRegistrationToken.claimRegistrationTokenOutput + .registrationToken + result.claimOk = true + + socket.setTimeout(() => { + const submit = post( + "CreateEventRegistration", + { + operationName: "CreateEventRegistration", + query: CREATE_DOC, + variables: { + input: { + eventId: SEED.eventId, + quotaId, + registrationToken: token, + firstName: "Bot", + lastName: `Number${vu}`, + email: result.email, + answers: null, + }, + }, + }, + "submit" + ) + submitDuration.add(submit.timings.duration) + const submitErrors = graphqlErrors(submit) + for (const e of submitErrors) fail("submit", e) + result.submitOk = submitErrors.length === 0 + // Linger briefly like a person reading the confirmation. + socket.setTimeout(() => socket.close(), 3000) + }, randomBetween(5000, 20000)) + } + + console.log(`RESULT ${JSON.stringify(result)}`) +} diff --git a/stress/postgres/init.sql b/stress/postgres/init.sql new file mode 100644 index 000000000..61805afdf --- /dev/null +++ b/stress/postgres/init.sql @@ -0,0 +1,18 @@ +-- Roles and database for the stress stack. The owner is a superuser only +-- while migrations run; the `finalize` service demotes it so that, as on +-- Azure, no ilmo role can use the superuser-reserved connection slots. +create role ilmo with login password 'stress' superuser; +create role ilmo_authenticator with login password 'stress' noinherit; +create role ilmo_visitor; +grant ilmo_visitor to ilmo_authenticator; +create database ilmo owner ilmo; + +-- Equivalent of @app/db/migrations/afterReset.sql +\connect ilmo +grant connect on database ilmo to ilmo; +grant connect on database ilmo to ilmo_authenticator; +grant all on database ilmo to ilmo; +alter schema public owner to ilmo; +create extension if not exists "uuid-ossp" with schema public; +create extension if not exists citext with schema public; +create extension if not exists pgcrypto with schema public; diff --git a/stress/run.sh b/stress/run.sh new file mode 100755 index 000000000..707d33c1c --- /dev/null +++ b/stress/run.sh @@ -0,0 +1,67 @@ +#!/usr/bin/env bash +# Runs one registration stampede against a fresh stack and prints a summary. +# +# Usage: pnpm stress [--image ] [--vus ] +set -euo pipefail +cd "$(dirname "$0")" + +scenario=${1:?usage: run.sh [--image ] [--vus ]} +shift +export IMAGE=ilmo-stress:after +case $scenario in + worst) vus=400 ;; + common) vus=200 ;; + *) echo "unknown scenario: $scenario" >&2; exit 1 ;; +esac +while [[ $# -gt 0 ]]; do + case $1 in + --image) IMAGE=$2; shift 2 ;; + --vus) vus=$2; shift 2 ;; + *) echo "unknown option: $1" >&2; exit 1 ;; + esac +done + +opens_in=45 +out="results/$(date +%Y%m%d-%H%M%S)-$scenario-${IMAGE//[:\/]/_}-$vus" +mkdir -p "$out" +# k6 runs as an unprivileged user inside its container. +chmod 777 "$out" + +echo "==> fresh stack with $IMAGE" +docker compose down -v --remove-orphans >/dev/null 2>&1 || true +docker compose up -d --wait server worker >/dev/null +up=false +for _ in $(seq 1 90); do + curl -sf -o /dev/null http://localhost:5678/ && up=true && break + sleep 1 +done +if ! $up; then + echo "server did not come up; last log lines:" >&2 + docker compose logs --tail 30 server >&2 + exit 1 +fi + +echo "==> seeding $scenario (opens in ${opens_in}s)" +./seed.sh "$scenario" "$opens_in" > "$out/seed.json" +cat "$out/seed.json" + +./sample-connections.sh "$out/connections.csv" & +sampler=$! +trap 'kill $sampler 2>/dev/null || true' EXIT + +echo "==> k6 with $vus VUs" +docker run --rm --network host \ + -v "$(cd .. && pwd)":/repo:ro \ + -v "$(pwd)/$out":/out \ + -e SEED="$(cat "$out/seed.json")" -e VUS="$vus" -e REPO=/repo \ + grafana/k6:0.54.0 run --quiet --log-format json \ + --summary-export /out/k6-summary.json \ + /repo/stress/k6/registration.js 2> "$out/k6.log" > "$out/k6-stdout.txt" || true + +# Let the worker drain and the last unfinished-registration state settle. +sleep 3 +kill $sampler 2>/dev/null || true +docker compose logs server > "$out/server.log" 2>&1 +docker compose logs worker > "$out/worker.log" 2>&1 + +node check-results.mjs "$out" diff --git a/stress/sample-connections.sh b/stress/sample-connections.sh new file mode 100755 index 000000000..32ecadf4b --- /dev/null +++ b/stress/sample-connections.sh @@ -0,0 +1,18 @@ +#!/usr/bin/env bash +# Samples Postgres connections held by ilmo roles every 200 ms until killed. +# Writes "epoch_ms,usename,state,count" lines to the given file. +# +# Usage: stress/sample-connections.sh +set -uo pipefail +cd "$(dirname "$0")" +out=$1 +: > "$out" +container=$(docker compose ps -q db) +while true; do + docker exec "$container" psql -U postgres -At -F, -c " + select (extract(epoch from clock_timestamp()) * 1000)::bigint, usename, coalesce(state, '-'), count(*) + from pg_stat_activity + where usename like 'ilmo%' + group by usename, state" >> "$out" 2>/dev/null + sleep 0.2 +done diff --git a/stress/seed.sh b/stress/seed.sh new file mode 100755 index 000000000..768692ac3 --- /dev/null +++ b/stress/seed.sh @@ -0,0 +1,60 @@ +#!/usr/bin/env bash +# Seeds one event for a stress scenario and prints +# {"eventId","slug","quotaIds":[...],"registrationStartTime"} as JSON. +# +# Usage: stress/seed.sh +set -euo pipefail +cd "$(dirname "$0")" + +scenario=$1 +opens_in=$2 +case $scenario in + worst) quotas=5 size=5 ;; + common) quotas=3 size=20 ;; + *) echo "unknown scenario: $scenario" >&2; exit 1 ;; +esac + +docker compose exec -T db psql -U postgres -d ilmo -At -v ON_ERROR_STOP=1 \ + -v quotas="$quotas" -v size="$size" -v opens_in="$opens_in" <<'SQL' +\set QUIET on +begin; +with org as ( + insert into app_public.organizations (slug, name, color) + values ('stress-' || gen_random_uuid(), 'Stress', '#000000') + returning id +), cat as ( + insert into app_public.event_categories (name, description, color, owner_organization_id) + select '{"fi":"Stressi","en":"Stress"}', '{"fi":"x","en":"x"}', '#000000', id from org + returning id, owner_organization_id +), ev as ( + insert into app_public.events ( + name, slug, description, location, + event_start_time, event_end_time, + registration_start_time, registration_end_time, + is_draft, open_quota_size, owner_organization_id, category_id + ) + select + '{"fi":"Stressitapahtuma","en":"Stress event"}', + 'stress-' || extract(epoch from now())::bigint, + '{"fi":[{"type":"paragraph","children":[{"text":"x"}]}],"en":[{"type":"paragraph","children":[{"text":"x"}]}]}', + 'Otaniemi', + now() + interval '2 days', now() + interval '3 days', + now() + make_interval(secs => :opens_in), now() + interval '1 day', + false, 0, owner_organization_id, id + from cat + returning id, slug, registration_start_time +), q as ( + insert into app_public.quotas (event_id, position, title, size) + select ev.id, i, jsonb_build_object('fi', 'Kiintiö ' || i, 'en', 'Quota ' || i), :size + from ev, generate_series(0, :quotas - 1) i + returning id, position +) +select json_build_object( + 'eventId', ev.id, + 'slug', ev.slug, + 'registrationStartTime', ev.registration_start_time, + 'quotaIds', (select json_agg(id order by position) from q) +) +from ev; +commit; +SQL From 6914bf787417278567f34b4d067307b122be43de Mon Sep 17 00:00:00 2001 From: Risto Virtaharju Date: Sat, 17 Oct 2026 08:11:15 +0000 Subject: [PATCH 007/163] fix: promote from the queue under the per-event positions lock The queue promotion trigger read positions without waiting for in-flight recomputes, so a claim committing between its read and the delete's recompute could be promoted out of the queue without an email. Co-Authored-By: Claude Opus 5.5 --- .../3-registration-positions-table.sql | 57 +++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/@app/db/migrations/current/3-registration-positions-table.sql b/@app/db/migrations/current/3-registration-positions-table.sql index 386a21f41..fa94436fa 100644 --- a/@app/db/migrations/current/3-registration-positions-table.sql +++ b/@app/db/migrations/current/3-registration-positions-table.sql @@ -179,3 +179,60 @@ create trigger _301_refresh_registration_positions execute procedure app_private.tg__refresh_registration_positions(); select app_private.refresh_registration_positions(id) from app_public.events; + +/* + * Queue promotion reads positions under the same per-event lock as the + * recompute. + */ +create or replace function app_private.tg__process_queue() returns trigger as $$ +declare + v_old_registration_status app_hidden.registrations_status_and_position; + v_received_spot app_hidden.registrations_status_and_position; +begin + -- Wait for in-flight position recomputes of this event so that the lookup + -- below sees every committed registration, including one that would be + -- first in queue. + perform pg_advisory_xact_lock(hashtext('registration_positions:' || OLD.event_id::text)); + + select * + into v_old_registration_status + from app_hidden.registrations_status_and_position + where + id = OLD.id; + + if v_old_registration_status.status = 'IN_QUOTA' then + select * + into v_received_spot + from app_hidden.registrations_status_and_position + where + event_id = v_old_registration_status.event_id and + quota_id = v_old_registration_status.quota_id and + status = 'IN_QUEUE'::app_public.registration_status and + position = 1 + order by position desc; + elsif v_old_registration_status.status = 'IN_OPEN_QUOTA' then + select * + into v_received_spot + from app_hidden.registrations_status_and_position + where + -- Almost the same where condition as above, only quota_id is + -- missing since open quota spots can be populated by any quota + event_id = v_old_registration_status.event_id and + status = 'IN_QUEUE'::app_public.registration_status and + position = 1 + order by position desc; + else + -- The deleted registration was in queue, nobody will get a spot so return. + return OLD; + end if; + + if v_received_spot is not null then + perform graphile_worker.add_job( + 'registration__process_queue', + json_build_object('receivedSpot', v_received_spot) + ); + end if; + + return OLD; +end; +$$ language plpgsql; From 31ec6f6e034b03a9e609fa4d2d2c8e2aac510c05 Mon Sep 17 00:00:00 2001 From: Claude Date: Sat, 17 Oct 2026 08:12:43 +0000 Subject: [PATCH 008/163] Only prefill registration names when the split is unambiguous Account names are a single field, so a name like "Anna Maria von Wright" can't be split into first and last name reliably. Leave both fields empty for names of three or more words instead of guessing. Co-Authored-By: Claude Opus 5.5 (1M context) Claude-Session: https://claude.ai/code/session_0126Kq6TYvUgHFmDYaQL7hp7 --- .../src/pages/event/[slug]/register/[quotaId]/index.tsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/@app/client/src/pages/event/[slug]/register/[quotaId]/index.tsx b/@app/client/src/pages/event/[slug]/register/[quotaId]/index.tsx index 3ef478d21..c2a3fead4 100644 --- a/@app/client/src/pages/event/[slug]/register/[quotaId]/index.tsx +++ b/@app/client/src/pages/event/[slug]/register/[quotaId]/index.tsx @@ -37,11 +37,11 @@ const EventRegistrationPage: NextPage = () => { const { name, primaryEmail } = currentUser || {} // TODO: The users table schema could be changed to include first - // and last names. For now infer them like this: the last word is the last - // name and everything before it is the first name (e.g. "Anna Maria"). + // and last names. Until then only prefill them when the split is + // unambiguous: with three or more words (e.g. "Anna Maria von Wright") + // there's no telling where the first name ends, so let the user fill them. const nameParts = name ? name.trim().split(/\s+/) : [] - const lastName = nameParts.length > 1 ? nameParts.pop() : undefined - const firstName = nameParts.length ? nameParts.join(" ") : undefined + const [firstName, lastName] = nameParts.length <= 2 ? nameParts : [] const formInitialValues = { firstName, From 496ea02932c2a5e8311fbb354d981d54fc506e3e Mon Sep 17 00:00:00 2001 From: Claude Date: Sat, 17 Oct 2026 08:18:34 +0000 Subject: [PATCH 009/163] payments: add paymentsEnabled flag and fee maths to @app/lib MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit paymentsEnabled() is the single switch for Stripe payments (PAYMENTS_ENABLED=1 plus STRIPE_SECRET_KEY and STRIPE_WEBHOOK_SECRET). Fee helpers work in integer cents: totalChargeCents, guildReceivesCents (halves round up, computed without float drift), isValidTicketPriceCents and formatEuro ("18,00 €" in every language). Adds a jest project for @app/lib with unit tests, and the stripe package (v23) to @app/server and @app/worker. Co-Authored-By: Claude Opus 5.5 (1M context) Claude-Session: https://claude.ai/code/session_01RKSTTfRBbDMSCoT7Y56nnd --- @app/lib/__tests__/payments.test.ts | 165 ++++++++++++++++++++++++++++ @app/lib/jest.config.ts | 3 + @app/lib/src/index.ts | 1 + @app/lib/src/payments.ts | 104 ++++++++++++++++++ @app/server/package.json | 1 + @app/worker/package.json | 3 +- pnpm-lock.yaml | 23 ++++ 7 files changed, 299 insertions(+), 1 deletion(-) create mode 100644 @app/lib/__tests__/payments.test.ts create mode 100644 @app/lib/jest.config.ts create mode 100644 @app/lib/src/payments.ts diff --git a/@app/lib/__tests__/payments.test.ts b/@app/lib/__tests__/payments.test.ts new file mode 100644 index 000000000..c69bbf220 --- /dev/null +++ b/@app/lib/__tests__/payments.test.ts @@ -0,0 +1,165 @@ +import { + formatEuro, + guildReceivesCents, + isValidTicketPriceCents, + MIN_PAID_PRICE_CENTS, + paymentsEnabled, + SERVICE_FEE_CENTS, + STRIPE_PERCENT_FEE, + totalChargeCents, +} from "../src/payments" + +describe("fee constants", () => { + test("match the PRD", () => { + expect(SERVICE_FEE_CENTS).toBe(25) + expect(STRIPE_PERCENT_FEE).toBe(0.015) + expect(MIN_PAID_PRICE_CENTS).toBe(25) + }) + + test("the minimum paid price meets Stripe's 0,50 € minimum charge", () => { + expect(totalChargeCents(MIN_PAID_PRICE_CENTS)).toBeGreaterThanOrEqual(50) + }) +}) + +describe("totalChargeCents", () => { + test.each([ + [0, 0], + [25, 50], + [1800, 1825], + [2200, 2225], + ])("%i cents → %i", (price, total) => { + expect(totalChargeCents(price)).toBe(total) + }) + + test.each([-1, 1.5, NaN, Infinity])("rejects %p", (price) => { + expect(() => totalChargeCents(price)).toThrow(RangeError) + }) +}) + +describe("guildReceivesCents", () => { + test.each([ + // free: nothing charged, nothing received + [0, 0], + // 25 − 0,015 × 50 = 24,25 + [25, 24], + // 1800 − 0,015 × 1825 = 1772,625 + [1800, 1773], + // 2200 − 0,015 × 2225 = 2166,625 + [2200, 2167], + // PRD example: a 10,00 € ticket gives the guild ≈ 9,85 € + [1000, 985], + // 75 − 0,015 × 100 = 73,5 exactly: halves round up + [75, 74], + [275, 271], + ])("%i cents → %i", (price, received) => { + expect(guildReceivesCents(price)).toBe(received) + }) + + test("matches the PRD formula for every price up to 1000 €", () => { + const mismatches: number[] = [] + for (let p = MIN_PAID_PRICE_CENTS; p <= 100000; p++) { + // Exact rational arithmetic: (985p − 375) / 1000, halves up. + const n = 985 * p - 375 + const expected = Math.floor(n / 1000) + (n % 1000 >= 500 ? 1 : 0) + if (guildReceivesCents(p) !== expected) mismatches.push(p) + } + expect(mismatches).toEqual([]) + }) + + test.each([-25, 18.5, NaN])("rejects %p", (price) => { + expect(() => guildReceivesCents(price)).toThrow(RangeError) + }) +}) + +describe("isValidTicketPriceCents", () => { + test.each([ + [0, true], + [1, false], + [24, false], + [25, true], + [1800, true], + [-25, false], + [25.5, false], + ])("%p → %p", (price, valid) => { + expect(isValidTicketPriceCents(price)).toBe(valid) + }) +}) + +describe("formatEuro", () => { + test.each([ + [0, "0,00 €"], + [5, "0,05 €"], + [25, "0,25 €"], + [1800, "18,00 €"], + [1825, "18,25 €"], + [2200, "22,00 €"], + [75912, "759,12 €"], + [123450, "1 234,50 €"], + [-1800, "-18,00 €"], + ])("%i cents → %p", (cents, text) => { + expect(formatEuro(cents)).toBe(text) + }) + + test("uses the decimal comma in every language", () => { + for (const lang of ["fi", "en", "sv"]) { + expect(formatEuro(1800, lang)).toBe("18,00 €") + } + }) + + test("rejects fractional cents", () => { + expect(() => formatEuro(18.5)).toThrow(RangeError) + }) +}) + +describe("paymentsEnabled", () => { + const KEYS = [ + "PAYMENTS_ENABLED", + "STRIPE_SECRET_KEY", + "STRIPE_WEBHOOK_SECRET", + ] as const + const saved: Record = {} + + beforeEach(() => { + for (const key of KEYS) { + saved[key] = process.env[key] + delete process.env[key] + } + }) + + afterEach(() => { + for (const key of KEYS) { + if (saved[key] === undefined) delete process.env[key] + else process.env[key] = saved[key] + } + }) + + function setAll() { + process.env.PAYMENTS_ENABLED = "1" + process.env.STRIPE_SECRET_KEY = "sk_test_123" + process.env.STRIPE_WEBHOOK_SECRET = "whsec_123" + } + + test("is off with nothing configured", () => { + expect(paymentsEnabled()).toBe(false) + }) + + test("is on when the flag and both secrets are set", () => { + setAll() + expect(paymentsEnabled()).toBe(true) + }) + + test.each(KEYS)("is off when %s is missing", (key) => { + setAll() + delete process.env[key] + expect(paymentsEnabled()).toBe(false) + }) + + test.each(["0", "true", "yes", ""])( + "is off when PAYMENTS_ENABLED=%p", + (value) => { + setAll() + process.env.PAYMENTS_ENABLED = value + expect(paymentsEnabled()).toBe(false) + } + ) +}) diff --git a/@app/lib/jest.config.ts b/@app/lib/jest.config.ts new file mode 100644 index 000000000..9bc2d71a8 --- /dev/null +++ b/@app/lib/jest.config.ts @@ -0,0 +1,3 @@ +module.exports = { + ...require("../../jest.config.base")(__dirname), +} diff --git a/@app/lib/src/index.ts b/@app/lib/src/index.ts index d6b5b3c89..5e8d62e9c 100644 --- a/@app/lib/src/index.ts +++ b/@app/lib/src/index.ts @@ -4,6 +4,7 @@ export * from "./cookies" export * from "./dates" export * from "./errors" export * from "./forms" +export * from "./payments" export * from "./sso" export * from "./tableUtils" export * from "./types" diff --git a/@app/lib/src/payments.ts b/@app/lib/src/payments.ts new file mode 100644 index 000000000..0abd9b0f8 --- /dev/null +++ b/@app/lib/src/payments.ts @@ -0,0 +1,104 @@ +/** + * Stripe payments: the feature flag and the fee maths shared by the server, + * the worker and the client. Money is always integer cents; only + * `formatEuro` turns it into text. + */ + +/** + * Payments are on only when the flag is set and both Stripe secrets are + * present; a partial configuration is a misconfiguration, not a + * half-enabled feature. This is the single switch for the whole feature: + * nothing else should read these env vars to decide whether payments exist. + */ +export function paymentsEnabled(): boolean { + return !!( + process.env.PAYMENTS_ENABLED === "1" && + process.env.STRIPE_SECRET_KEY && + process.env.STRIPE_WEBHOOK_SECRET + ) +} + +/** + * Stripe's fixed per-payment fee, charged to the customer as a separate + * "service fee" line item at Checkout. Never refunded. + */ +export const SERVICE_FEE_CENTS = 25 + +/** Stripe's percentage fee, taken from the total charge. */ +export const STRIPE_PERCENT_FEE = 0.015 + +/** + * The smallest non-zero ticket price. Together with the service fee it makes + * the total charge reach Stripe's 0,50 € minimum. + */ +export const MIN_PAID_PRICE_CENTS = 25 + +// The percentage fee in per-mille, so the maths below stays in integers. +const STRIPE_PERCENT_FEE_PER_MILLE = Math.round(STRIPE_PERCENT_FEE * 1000) + +function assertCents(cents: number, name: string): void { + if (!Number.isSafeInteger(cents) || cents < 0) { + throw new RangeError( + `${name} must be a non-negative integer number of cents, got ${cents}` + ) + } +} + +/** + * A ticket price is valid when it is free (0) or at least + * `MIN_PAID_PRICE_CENTS`. + */ +export function isValidTicketPriceCents(priceCents: number): boolean { + return ( + Number.isSafeInteger(priceCents) && + (priceCents === 0 || priceCents >= MIN_PAID_PRICE_CENTS) + ) +} + +/** + * What the customer pays at Checkout: the ticket price plus the service fee. + * A free ticket is never charged, so it costs 0. + */ +export function totalChargeCents(priceCents: number): number { + assertCents(priceCents, "priceCents") + if (priceCents === 0) return 0 + return priceCents + SERVICE_FEE_CENTS +} + +/** + * What the guild receives for a ticket: Stripe keeps the service fee plus + * 1,5 % of the total charge, so the guild gets + * `P − 1,5 % × (P + 0,25 €)`, rounded to the nearest cent (halves up). + * 0 for a free ticket. + * + * Computed as `(985·P − 375) / 1000` so the only floating point step is one + * correctly rounded division: an exact half stays an exact half and rounds + * up, instead of landing a hair either side of it. + */ +export function guildReceivesCents(priceCents: number): number { + assertCents(priceCents, "priceCents") + if (priceCents === 0) return 0 + const numerator = + 1000 * priceCents - + STRIPE_PERCENT_FEE_PER_MILLE * (priceCents + SERVICE_FEE_CENTS) + return Math.round(numerator / 1000) +} + +/** + * Formats cents as euros in the style of the designs, e.g. `18,00 €`. + * Every language uses the Finnish decimal comma and a trailing euro sign; + * thousands are grouped with a space (`1 234,50 €`). `lang` is accepted so + * call sites need not change if a locale ever needs its own format. + */ +export function formatEuro(cents: number, _lang?: string): string { + if (!Number.isSafeInteger(cents)) { + throw new RangeError(`cents must be an integer, got ${cents}`) + } + const sign = cents < 0 ? "-" : "" + const abs = Math.abs(cents) + const euros = Math.floor(abs / 100) + .toString() + .replace(/\B(?=(\d{3})+(?!\d))/g, " ") + const rest = (abs % 100).toString().padStart(2, "0") + return `${sign}${euros},${rest} €` +} diff --git a/@app/server/package.json b/@app/server/package.json index ca28ad3d7..f161ec6f6 100644 --- a/@app/server/package.json +++ b/@app/server/package.json @@ -62,6 +62,7 @@ "sharp": "^0.30.7", "slugify": "^1.6.5", "source-map-support": "^0.5.21", + "stripe": "^23.0.0", "tslib": "^2.6.0", "uuid": "^8.3.2" }, diff --git a/@app/worker/package.json b/@app/worker/package.json index 9408d7ae6..51d82b8db 100644 --- a/@app/worker/package.json +++ b/@app/worker/package.json @@ -9,7 +9,7 @@ "dev": "cd dist && nodemon --signal SIGINT --watch '**/*.js' -x \"node --inspect -r @app/config/env.js -r source-map-support/register ../../../node_modules/graphile-worker/dist/cli.js --crontab ../crontab\"", "watch": "exit 0", "install-db-schema": "mkdirp dist && pnpm gw --schema-only", - "depcheck": "depcheck --ignores=\"tslib\"" + "depcheck": "depcheck --ignores=\"tslib,stripe\"" }, "dependencies": { "@app/config": "workspace:*", @@ -22,6 +22,7 @@ "mjml": "^4.13.0", "nodemailer": "^6.7.7", "nunjucks": "^3.2.3", + "stripe": "^23.0.0", "tslib": "^2.6.0" }, "devDependencies": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d935534db..c3a9e513c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -670,6 +670,9 @@ importers: source-map-support: specifier: ^0.5.21 version: 0.5.21 + stripe: + specifier: ^23.0.0 + version: 23.0.0(@types/node@18.19.130) tslib: specifier: ^2.6.0 version: 2.8.1 @@ -738,6 +741,9 @@ importers: nunjucks: specifier: ^3.2.3 version: 3.2.4(chokidar@3.6.0) + stripe: + specifier: ^23.0.0 + version: 23.0.0(@types/node@22.19.17) tslib: specifier: ^2.6.0 version: 2.8.1 @@ -8693,6 +8699,15 @@ packages: resolution: {integrity: sha512-1tB5mhVo7U+ETBKNf92xT4hrQa3pm0MZ0PQvuDnWgAAGHDsfp4lPSpiS6psrSiet87wyGPh9ft6wmhOMQ0hDiw==} engines: {node: '>=14.16'} + stripe@23.0.0: + resolution: {integrity: sha512-MDE2A5ZVVluYURORaZEVghSmnLJc3w6aHAlZSxDQMsOjOb3V0O6ro/CiaeFlJS4N7uIVmsg98ocRsPmUK6YfyA==} + engines: {node: '>=20'} + peerDependencies: + '@types/node': '>=20' + peerDependenciesMeta: + '@types/node': + optional: true + strnum@2.2.3: resolution: {integrity: sha512-oKx6RUCuHfT3oyVjtnrmn19H1SiCqgJSg+54XqURKp5aCMbrXrhLjRN9TjuwMjiYstZ0MzDrHqkGZ5dFTKd+zg==} @@ -19655,6 +19670,14 @@ snapshots: strip-json-comments@5.0.3: {} + stripe@23.0.0(@types/node@18.19.130): + optionalDependencies: + '@types/node': 18.19.130 + + stripe@23.0.0(@types/node@22.19.17): + optionalDependencies: + '@types/node': 22.19.17 + strnum@2.2.3: {} styled-jsx@5.1.6(@babel/core@7.29.0)(babel-plugin-macros@3.1.0)(react@18.2.0): From c7e9f048ac6737bf3c9ea57c98efa8d38c57a046 Mon Sep 17 00:00:00 2001 From: Claude Date: Sat, 17 Oct 2026 08:18:35 +0000 Subject: [PATCH 010/163] payments: expose Query.paymentsEnabled and lazy Stripe client PaymentsPlugin adds Query.paymentsEnabled (mirroring ssoLoginEnabled) and SharedLayout_Query fetches it so every page knows whether payment UI exists. utils/stripe.ts builds the Stripe client on first use and throws while payments are disabled. The server logs "payments disabled" at startup when the flag is off, and the setup script prompts for the three env vars next to the Keycloak ones (.env.ci gets commented placeholders). Co-Authored-By: Claude Opus 5.5 (1M context) Claude-Session: https://claude.ai/code/session_01RKSTTfRBbDMSCoT7Y56nnd --- .env.ci | 5 ++ .../graphql/layout/SharedLayout_Query.graphql | 1 + ...e5e3b13bc05f5b5141b91be4dc52991f9.graphql} | 1 + ...b172c0343efb94a3e151c9d2c45c58560.graphql} | 1 + ...c5f45101b754905c58537dda0e3330af5.graphql} | 1 + ...12feb586c09160fcaeaeaebad4ffe0e8d.graphql} | 1 + ...4baae23893840c7cb0dd12a0d852ede1c.graphql} | 1 + ...afaaf67c76caa83a6bd0eab8761c800b6.graphql} | 1 + ...dc11511ef9acac82182ce07ad926134d3.graphql} | 1 + ...324494ed678ca6c7d7d5cab822d5a754d.graphql} | 1 + ...5cc500963d011c0a9420d3114e7695287.graphql} | 1 + ...c87d92d3a8d3a43bbbfed47c331a27f65.graphql} | 1 + @app/graphql/client.json | 20 +++--- @app/graphql/server.json | 20 +++--- .../__tests__/queries/paymentsEnabled.test.ts | 66 ++++++++++++++++++ @app/server/__tests__/utils/stripe.test.ts | 67 +++++++++++++++++++ @app/server/src/app.ts | 8 +++ .../src/middleware/installPostGraphile.ts | 4 ++ @app/server/src/plugins/PaymentsPlugin.ts | 24 +++++++ @app/server/src/plugins/index.ts | 2 + @app/server/src/utils/stripe.ts | 36 ++++++++++ data/schema.graphql | 12 ++++ scripts/_setup_utils.mjs | 31 +++++++++ 23 files changed, 286 insertions(+), 20 deletions(-) rename @app/graphql/.persisted_operations/{2e4a7c74a71603bcec3debb7b11c003a481d28d6b25b130694e38f2760fcf7e9.graphql => 21842ecc4434e4a36d31b5a59415565e5e3b13bc05f5b5141b91be4dc52991f9.graphql} (99%) rename @app/graphql/.persisted_operations/{301da0928db49b18b443128fd731b8815df9fd05a090c4f6e648837bc2436754.graphql => 41104ed3b765a23562598393ac16235b172c0343efb94a3e151c9d2c45c58560.graphql} (99%) rename @app/graphql/.persisted_operations/{eb985e5bfabc266d0fc5637eda513cac8a293bc851b29e863dbf304c4932f7f1.graphql => 4c5867b217506620352bf459db01308c5f45101b754905c58537dda0e3330af5.graphql} (98%) rename @app/graphql/.persisted_operations/{e75fddfae08b7bdc7571c0cd3426cdda51dc0b336d6a428c214da7d7f2752708.graphql => 5057d31502468d016f47f72c5c56c1912feb586c09160fcaeaeaebad4ffe0e8d.graphql} (98%) rename @app/graphql/.persisted_operations/{3d3ae0471e11f29477713606f9d884cb6d2a031b1a8bed9e220bec4c5e54337f.graphql => 601c9f68c8010cef2a103f77bfed4ea4baae23893840c7cb0dd12a0d852ede1c.graphql} (98%) rename @app/graphql/.persisted_operations/{77885919f782dbb117e2759c4918f2445a633ed0a98d08fd5d1ab699ebce9391.graphql => 65cab80d460e10b8d5697dab7f7e162afaaf67c76caa83a6bd0eab8761c800b6.graphql} (98%) rename @app/graphql/.persisted_operations/{c80a1b7e4a79510cd8e544910e72dec734223574011e0a40bb00c78de8de310c.graphql => 7409ffafc3214107fea8f4bf103d34bdc11511ef9acac82182ce07ad926134d3.graphql} (99%) rename @app/graphql/.persisted_operations/{994c6d2a2d085b6452233787ccd1502e270b193029b1793369e0d7503ef999b5.graphql => cd7edaad090c74e09867b045fac6c64324494ed678ca6c7d7d5cab822d5a754d.graphql} (98%) rename @app/graphql/.persisted_operations/{f03f38c3d71fd696ef382a99987cf83cc85f699074616d593fbd4216e7de1a2f.graphql => dc4e6cc97a9f85d7864670ab0bb8e065cc500963d011c0a9420d3114e7695287.graphql} (98%) rename @app/graphql/.persisted_operations/{7e487496b03e301f627d86bce4edd2273740b18548ad91c12bd6575aaff34ad7.graphql => f8a8bf398770887fbfe0f7c66bc55e6c87d92d3a8d3a43bbbfed47c331a27f65.graphql} (99%) create mode 100644 @app/server/__tests__/queries/paymentsEnabled.test.ts create mode 100644 @app/server/__tests__/utils/stripe.test.ts create mode 100644 @app/server/src/plugins/PaymentsPlugin.ts create mode 100644 @app/server/src/utils/stripe.ts diff --git a/.env.ci b/.env.ci index 63e5957d5..1d12190bf 100644 --- a/.env.ci +++ b/.env.ci @@ -14,3 +14,8 @@ PORT=5678 ROOT_URL=http://localhost:5678 ENABLE_CYPRESS_COMMANDS=1 REDIS_URL=redis://127.0.0.1:6379 + +# Stripe payments stay disabled in CI; tests set these themselves. +# PAYMENTS_ENABLED=1 +# STRIPE_SECRET_KEY=sk_test_... +# STRIPE_WEBHOOK_SECRET=whsec_... diff --git a/@app/client/src/graphql/layout/SharedLayout_Query.graphql b/@app/client/src/graphql/layout/SharedLayout_Query.graphql index 7fc931d59..6ae9078cd 100644 --- a/@app/client/src/graphql/layout/SharedLayout_Query.graphql +++ b/@app/client/src/graphql/layout/SharedLayout_Query.graphql @@ -13,6 +13,7 @@ fragment SharedLayout_Query on Query { ...SharedLayout_Organization } } + paymentsEnabled ssoLoginEnabled supportedLanguages } diff --git a/@app/graphql/.persisted_operations/2e4a7c74a71603bcec3debb7b11c003a481d28d6b25b130694e38f2760fcf7e9.graphql b/@app/graphql/.persisted_operations/21842ecc4434e4a36d31b5a59415565e5e3b13bc05f5b5141b91be4dc52991f9.graphql similarity index 99% rename from @app/graphql/.persisted_operations/2e4a7c74a71603bcec3debb7b11c003a481d28d6b25b130694e38f2760fcf7e9.graphql rename to @app/graphql/.persisted_operations/21842ecc4434e4a36d31b5a59415565e5e3b13bc05f5b5141b91be4dc52991f9.graphql index e2e80db2e..fad2d7b82 100644 --- a/@app/graphql/.persisted_operations/2e4a7c74a71603bcec3debb7b11c003a481d28d6b25b130694e38f2760fcf7e9.graphql +++ b/@app/graphql/.persisted_operations/21842ecc4434e4a36d31b5a59415565e5e3b13bc05f5b5141b91be4dc52991f9.graphql @@ -26,6 +26,7 @@ fragment SharedLayout_Query on Query { } __typename } + paymentsEnabled ssoLoginEnabled supportedLanguages __typename diff --git a/@app/graphql/.persisted_operations/301da0928db49b18b443128fd731b8815df9fd05a090c4f6e648837bc2436754.graphql b/@app/graphql/.persisted_operations/41104ed3b765a23562598393ac16235b172c0343efb94a3e151c9d2c45c58560.graphql similarity index 99% rename from @app/graphql/.persisted_operations/301da0928db49b18b443128fd731b8815df9fd05a090c4f6e648837bc2436754.graphql rename to @app/graphql/.persisted_operations/41104ed3b765a23562598393ac16235b172c0343efb94a3e151c9d2c45c58560.graphql index a8e2594d3..ed443357e 100644 --- a/@app/graphql/.persisted_operations/301da0928db49b18b443128fd731b8815df9fd05a090c4f6e648837bc2436754.graphql +++ b/@app/graphql/.persisted_operations/41104ed3b765a23562598393ac16235b172c0343efb94a3e151c9d2c45c58560.graphql @@ -41,6 +41,7 @@ fragment SharedLayout_Query on Query { } __typename } + paymentsEnabled ssoLoginEnabled supportedLanguages __typename diff --git a/@app/graphql/.persisted_operations/eb985e5bfabc266d0fc5637eda513cac8a293bc851b29e863dbf304c4932f7f1.graphql b/@app/graphql/.persisted_operations/4c5867b217506620352bf459db01308c5f45101b754905c58537dda0e3330af5.graphql similarity index 98% rename from @app/graphql/.persisted_operations/eb985e5bfabc266d0fc5637eda513cac8a293bc851b29e863dbf304c4932f7f1.graphql rename to @app/graphql/.persisted_operations/4c5867b217506620352bf459db01308c5f45101b754905c58537dda0e3330af5.graphql index d1a3ec1b5..e068e34da 100644 --- a/@app/graphql/.persisted_operations/eb985e5bfabc266d0fc5637eda513cac8a293bc851b29e863dbf304c4932f7f1.graphql +++ b/@app/graphql/.persisted_operations/4c5867b217506620352bf459db01308c5f45101b754905c58537dda0e3330af5.graphql @@ -10,6 +10,7 @@ fragment SharedLayout_Query on Query { } __typename } + paymentsEnabled ssoLoginEnabled supportedLanguages __typename diff --git a/@app/graphql/.persisted_operations/e75fddfae08b7bdc7571c0cd3426cdda51dc0b336d6a428c214da7d7f2752708.graphql b/@app/graphql/.persisted_operations/5057d31502468d016f47f72c5c56c1912feb586c09160fcaeaeaebad4ffe0e8d.graphql similarity index 98% rename from @app/graphql/.persisted_operations/e75fddfae08b7bdc7571c0cd3426cdda51dc0b336d6a428c214da7d7f2752708.graphql rename to @app/graphql/.persisted_operations/5057d31502468d016f47f72c5c56c1912feb586c09160fcaeaeaebad4ffe0e8d.graphql index fe5b0684b..dae87275c 100644 --- a/@app/graphql/.persisted_operations/e75fddfae08b7bdc7571c0cd3426cdda51dc0b336d6a428c214da7d7f2752708.graphql +++ b/@app/graphql/.persisted_operations/5057d31502468d016f47f72c5c56c1912feb586c09160fcaeaeaebad4ffe0e8d.graphql @@ -18,6 +18,7 @@ fragment SharedLayout_Query on Query { } __typename } + paymentsEnabled ssoLoginEnabled supportedLanguages __typename diff --git a/@app/graphql/.persisted_operations/3d3ae0471e11f29477713606f9d884cb6d2a031b1a8bed9e220bec4c5e54337f.graphql b/@app/graphql/.persisted_operations/601c9f68c8010cef2a103f77bfed4ea4baae23893840c7cb0dd12a0d852ede1c.graphql similarity index 98% rename from @app/graphql/.persisted_operations/3d3ae0471e11f29477713606f9d884cb6d2a031b1a8bed9e220bec4c5e54337f.graphql rename to @app/graphql/.persisted_operations/601c9f68c8010cef2a103f77bfed4ea4baae23893840c7cb0dd12a0d852ede1c.graphql index 6031860df..66f99bad7 100644 --- a/@app/graphql/.persisted_operations/3d3ae0471e11f29477713606f9d884cb6d2a031b1a8bed9e220bec4c5e54337f.graphql +++ b/@app/graphql/.persisted_operations/601c9f68c8010cef2a103f77bfed4ea4baae23893840c7cb0dd12a0d852ede1c.graphql @@ -10,6 +10,7 @@ fragment SharedLayout_Query on Query { } __typename } + paymentsEnabled ssoLoginEnabled supportedLanguages __typename diff --git a/@app/graphql/.persisted_operations/77885919f782dbb117e2759c4918f2445a633ed0a98d08fd5d1ab699ebce9391.graphql b/@app/graphql/.persisted_operations/65cab80d460e10b8d5697dab7f7e162afaaf67c76caa83a6bd0eab8761c800b6.graphql similarity index 98% rename from @app/graphql/.persisted_operations/77885919f782dbb117e2759c4918f2445a633ed0a98d08fd5d1ab699ebce9391.graphql rename to @app/graphql/.persisted_operations/65cab80d460e10b8d5697dab7f7e162afaaf67c76caa83a6bd0eab8761c800b6.graphql index 888aba7cc..85637695d 100644 --- a/@app/graphql/.persisted_operations/77885919f782dbb117e2759c4918f2445a633ed0a98d08fd5d1ab699ebce9391.graphql +++ b/@app/graphql/.persisted_operations/65cab80d460e10b8d5697dab7f7e162afaaf67c76caa83a6bd0eab8761c800b6.graphql @@ -21,6 +21,7 @@ fragment SharedLayout_Query on Query { } __typename } + paymentsEnabled ssoLoginEnabled supportedLanguages __typename diff --git a/@app/graphql/.persisted_operations/c80a1b7e4a79510cd8e544910e72dec734223574011e0a40bb00c78de8de310c.graphql b/@app/graphql/.persisted_operations/7409ffafc3214107fea8f4bf103d34bdc11511ef9acac82182ce07ad926134d3.graphql similarity index 99% rename from @app/graphql/.persisted_operations/c80a1b7e4a79510cd8e544910e72dec734223574011e0a40bb00c78de8de310c.graphql rename to @app/graphql/.persisted_operations/7409ffafc3214107fea8f4bf103d34bdc11511ef9acac82182ce07ad926134d3.graphql index 4f5141897..84f4741eb 100644 --- a/@app/graphql/.persisted_operations/c80a1b7e4a79510cd8e544910e72dec734223574011e0a40bb00c78de8de310c.graphql +++ b/@app/graphql/.persisted_operations/7409ffafc3214107fea8f4bf103d34bdc11511ef9acac82182ce07ad926134d3.graphql @@ -22,6 +22,7 @@ fragment SharedLayout_Query on Query { } __typename } + paymentsEnabled ssoLoginEnabled supportedLanguages __typename diff --git a/@app/graphql/.persisted_operations/994c6d2a2d085b6452233787ccd1502e270b193029b1793369e0d7503ef999b5.graphql b/@app/graphql/.persisted_operations/cd7edaad090c74e09867b045fac6c64324494ed678ca6c7d7d5cab822d5a754d.graphql similarity index 98% rename from @app/graphql/.persisted_operations/994c6d2a2d085b6452233787ccd1502e270b193029b1793369e0d7503ef999b5.graphql rename to @app/graphql/.persisted_operations/cd7edaad090c74e09867b045fac6c64324494ed678ca6c7d7d5cab822d5a754d.graphql index 57d6ae688..341a72653 100644 --- a/@app/graphql/.persisted_operations/994c6d2a2d085b6452233787ccd1502e270b193029b1793369e0d7503ef999b5.graphql +++ b/@app/graphql/.persisted_operations/cd7edaad090c74e09867b045fac6c64324494ed678ca6c7d7d5cab822d5a754d.graphql @@ -19,6 +19,7 @@ fragment SharedLayout_Query on Query { } __typename } + paymentsEnabled ssoLoginEnabled supportedLanguages __typename diff --git a/@app/graphql/.persisted_operations/f03f38c3d71fd696ef382a99987cf83cc85f699074616d593fbd4216e7de1a2f.graphql b/@app/graphql/.persisted_operations/dc4e6cc97a9f85d7864670ab0bb8e065cc500963d011c0a9420d3114e7695287.graphql similarity index 98% rename from @app/graphql/.persisted_operations/f03f38c3d71fd696ef382a99987cf83cc85f699074616d593fbd4216e7de1a2f.graphql rename to @app/graphql/.persisted_operations/dc4e6cc97a9f85d7864670ab0bb8e065cc500963d011c0a9420d3114e7695287.graphql index 3be1106e6..8419b5a42 100644 --- a/@app/graphql/.persisted_operations/f03f38c3d71fd696ef382a99987cf83cc85f699074616d593fbd4216e7de1a2f.graphql +++ b/@app/graphql/.persisted_operations/dc4e6cc97a9f85d7864670ab0bb8e065cc500963d011c0a9420d3114e7695287.graphql @@ -21,6 +21,7 @@ fragment SharedLayout_Query on Query { } __typename } + paymentsEnabled ssoLoginEnabled supportedLanguages __typename diff --git a/@app/graphql/.persisted_operations/7e487496b03e301f627d86bce4edd2273740b18548ad91c12bd6575aaff34ad7.graphql b/@app/graphql/.persisted_operations/f8a8bf398770887fbfe0f7c66bc55e6c87d92d3a8d3a43bbbfed47c331a27f65.graphql similarity index 99% rename from @app/graphql/.persisted_operations/7e487496b03e301f627d86bce4edd2273740b18548ad91c12bd6575aaff34ad7.graphql rename to @app/graphql/.persisted_operations/f8a8bf398770887fbfe0f7c66bc55e6c87d92d3a8d3a43bbbfed47c331a27f65.graphql index 273307430..de0281821 100644 --- a/@app/graphql/.persisted_operations/7e487496b03e301f627d86bce4edd2273740b18548ad91c12bd6575aaff34ad7.graphql +++ b/@app/graphql/.persisted_operations/f8a8bf398770887fbfe0f7c66bc55e6c87d92d3a8d3a43bbbfed47c331a27f65.graphql @@ -25,6 +25,7 @@ fragment SharedLayout_Query on Query { } __typename } + paymentsEnabled ssoLoginEnabled supportedLanguages __typename diff --git a/@app/graphql/client.json b/@app/graphql/client.json index c68ae7607..e4fe5237d 100644 --- a/@app/graphql/client.json +++ b/@app/graphql/client.json @@ -4,19 +4,19 @@ "CreateEventCategory": "9fb202fac8b6c91ad9ba74ce246cfc3164f66cc3e11d940048bf289fcb0f7450", "DeleteEventCategory": "f555d3fc31063758bc496e6fca37600cb6734d08aa6a8f9337f1073636a1bb8d", "ListEventCategories": "9cc733e3ca754e0697c58ff9e697d6605cfc53c15fe7946849dbef75c677d808", - "UpdateEventCategoryPage": "994c6d2a2d085b6452233787ccd1502e270b193029b1793369e0d7503ef999b5", + "UpdateEventCategoryPage": "cd7edaad090c74e09867b045fac6c64324494ed678ca6c7d7d5cab822d5a754d", "UpdateEventCategory": "940f0de83cc5a7fbcd2d8e2d1774a59556f759b117c0b6d8e5ce8c5584907eae", "AdminListEvents": "ee0afc787cdba3845d8fe784c6585e07c101573c699914e3803ed9c17fb8360b", - "CreateEventPage": "77885919f782dbb117e2759c4918f2445a633ed0a98d08fd5d1ab699ebce9391", + "CreateEventPage": "65cab80d460e10b8d5697dab7f7e162afaaf67c76caa83a6bd0eab8761c800b6", "CreateEvent": "98965cb2bb84e54d0e0d6ba48046a829fc42776ce6b7b9eeae134dcae7036044", "DeleteEvent": "75c86da8b31d18d79c4dcab26bacfffb860b4c7933568ca830731c793f815338", - "ListEventsPage": "f03f38c3d71fd696ef382a99987cf83cc85f699074616d593fbd4216e7de1a2f", + "ListEventsPage": "dc4e6cc97a9f85d7864670ab0bb8e065cc500963d011c0a9420d3114e7695287", "TranslateText": "2fd1ef03df33a4dacf0b46162521f2bec22b99971807fb81a205aa5d36a0e59c", - "UpdateEventPage": "7e487496b03e301f627d86bce4edd2273740b18548ad91c12bd6575aaff34ad7", + "UpdateEventPage": "f8a8bf398770887fbfe0f7c66bc55e6c87d92d3a8d3a43bbbfed47c331a27f65", "UpdateEvent": "063ffe79e5b7bcf7d58cc1b0742a2526dfd993ebd5550a37cc5d326b8fd35d00", "InviteToOrganization": "c639d16546c2d6c7133350ef65627885f7e11a1e33ec9ae099d0bb4a9b9af331", "OrganizationBySlug": "7d4e6fe382bf3e0467c9372406e18fd1e63b6aa3f1aea2530a66c60cdfa3da2d", - "OrganizationPage": "e75fddfae08b7bdc7571c0cd3426cdda51dc0b336d6a428c214da7d7f2752708", + "OrganizationPage": "5057d31502468d016f47f72c5c56c1912feb586c09160fcaeaeaebad4ffe0e8d", "RemoveFromOrganization": "234a33748153a85850a5e8cd76126a46c10f300f3e3deee0b1e8b832aa66948d", "TransferOrganizationOwnership": "949e86df3cd114d207d517c292df1fc19b09e8ce9609c4ae243b61f002959bd7", "UpdateOrganization": "565716f69ef0f845afbba0bb8ff6b0b2c67e10926db9646ac20350588b4c0dc1", @@ -29,18 +29,18 @@ "EventPage": "1583d624d064d3c3b0fc46fd55d971815a7a669d38c8f20fe06b2049fe048744", "EventRegistrations": "c22efb8e3e3226153a7be53c61321e72c94f3cbc667ca769cc056b4fee27678c", "HomePageEvents": "368543083e66d7a6ae5e78654849ec0d94283752aece92394005e027bf3e429c", - "HomePage": "301da0928db49b18b443128fd731b8815df9fd05a090c4f6e648837bc2436754", + "HomePage": "41104ed3b765a23562598393ac16235b172c0343efb94a3e151c9d2c45c58560", "CurrentTime": "f836d34508a8ee8ab07ca87bb086fe03dbddcf1fa40ffe912ef6143a843db460", - "Shared": "eb985e5bfabc266d0fc5637eda513cac8a293bc851b29e863dbf304c4932f7f1", + "Shared": "4c5867b217506620352bf459db01308c5f45101b754905c58537dda0e3330af5", "AcceptOrganizationInvite": "29b135f119928bfc6de24b8aa6ec513ed62cb3cadf95eec1da607a3c760df7e9", "CreateOrganization": "61c018fcf82eca2de4bf2fe5ca833cbf1586808421b10428aa99ba75b028cc6c", "DeleteOrganization": "39f623b7dd9b3111922c0937f5985ef32d8de76b88898b043daaf53dc20877b2", - "InvitationDetail": "3d3ae0471e11f29477713606f9d884cb6d2a031b1a8bed9e220bec4c5e54337f", + "InvitationDetail": "601c9f68c8010cef2a103f77bfed4ea4baae23893840c7cb0dd12a0d852ede1c", "ClaimRegistrationToken": "c3c63bf12e25e4025a986f94781d706f7adb2261e91689d356069378faec2c4a", - "CreateEventRegistrationPage": "c80a1b7e4a79510cd8e544910e72dec734223574011e0a40bb00c78de8de310c", + "CreateEventRegistrationPage": "7409ffafc3214107fea8f4bf103d34bdc11511ef9acac82182ce07ad926134d3", "CreateEventRegistration": "e97c6726ce1d78c512935a15f46e8315e8ab2e50b2776d4fa1c92a5e8a54c566", "DeleteEventRegistration": "be0f72e306dcf5e22dbaa962b5228422a5a0bd12dc68d688ee8b9a28b479318b", - "UpdateEventRegistrationPage": "2e4a7c74a71603bcec3debb7b11c003a481d28d6b25b130694e38f2760fcf7e9", + "UpdateEventRegistrationPage": "21842ecc4434e4a36d31b5a59415565e5e3b13bc05f5b5141b91be4dc52991f9", "UpdateEventRegistration": "a073a90b247942ecbca6dd214aa1b2dcbe42ab30618e881c8a8d90b1c5097739", "AddEmail": "da27b66ae2e115cc90ba53748aaadae32ba97b016e2783550fe847089f7423c2", "ChangePassword": "2532c897bead71cb8b9171c240298a47c4b6b13197886c990ccfcc937356ceab", diff --git a/@app/graphql/server.json b/@app/graphql/server.json index ae4556691..521986147 100644 --- a/@app/graphql/server.json +++ b/@app/graphql/server.json @@ -4,19 +4,19 @@ "9fb202fac8b6c91ad9ba74ce246cfc3164f66cc3e11d940048bf289fcb0f7450": "fragment EventPage_EventCategory on EventCategory {\n id\n description\n name\n color\n ownerOrganization {\n ...EventPage_Organization\n __typename\n }\n updatedAt\n __typename\n}\nfragment EventPage_Organization on Organization {\n id\n name\n slug\n color\n __typename\n}\nmutation CreateEventCategory($input: CreateEventCategoryInput!) {\n createEventCategory(input: $input) {\n eventCategory {\n ...EventPage_EventCategory\n __typename\n }\n __typename\n }\n}", "f555d3fc31063758bc496e6fca37600cb6734d08aa6a8f9337f1073636a1bb8d": "mutation DeleteEventCategory($id: UUID!) {\n deleteEventCategory(input: {id: $id}) {\n clientMutationId\n __typename\n }\n}", "9cc733e3ca754e0697c58ff9e697d6605cfc53c15fe7946849dbef75c677d808": "fragment ListEventCategories_Query on Query {\n eventCategories(first: $first, offset: $offset) {\n nodes {\n id\n ...ListEventCategories\n __typename\n }\n totalCount\n __typename\n }\n __typename\n}\nfragment ListEventCategories on EventCategory {\n ...EventPage_EventCategory\n __typename\n}\nfragment EventPage_EventCategory on EventCategory {\n id\n description\n name\n color\n ownerOrganization {\n ...EventPage_Organization\n __typename\n }\n updatedAt\n __typename\n}\nfragment EventPage_Organization on Organization {\n id\n name\n slug\n color\n __typename\n}\nquery ListEventCategories($offset: Int!, $first: Int!) {\n ...ListEventCategories_Query\n}", - "994c6d2a2d085b6452233787ccd1502e270b193029b1793369e0d7503ef999b5": "fragment UpdateEventCategoryPage_Query on Query {\n ...SharedLayout_Query\n eventCategory(id: $id) {\n id\n ...EventPage_EventCategory\n __typename\n }\n __typename\n}\nfragment SharedLayout_Query on Query {\n currentUser {\n ...SharedLayout_User\n __typename\n }\n organizations(orderBy: SLUG_ASC) {\n nodes {\n ...SharedLayout_Organization\n __typename\n }\n __typename\n }\n ssoLoginEnabled\n supportedLanguages\n __typename\n}\nfragment SharedLayout_User on User {\n id\n name\n username\n avatarUrl\n isAdmin\n isVerified\n primaryEmail\n userEmails(first: 50) {\n nodes {\n ...SharedLayout_UserEmail\n __typename\n }\n __typename\n }\n organizationMemberships(first: 20) {\n totalCount\n nodes {\n id\n isOwner\n organization {\n id\n name\n slug\n __typename\n }\n __typename\n }\n __typename\n }\n __typename\n}\nfragment SharedLayout_UserEmail on UserEmail {\n id\n email\n isVerified\n isPrimary\n createdAt\n __typename\n}\nfragment SharedLayout_Organization on Organization {\n id\n name\n slug\n __typename\n}\nfragment EventPage_EventCategory on EventCategory {\n id\n description\n name\n color\n ownerOrganization {\n ...EventPage_Organization\n __typename\n }\n updatedAt\n __typename\n}\nfragment EventPage_Organization on Organization {\n id\n name\n slug\n color\n __typename\n}\nquery UpdateEventCategoryPage($id: UUID!) {\n ...UpdateEventCategoryPage_Query\n}", + "cd7edaad090c74e09867b045fac6c64324494ed678ca6c7d7d5cab822d5a754d": "fragment UpdateEventCategoryPage_Query on Query {\n ...SharedLayout_Query\n eventCategory(id: $id) {\n id\n ...EventPage_EventCategory\n __typename\n }\n __typename\n}\nfragment SharedLayout_Query on Query {\n currentUser {\n ...SharedLayout_User\n __typename\n }\n organizations(orderBy: SLUG_ASC) {\n nodes {\n ...SharedLayout_Organization\n __typename\n }\n __typename\n }\n paymentsEnabled\n ssoLoginEnabled\n supportedLanguages\n __typename\n}\nfragment SharedLayout_User on User {\n id\n name\n username\n avatarUrl\n isAdmin\n isVerified\n primaryEmail\n userEmails(first: 50) {\n nodes {\n ...SharedLayout_UserEmail\n __typename\n }\n __typename\n }\n organizationMemberships(first: 20) {\n totalCount\n nodes {\n id\n isOwner\n organization {\n id\n name\n slug\n __typename\n }\n __typename\n }\n __typename\n }\n __typename\n}\nfragment SharedLayout_UserEmail on UserEmail {\n id\n email\n isVerified\n isPrimary\n createdAt\n __typename\n}\nfragment SharedLayout_Organization on Organization {\n id\n name\n slug\n __typename\n}\nfragment EventPage_EventCategory on EventCategory {\n id\n description\n name\n color\n ownerOrganization {\n ...EventPage_Organization\n __typename\n }\n updatedAt\n __typename\n}\nfragment EventPage_Organization on Organization {\n id\n name\n slug\n color\n __typename\n}\nquery UpdateEventCategoryPage($id: UUID!) {\n ...UpdateEventCategoryPage_Query\n}", "940f0de83cc5a7fbcd2d8e2d1774a59556f759b117c0b6d8e5ce8c5584907eae": "fragment EventPage_EventCategory on EventCategory {\n id\n description\n name\n color\n ownerOrganization {\n ...EventPage_Organization\n __typename\n }\n updatedAt\n __typename\n}\nfragment EventPage_Organization on Organization {\n id\n name\n slug\n color\n __typename\n}\nmutation UpdateEventCategory($input: UpdateEventCategoryInput!) {\n updateEventCategory(input: $input) {\n eventCategory {\n ...EventPage_EventCategory\n __typename\n }\n __typename\n }\n}", "ee0afc787cdba3845d8fe784c6585e07c101573c699914e3803ed9c17fb8360b": "fragment AdminListEvents_Query on Query {\n events(first: $first, offset: $offset, filter: $filter, orderBy: $orderBy) {\n nodes {\n ...AdminListEvents_Event\n __typename\n }\n totalCount\n __typename\n }\n __typename\n}\nfragment AdminListEvents_Event on Event {\n id\n name\n slug\n isDraft\n isHighlighted\n registrationStartTime\n eventStartTime\n category {\n id\n name\n color\n __typename\n }\n quotas(orderBy: POSITION_ASC) {\n nodes {\n id\n title\n size\n registrations {\n totalCount\n __typename\n }\n __typename\n }\n __typename\n }\n registrations {\n totalCount\n __typename\n }\n __typename\n}\nquery AdminListEvents($offset: Int!, $first: Int!, $filter: EventFilter, $orderBy: [EventsOrderBy!]) {\n ...AdminListEvents_Query\n}", - "77885919f782dbb117e2759c4918f2445a633ed0a98d08fd5d1ab699ebce9391": "fragment CreateEventPage_Query on Query {\n ...SharedLayout_Query\n eventCategories(orderBy: NAME_ASC) {\n nodes {\n ...EventPage_EventCategory\n __typename\n }\n __typename\n }\n __typename\n}\nfragment SharedLayout_Query on Query {\n currentUser {\n ...SharedLayout_User\n __typename\n }\n organizations(orderBy: SLUG_ASC) {\n nodes {\n ...SharedLayout_Organization\n __typename\n }\n __typename\n }\n ssoLoginEnabled\n supportedLanguages\n __typename\n}\nfragment SharedLayout_User on User {\n id\n name\n username\n avatarUrl\n isAdmin\n isVerified\n primaryEmail\n userEmails(first: 50) {\n nodes {\n ...SharedLayout_UserEmail\n __typename\n }\n __typename\n }\n organizationMemberships(first: 20) {\n totalCount\n nodes {\n id\n isOwner\n organization {\n id\n name\n slug\n __typename\n }\n __typename\n }\n __typename\n }\n __typename\n}\nfragment SharedLayout_UserEmail on UserEmail {\n id\n email\n isVerified\n isPrimary\n createdAt\n __typename\n}\nfragment SharedLayout_Organization on Organization {\n id\n name\n slug\n __typename\n}\nfragment EventPage_EventCategory on EventCategory {\n id\n description\n name\n color\n ownerOrganization {\n ...EventPage_Organization\n __typename\n }\n updatedAt\n __typename\n}\nfragment EventPage_Organization on Organization {\n id\n name\n slug\n color\n __typename\n}\nquery CreateEventPage {\n ...CreateEventPage_Query\n}", + "65cab80d460e10b8d5697dab7f7e162afaaf67c76caa83a6bd0eab8761c800b6": "fragment CreateEventPage_Query on Query {\n ...SharedLayout_Query\n eventCategories(orderBy: NAME_ASC) {\n nodes {\n ...EventPage_EventCategory\n __typename\n }\n __typename\n }\n __typename\n}\nfragment SharedLayout_Query on Query {\n currentUser {\n ...SharedLayout_User\n __typename\n }\n organizations(orderBy: SLUG_ASC) {\n nodes {\n ...SharedLayout_Organization\n __typename\n }\n __typename\n }\n paymentsEnabled\n ssoLoginEnabled\n supportedLanguages\n __typename\n}\nfragment SharedLayout_User on User {\n id\n name\n username\n avatarUrl\n isAdmin\n isVerified\n primaryEmail\n userEmails(first: 50) {\n nodes {\n ...SharedLayout_UserEmail\n __typename\n }\n __typename\n }\n organizationMemberships(first: 20) {\n totalCount\n nodes {\n id\n isOwner\n organization {\n id\n name\n slug\n __typename\n }\n __typename\n }\n __typename\n }\n __typename\n}\nfragment SharedLayout_UserEmail on UserEmail {\n id\n email\n isVerified\n isPrimary\n createdAt\n __typename\n}\nfragment SharedLayout_Organization on Organization {\n id\n name\n slug\n __typename\n}\nfragment EventPage_EventCategory on EventCategory {\n id\n description\n name\n color\n ownerOrganization {\n ...EventPage_Organization\n __typename\n }\n updatedAt\n __typename\n}\nfragment EventPage_Organization on Organization {\n id\n name\n slug\n color\n __typename\n}\nquery CreateEventPage {\n ...CreateEventPage_Query\n}", "98965cb2bb84e54d0e0d6ba48046a829fc42776ce6b7b9eeae134dcae7036044": "fragment EventFields on Event {\n id\n name\n slug\n description\n location\n eventStartTime\n eventEndTime\n registrationStartTime\n registrationEndTime\n isHighlighted\n isDraft\n headerImageFile\n openQuotaSize\n signupOpen\n signupUpcoming\n signupClosed\n createdBy\n updatedBy\n createdAt\n updatedAt\n __typename\n}\nmutation CreateEvent($input: CreateEventInput!) {\n createEvent(input: $input) {\n event {\n ...EventFields\n __typename\n }\n __typename\n }\n}", "75c86da8b31d18d79c4dcab26bacfffb860b4c7933568ca830731c793f815338": "mutation DeleteEvent($id: UUID!) {\n deleteEvent(input: {id: $id}) {\n clientMutationId\n __typename\n }\n}", - "f03f38c3d71fd696ef382a99987cf83cc85f699074616d593fbd4216e7de1a2f": "fragment ListEventsPage_Query on Query {\n ...SharedLayout_Query\n eventCategories {\n nodes {\n ...EventPage_EventCategory\n __typename\n }\n __typename\n }\n __typename\n}\nfragment SharedLayout_Query on Query {\n currentUser {\n ...SharedLayout_User\n __typename\n }\n organizations(orderBy: SLUG_ASC) {\n nodes {\n ...SharedLayout_Organization\n __typename\n }\n __typename\n }\n ssoLoginEnabled\n supportedLanguages\n __typename\n}\nfragment SharedLayout_User on User {\n id\n name\n username\n avatarUrl\n isAdmin\n isVerified\n primaryEmail\n userEmails(first: 50) {\n nodes {\n ...SharedLayout_UserEmail\n __typename\n }\n __typename\n }\n organizationMemberships(first: 20) {\n totalCount\n nodes {\n id\n isOwner\n organization {\n id\n name\n slug\n __typename\n }\n __typename\n }\n __typename\n }\n __typename\n}\nfragment SharedLayout_UserEmail on UserEmail {\n id\n email\n isVerified\n isPrimary\n createdAt\n __typename\n}\nfragment SharedLayout_Organization on Organization {\n id\n name\n slug\n __typename\n}\nfragment EventPage_EventCategory on EventCategory {\n id\n description\n name\n color\n ownerOrganization {\n ...EventPage_Organization\n __typename\n }\n updatedAt\n __typename\n}\nfragment EventPage_Organization on Organization {\n id\n name\n slug\n color\n __typename\n}\nquery ListEventsPage {\n ...ListEventsPage_Query\n}", + "dc4e6cc97a9f85d7864670ab0bb8e065cc500963d011c0a9420d3114e7695287": "fragment ListEventsPage_Query on Query {\n ...SharedLayout_Query\n eventCategories {\n nodes {\n ...EventPage_EventCategory\n __typename\n }\n __typename\n }\n __typename\n}\nfragment SharedLayout_Query on Query {\n currentUser {\n ...SharedLayout_User\n __typename\n }\n organizations(orderBy: SLUG_ASC) {\n nodes {\n ...SharedLayout_Organization\n __typename\n }\n __typename\n }\n paymentsEnabled\n ssoLoginEnabled\n supportedLanguages\n __typename\n}\nfragment SharedLayout_User on User {\n id\n name\n username\n avatarUrl\n isAdmin\n isVerified\n primaryEmail\n userEmails(first: 50) {\n nodes {\n ...SharedLayout_UserEmail\n __typename\n }\n __typename\n }\n organizationMemberships(first: 20) {\n totalCount\n nodes {\n id\n isOwner\n organization {\n id\n name\n slug\n __typename\n }\n __typename\n }\n __typename\n }\n __typename\n}\nfragment SharedLayout_UserEmail on UserEmail {\n id\n email\n isVerified\n isPrimary\n createdAt\n __typename\n}\nfragment SharedLayout_Organization on Organization {\n id\n name\n slug\n __typename\n}\nfragment EventPage_EventCategory on EventCategory {\n id\n description\n name\n color\n ownerOrganization {\n ...EventPage_Organization\n __typename\n }\n updatedAt\n __typename\n}\nfragment EventPage_Organization on Organization {\n id\n name\n slug\n color\n __typename\n}\nquery ListEventsPage {\n ...ListEventsPage_Query\n}", "2fd1ef03df33a4dacf0b46162521f2bec22b99971807fb81a205aa5d36a0e59c": "mutation TranslateText($from: SupportedLanguages!, $to: SupportedLanguages!, $text: String!) {\n translateText(fromLanguage: $from, toLanguage: $to, text: $text) {\n originalText\n translatedText\n __typename\n }\n}", - "7e487496b03e301f627d86bce4edd2273740b18548ad91c12bd6575aaff34ad7": "fragment UpdateEventPage_Query on Query {\n ...SharedLayout_Query\n event(id: $id) {\n ...UpdateEventPage_Event\n __typename\n }\n eventCategories(orderBy: NAME_ASC) {\n nodes {\n ...EventPage_EventCategory\n __typename\n }\n __typename\n }\n __typename\n}\nfragment SharedLayout_Query on Query {\n currentUser {\n ...SharedLayout_User\n __typename\n }\n organizations(orderBy: SLUG_ASC) {\n nodes {\n ...SharedLayout_Organization\n __typename\n }\n __typename\n }\n ssoLoginEnabled\n supportedLanguages\n __typename\n}\nfragment SharedLayout_User on User {\n id\n name\n username\n avatarUrl\n isAdmin\n isVerified\n primaryEmail\n userEmails(first: 50) {\n nodes {\n ...SharedLayout_UserEmail\n __typename\n }\n __typename\n }\n organizationMemberships(first: 20) {\n totalCount\n nodes {\n id\n isOwner\n organization {\n id\n name\n slug\n __typename\n }\n __typename\n }\n __typename\n }\n __typename\n}\nfragment SharedLayout_UserEmail on UserEmail {\n id\n email\n isVerified\n isPrimary\n createdAt\n __typename\n}\nfragment SharedLayout_Organization on Organization {\n id\n name\n slug\n __typename\n}\nfragment UpdateEventPage_Event on Event {\n ...EventFields\n category {\n ...EventPage_EventCategory\n __typename\n }\n ownerOrganization {\n ...EventPage_Organization\n __typename\n }\n quotas(orderBy: POSITION_ASC) {\n nodes {\n ...EventPage_Quota\n registrations {\n totalCount\n __typename\n }\n __typename\n }\n __typename\n }\n eventQuestions(orderBy: POSITION_ASC) {\n nodes {\n ...EventPage_Question\n __typename\n }\n __typename\n }\n __typename\n}\nfragment EventFields on Event {\n id\n name\n slug\n description\n location\n eventStartTime\n eventEndTime\n registrationStartTime\n registrationEndTime\n isHighlighted\n isDraft\n headerImageFile\n openQuotaSize\n signupOpen\n signupUpcoming\n signupClosed\n createdBy\n updatedBy\n createdAt\n updatedAt\n __typename\n}\nfragment EventPage_EventCategory on EventCategory {\n id\n description\n name\n color\n ownerOrganization {\n ...EventPage_Organization\n __typename\n }\n updatedAt\n __typename\n}\nfragment EventPage_Organization on Organization {\n id\n name\n slug\n color\n __typename\n}\nfragment EventPage_Quota on Quota {\n id\n position\n title\n size\n __typename\n}\nfragment EventPage_Question on EventQuestion {\n id\n position\n type\n label\n isRequired\n data\n __typename\n}\nquery UpdateEventPage($id: UUID!) {\n ...UpdateEventPage_Query\n}", + "f8a8bf398770887fbfe0f7c66bc55e6c87d92d3a8d3a43bbbfed47c331a27f65": "fragment UpdateEventPage_Query on Query {\n ...SharedLayout_Query\n event(id: $id) {\n ...UpdateEventPage_Event\n __typename\n }\n eventCategories(orderBy: NAME_ASC) {\n nodes {\n ...EventPage_EventCategory\n __typename\n }\n __typename\n }\n __typename\n}\nfragment SharedLayout_Query on Query {\n currentUser {\n ...SharedLayout_User\n __typename\n }\n organizations(orderBy: SLUG_ASC) {\n nodes {\n ...SharedLayout_Organization\n __typename\n }\n __typename\n }\n paymentsEnabled\n ssoLoginEnabled\n supportedLanguages\n __typename\n}\nfragment SharedLayout_User on User {\n id\n name\n username\n avatarUrl\n isAdmin\n isVerified\n primaryEmail\n userEmails(first: 50) {\n nodes {\n ...SharedLayout_UserEmail\n __typename\n }\n __typename\n }\n organizationMemberships(first: 20) {\n totalCount\n nodes {\n id\n isOwner\n organization {\n id\n name\n slug\n __typename\n }\n __typename\n }\n __typename\n }\n __typename\n}\nfragment SharedLayout_UserEmail on UserEmail {\n id\n email\n isVerified\n isPrimary\n createdAt\n __typename\n}\nfragment SharedLayout_Organization on Organization {\n id\n name\n slug\n __typename\n}\nfragment UpdateEventPage_Event on Event {\n ...EventFields\n category {\n ...EventPage_EventCategory\n __typename\n }\n ownerOrganization {\n ...EventPage_Organization\n __typename\n }\n quotas(orderBy: POSITION_ASC) {\n nodes {\n ...EventPage_Quota\n registrations {\n totalCount\n __typename\n }\n __typename\n }\n __typename\n }\n eventQuestions(orderBy: POSITION_ASC) {\n nodes {\n ...EventPage_Question\n __typename\n }\n __typename\n }\n __typename\n}\nfragment EventFields on Event {\n id\n name\n slug\n description\n location\n eventStartTime\n eventEndTime\n registrationStartTime\n registrationEndTime\n isHighlighted\n isDraft\n headerImageFile\n openQuotaSize\n signupOpen\n signupUpcoming\n signupClosed\n createdBy\n updatedBy\n createdAt\n updatedAt\n __typename\n}\nfragment EventPage_EventCategory on EventCategory {\n id\n description\n name\n color\n ownerOrganization {\n ...EventPage_Organization\n __typename\n }\n updatedAt\n __typename\n}\nfragment EventPage_Organization on Organization {\n id\n name\n slug\n color\n __typename\n}\nfragment EventPage_Quota on Quota {\n id\n position\n title\n size\n __typename\n}\nfragment EventPage_Question on EventQuestion {\n id\n position\n type\n label\n isRequired\n data\n __typename\n}\nquery UpdateEventPage($id: UUID!) {\n ...UpdateEventPage_Query\n}", "063ffe79e5b7bcf7d58cc1b0742a2526dfd993ebd5550a37cc5d326b8fd35d00": "fragment EventFields on Event {\n id\n name\n slug\n description\n location\n eventStartTime\n eventEndTime\n registrationStartTime\n registrationEndTime\n isHighlighted\n isDraft\n headerImageFile\n openQuotaSize\n signupOpen\n signupUpcoming\n signupClosed\n createdBy\n updatedBy\n createdAt\n updatedAt\n __typename\n}\nmutation UpdateEvent($input: UpdateEventInput!) {\n updateEvent(input: $input) {\n event {\n ...EventFields\n __typename\n }\n __typename\n }\n}", "c639d16546c2d6c7133350ef65627885f7e11a1e33ec9ae099d0bb4a9b9af331": "mutation InviteToOrganization($organizationId: UUID!, $email: String, $username: String) {\n inviteToOrganization(\n input: {organizationId: $organizationId, email: $email, username: $username}\n ) {\n clientMutationId\n __typename\n }\n}", "7d4e6fe382bf3e0467c9372406e18fd1e63b6aa3f1aea2530a66c60cdfa3da2d": "query OrganizationBySlug($slug: String!) {\n organizationBySlug(slug: $slug) {\n id\n name\n slug\n __typename\n }\n}", - "e75fddfae08b7bdc7571c0cd3426cdda51dc0b336d6a428c214da7d7f2752708": "fragment OrganizationPage_Query on Query {\n ...SharedLayout_Query\n organizationBySlug(slug: $slug) {\n ...OrganizationPage_Organization\n __typename\n }\n __typename\n}\nfragment SharedLayout_Query on Query {\n currentUser {\n ...SharedLayout_User\n __typename\n }\n organizations(orderBy: SLUG_ASC) {\n nodes {\n ...SharedLayout_Organization\n __typename\n }\n __typename\n }\n ssoLoginEnabled\n supportedLanguages\n __typename\n}\nfragment SharedLayout_User on User {\n id\n name\n username\n avatarUrl\n isAdmin\n isVerified\n primaryEmail\n userEmails(first: 50) {\n nodes {\n ...SharedLayout_UserEmail\n __typename\n }\n __typename\n }\n organizationMemberships(first: 20) {\n totalCount\n nodes {\n id\n isOwner\n organization {\n id\n name\n slug\n __typename\n }\n __typename\n }\n __typename\n }\n __typename\n}\nfragment SharedLayout_UserEmail on UserEmail {\n id\n email\n isVerified\n isPrimary\n createdAt\n __typename\n}\nfragment SharedLayout_Organization on Organization {\n id\n name\n slug\n __typename\n}\nfragment OrganizationPage_Organization on Organization {\n ...EventPage_Organization\n currentUserIsOwner\n organizationMemberships(first: 10, offset: $offset, orderBy: [MEMBER_NAME_ASC]) {\n nodes {\n ...OrganizationPage_Membership\n __typename\n }\n totalCount\n __typename\n }\n __typename\n}\nfragment EventPage_Organization on Organization {\n id\n name\n slug\n color\n __typename\n}\nfragment OrganizationPage_Membership on OrganizationMembership {\n id\n createdAt\n isOwner\n user {\n id\n username\n name\n __typename\n }\n __typename\n}\nquery OrganizationPage($slug: String!, $offset: Int = 0) {\n ...OrganizationPage_Query\n}", + "5057d31502468d016f47f72c5c56c1912feb586c09160fcaeaeaebad4ffe0e8d": "fragment OrganizationPage_Query on Query {\n ...SharedLayout_Query\n organizationBySlug(slug: $slug) {\n ...OrganizationPage_Organization\n __typename\n }\n __typename\n}\nfragment SharedLayout_Query on Query {\n currentUser {\n ...SharedLayout_User\n __typename\n }\n organizations(orderBy: SLUG_ASC) {\n nodes {\n ...SharedLayout_Organization\n __typename\n }\n __typename\n }\n paymentsEnabled\n ssoLoginEnabled\n supportedLanguages\n __typename\n}\nfragment SharedLayout_User on User {\n id\n name\n username\n avatarUrl\n isAdmin\n isVerified\n primaryEmail\n userEmails(first: 50) {\n nodes {\n ...SharedLayout_UserEmail\n __typename\n }\n __typename\n }\n organizationMemberships(first: 20) {\n totalCount\n nodes {\n id\n isOwner\n organization {\n id\n name\n slug\n __typename\n }\n __typename\n }\n __typename\n }\n __typename\n}\nfragment SharedLayout_UserEmail on UserEmail {\n id\n email\n isVerified\n isPrimary\n createdAt\n __typename\n}\nfragment SharedLayout_Organization on Organization {\n id\n name\n slug\n __typename\n}\nfragment OrganizationPage_Organization on Organization {\n ...EventPage_Organization\n currentUserIsOwner\n organizationMemberships(first: 10, offset: $offset, orderBy: [MEMBER_NAME_ASC]) {\n nodes {\n ...OrganizationPage_Membership\n __typename\n }\n totalCount\n __typename\n }\n __typename\n}\nfragment EventPage_Organization on Organization {\n id\n name\n slug\n color\n __typename\n}\nfragment OrganizationPage_Membership on OrganizationMembership {\n id\n createdAt\n isOwner\n user {\n id\n username\n name\n __typename\n }\n __typename\n}\nquery OrganizationPage($slug: String!, $offset: Int = 0) {\n ...OrganizationPage_Query\n}", "234a33748153a85850a5e8cd76126a46c10f300f3e3deee0b1e8b832aa66948d": "mutation RemoveFromOrganization($organizationId: UUID!, $userId: UUID!) {\n removeFromOrganization(\n input: {organizationId: $organizationId, userId: $userId}\n ) {\n clientMutationId\n __typename\n }\n}", "949e86df3cd114d207d517c292df1fc19b09e8ce9609c4ae243b61f002959bd7": "mutation TransferOrganizationOwnership($organizationId: UUID!, $userId: UUID!) {\n transferOrganizationOwnership(\n input: {organizationId: $organizationId, userId: $userId}\n ) {\n organization {\n id\n currentUserIsOwner\n __typename\n }\n __typename\n }\n}", "565716f69ef0f845afbba0bb8ff6b0b2c67e10926db9646ac20350588b4c0dc1": "fragment EventPage_Organization on Organization {\n id\n name\n slug\n color\n __typename\n}\nmutation UpdateOrganization($input: UpdateOrganizationInput!) {\n updateOrganization(input: $input) {\n organization {\n ...EventPage_Organization\n __typename\n }\n __typename\n }\n}", @@ -29,18 +29,18 @@ "1583d624d064d3c3b0fc46fd55d971815a7a669d38c8f20fe06b2049fe048744": "fragment EventPage_Subscription on Subscription {\n currentUser {\n ...SharedLayout_User\n __typename\n }\n eventBySlug(slug: $slug) {\n ...EventPage_Event\n __typename\n }\n __typename\n}\nfragment SharedLayout_User on User {\n id\n name\n username\n avatarUrl\n isAdmin\n isVerified\n primaryEmail\n userEmails(first: 50) {\n nodes {\n ...SharedLayout_UserEmail\n __typename\n }\n __typename\n }\n organizationMemberships(first: 20) {\n totalCount\n nodes {\n id\n isOwner\n organization {\n id\n name\n slug\n __typename\n }\n __typename\n }\n __typename\n }\n __typename\n}\nfragment SharedLayout_UserEmail on UserEmail {\n id\n email\n isVerified\n isPrimary\n createdAt\n __typename\n}\nfragment EventPage_Event on Event {\n ...EventFields\n category {\n ...EventPage_EventCategory\n __typename\n }\n ownerOrganization {\n ...EventPage_Organization\n __typename\n }\n quotas(orderBy: POSITION_ASC) {\n nodes {\n ...EventPage_Quota\n __typename\n }\n __typename\n }\n registrations(orderBy: POSITION_ASC) {\n nodes {\n ...EventPage_Registration\n __typename\n }\n __typename\n }\n eventQuestions(orderBy: POSITION_ASC) {\n nodes {\n ...EventPage_Question\n __typename\n }\n __typename\n }\n __typename\n}\nfragment EventFields on Event {\n id\n name\n slug\n description\n location\n eventStartTime\n eventEndTime\n registrationStartTime\n registrationEndTime\n isHighlighted\n isDraft\n headerImageFile\n openQuotaSize\n signupOpen\n signupUpcoming\n signupClosed\n createdBy\n updatedBy\n createdAt\n updatedAt\n __typename\n}\nfragment EventPage_EventCategory on EventCategory {\n id\n description\n name\n color\n ownerOrganization {\n ...EventPage_Organization\n __typename\n }\n updatedAt\n __typename\n}\nfragment EventPage_Organization on Organization {\n id\n name\n slug\n color\n __typename\n}\nfragment EventPage_Quota on Quota {\n id\n position\n title\n size\n __typename\n}\nfragment EventPage_Registration on Registration {\n id\n fullName\n status\n position\n createdAt\n quota {\n ...EventPage_Quota\n __typename\n }\n __typename\n}\nfragment EventPage_Question on EventQuestion {\n id\n position\n type\n label\n isRequired\n data\n __typename\n}\nsubscription EventPage($slug: String!) {\n ...EventPage_Subscription\n}", "c22efb8e3e3226153a7be53c61321e72c94f3cbc667ca769cc056b4fee27678c": "fragment EventPage_Registration on Registration {\n id\n fullName\n status\n position\n createdAt\n quota {\n ...EventPage_Quota\n __typename\n }\n __typename\n}\nfragment EventPage_Quota on Quota {\n id\n position\n title\n size\n __typename\n}\nsubscription EventRegistrations($eventId: UUID!, $after: Datetime!) {\n eventRegistrations(eventId: $eventId) {\n registrations(after: $after) {\n ...EventPage_Registration\n quota {\n ...EventPage_Quota\n __typename\n }\n __typename\n }\n __typename\n }\n}", "368543083e66d7a6ae5e78654849ec0d94283752aece92394005e027bf3e429c": "fragment HomePageClosedEvents_Query on Query {\n signupClosedEvents: events(\n first: $first\n offset: $offset\n filter: {signupClosed: {equalTo: true}, name: {containsKey: $language}}\n orderBy: EVENT_END_TIME_DESC\n ) {\n nodes {\n ...HomePage_Event\n __typename\n }\n totalCount\n __typename\n }\n __typename\n}\nfragment HomePage_Event on Event {\n ...EventFields\n ownerOrganization {\n ...EventPage_Organization\n __typename\n }\n category {\n ...EventPage_EventCategory\n __typename\n }\n quotas(orderBy: POSITION_ASC) {\n nodes {\n ...EventPage_Quota\n registrations {\n totalCount\n __typename\n }\n __typename\n }\n __typename\n }\n registrations {\n totalCount\n __typename\n }\n __typename\n}\nfragment EventFields on Event {\n id\n name\n slug\n description\n location\n eventStartTime\n eventEndTime\n registrationStartTime\n registrationEndTime\n isHighlighted\n isDraft\n headerImageFile\n openQuotaSize\n signupOpen\n signupUpcoming\n signupClosed\n createdBy\n updatedBy\n createdAt\n updatedAt\n __typename\n}\nfragment EventPage_Organization on Organization {\n id\n name\n slug\n color\n __typename\n}\nfragment EventPage_EventCategory on EventCategory {\n id\n description\n name\n color\n ownerOrganization {\n ...EventPage_Organization\n __typename\n }\n updatedAt\n __typename\n}\nfragment EventPage_Quota on Quota {\n id\n position\n title\n size\n __typename\n}\nquery HomePageEvents($offset: Int, $first: Int, $language: String) {\n ...HomePageClosedEvents_Query\n}", - "301da0928db49b18b443128fd731b8815df9fd05a090c4f6e648837bc2436754": "fragment HomePage_Query on Query {\n ...SharedLayout_Query\n signupOpenEvents: events(\n filter: {signupOpen: {equalTo: true}, isDraft: {equalTo: false}, name: {containsKey: $language}}\n orderBy: [IS_HIGHLIGHTED_DESC, REGISTRATION_END_TIME_ASC]\n ) {\n nodes {\n ...HomePage_Event\n __typename\n }\n __typename\n }\n signupUpcomingEvents: events(\n filter: {signupUpcoming: {equalTo: true}, isDraft: {equalTo: false}, name: {containsKey: $language}}\n orderBy: [IS_HIGHLIGHTED_DESC, REGISTRATION_END_TIME_ASC]\n ) {\n nodes {\n ...HomePage_Event\n __typename\n }\n __typename\n }\n eventCategories {\n nodes {\n ...EventPage_EventCategory\n __typename\n }\n __typename\n }\n __typename\n}\nfragment SharedLayout_Query on Query {\n currentUser {\n ...SharedLayout_User\n __typename\n }\n organizations(orderBy: SLUG_ASC) {\n nodes {\n ...SharedLayout_Organization\n __typename\n }\n __typename\n }\n ssoLoginEnabled\n supportedLanguages\n __typename\n}\nfragment SharedLayout_User on User {\n id\n name\n username\n avatarUrl\n isAdmin\n isVerified\n primaryEmail\n userEmails(first: 50) {\n nodes {\n ...SharedLayout_UserEmail\n __typename\n }\n __typename\n }\n organizationMemberships(first: 20) {\n totalCount\n nodes {\n id\n isOwner\n organization {\n id\n name\n slug\n __typename\n }\n __typename\n }\n __typename\n }\n __typename\n}\nfragment SharedLayout_UserEmail on UserEmail {\n id\n email\n isVerified\n isPrimary\n createdAt\n __typename\n}\nfragment SharedLayout_Organization on Organization {\n id\n name\n slug\n __typename\n}\nfragment HomePage_Event on Event {\n ...EventFields\n ownerOrganization {\n ...EventPage_Organization\n __typename\n }\n category {\n ...EventPage_EventCategory\n __typename\n }\n quotas(orderBy: POSITION_ASC) {\n nodes {\n ...EventPage_Quota\n registrations {\n totalCount\n __typename\n }\n __typename\n }\n __typename\n }\n registrations {\n totalCount\n __typename\n }\n __typename\n}\nfragment EventFields on Event {\n id\n name\n slug\n description\n location\n eventStartTime\n eventEndTime\n registrationStartTime\n registrationEndTime\n isHighlighted\n isDraft\n headerImageFile\n openQuotaSize\n signupOpen\n signupUpcoming\n signupClosed\n createdBy\n updatedBy\n createdAt\n updatedAt\n __typename\n}\nfragment EventPage_Organization on Organization {\n id\n name\n slug\n color\n __typename\n}\nfragment EventPage_EventCategory on EventCategory {\n id\n description\n name\n color\n ownerOrganization {\n ...EventPage_Organization\n __typename\n }\n updatedAt\n __typename\n}\nfragment EventPage_Quota on Quota {\n id\n position\n title\n size\n __typename\n}\nquery HomePage($language: String!) {\n ...HomePage_Query\n}", + "41104ed3b765a23562598393ac16235b172c0343efb94a3e151c9d2c45c58560": "fragment HomePage_Query on Query {\n ...SharedLayout_Query\n signupOpenEvents: events(\n filter: {signupOpen: {equalTo: true}, isDraft: {equalTo: false}, name: {containsKey: $language}}\n orderBy: [IS_HIGHLIGHTED_DESC, REGISTRATION_END_TIME_ASC]\n ) {\n nodes {\n ...HomePage_Event\n __typename\n }\n __typename\n }\n signupUpcomingEvents: events(\n filter: {signupUpcoming: {equalTo: true}, isDraft: {equalTo: false}, name: {containsKey: $language}}\n orderBy: [IS_HIGHLIGHTED_DESC, REGISTRATION_END_TIME_ASC]\n ) {\n nodes {\n ...HomePage_Event\n __typename\n }\n __typename\n }\n eventCategories {\n nodes {\n ...EventPage_EventCategory\n __typename\n }\n __typename\n }\n __typename\n}\nfragment SharedLayout_Query on Query {\n currentUser {\n ...SharedLayout_User\n __typename\n }\n organizations(orderBy: SLUG_ASC) {\n nodes {\n ...SharedLayout_Organization\n __typename\n }\n __typename\n }\n paymentsEnabled\n ssoLoginEnabled\n supportedLanguages\n __typename\n}\nfragment SharedLayout_User on User {\n id\n name\n username\n avatarUrl\n isAdmin\n isVerified\n primaryEmail\n userEmails(first: 50) {\n nodes {\n ...SharedLayout_UserEmail\n __typename\n }\n __typename\n }\n organizationMemberships(first: 20) {\n totalCount\n nodes {\n id\n isOwner\n organization {\n id\n name\n slug\n __typename\n }\n __typename\n }\n __typename\n }\n __typename\n}\nfragment SharedLayout_UserEmail on UserEmail {\n id\n email\n isVerified\n isPrimary\n createdAt\n __typename\n}\nfragment SharedLayout_Organization on Organization {\n id\n name\n slug\n __typename\n}\nfragment HomePage_Event on Event {\n ...EventFields\n ownerOrganization {\n ...EventPage_Organization\n __typename\n }\n category {\n ...EventPage_EventCategory\n __typename\n }\n quotas(orderBy: POSITION_ASC) {\n nodes {\n ...EventPage_Quota\n registrations {\n totalCount\n __typename\n }\n __typename\n }\n __typename\n }\n registrations {\n totalCount\n __typename\n }\n __typename\n}\nfragment EventFields on Event {\n id\n name\n slug\n description\n location\n eventStartTime\n eventEndTime\n registrationStartTime\n registrationEndTime\n isHighlighted\n isDraft\n headerImageFile\n openQuotaSize\n signupOpen\n signupUpcoming\n signupClosed\n createdBy\n updatedBy\n createdAt\n updatedAt\n __typename\n}\nfragment EventPage_Organization on Organization {\n id\n name\n slug\n color\n __typename\n}\nfragment EventPage_EventCategory on EventCategory {\n id\n description\n name\n color\n ownerOrganization {\n ...EventPage_Organization\n __typename\n }\n updatedAt\n __typename\n}\nfragment EventPage_Quota on Quota {\n id\n position\n title\n size\n __typename\n}\nquery HomePage($language: String!) {\n ...HomePage_Query\n}", "f836d34508a8ee8ab07ca87bb086fe03dbddcf1fa40ffe912ef6143a843db460": "subscription CurrentTime {\n currentTime\n}", - "eb985e5bfabc266d0fc5637eda513cac8a293bc851b29e863dbf304c4932f7f1": "fragment SharedLayout_Query on Query {\n currentUser {\n ...SharedLayout_User\n __typename\n }\n organizations(orderBy: SLUG_ASC) {\n nodes {\n ...SharedLayout_Organization\n __typename\n }\n __typename\n }\n ssoLoginEnabled\n supportedLanguages\n __typename\n}\nfragment SharedLayout_User on User {\n id\n name\n username\n avatarUrl\n isAdmin\n isVerified\n primaryEmail\n userEmails(first: 50) {\n nodes {\n ...SharedLayout_UserEmail\n __typename\n }\n __typename\n }\n organizationMemberships(first: 20) {\n totalCount\n nodes {\n id\n isOwner\n organization {\n id\n name\n slug\n __typename\n }\n __typename\n }\n __typename\n }\n __typename\n}\nfragment SharedLayout_UserEmail on UserEmail {\n id\n email\n isVerified\n isPrimary\n createdAt\n __typename\n}\nfragment SharedLayout_Organization on Organization {\n id\n name\n slug\n __typename\n}\nquery Shared {\n ...SharedLayout_Query\n}", + "4c5867b217506620352bf459db01308c5f45101b754905c58537dda0e3330af5": "fragment SharedLayout_Query on Query {\n currentUser {\n ...SharedLayout_User\n __typename\n }\n organizations(orderBy: SLUG_ASC) {\n nodes {\n ...SharedLayout_Organization\n __typename\n }\n __typename\n }\n paymentsEnabled\n ssoLoginEnabled\n supportedLanguages\n __typename\n}\nfragment SharedLayout_User on User {\n id\n name\n username\n avatarUrl\n isAdmin\n isVerified\n primaryEmail\n userEmails(first: 50) {\n nodes {\n ...SharedLayout_UserEmail\n __typename\n }\n __typename\n }\n organizationMemberships(first: 20) {\n totalCount\n nodes {\n id\n isOwner\n organization {\n id\n name\n slug\n __typename\n }\n __typename\n }\n __typename\n }\n __typename\n}\nfragment SharedLayout_UserEmail on UserEmail {\n id\n email\n isVerified\n isPrimary\n createdAt\n __typename\n}\nfragment SharedLayout_Organization on Organization {\n id\n name\n slug\n __typename\n}\nquery Shared {\n ...SharedLayout_Query\n}", "29b135f119928bfc6de24b8aa6ec513ed62cb3cadf95eec1da607a3c760df7e9": "mutation AcceptOrganizationInvite($id: UUID!, $code: String) {\n acceptInvitationToOrganization(input: {invitationId: $id, code: $code}) {\n clientMutationId\n __typename\n }\n}", "61c018fcf82eca2de4bf2fe5ca833cbf1586808421b10428aa99ba75b028cc6c": "fragment EventPage_Organization on Organization {\n id\n name\n slug\n color\n __typename\n}\nmutation CreateOrganization($name: String!, $slug: String!, $color: String!) {\n createOrganization(input: {name: $name, slug: $slug, color: $color}) {\n organization {\n ...EventPage_Organization\n __typename\n }\n query {\n organizationBySlug(slug: $slug) {\n ...EventPage_Organization\n __typename\n }\n __typename\n }\n __typename\n }\n}", "39f623b7dd9b3111922c0937f5985ef32d8de76b88898b043daaf53dc20877b2": "mutation DeleteOrganization($organizationId: UUID!) {\n deleteOrganization(input: {organizationId: $organizationId}) {\n clientMutationId\n __typename\n }\n}", - "3d3ae0471e11f29477713606f9d884cb6d2a031b1a8bed9e220bec4c5e54337f": "fragment SharedLayout_Query on Query {\n currentUser {\n ...SharedLayout_User\n __typename\n }\n organizations(orderBy: SLUG_ASC) {\n nodes {\n ...SharedLayout_Organization\n __typename\n }\n __typename\n }\n ssoLoginEnabled\n supportedLanguages\n __typename\n}\nfragment SharedLayout_User on User {\n id\n name\n username\n avatarUrl\n isAdmin\n isVerified\n primaryEmail\n userEmails(first: 50) {\n nodes {\n ...SharedLayout_UserEmail\n __typename\n }\n __typename\n }\n organizationMemberships(first: 20) {\n totalCount\n nodes {\n id\n isOwner\n organization {\n id\n name\n slug\n __typename\n }\n __typename\n }\n __typename\n }\n __typename\n}\nfragment SharedLayout_UserEmail on UserEmail {\n id\n email\n isVerified\n isPrimary\n createdAt\n __typename\n}\nfragment SharedLayout_Organization on Organization {\n id\n name\n slug\n __typename\n}\nquery InvitationDetail($id: UUID!, $code: String) {\n ...SharedLayout_Query\n organizationForInvitation(invitationId: $id, code: $code) {\n id\n name\n slug\n __typename\n }\n}", + "601c9f68c8010cef2a103f77bfed4ea4baae23893840c7cb0dd12a0d852ede1c": "fragment SharedLayout_Query on Query {\n currentUser {\n ...SharedLayout_User\n __typename\n }\n organizations(orderBy: SLUG_ASC) {\n nodes {\n ...SharedLayout_Organization\n __typename\n }\n __typename\n }\n paymentsEnabled\n ssoLoginEnabled\n supportedLanguages\n __typename\n}\nfragment SharedLayout_User on User {\n id\n name\n username\n avatarUrl\n isAdmin\n isVerified\n primaryEmail\n userEmails(first: 50) {\n nodes {\n ...SharedLayout_UserEmail\n __typename\n }\n __typename\n }\n organizationMemberships(first: 20) {\n totalCount\n nodes {\n id\n isOwner\n organization {\n id\n name\n slug\n __typename\n }\n __typename\n }\n __typename\n }\n __typename\n}\nfragment SharedLayout_UserEmail on UserEmail {\n id\n email\n isVerified\n isPrimary\n createdAt\n __typename\n}\nfragment SharedLayout_Organization on Organization {\n id\n name\n slug\n __typename\n}\nquery InvitationDetail($id: UUID!, $code: String) {\n ...SharedLayout_Query\n organizationForInvitation(invitationId: $id, code: $code) {\n id\n name\n slug\n __typename\n }\n}", "c3c63bf12e25e4025a986f94781d706f7adb2261e91689d356069378faec2c4a": "mutation ClaimRegistrationToken($input: ClaimRegistrationTokenInput!) {\n claimRegistrationToken(input: $input) {\n claimRegistrationTokenOutput {\n registrationToken\n updateToken\n __typename\n }\n __typename\n }\n}", - "c80a1b7e4a79510cd8e544910e72dec734223574011e0a40bb00c78de8de310c": "fragment CreateEventRegistrationPage_Query on Query {\n ...SharedLayout_Query\n eventBySlug(slug: $slug) {\n ...EventPage_Event\n __typename\n }\n quota(id: $quotaId) {\n ...EventPage_Quota\n __typename\n }\n __typename\n}\nfragment SharedLayout_Query on Query {\n currentUser {\n ...SharedLayout_User\n __typename\n }\n organizations(orderBy: SLUG_ASC) {\n nodes {\n ...SharedLayout_Organization\n __typename\n }\n __typename\n }\n ssoLoginEnabled\n supportedLanguages\n __typename\n}\nfragment SharedLayout_User on User {\n id\n name\n username\n avatarUrl\n isAdmin\n isVerified\n primaryEmail\n userEmails(first: 50) {\n nodes {\n ...SharedLayout_UserEmail\n __typename\n }\n __typename\n }\n organizationMemberships(first: 20) {\n totalCount\n nodes {\n id\n isOwner\n organization {\n id\n name\n slug\n __typename\n }\n __typename\n }\n __typename\n }\n __typename\n}\nfragment SharedLayout_UserEmail on UserEmail {\n id\n email\n isVerified\n isPrimary\n createdAt\n __typename\n}\nfragment SharedLayout_Organization on Organization {\n id\n name\n slug\n __typename\n}\nfragment EventPage_Event on Event {\n ...EventFields\n category {\n ...EventPage_EventCategory\n __typename\n }\n ownerOrganization {\n ...EventPage_Organization\n __typename\n }\n quotas(orderBy: POSITION_ASC) {\n nodes {\n ...EventPage_Quota\n __typename\n }\n __typename\n }\n registrations(orderBy: POSITION_ASC) {\n nodes {\n ...EventPage_Registration\n __typename\n }\n __typename\n }\n eventQuestions(orderBy: POSITION_ASC) {\n nodes {\n ...EventPage_Question\n __typename\n }\n __typename\n }\n __typename\n}\nfragment EventFields on Event {\n id\n name\n slug\n description\n location\n eventStartTime\n eventEndTime\n registrationStartTime\n registrationEndTime\n isHighlighted\n isDraft\n headerImageFile\n openQuotaSize\n signupOpen\n signupUpcoming\n signupClosed\n createdBy\n updatedBy\n createdAt\n updatedAt\n __typename\n}\nfragment EventPage_EventCategory on EventCategory {\n id\n description\n name\n color\n ownerOrganization {\n ...EventPage_Organization\n __typename\n }\n updatedAt\n __typename\n}\nfragment EventPage_Organization on Organization {\n id\n name\n slug\n color\n __typename\n}\nfragment EventPage_Quota on Quota {\n id\n position\n title\n size\n __typename\n}\nfragment EventPage_Registration on Registration {\n id\n fullName\n status\n position\n createdAt\n quota {\n ...EventPage_Quota\n __typename\n }\n __typename\n}\nfragment EventPage_Question on EventQuestion {\n id\n position\n type\n label\n isRequired\n data\n __typename\n}\nquery CreateEventRegistrationPage($slug: String!, $quotaId: UUID!) {\n ...CreateEventRegistrationPage_Query\n}", + "7409ffafc3214107fea8f4bf103d34bdc11511ef9acac82182ce07ad926134d3": "fragment CreateEventRegistrationPage_Query on Query {\n ...SharedLayout_Query\n eventBySlug(slug: $slug) {\n ...EventPage_Event\n __typename\n }\n quota(id: $quotaId) {\n ...EventPage_Quota\n __typename\n }\n __typename\n}\nfragment SharedLayout_Query on Query {\n currentUser {\n ...SharedLayout_User\n __typename\n }\n organizations(orderBy: SLUG_ASC) {\n nodes {\n ...SharedLayout_Organization\n __typename\n }\n __typename\n }\n paymentsEnabled\n ssoLoginEnabled\n supportedLanguages\n __typename\n}\nfragment SharedLayout_User on User {\n id\n name\n username\n avatarUrl\n isAdmin\n isVerified\n primaryEmail\n userEmails(first: 50) {\n nodes {\n ...SharedLayout_UserEmail\n __typename\n }\n __typename\n }\n organizationMemberships(first: 20) {\n totalCount\n nodes {\n id\n isOwner\n organization {\n id\n name\n slug\n __typename\n }\n __typename\n }\n __typename\n }\n __typename\n}\nfragment SharedLayout_UserEmail on UserEmail {\n id\n email\n isVerified\n isPrimary\n createdAt\n __typename\n}\nfragment SharedLayout_Organization on Organization {\n id\n name\n slug\n __typename\n}\nfragment EventPage_Event on Event {\n ...EventFields\n category {\n ...EventPage_EventCategory\n __typename\n }\n ownerOrganization {\n ...EventPage_Organization\n __typename\n }\n quotas(orderBy: POSITION_ASC) {\n nodes {\n ...EventPage_Quota\n __typename\n }\n __typename\n }\n registrations(orderBy: POSITION_ASC) {\n nodes {\n ...EventPage_Registration\n __typename\n }\n __typename\n }\n eventQuestions(orderBy: POSITION_ASC) {\n nodes {\n ...EventPage_Question\n __typename\n }\n __typename\n }\n __typename\n}\nfragment EventFields on Event {\n id\n name\n slug\n description\n location\n eventStartTime\n eventEndTime\n registrationStartTime\n registrationEndTime\n isHighlighted\n isDraft\n headerImageFile\n openQuotaSize\n signupOpen\n signupUpcoming\n signupClosed\n createdBy\n updatedBy\n createdAt\n updatedAt\n __typename\n}\nfragment EventPage_EventCategory on EventCategory {\n id\n description\n name\n color\n ownerOrganization {\n ...EventPage_Organization\n __typename\n }\n updatedAt\n __typename\n}\nfragment EventPage_Organization on Organization {\n id\n name\n slug\n color\n __typename\n}\nfragment EventPage_Quota on Quota {\n id\n position\n title\n size\n __typename\n}\nfragment EventPage_Registration on Registration {\n id\n fullName\n status\n position\n createdAt\n quota {\n ...EventPage_Quota\n __typename\n }\n __typename\n}\nfragment EventPage_Question on EventQuestion {\n id\n position\n type\n label\n isRequired\n data\n __typename\n}\nquery CreateEventRegistrationPage($slug: String!, $quotaId: UUID!) {\n ...CreateEventRegistrationPage_Query\n}", "e97c6726ce1d78c512935a15f46e8315e8ab2e50b2776d4fa1c92a5e8a54c566": "fragment EventPage_Registration on Registration {\n id\n fullName\n status\n position\n createdAt\n quota {\n ...EventPage_Quota\n __typename\n }\n __typename\n}\nfragment EventPage_Quota on Quota {\n id\n position\n title\n size\n __typename\n}\nmutation CreateEventRegistration($input: CreateRegistrationInput!) {\n createRegistration(input: $input) {\n registration {\n ...EventPage_Registration\n quota {\n ...EventPage_Quota\n __typename\n }\n event {\n id\n slug\n __typename\n }\n __typename\n }\n __typename\n }\n}", "be0f72e306dcf5e22dbaa962b5228422a5a0bd12dc68d688ee8b9a28b479318b": "mutation DeleteEventRegistration($updateToken: String!) {\n deleteRegistration(input: {updateToken: $updateToken}) {\n success\n __typename\n }\n}", - "2e4a7c74a71603bcec3debb7b11c003a481d28d6b25b130694e38f2760fcf7e9": "fragment UpdateEventRegistrationPage_Query on Query {\n ...SharedLayout_Query\n registrationByUpdateToken(updateToken: $updateToken) {\n ...UpdateEventRegistrationPage_Registration\n quota {\n ...EventPage_Quota\n __typename\n }\n event {\n ...EventPage_Event\n __typename\n }\n __typename\n }\n __typename\n}\nfragment SharedLayout_Query on Query {\n currentUser {\n ...SharedLayout_User\n __typename\n }\n organizations(orderBy: SLUG_ASC) {\n nodes {\n ...SharedLayout_Organization\n __typename\n }\n __typename\n }\n ssoLoginEnabled\n supportedLanguages\n __typename\n}\nfragment SharedLayout_User on User {\n id\n name\n username\n avatarUrl\n isAdmin\n isVerified\n primaryEmail\n userEmails(first: 50) {\n nodes {\n ...SharedLayout_UserEmail\n __typename\n }\n __typename\n }\n organizationMemberships(first: 20) {\n totalCount\n nodes {\n id\n isOwner\n organization {\n id\n name\n slug\n __typename\n }\n __typename\n }\n __typename\n }\n __typename\n}\nfragment SharedLayout_UserEmail on UserEmail {\n id\n email\n isVerified\n isPrimary\n createdAt\n __typename\n}\nfragment SharedLayout_Organization on Organization {\n id\n name\n slug\n __typename\n}\nfragment UpdateEventRegistrationPage_Registration on Registration {\n id\n firstName\n lastName\n answers\n __typename\n}\nfragment EventPage_Quota on Quota {\n id\n position\n title\n size\n __typename\n}\nfragment EventPage_Event on Event {\n ...EventFields\n category {\n ...EventPage_EventCategory\n __typename\n }\n ownerOrganization {\n ...EventPage_Organization\n __typename\n }\n quotas(orderBy: POSITION_ASC) {\n nodes {\n ...EventPage_Quota\n __typename\n }\n __typename\n }\n registrations(orderBy: POSITION_ASC) {\n nodes {\n ...EventPage_Registration\n __typename\n }\n __typename\n }\n eventQuestions(orderBy: POSITION_ASC) {\n nodes {\n ...EventPage_Question\n __typename\n }\n __typename\n }\n __typename\n}\nfragment EventFields on Event {\n id\n name\n slug\n description\n location\n eventStartTime\n eventEndTime\n registrationStartTime\n registrationEndTime\n isHighlighted\n isDraft\n headerImageFile\n openQuotaSize\n signupOpen\n signupUpcoming\n signupClosed\n createdBy\n updatedBy\n createdAt\n updatedAt\n __typename\n}\nfragment EventPage_EventCategory on EventCategory {\n id\n description\n name\n color\n ownerOrganization {\n ...EventPage_Organization\n __typename\n }\n updatedAt\n __typename\n}\nfragment EventPage_Organization on Organization {\n id\n name\n slug\n color\n __typename\n}\nfragment EventPage_Registration on Registration {\n id\n fullName\n status\n position\n createdAt\n quota {\n ...EventPage_Quota\n __typename\n }\n __typename\n}\nfragment EventPage_Question on EventQuestion {\n id\n position\n type\n label\n isRequired\n data\n __typename\n}\nquery UpdateEventRegistrationPage($updateToken: String!) {\n ...UpdateEventRegistrationPage_Query\n}", + "21842ecc4434e4a36d31b5a59415565e5e3b13bc05f5b5141b91be4dc52991f9": "fragment UpdateEventRegistrationPage_Query on Query {\n ...SharedLayout_Query\n registrationByUpdateToken(updateToken: $updateToken) {\n ...UpdateEventRegistrationPage_Registration\n quota {\n ...EventPage_Quota\n __typename\n }\n event {\n ...EventPage_Event\n __typename\n }\n __typename\n }\n __typename\n}\nfragment SharedLayout_Query on Query {\n currentUser {\n ...SharedLayout_User\n __typename\n }\n organizations(orderBy: SLUG_ASC) {\n nodes {\n ...SharedLayout_Organization\n __typename\n }\n __typename\n }\n paymentsEnabled\n ssoLoginEnabled\n supportedLanguages\n __typename\n}\nfragment SharedLayout_User on User {\n id\n name\n username\n avatarUrl\n isAdmin\n isVerified\n primaryEmail\n userEmails(first: 50) {\n nodes {\n ...SharedLayout_UserEmail\n __typename\n }\n __typename\n }\n organizationMemberships(first: 20) {\n totalCount\n nodes {\n id\n isOwner\n organization {\n id\n name\n slug\n __typename\n }\n __typename\n }\n __typename\n }\n __typename\n}\nfragment SharedLayout_UserEmail on UserEmail {\n id\n email\n isVerified\n isPrimary\n createdAt\n __typename\n}\nfragment SharedLayout_Organization on Organization {\n id\n name\n slug\n __typename\n}\nfragment UpdateEventRegistrationPage_Registration on Registration {\n id\n firstName\n lastName\n answers\n __typename\n}\nfragment EventPage_Quota on Quota {\n id\n position\n title\n size\n __typename\n}\nfragment EventPage_Event on Event {\n ...EventFields\n category {\n ...EventPage_EventCategory\n __typename\n }\n ownerOrganization {\n ...EventPage_Organization\n __typename\n }\n quotas(orderBy: POSITION_ASC) {\n nodes {\n ...EventPage_Quota\n __typename\n }\n __typename\n }\n registrations(orderBy: POSITION_ASC) {\n nodes {\n ...EventPage_Registration\n __typename\n }\n __typename\n }\n eventQuestions(orderBy: POSITION_ASC) {\n nodes {\n ...EventPage_Question\n __typename\n }\n __typename\n }\n __typename\n}\nfragment EventFields on Event {\n id\n name\n slug\n description\n location\n eventStartTime\n eventEndTime\n registrationStartTime\n registrationEndTime\n isHighlighted\n isDraft\n headerImageFile\n openQuotaSize\n signupOpen\n signupUpcoming\n signupClosed\n createdBy\n updatedBy\n createdAt\n updatedAt\n __typename\n}\nfragment EventPage_EventCategory on EventCategory {\n id\n description\n name\n color\n ownerOrganization {\n ...EventPage_Organization\n __typename\n }\n updatedAt\n __typename\n}\nfragment EventPage_Organization on Organization {\n id\n name\n slug\n color\n __typename\n}\nfragment EventPage_Registration on Registration {\n id\n fullName\n status\n position\n createdAt\n quota {\n ...EventPage_Quota\n __typename\n }\n __typename\n}\nfragment EventPage_Question on EventQuestion {\n id\n position\n type\n label\n isRequired\n data\n __typename\n}\nquery UpdateEventRegistrationPage($updateToken: String!) {\n ...UpdateEventRegistrationPage_Query\n}", "a073a90b247942ecbca6dd214aa1b2dcbe42ab30618e881c8a8d90b1c5097739": "fragment EventPage_Registration on Registration {\n id\n fullName\n status\n position\n createdAt\n quota {\n ...EventPage_Quota\n __typename\n }\n __typename\n}\nfragment EventPage_Quota on Quota {\n id\n position\n title\n size\n __typename\n}\nmutation UpdateEventRegistration($input: UpdateRegistrationInput!) {\n updateRegistration(input: $input) {\n registration {\n ...EventPage_Registration\n firstName\n lastName\n answers\n updatedAt\n __typename\n }\n __typename\n }\n}", "da27b66ae2e115cc90ba53748aaadae32ba97b016e2783550fe847089f7423c2": "fragment EmailsForm_UserEmail on UserEmail {\n id\n email\n isVerified\n isPrimary\n createdAt\n __typename\n}\nmutation AddEmail($email: Email!) {\n createUserEmail(input: {userEmail: {email: $email}}) {\n user {\n id\n userEmails(first: 50) {\n nodes {\n ...EmailsForm_UserEmail\n __typename\n }\n __typename\n }\n __typename\n }\n __typename\n }\n}", "2532c897bead71cb8b9171c240298a47c4b6b13197886c990ccfcc937356ceab": "mutation ChangePassword($oldPassword: String!, $newPassword: String!) {\n changePassword(input: {oldPassword: $oldPassword, newPassword: $newPassword}) {\n success\n __typename\n }\n}", diff --git a/@app/server/__tests__/queries/paymentsEnabled.test.ts b/@app/server/__tests__/queries/paymentsEnabled.test.ts new file mode 100644 index 000000000..3ba7212b7 --- /dev/null +++ b/@app/server/__tests__/queries/paymentsEnabled.test.ts @@ -0,0 +1,66 @@ +import { deleteTestData, runGraphQLQuery, setup, teardown } from "../helpers" + +beforeEach(deleteTestData) +beforeAll(setup) +afterAll(teardown) + +const PAYMENTS_ENV_KEYS = [ + "PAYMENTS_ENABLED", + "STRIPE_SECRET_KEY", + "STRIPE_WEBHOOK_SECRET", +] as const +const savedEnv: Record = {} + +beforeEach(() => { + for (const key of PAYMENTS_ENV_KEYS) { + savedEnv[key] = process.env[key] + } +}) + +afterEach(() => { + for (const key of PAYMENTS_ENV_KEYS) { + if (savedEnv[key] === undefined) { + delete process.env[key] + } else { + process.env[key] = savedEnv[key] + } + } +}) + +async function expectPaymentsEnabled(expected: boolean) { + // No snapshot: the result deliberately flips with the environment. + await runGraphQLQuery( + `{ paymentsEnabled }`, + {}, + {}, + async (json) => { + expect(json.errors).toBeFalsy() + expect(json.data!.paymentsEnabled).toBe(expected) + }, + true, + false + ) +} + +// Every page reads this through SharedLayout to decide whether to show any +// payment UI at all, so it has to follow the server's actual configuration. +test("paymentsEnabled tracks the PAYMENTS_ENABLED / STRIPE_* environment", async () => { + process.env.PAYMENTS_ENABLED = "1" + process.env.STRIPE_SECRET_KEY = "sk_test_123" + process.env.STRIPE_WEBHOOK_SECRET = "whsec_123" + await expectPaymentsEnabled(true) + + delete process.env.STRIPE_WEBHOOK_SECRET + await expectPaymentsEnabled(false) + + process.env.STRIPE_WEBHOOK_SECRET = "whsec_123" + process.env.PAYMENTS_ENABLED = "0" + await expectPaymentsEnabled(false) +}) + +test("paymentsEnabled is false when nothing is configured", async () => { + for (const key of PAYMENTS_ENV_KEYS) { + delete process.env[key] + } + await expectPaymentsEnabled(false) +}) diff --git a/@app/server/__tests__/utils/stripe.test.ts b/@app/server/__tests__/utils/stripe.test.ts new file mode 100644 index 000000000..5a00e722d --- /dev/null +++ b/@app/server/__tests__/utils/stripe.test.ts @@ -0,0 +1,67 @@ +import Stripe from "stripe" + +import { getStripe, resetStripeClient } from "../../src/utils/stripe" + +jest.mock("stripe", () => ({ + __esModule: true, + default: jest.fn().mockImplementation((key: string) => ({ key })), +})) + +const StripeMock = Stripe as unknown as jest.Mock + +const KEYS = [ + "PAYMENTS_ENABLED", + "STRIPE_SECRET_KEY", + "STRIPE_WEBHOOK_SECRET", +] as const +const saved: Record = {} + +beforeEach(() => { + StripeMock.mockClear() + resetStripeClient() + for (const key of KEYS) { + saved[key] = process.env[key] + delete process.env[key] + } +}) + +afterEach(() => { + for (const key of KEYS) { + if (saved[key] === undefined) delete process.env[key] + else process.env[key] = saved[key] + } + resetStripeClient() +}) + +function enable() { + process.env.PAYMENTS_ENABLED = "1" + process.env.STRIPE_SECRET_KEY = "sk_test_123" + process.env.STRIPE_WEBHOOK_SECRET = "whsec_123" +} + +describe("getStripe", () => { + it("throws while payments are disabled and never builds a client", () => { + expect(() => getStripe()).toThrow(/payments are disabled/) + process.env.STRIPE_SECRET_KEY = "sk_test_123" + process.env.STRIPE_WEBHOOK_SECRET = "whsec_123" + expect(() => getStripe()).toThrow(/payments are disabled/) + expect(StripeMock).not.toHaveBeenCalled() + }) + + it("lazily builds one client from STRIPE_SECRET_KEY", () => { + enable() + expect(StripeMock).not.toHaveBeenCalled() + const first = getStripe() + const second = getStripe() + expect(first).toBe(second) + expect(StripeMock).toHaveBeenCalledTimes(1) + expect(StripeMock.mock.calls[0][0]).toBe("sk_test_123") + }) + + it("throws again once payments are switched off", () => { + enable() + getStripe() + delete process.env.PAYMENTS_ENABLED + expect(() => getStripe()).toThrow(/payments are disabled/) + }) +}) diff --git a/@app/server/src/app.ts b/@app/server/src/app.ts index fc236c61c..6848bc933 100644 --- a/@app/server/src/app.ts +++ b/@app/server/src/app.ts @@ -11,6 +11,7 @@ import { PostGraphileResponseFastify3, } from "postgraphile" +import { paymentsEnabled } from "./utils/stripe" import * as middleware from "./middleware" import { makeShutdownActions, ShutdownAction } from "./shutdownActions" import { sanitizeEnv } from "./utils" @@ -103,6 +104,13 @@ export async function makeApp({ await app.register(middleware.installCSRFProtection) await app.register(middleware.installPassport) await app.register(middleware.installKeycloak) + if (!paymentsEnabled()) { + // The ordinary state until Stripe is configured; every payments code path + // is skipped and events behave exactly as they did before payments. + app.log.info( + "PAYMENTS_ENABLED / STRIPE_SECRET_KEY / STRIPE_WEBHOOK_SECRET not all set; payments disabled" + ) + } await app.register(middleware.installStaticUploads) if (isTest || isDev) { // Loaded dynamically so the production bundle never imports diff --git a/@app/server/src/middleware/installPostGraphile.ts b/@app/server/src/middleware/installPostGraphile.ts index 594c0213b..8e14bcfd0 100644 --- a/@app/server/src/middleware/installPostGraphile.ts +++ b/@app/server/src/middleware/installPostGraphile.ts @@ -29,6 +29,7 @@ import { OrdersPlugin, PassportLoginPlugin, PasswordStrengthPlugin, + PaymentsPlugin, PrimaryKeyMutationsOnlyPlugin, RateLimitPlugin, RemoveOwnershipInfoForeignKeyConnections, @@ -276,6 +277,9 @@ export function getPostGraphileOptions({ // Calculate password strength with zxcvbn-ts on the server side PasswordStrengthPlugin, + // Stripe payments; for now only the paymentsEnabled flag + PaymentsPlugin, + // Remove connections based on ownership information from the schema. // For example: eventCategoriesByCreatedBy, eventCategoriesByUpdatedBy etc. RemoveOwnershipInfoForeignKeyConnections, diff --git a/@app/server/src/plugins/PaymentsPlugin.ts b/@app/server/src/plugins/PaymentsPlugin.ts new file mode 100644 index 000000000..e87b93405 --- /dev/null +++ b/@app/server/src/plugins/PaymentsPlugin.ts @@ -0,0 +1,24 @@ +import { gql, makeExtendSchemaPlugin } from "graphile-utils" + +import { paymentsEnabled } from "../utils/stripe" + +const PaymentsPlugin = makeExtendSchemaPlugin(() => ({ + typeDefs: gql` + extend type Query { + """ + True when Stripe payments are configured on this server. While false, + every event behaves as if its payment mode were NONE. + """ + paymentsEnabled: Boolean! + } + `, + resolvers: { + Query: { + paymentsEnabled() { + return paymentsEnabled() + }, + }, + }, +})) + +export default PaymentsPlugin diff --git a/@app/server/src/plugins/index.ts b/@app/server/src/plugins/index.ts index 238743cb9..9bab82c18 100644 --- a/@app/server/src/plugins/index.ts +++ b/@app/server/src/plugins/index.ts @@ -3,6 +3,7 @@ import EventRegistrationPlugin from "./EventRegistrationPlugin" import OrdersPlugin from "./OrdersPlugin" import PassportLoginPlugin from "./PassportLoginPlugin" import PasswordStrengthPlugin from "./PasswordStrengthPlugin" +import PaymentsPlugin from "./PaymentsPlugin" import PrimaryKeyMutationsOnlyPlugin from "./PrimaryKeyMutationsOnlyPlugin" import RateLimitPlugin from "./RateLimitPlugin" import RemoveOwnershipInfoForeignKeyConnections from "./RemoveOwnershipInfoForeignKeyConnections" @@ -18,6 +19,7 @@ export { OrdersPlugin, PassportLoginPlugin, PasswordStrengthPlugin, + PaymentsPlugin, PrimaryKeyMutationsOnlyPlugin, RateLimitPlugin, RemoveOwnershipInfoForeignKeyConnections, diff --git a/@app/server/src/utils/stripe.ts b/@app/server/src/utils/stripe.ts new file mode 100644 index 000000000..ead544a4b --- /dev/null +++ b/@app/server/src/utils/stripe.ts @@ -0,0 +1,36 @@ +import { paymentsEnabled } from "@app/lib" +import Stripe from "stripe" + +// Server code reads the flag through here alongside the client itself. +export { paymentsEnabled } + +let client: Stripe | null = null + +/** + * The shared Stripe client, constructed on first use from + * `STRIPE_SECRET_KEY`. The API version is the one this major of the `stripe` + * package is pinned to, so upgrading the package is what moves it. + * + * Throws while payments are disabled: every caller sits behind a + * `paymentsEnabled()` check, so reaching this with the flag off is a bug, and + * failing loudly beats talking to Stripe with a half-configured server. + */ +export function getStripe(): Stripe { + if (!paymentsEnabled()) { + throw new Error( + "Stripe client requested while payments are disabled (PAYMENTS_ENABLED / STRIPE_SECRET_KEY / STRIPE_WEBHOOK_SECRET)" + ) + } + if (!client) { + client = new Stripe(process.env.STRIPE_SECRET_KEY!, { + appInfo: { name: "Ilmo", url: "https://github.com/Prodeko/ilmo" }, + maxNetworkRetries: 2, + }) + } + return client +} + +/** Forget the cached client, so tests can change the environment. */ +export function resetStripeClient(): void { + client = null +} diff --git a/data/schema.graphql b/data/schema.graphql index d973bbe26..8204ddb65 100644 --- a/data/schema.graphql +++ b/data/schema.graphql @@ -2404,6 +2404,12 @@ type Query { """The method to use when ordering `Organization`.""" orderBy: [OrganizationsOrderBy!] = [PRIMARY_KEY_ASC] ): OrganizationsConnection + + """ + True when Stripe payments are configured on this server. While false, + every event behaves as if its payment mode were NONE. + """ + paymentsEnabled: Boolean! quota(id: UUID!): Quota """Reads and enables pagination through a set of `Quota`.""" @@ -3364,6 +3370,12 @@ type Subscription { orderBy: [OrganizationsOrderBy!] = [PRIMARY_KEY_ASC] ): OrganizationsConnection + """ + True when Stripe payments are configured on this server. While false, + every event behaves as if its payment mode were NONE. (live) + """ + paymentsEnabled: Boolean! + """ (live)""" quota(id: UUID!): Quota diff --git a/scripts/_setup_utils.mjs b/scripts/_setup_utils.mjs index 9e56b4acd..30f917e17 100644 --- a/scripts/_setup_utils.mjs +++ b/scripts/_setup_utils.mjs @@ -137,6 +137,37 @@ export function updateDotenv(add, answers) { # Client secret from the Keycloak admin console:` ) + add( + "PAYMENTS_ENABLED", + null, + `\ +# Stripe payments. Leave these blank to keep payments disabled; no event +# then takes payments. Payments are on only when PAYMENTS_ENABLED=1 +# and both Stripe secrets below are set. +# +# Webhook endpoint: ${rootUrl}/api/stripe/webhook +# Events to send: checkout.session.completed, +# checkout.session.expired, charge.refunded +# +# Use test-mode keys (sk_test_...) outside production. Locally, run +# \`stripe listen --forward-to ${rootUrl}/api/stripe/webhook\` and use the +# whsec_... secret it prints.` + ) + + add( + "STRIPE_SECRET_KEY", + null, + `\ +# Stripe secret API key (sk_test_... or sk_live_...):` + ) + + add( + "STRIPE_WEBHOOK_SECRET", + null, + `\ +# Signing secret of the webhook endpoint above (whsec_...):` + ) + add( "GRAPHILE_TURBO", "1", From 26d6f6f056174d78267518f9baea6cad50f86601 Mon Sep 17 00:00:00 2001 From: Claude Date: Sat, 17 Oct 2026 08:36:27 +0000 Subject: [PATCH 011/163] Store first and last names from Keycloak and prefill registrations with them Keycloak's ID token carries the standard given_name and family_name claims, but only the combined name was kept, so the registration form had to guess where a multi-word first name ends. Store both on the user at every Keycloak login and prefill the form from them, falling back to the two-word split for accounts that have never logged in with Keycloak. Co-Authored-By: Claude Opus 5.5 (1M context) Claude-Session: https://claude.ai/code/session_0126Kq6TYvUgHFmDYaQL7hp7 --- .../CreateEventRegistrationPage_Query.graphql | 5 +++ .../event/[slug]/register/[quotaId]/index.tsx | 13 ++++--- .../functions/link_or_register_user.test.ts | 2 ++ .../functions/really_create_user.test.ts | 4 +++ .../current/4-user-first-and-last-name.sql | 17 ++++++++++ ...7be7e3469d5907beb737d136cd7a97f18.graphql} | 6 ++++ @app/graphql/client.json | 2 +- @app/graphql/server.json | 2 +- .../middleware/installKeycloak.test.ts | 34 +++++++++++++++++++ @app/server/__tests__/utils/keycloak.test.ts | 23 +++++++++++++ @app/server/src/middleware/installKeycloak.ts | 10 ++++++ @app/server/src/utils/keycloak.ts | 11 ++++++ data/schema.graphql | 12 ++++++- 13 files changed, 134 insertions(+), 7 deletions(-) create mode 100644 @app/db/migrations/current/4-user-first-and-last-name.sql rename @app/graphql/.persisted_operations/{c80a1b7e4a79510cd8e544910e72dec734223574011e0a40bb00c78de8de310c.graphql => cf379a5019fc535c126b68a4cc205cf7be7e3469d5907beb737d136cd7a97f18.graphql} (97%) diff --git a/@app/client/src/graphql/register/CreateEventRegistrationPage_Query.graphql b/@app/client/src/graphql/register/CreateEventRegistrationPage_Query.graphql index 48cfcb2aa..009299ad4 100644 --- a/@app/client/src/graphql/register/CreateEventRegistrationPage_Query.graphql +++ b/@app/client/src/graphql/register/CreateEventRegistrationPage_Query.graphql @@ -1,5 +1,10 @@ fragment CreateEventRegistrationPage_Query on Query { ...SharedLayout_Query + currentUser { + id + firstName + lastName + } eventBySlug(slug: $slug) { ...EventPage_Event } diff --git a/@app/client/src/pages/event/[slug]/register/[quotaId]/index.tsx b/@app/client/src/pages/event/[slug]/register/[quotaId]/index.tsx index c2a3fead4..62657d6bc 100644 --- a/@app/client/src/pages/event/[slug]/register/[quotaId]/index.tsx +++ b/@app/client/src/pages/event/[slug]/register/[quotaId]/index.tsx @@ -36,12 +36,17 @@ const EventRegistrationPage: NextPage = () => { const { signupClosed, signupUpcoming } = event || {} const { name, primaryEmail } = currentUser || {} - // TODO: The users table schema could be changed to include first - // and last names. Until then only prefill them when the split is - // unambiguous: with three or more words (e.g. "Anna Maria von Wright") + // Keycloak users have their first and last names stored separately. For + // other accounts only the full name is known, so only prefill it when the + // split is unambiguous: with three or more words ("Anna Maria von Wright") // there's no telling where the first name ends, so let the user fill them. const nameParts = name ? name.trim().split(/\s+/) : [] - const [firstName, lastName] = nameParts.length <= 2 ? nameParts : [] + const [firstName, lastName] = + currentUser?.firstName && currentUser?.lastName + ? [currentUser.firstName, currentUser.lastName] + : nameParts.length <= 2 + ? nameParts + : [] const formInitialValues = { firstName, diff --git a/@app/db/__tests__/app_private/functions/link_or_register_user.test.ts b/@app/db/__tests__/app_private/functions/link_or_register_user.test.ts index 77905771f..71b1c16b7 100644 --- a/@app/db/__tests__/app_private/functions/link_or_register_user.test.ts +++ b/@app/db/__tests__/app_private/functions/link_or_register_user.test.ts @@ -51,9 +51,11 @@ describe("when account doesn't already exist", () => { { "avatar_url": "http://example.com/avatar.jpg", "created_at": "[DATE]", + "first_name": null, "id": "[ID]", "is_admin": false, "is_verified": true, + "last_name": null, "name": "Webbitiimi", "updated_at": "[DATE]", "username": "webbitiimi", diff --git a/@app/db/__tests__/app_private/functions/really_create_user.test.ts b/@app/db/__tests__/app_private/functions/really_create_user.test.ts index 88d2326a7..61e40ee57 100644 --- a/@app/db/__tests__/app_private/functions/really_create_user.test.ts +++ b/@app/db/__tests__/app_private/functions/really_create_user.test.ts @@ -47,9 +47,11 @@ test("can register user with a password", () => { "avatar_url": "http://example.com", "created_at": "[DATE]", + "first_name": null, "id": "[ID]", "is_admin": false, "is_verified": false, + "last_name": null, "name": "Test One", "updated_at": "[DATE]", "username": "testuser", @@ -89,9 +91,11 @@ test("can register user with just a username and email", () => { "avatar_url": null, "created_at": "[DATE]", + "first_name": null, "id": "[ID]", "is_admin": false, "is_verified": false, + "last_name": null, "name": null, "updated_at": "[DATE]", "username": "testuser", diff --git a/@app/db/migrations/current/4-user-first-and-last-name.sql b/@app/db/migrations/current/4-user-first-and-last-name.sql new file mode 100644 index 000000000..8baacac9a --- /dev/null +++ b/@app/db/migrations/current/4-user-first-and-last-name.sql @@ -0,0 +1,17 @@ +/* + * Users only had a single `name`, so the registration form had to guess where + * the first name ends ("Anna Maria von Wright"). Keycloak already knows the + * split (the standard `given_name` and `family_name` claims), so keep it on + * the user and prefill registrations from it. The columns are written by the + * Keycloak login callback on every login (the member registry is the source + * of truth), which is why users get no update grant on them. They stay null + * for accounts that have never logged in through Keycloak. + */ + +alter table app_public.users add column if not exists first_name text; +alter table app_public.users add column if not exists last_name text; + +comment on column app_public.users.first_name is + E'The user''s first name(s), from the Keycloak `given_name` claim. Null for users that have not logged in with Keycloak.'; +comment on column app_public.users.last_name is + E'The user''s last name, from the Keycloak `family_name` claim. Null for users that have not logged in with Keycloak.'; diff --git a/@app/graphql/.persisted_operations/c80a1b7e4a79510cd8e544910e72dec734223574011e0a40bb00c78de8de310c.graphql b/@app/graphql/.persisted_operations/cf379a5019fc535c126b68a4cc205cf7be7e3469d5907beb737d136cd7a97f18.graphql similarity index 97% rename from @app/graphql/.persisted_operations/c80a1b7e4a79510cd8e544910e72dec734223574011e0a40bb00c78de8de310c.graphql rename to @app/graphql/.persisted_operations/cf379a5019fc535c126b68a4cc205cf7be7e3469d5907beb737d136cd7a97f18.graphql index 4f5141897..6c4178dfe 100644 --- a/@app/graphql/.persisted_operations/c80a1b7e4a79510cd8e544910e72dec734223574011e0a40bb00c78de8de310c.graphql +++ b/@app/graphql/.persisted_operations/cf379a5019fc535c126b68a4cc205cf7be7e3469d5907beb737d136cd7a97f18.graphql @@ -1,5 +1,11 @@ fragment CreateEventRegistrationPage_Query on Query { ...SharedLayout_Query + currentUser { + id + firstName + lastName + __typename + } eventBySlug(slug: $slug) { ...EventPage_Event __typename diff --git a/@app/graphql/client.json b/@app/graphql/client.json index c68ae7607..ab6c1b3a2 100644 --- a/@app/graphql/client.json +++ b/@app/graphql/client.json @@ -37,7 +37,7 @@ "DeleteOrganization": "39f623b7dd9b3111922c0937f5985ef32d8de76b88898b043daaf53dc20877b2", "InvitationDetail": "3d3ae0471e11f29477713606f9d884cb6d2a031b1a8bed9e220bec4c5e54337f", "ClaimRegistrationToken": "c3c63bf12e25e4025a986f94781d706f7adb2261e91689d356069378faec2c4a", - "CreateEventRegistrationPage": "c80a1b7e4a79510cd8e544910e72dec734223574011e0a40bb00c78de8de310c", + "CreateEventRegistrationPage": "cf379a5019fc535c126b68a4cc205cf7be7e3469d5907beb737d136cd7a97f18", "CreateEventRegistration": "e97c6726ce1d78c512935a15f46e8315e8ab2e50b2776d4fa1c92a5e8a54c566", "DeleteEventRegistration": "be0f72e306dcf5e22dbaa962b5228422a5a0bd12dc68d688ee8b9a28b479318b", "UpdateEventRegistrationPage": "2e4a7c74a71603bcec3debb7b11c003a481d28d6b25b130694e38f2760fcf7e9", diff --git a/@app/graphql/server.json b/@app/graphql/server.json index ae4556691..ac2cfd201 100644 --- a/@app/graphql/server.json +++ b/@app/graphql/server.json @@ -37,7 +37,7 @@ "39f623b7dd9b3111922c0937f5985ef32d8de76b88898b043daaf53dc20877b2": "mutation DeleteOrganization($organizationId: UUID!) {\n deleteOrganization(input: {organizationId: $organizationId}) {\n clientMutationId\n __typename\n }\n}", "3d3ae0471e11f29477713606f9d884cb6d2a031b1a8bed9e220bec4c5e54337f": "fragment SharedLayout_Query on Query {\n currentUser {\n ...SharedLayout_User\n __typename\n }\n organizations(orderBy: SLUG_ASC) {\n nodes {\n ...SharedLayout_Organization\n __typename\n }\n __typename\n }\n ssoLoginEnabled\n supportedLanguages\n __typename\n}\nfragment SharedLayout_User on User {\n id\n name\n username\n avatarUrl\n isAdmin\n isVerified\n primaryEmail\n userEmails(first: 50) {\n nodes {\n ...SharedLayout_UserEmail\n __typename\n }\n __typename\n }\n organizationMemberships(first: 20) {\n totalCount\n nodes {\n id\n isOwner\n organization {\n id\n name\n slug\n __typename\n }\n __typename\n }\n __typename\n }\n __typename\n}\nfragment SharedLayout_UserEmail on UserEmail {\n id\n email\n isVerified\n isPrimary\n createdAt\n __typename\n}\nfragment SharedLayout_Organization on Organization {\n id\n name\n slug\n __typename\n}\nquery InvitationDetail($id: UUID!, $code: String) {\n ...SharedLayout_Query\n organizationForInvitation(invitationId: $id, code: $code) {\n id\n name\n slug\n __typename\n }\n}", "c3c63bf12e25e4025a986f94781d706f7adb2261e91689d356069378faec2c4a": "mutation ClaimRegistrationToken($input: ClaimRegistrationTokenInput!) {\n claimRegistrationToken(input: $input) {\n claimRegistrationTokenOutput {\n registrationToken\n updateToken\n __typename\n }\n __typename\n }\n}", - "c80a1b7e4a79510cd8e544910e72dec734223574011e0a40bb00c78de8de310c": "fragment CreateEventRegistrationPage_Query on Query {\n ...SharedLayout_Query\n eventBySlug(slug: $slug) {\n ...EventPage_Event\n __typename\n }\n quota(id: $quotaId) {\n ...EventPage_Quota\n __typename\n }\n __typename\n}\nfragment SharedLayout_Query on Query {\n currentUser {\n ...SharedLayout_User\n __typename\n }\n organizations(orderBy: SLUG_ASC) {\n nodes {\n ...SharedLayout_Organization\n __typename\n }\n __typename\n }\n ssoLoginEnabled\n supportedLanguages\n __typename\n}\nfragment SharedLayout_User on User {\n id\n name\n username\n avatarUrl\n isAdmin\n isVerified\n primaryEmail\n userEmails(first: 50) {\n nodes {\n ...SharedLayout_UserEmail\n __typename\n }\n __typename\n }\n organizationMemberships(first: 20) {\n totalCount\n nodes {\n id\n isOwner\n organization {\n id\n name\n slug\n __typename\n }\n __typename\n }\n __typename\n }\n __typename\n}\nfragment SharedLayout_UserEmail on UserEmail {\n id\n email\n isVerified\n isPrimary\n createdAt\n __typename\n}\nfragment SharedLayout_Organization on Organization {\n id\n name\n slug\n __typename\n}\nfragment EventPage_Event on Event {\n ...EventFields\n category {\n ...EventPage_EventCategory\n __typename\n }\n ownerOrganization {\n ...EventPage_Organization\n __typename\n }\n quotas(orderBy: POSITION_ASC) {\n nodes {\n ...EventPage_Quota\n __typename\n }\n __typename\n }\n registrations(orderBy: POSITION_ASC) {\n nodes {\n ...EventPage_Registration\n __typename\n }\n __typename\n }\n eventQuestions(orderBy: POSITION_ASC) {\n nodes {\n ...EventPage_Question\n __typename\n }\n __typename\n }\n __typename\n}\nfragment EventFields on Event {\n id\n name\n slug\n description\n location\n eventStartTime\n eventEndTime\n registrationStartTime\n registrationEndTime\n isHighlighted\n isDraft\n headerImageFile\n openQuotaSize\n signupOpen\n signupUpcoming\n signupClosed\n createdBy\n updatedBy\n createdAt\n updatedAt\n __typename\n}\nfragment EventPage_EventCategory on EventCategory {\n id\n description\n name\n color\n ownerOrganization {\n ...EventPage_Organization\n __typename\n }\n updatedAt\n __typename\n}\nfragment EventPage_Organization on Organization {\n id\n name\n slug\n color\n __typename\n}\nfragment EventPage_Quota on Quota {\n id\n position\n title\n size\n __typename\n}\nfragment EventPage_Registration on Registration {\n id\n fullName\n status\n position\n createdAt\n quota {\n ...EventPage_Quota\n __typename\n }\n __typename\n}\nfragment EventPage_Question on EventQuestion {\n id\n position\n type\n label\n isRequired\n data\n __typename\n}\nquery CreateEventRegistrationPage($slug: String!, $quotaId: UUID!) {\n ...CreateEventRegistrationPage_Query\n}", + "cf379a5019fc535c126b68a4cc205cf7be7e3469d5907beb737d136cd7a97f18": "fragment CreateEventRegistrationPage_Query on Query {\n ...SharedLayout_Query\n currentUser {\n id\n firstName\n lastName\n __typename\n }\n eventBySlug(slug: $slug) {\n ...EventPage_Event\n __typename\n }\n quota(id: $quotaId) {\n ...EventPage_Quota\n __typename\n }\n __typename\n}\nfragment SharedLayout_Query on Query {\n currentUser {\n ...SharedLayout_User\n __typename\n }\n organizations(orderBy: SLUG_ASC) {\n nodes {\n ...SharedLayout_Organization\n __typename\n }\n __typename\n }\n ssoLoginEnabled\n supportedLanguages\n __typename\n}\nfragment SharedLayout_User on User {\n id\n name\n username\n avatarUrl\n isAdmin\n isVerified\n primaryEmail\n userEmails(first: 50) {\n nodes {\n ...SharedLayout_UserEmail\n __typename\n }\n __typename\n }\n organizationMemberships(first: 20) {\n totalCount\n nodes {\n id\n isOwner\n organization {\n id\n name\n slug\n __typename\n }\n __typename\n }\n __typename\n }\n __typename\n}\nfragment SharedLayout_UserEmail on UserEmail {\n id\n email\n isVerified\n isPrimary\n createdAt\n __typename\n}\nfragment SharedLayout_Organization on Organization {\n id\n name\n slug\n __typename\n}\nfragment EventPage_Event on Event {\n ...EventFields\n category {\n ...EventPage_EventCategory\n __typename\n }\n ownerOrganization {\n ...EventPage_Organization\n __typename\n }\n quotas(orderBy: POSITION_ASC) {\n nodes {\n ...EventPage_Quota\n __typename\n }\n __typename\n }\n registrations(orderBy: POSITION_ASC) {\n nodes {\n ...EventPage_Registration\n __typename\n }\n __typename\n }\n eventQuestions(orderBy: POSITION_ASC) {\n nodes {\n ...EventPage_Question\n __typename\n }\n __typename\n }\n __typename\n}\nfragment EventFields on Event {\n id\n name\n slug\n description\n location\n eventStartTime\n eventEndTime\n registrationStartTime\n registrationEndTime\n isHighlighted\n isDraft\n headerImageFile\n openQuotaSize\n signupOpen\n signupUpcoming\n signupClosed\n createdBy\n updatedBy\n createdAt\n updatedAt\n __typename\n}\nfragment EventPage_EventCategory on EventCategory {\n id\n description\n name\n color\n ownerOrganization {\n ...EventPage_Organization\n __typename\n }\n updatedAt\n __typename\n}\nfragment EventPage_Organization on Organization {\n id\n name\n slug\n color\n __typename\n}\nfragment EventPage_Quota on Quota {\n id\n position\n title\n size\n __typename\n}\nfragment EventPage_Registration on Registration {\n id\n fullName\n status\n position\n createdAt\n quota {\n ...EventPage_Quota\n __typename\n }\n __typename\n}\nfragment EventPage_Question on EventQuestion {\n id\n position\n type\n label\n isRequired\n data\n __typename\n}\nquery CreateEventRegistrationPage($slug: String!, $quotaId: UUID!) {\n ...CreateEventRegistrationPage_Query\n}", "e97c6726ce1d78c512935a15f46e8315e8ab2e50b2776d4fa1c92a5e8a54c566": "fragment EventPage_Registration on Registration {\n id\n fullName\n status\n position\n createdAt\n quota {\n ...EventPage_Quota\n __typename\n }\n __typename\n}\nfragment EventPage_Quota on Quota {\n id\n position\n title\n size\n __typename\n}\nmutation CreateEventRegistration($input: CreateRegistrationInput!) {\n createRegistration(input: $input) {\n registration {\n ...EventPage_Registration\n quota {\n ...EventPage_Quota\n __typename\n }\n event {\n id\n slug\n __typename\n }\n __typename\n }\n __typename\n }\n}", "be0f72e306dcf5e22dbaa962b5228422a5a0bd12dc68d688ee8b9a28b479318b": "mutation DeleteEventRegistration($updateToken: String!) {\n deleteRegistration(input: {updateToken: $updateToken}) {\n success\n __typename\n }\n}", "2e4a7c74a71603bcec3debb7b11c003a481d28d6b25b130694e38f2760fcf7e9": "fragment UpdateEventRegistrationPage_Query on Query {\n ...SharedLayout_Query\n registrationByUpdateToken(updateToken: $updateToken) {\n ...UpdateEventRegistrationPage_Registration\n quota {\n ...EventPage_Quota\n __typename\n }\n event {\n ...EventPage_Event\n __typename\n }\n __typename\n }\n __typename\n}\nfragment SharedLayout_Query on Query {\n currentUser {\n ...SharedLayout_User\n __typename\n }\n organizations(orderBy: SLUG_ASC) {\n nodes {\n ...SharedLayout_Organization\n __typename\n }\n __typename\n }\n ssoLoginEnabled\n supportedLanguages\n __typename\n}\nfragment SharedLayout_User on User {\n id\n name\n username\n avatarUrl\n isAdmin\n isVerified\n primaryEmail\n userEmails(first: 50) {\n nodes {\n ...SharedLayout_UserEmail\n __typename\n }\n __typename\n }\n organizationMemberships(first: 20) {\n totalCount\n nodes {\n id\n isOwner\n organization {\n id\n name\n slug\n __typename\n }\n __typename\n }\n __typename\n }\n __typename\n}\nfragment SharedLayout_UserEmail on UserEmail {\n id\n email\n isVerified\n isPrimary\n createdAt\n __typename\n}\nfragment SharedLayout_Organization on Organization {\n id\n name\n slug\n __typename\n}\nfragment UpdateEventRegistrationPage_Registration on Registration {\n id\n firstName\n lastName\n answers\n __typename\n}\nfragment EventPage_Quota on Quota {\n id\n position\n title\n size\n __typename\n}\nfragment EventPage_Event on Event {\n ...EventFields\n category {\n ...EventPage_EventCategory\n __typename\n }\n ownerOrganization {\n ...EventPage_Organization\n __typename\n }\n quotas(orderBy: POSITION_ASC) {\n nodes {\n ...EventPage_Quota\n __typename\n }\n __typename\n }\n registrations(orderBy: POSITION_ASC) {\n nodes {\n ...EventPage_Registration\n __typename\n }\n __typename\n }\n eventQuestions(orderBy: POSITION_ASC) {\n nodes {\n ...EventPage_Question\n __typename\n }\n __typename\n }\n __typename\n}\nfragment EventFields on Event {\n id\n name\n slug\n description\n location\n eventStartTime\n eventEndTime\n registrationStartTime\n registrationEndTime\n isHighlighted\n isDraft\n headerImageFile\n openQuotaSize\n signupOpen\n signupUpcoming\n signupClosed\n createdBy\n updatedBy\n createdAt\n updatedAt\n __typename\n}\nfragment EventPage_EventCategory on EventCategory {\n id\n description\n name\n color\n ownerOrganization {\n ...EventPage_Organization\n __typename\n }\n updatedAt\n __typename\n}\nfragment EventPage_Organization on Organization {\n id\n name\n slug\n color\n __typename\n}\nfragment EventPage_Registration on Registration {\n id\n fullName\n status\n position\n createdAt\n quota {\n ...EventPage_Quota\n __typename\n }\n __typename\n}\nfragment EventPage_Question on EventQuestion {\n id\n position\n type\n label\n isRequired\n data\n __typename\n}\nquery UpdateEventRegistrationPage($updateToken: String!) {\n ...UpdateEventRegistrationPage_Query\n}", diff --git a/@app/server/__tests__/middleware/installKeycloak.test.ts b/@app/server/__tests__/middleware/installKeycloak.test.ts index adbd61f73..7f17f181d 100644 --- a/@app/server/__tests__/middleware/installKeycloak.test.ts +++ b/@app/server/__tests__/middleware/installKeycloak.test.ts @@ -586,6 +586,40 @@ describe("GET /auth/keycloak/callback", () => { expect(user.is_admin).toBe(false) }) + it("stores given and family names on the user and refreshes them on every login", async () => { + const selectNames = () => + pool.query( + `select u.first_name, u.last_name from app_public.users u + join app_public.user_authentications ua on ua.user_id = u.id + where ua.identifier = 'kc-sub-1'` + ) + let res = await doCallback({ + name: "Anna Maria von Wright", + given_name: "Anna Maria", + family_name: "von Wright", + }) + expect(res.statusCode).toBe(302) + let { + rows: [user], + } = await selectNames() + expect(user).toEqual({ first_name: "Anna Maria", last_name: "von Wright" }) + + res = await doCallback({ given_name: "Anna", family_name: "Wright" }) + expect(res.statusCode).toBe(302) + ;({ + rows: [user], + } = await selectNames()) + expect(user).toEqual({ first_name: "Anna", last_name: "Wright" }) + + // A token without both claims leaves the stored names alone + res = await doCallback({ given_name: "Anna" }) + expect(res.statusCode).toBe(302) + ;({ + rows: [user], + } = await selectNames()) + expect(user).toEqual({ first_name: "Anna", last_name: "Wright" }) + }) + it("leaves is_admin untouched when the id token has no realm_access claim", async () => { // A dropped realm-roles mapper makes the roles unknown, which must not // read as "not an admin": stamping false here would demote every admin diff --git a/@app/server/__tests__/utils/keycloak.test.ts b/@app/server/__tests__/utils/keycloak.test.ts index ae474ad79..e5b2ac2e8 100644 --- a/@app/server/__tests__/utils/keycloak.test.ts +++ b/@app/server/__tests__/utils/keycloak.test.ts @@ -9,6 +9,8 @@ const baseClaims = { email: "matti.meikalainen@example.com", email_verified: true, name: "Matti Meikäläinen", + given_name: "Matti", + family_name: "Meikäläinen", locale: "fi", realm_access: { roles: ["membership", "ilmo-admin"] }, } @@ -20,6 +22,8 @@ describe("mapKeycloakClaims", () => { email: "matti.meikalainen@example.com", emailVerified: true, name: "Matti Meikäläinen", + givenName: "Matti", + familyName: "Meikäläinen", usernameSuggestion: "matti.meikalainen", locale: "fi", isAdmin: true, @@ -108,6 +112,25 @@ describe("mapKeycloakClaims", () => { expect(mapKeycloakClaims(claims).name).toBe("matti.meikalainen") }) + it("keeps multi-word given and family names intact", () => { + const claims = { + ...baseClaims, + name: "Anna Maria von Wright", + given_name: " Anna Maria ", + family_name: "von Wright", + } + const profile = mapKeycloakClaims(claims) + expect(profile.givenName).toBe("Anna Maria") + expect(profile.familyName).toBe("von Wright") + }) + + it("maps missing or blank given and family names to null", () => { + const { given_name: _dropped, ...claims } = baseClaims + const profile = mapKeycloakClaims({ ...claims, family_name: " " }) + expect(profile.givenName).toBeNull() + expect(profile.familyName).toBeNull() + }) + it("throws KCCLM naming the missing claims", () => { const { email: _dropped, ...noEmail } = baseClaims const { sub: _dropped2, ...noSub } = baseClaims diff --git a/@app/server/src/middleware/installKeycloak.ts b/@app/server/src/middleware/installKeycloak.ts index 064a98f42..6e03873bd 100644 --- a/@app/server/src/middleware/installKeycloak.ts +++ b/@app/server/src/middleware/installKeycloak.ts @@ -497,6 +497,16 @@ const InstallKeycloak: FastifyPluginAsync = async (app) => { ) } + // Like admin rights, the registry owns first and last names, so they + // are refreshed on every login. Only a complete pair is written: half + // a name would prefill registrations worse than none. + if (profile.givenName && profile.familyName) { + await client.query( + `update app_public.users set first_name = $1, last_name = $2 where id = $3`, + [profile.givenName, profile.familyName, user.id] + ) + } + const { rows: [session], } = await client.query( diff --git a/@app/server/src/utils/keycloak.ts b/@app/server/src/utils/keycloak.ts index c08c5675d..eba7e3fb2 100644 --- a/@app/server/src/utils/keycloak.ts +++ b/@app/server/src/utils/keycloak.ts @@ -27,6 +27,13 @@ export interface KeycloakProfile { readonly email: string readonly emailVerified: boolean readonly name: string + /** + * The standard OIDC `given_name` / `family_name` claims, `null` when the + * token doesn't carry them. Unlike `name` they keep multi-word first and + * last names apart ("Anna Maria" / "von Wright"). + */ + readonly givenName: string | null + readonly familyName: string | null /** * The raw email localpart. It is *not* a valid app username: register_user * strips and slugifies it and appends a counter to break ties, so only the @@ -79,11 +86,15 @@ export function mapKeycloakClaims( ) } const rawLocale = typeof claims.locale === "string" ? claims.locale : null + const nameClaim = (claim: unknown) => + typeof claim === "string" && claim.trim() ? claim.trim() : null return { sub, email, emailVerified: claims.email_verified === true, name: typeof claims.name === "string" ? claims.name : localpart, + givenName: nameClaim(claims.given_name), + familyName: nameClaim(claims.family_name), usernameSuggestion: localpart, // The app ships fi/en/se; anything else has no translations to fall back // on, so the user keeps whatever locale the browser negotiated. diff --git a/data/schema.graphql b/data/schema.graphql index d973bbe26..27a3d7da8 100644 --- a/data/schema.graphql +++ b/data/schema.graphql @@ -223,7 +223,7 @@ type ConfirmAccountDeletionPayload { success: Boolean } -"""A field which must not contain spaces""" +"""A name field which must not be empty or contain only whitespace""" scalar ConstrainedName """All input for the create `EventCategory` mutation.""" @@ -3852,6 +3852,11 @@ type User { """Optional avatar URL.""" avatarUrl: String createdAt: Datetime! + + """ + The user's first name(s), from the Keycloak `given_name` claim. Null for users that have not logged in with Keycloak. + """ + firstName: String hasPassword: Boolean """Unique identifier for the user.""" @@ -3861,6 +3866,11 @@ type User { isAdmin: Boolean! isVerified: Boolean! + """ + The user's last name, from the Keycloak `family_name` claim. Null for users that have not logged in with Keycloak. + """ + lastName: String + """Public-facing name (or pseudonym) of the user.""" name: String From 0805b625cb666aa232d8ae7cc66d6d6b1ada15c6 Mon Sep 17 00:00:00 2001 From: Risto Virtaharju Date: Sat, 17 Oct 2026 08:41:50 +0000 Subject: [PATCH 012/163] docs: document the stress test harness Co-Authored-By: Claude Opus 5.5 --- stress/README.md | 64 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100644 stress/README.md diff --git a/stress/README.md b/stress/README.md new file mode 100644 index 000000000..c15dbd999 --- /dev/null +++ b/stress/README.md @@ -0,0 +1,64 @@ +# Registration stress test + +This simulates a contested registration opening against a production build of ilmo. It runs under production-like limits: + +- **Postgres:** `wal_level=replica`, with 10 connection slots for the ilmo roles (`max_connections=13`, `superuser_reserved_connections=3`). +- **Database owner:** not a superuser, so it can't use the reserved slots. +- **Server:** pinned to two cores with `taskset`. + +## Running + +Build an image of the source tree you want to test, then run a scenario: + +```bash +stress/build-image.sh . ilmo-stress:after +pnpm stress worst --image ilmo-stress:after +``` + +| Scenario | Bots | Quotas | +|---|---|---| +| `worst` | 400 | 5 × 5 spots | +| `common` | 200 | 3 × 20 spots | + +`--vus ` overrides the bot count. Use `--vus 5` for a quick smoke test. + +To compare against another commit, export it first: + +```bash +git archive | tar -x -C /tmp/ilmo- +stress/build-image.sh /tmp/ilmo- ilmo-stress: +``` + +`build-image.sh` builds the app's own Dockerfile. It feeds sharp's native binaries in from `stress/.cache` because the GitHub download times out on slow links. + +## What a bot does + +Each bot does the following: + +1. Loads the event page some time before opening. +2. Holds the page's websocket subscriptions (`EventPage`, `CurrentTime`). +3. At opening, plus 0–1 s, runs the register page's query, subscribes to `EventRegistrations` and claims a registration token. +4. Waits 5–20 s, then submits the form. + +10% of bots share one client IP, like a guild room, and the rest each get their own. + +## Results + +Each run writes to `stress/results/