From 42a982010d2ec14c62996b3f0015cf19522fecd5 Mon Sep 17 00:00:00 2001 From: feco Date: Fri, 20 Nov 2026 06:41:21 +0000 Subject: [PATCH 1/2] Packages paid through Stripe Checkout The catalog stays in packages.rs: every checkout session carries the package's name and gross price, nothing has to be kept in Stripe. The package is granted once, when Stripe confirms the payment: by the signed webhook, or by the return page asking Stripe when the webhook is late. With a test key only admins can buy, so Stripe's test cards give nobody free packages. Without the keys nothing changes. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_012vLHzh5qUhFtmJhzkcTbXL --- Cargo.lock | 1 + .../db/migrations/0027_stripe_checkouts.sql | 16 ++ deploy/README.md | 2 +- deploy/docker-compose.yml | 9 +- docker-compose.yml | 5 + docs/csomagok.md | 3 +- docs/fizetes.md | 44 ++++ services/backend/Cargo.toml | 1 + services/backend/src/config.rs | 40 ++++ services/backend/src/main.rs | 3 + services/backend/src/packages.rs | 5 +- services/backend/src/routes/mod.rs | 8 +- services/backend/src/routes/payments.rs | 189 +++++++++++++++++- services/backend/src/stripe.rs | 157 +++++++++++++++ services/backend/src/tests.rs | 178 ++++++++++++++++- .../src/app/api/v1/[...path]/route.ts | 11 +- services/frontend/src/app/csomagok/page.tsx | 3 +- services/frontend/src/app/globals.css | 9 + .../app/kepletek/[id]/elorejelzes/page.tsx | 3 +- .../frontend/src/app/kepletek/[id]/page.tsx | 3 +- services/frontend/src/app/layout.tsx | 7 + .../src/app/osszevetesek/[id]/page.tsx | 3 +- services/frontend/src/app/szemelyek/page.tsx | 3 +- .../frontend/src/app/szemelyek/uj/page.tsx | 3 +- .../src/components/AnalysisQuestions.tsx | 4 +- .../src/components/DetailedAnalysis.tsx | 12 +- .../frontend/src/components/PackageCards.tsx | 47 ++++- .../frontend/src/components/PaymentReturn.tsx | 90 +++++++++ .../frontend/src/components/PersonPacks.tsx | 4 +- services/frontend/src/lib/payments.ts | 9 + services/frontend/src/lib/types.ts | 7 + 31 files changed, 842 insertions(+), 37 deletions(-) create mode 100644 crates/db/migrations/0027_stripe_checkouts.sql create mode 100644 docs/fizetes.md create mode 100644 services/backend/src/stripe.rs create mode 100644 services/frontend/src/components/PaymentReturn.tsx create mode 100644 services/frontend/src/lib/payments.ts diff --git a/Cargo.lock b/Cargo.lock index 7b8ca1f..e9b1a74 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -170,6 +170,7 @@ dependencies = [ "axum-extra", "db", "email-templates", + "hmac", "horoscope-client", "http-body-util", "jsonwebtoken", diff --git a/crates/db/migrations/0027_stripe_checkouts.sql b/crates/db/migrations/0027_stripe_checkouts.sql new file mode 100644 index 0000000..f7d2114 --- /dev/null +++ b/crates/db/migrations/0027_stripe_checkouts.sql @@ -0,0 +1,16 @@ +-- Stripe Checkout sessions started from the package cards. The package is +-- granted once, when the payment is confirmed (webhook, or the return page +-- asking Stripe), and the session id keeps that from happening twice. +CREATE TABLE stripe_checkouts ( + -- Stripe's Checkout Session id (cs_test_… / cs_live_…). + id text PRIMARY KEY, + user_id uuid NOT NULL REFERENCES users ON DELETE CASCADE, + package text NOT NULL, + price_huf integer NOT NULL CHECK (price_huf > 0), + live boolean NOT NULL, + created_at timestamptz NOT NULL DEFAULT now(), + completed_at timestamptz, + order_id uuid REFERENCES package_orders ON DELETE SET NULL +); + +CREATE INDEX stripe_checkouts_user_idx ON stripe_checkouts (user_id, created_at DESC); diff --git a/deploy/README.md b/deploy/README.md index 00abbda..f871589 100644 --- a/deploy/README.md +++ b/deploy/README.md @@ -68,7 +68,7 @@ A Docker által kinyitott portokat az ufw magától nem szűri, ezért a 80-as `deploy` felhasználóként, a `/opt/sorsfonalak` mappában: - `.env`: az itteni `.env.example` kitöltve. -- `.env.secrets`: `OPENROUTER_API_KEY=...`. +- `.env.secrets`: `OPENROUTER_API_KEY=...`, a levélküldés adatai, és ha van, `STRIPE_SECRET_KEY` / `STRIPE_WEBHOOK_SECRET` (`docs/fizetes.md`). - `docker login registry.sagifer.com` egy `read:package` jogú tokennel. Amíg a `sagifer` fiók nyilvános, erre nincs szükség. ### Cloudflare (sorsfonalak.hu) diff --git a/deploy/docker-compose.yml b/deploy/docker-compose.yml index b09292f..5380da2 100644 --- a/deploy/docker-compose.yml +++ b/deploy/docker-compose.yml @@ -85,8 +85,8 @@ services: ANALYSIS_MODEL: ${ANALYSIS_MODEL:-} SUMMARY_MODEL: ${SUMMARY_MODEL:-} PASSWORD_LOGIN: ${PASSWORD_LOGIN:-false} - # Purchases are off until real payments are connected; packages come - # from promo codes and admins (MOCK_PAYMENTS=true: pretend purchases). + # Without the Stripe keys purchases are off; packages come from promo + # codes and admins (MOCK_PAYMENTS=true: pretend purchases). MOCK_PAYMENTS: ${MOCK_PAYMENTS:-false} # Users inviting others ("Meghívom"): shown but off until the launch. USER_INVITES: ${USER_INVITES:-false} @@ -95,6 +95,11 @@ services: FREE_PERSON_SLOTS: ${FREE_PERSON_SLOTS:-0} # invite: new accounts need an invitation (admin page "Meghívók"); open: anyone. SIGNUP_MODE: ${SIGNUP_MODE:-invite} + # STRIPE_SECRET_KEY and STRIPE_WEBHOOK_SECRET (docs/fizetes.md): with them + # packages can be bought (a test key: by admins only). + env_file: + - path: .env.secrets + required: false depends_on: postgres: condition: service_healthy diff --git a/docker-compose.yml b/docker-compose.yml index b8eb6bb..c037b26 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -58,6 +58,11 @@ services: FREE_PERSON_SLOTS: ${FREE_PERSON_SLOTS:-0} # invite: new accounts need an invitation (admin page "Meghívók"); open: anyone. SIGNUP_MODE: ${SIGNUP_MODE:-invite} + # STRIPE_SECRET_KEY / STRIPE_WEBHOOK_SECRET (test keys; docs/fizetes.md). + # With them Stripe replaces the stand-in payment. + env_file: + - path: .env.secrets + required: false depends_on: postgres: condition: service_healthy diff --git a/docs/csomagok.md b/docs/csomagok.md index 02be815..71b7afe 100644 --- a/docs/csomagok.md +++ b/docs/csomagok.md @@ -39,7 +39,6 @@ Az éves előrejelzés (2026 novembere óta) a Páros és a Család csomagban mi ## Későbbre -- Stripe-bekötés: a `package_orders.source = 'stripe'` már helyet kapott. - Bevezető kedvezmény vagy kupon (pl. az első 100 vásárlónak). - Ajándékba adható csomag (karácsony, Valentin-nap): a Páros és a Család jó ajándék. -- Számlázás (NAV Online Számla) a vásárlásokhoz. +- Számlázás (NAV Online Számla) a vásárlásokhoz. A fizetés a Stripe-on megy: [fizetes.md](fizetes.md). diff --git a/docs/fizetes.md b/docs/fizetes.md new file mode 100644 index 0000000..d3661b0 --- /dev/null +++ b/docs/fizetes.md @@ -0,0 +1,44 @@ +# Fizetés (Stripe) + +A csomagokat a Stripe Checkout fizetési oldalán lehet megvenni. A csomagok neve, tartalma és ára a `services/backend/src/packages.rs`-ben van; minden fizetés ezekkel indul, a Stripe-ban nem kell termékeket felvenni. + +## Menete + +1. A „Megveszem” gomb a `POST /v1/payments/checkout` végpontot hívja (`package`, `return_path`: az oldal, ahonnan indult). +2. A backend létrehoz egy Checkout Sessiont (bruttó ár forintban, a csomag neve, a felhasználó e-mail-címe, kötelező számlázási cím), elmenti a `stripe_checkouts` táblába, és visszaadja a fizetési oldal címét. +3. Fizetés után a Stripe visszaküld ugyanarra az oldalra `?fizetes=` paraméterrel (megszakításkor `?fizetes=megszakitva`). A `PaymentReturn` komponens a `GET /v1/payments/checkout/{id}` végpontot kérdezi, amíg a fizetés be nem igazolódik. +4. A csomagot a backend akkor adja meg, amikor a Stripe igazolja a fizetést: + - a webhook (`POST /api/v1/payments/stripe/webhook`, aláírással ellenőrizve), vagy + - ha a webhook még nem jött meg (vagy helyben nincs beállítva), a visszatérő oldal kérdésére a backend maga kérdezi meg a Stripe-ot. + + A session id miatt egy fizetés csak egyszer ír jóvá (`package_orders.source = 'stripe'`). + +## Beállítás + +A kulcsok a `.env.secrets` fájlba kerülnek (helyben a repó gyökerében, a szerveren a `/opt/sorsfonalak` mappában), git-be soha: + +``` +STRIPE_SECRET_KEY=sk_test_... +STRIPE_WEBHOOK_SECRET=whsec_... +``` + +- **Teszt kulccsal (`sk_test_…`) csak az adminok vásárolhatnak**, a többieknek a gombok „Hamarosan” feliratúak maradnak; így senki nem jut csomaghoz a Stripe tesztkártyáival. Tesztkártya: `4242 4242 4242 4242`, bármilyen jövőbeli lejárat és CVC. +- Élő kulccsal (`sk_live_…`) mindenki vásárolhat. +- Kulcs nélkül nincs vásárlás (helyben a `MOCK_PAYMENTS=true` próbafizetés működik; a Stripe-kulcs ezt felülírja). + +A Stripe felületén: + +1. **Developers → API keys**: a Secret key → `STRIPE_SECRET_KEY`. +2. **Developers → Webhooks → Add endpoint**: `https://sorsfonalak.hu/api/v1/payments/stripe/webhook`, események: `checkout.session.completed` és `checkout.session.async_payment_succeeded`. A Signing secret → `STRIPE_WEBHOOK_SECRET`. Teszt és élő módban külön végpontot kell felvenni, külön titokkal. +3. **Settings → Branding**: logó, színek (a fizetési oldal kinézete). +4. **Settings → Payment methods**: bankkártya, Apple Pay, Google Pay. + +A kulcsok módosítása után a backendet újra kell indítani (`docker compose up -d backend`). + +Helyben a webhook nem ér el a géphez; nem is kell, mert a visszatérő oldal a Stripe-tól kérdezi le a fizetést. Ha mégis próbálni kell: `stripe listen --forward-to localhost:3001/api/v1/payments/stripe/webhook`. + +## Megnyitás előtt + +- A Stripe-fiók aktiválása (céges adatok, bankszámla), élő kulcsok és élő webhook. +- Számla: Billingo API-val, minden sikeres fizetés után (a vásárló neve és címe a Checkoutból jön). A Stripe nyugtája nem magyar számla. +- Visszatérítés: egyelőre a Stripe felületén, a csomagot pedig az admin oldalon kell kézzel csökkenteni. diff --git a/services/backend/Cargo.toml b/services/backend/Cargo.toml index 28871b1..ba06e2d 100644 --- a/services/backend/Cargo.toml +++ b/services/backend/Cargo.toml @@ -10,6 +10,7 @@ publish.workspace = true db.workspace = true analysis-prompt.workspace = true email-templates.workspace = true +hmac.workspace = true horoscope-client.workspace = true service-kit.workspace = true anyhow.workspace = true diff --git a/services/backend/src/config.rs b/services/backend/src/config.rs index d9fbc77..ab6744d 100644 --- a/services/backend/src/config.rs +++ b/services/backend/src/config.rs @@ -45,6 +45,9 @@ pub struct Config { /// `MOCK_PAYMENTS` (default `false`): a stand-in payment that adds an /// analysis unit at once, until Stripe is connected. pub mock_payments: bool, + /// Stripe Checkout, when `STRIPE_SECRET_KEY` is set (it wins over + /// `MOCK_PAYMENTS`). With a test key only admins can buy. + pub stripe: Option, /// `USER_INVITES` (default `false`): users may invite others ("how /// compatible are we?" links, which also let the invitee sign up). Off /// until the launch; admins may always. @@ -85,6 +88,34 @@ pub struct Config { pub signup_mode: SignupMode, } +/// `STRIPE_SECRET_KEY` (`sk_test_…` or `sk_live_…`), `STRIPE_WEBHOOK_SECRET` +/// (`whsec_…`, from the webhook endpoint in the Stripe dashboard) and +/// `STRIPE_API_URL` (default `https://api.stripe.com`, tests change it). +#[derive(Clone)] +pub struct StripeConfig { + pub secret_key: String, + pub webhook_secret: Option, + pub api_url: String, +} + +impl StripeConfig { + /// A test-mode key: no real money moves. + pub fn test_mode(&self) -> bool { + self.secret_key.starts_with("sk_test_") || self.secret_key.starts_with("rk_test_") + } +} + +// The keys stay out of logs. +impl std::fmt::Debug for StripeConfig { + fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + f.debug_struct("StripeConfig") + .field("test_mode", &self.test_mode()) + .field("webhook_secret", &self.webhook_secret.is_some()) + .field("api_url", &self.api_url) + .finish() + } +} + fn var(name: &str) -> Option { std::env::var(name).ok().map(|v| v.trim().to_string()).filter(|v| !v.is_empty()) } @@ -127,6 +158,14 @@ impl Config { session_ttl_days: parsed("SESSION_TTL_DAYS", 30)?, password_login: parsed("PASSWORD_LOGIN", false)?, mock_payments: parsed("MOCK_PAYMENTS", false)?, + stripe: var("STRIPE_SECRET_KEY").map(|secret_key| StripeConfig { + secret_key, + webhook_secret: var("STRIPE_WEBHOOK_SECRET"), + api_url: var("STRIPE_API_URL") + .unwrap_or_else(|| "https://api.stripe.com".into()) + .trim_end_matches('/') + .to_string(), + }), user_invites: parsed("USER_INVITES", false)?, referral_rewards: parsed("REFERRAL_REWARDS", false)?, google_client_ids: list("GOOGLE_CLIENT_IDS"), @@ -166,6 +205,7 @@ impl Config { session_ttl_days: 30, password_login: true, mock_payments: true, + stripe: None, user_invites: true, referral_rewards: true, google_client_ids: vec!["test-client.apps.googleusercontent.com".into()], diff --git a/services/backend/src/main.rs b/services/backend/src/main.rs index 38fb618..56cf9e3 100644 --- a/services/backend/src/main.rs +++ b/services/backend/src/main.rs @@ -17,6 +17,7 @@ mod models; mod packages; mod persons; mod routes; +mod stripe; #[cfg(test)] mod tests; mod views; @@ -41,6 +42,7 @@ pub struct AppState { pub google: GoogleVerifier, pub login_limiter: LoginLimiter, pub models: models::Catalog, + pub stripe: stripe::Client, } impl AppState { @@ -50,6 +52,7 @@ impl AppState { google: GoogleVerifier::new(config.google_client_ids.clone(), config.google_jwks_url.clone()), login_limiter: LoginLimiter::new(10, Duration::from_secs(15 * 60)), models: models::Catalog::new(&config.openrouter_models_url), + stripe: stripe::Client::default(), db, config, } diff --git a/services/backend/src/packages.rs b/services/backend/src/packages.rs index 939a277..8511eec 100644 --- a/services/backend/src/packages.rs +++ b/services/backend/src/packages.rs @@ -186,6 +186,8 @@ pub enum Source { Mock, /// A redeemed promo code. Promo, + /// Paid through Stripe Checkout. + Stripe, } impl Source { @@ -194,6 +196,7 @@ impl Source { Source::Admin => "admin", Source::Mock => "mock", Source::Promo => "promo", + Source::Stripe => "stripe", } } } @@ -268,7 +271,7 @@ async fn record( let order = Uuid::now_v7(); let price = match source { Source::Admin | Source::Promo => 0, - Source::Mock => package.price_huf, + Source::Mock | Source::Stripe => package.price_huf, }; sqlx::query( "INSERT INTO package_orders (id, user_id, package, source, price_huf, note, created_by) \ diff --git a/services/backend/src/routes/mod.rs b/services/backend/src/routes/mod.rs index 915a04f..61030d2 100644 --- a/services/backend/src/routes/mod.rs +++ b/services/backend/src/routes/mod.rs @@ -77,6 +77,9 @@ pub fn router(state: Arc) -> Router { .route("/v1/me/export", get(account::export)) .route("/v1/credits", get(account::credits)) .route("/v1/payments/mock", post(payments::mock)) + .route("/v1/payments/checkout", post(payments::checkout)) + .route("/v1/payments/checkout/{id}", get(payments::checkout_status)) + .route("/v1/payments/stripe/webhook", post(payments::stripe_webhook)) // charts .route("/v1/charts", get(charts::list).post(charts::create)) .route("/v1/charts/{id}", get(charts::get_one).patch(charts::update).delete(charts::remove)) @@ -161,7 +164,10 @@ async fn public_config(State(state): St) -> Json { "google_login": { "enabled": state.google.enabled(), "client_id": c.google_client_ids.first() }, "locales": c.supported_locales, "password_login": c.password_login, - "mock_payments": c.mock_payments, + "mock_payments": payments::method(c) == Some("mock"), + // "stripe", "mock" or null; with a Stripe test key only admins can buy. + "payments": payments::method(c), + "payments_test": c.stripe.as_ref().is_some_and(|s| s.test_mode()), "user_invites": c.user_invites, "referral_rewards": c.referral_rewards, "signup_mode": c.signup_mode.as_str(), diff --git a/services/backend/src/routes/payments.rs b/services/backend/src/routes/payments.rs index 20a50cc..bea3c18 100644 --- a/services/backend/src/routes/payments.rs +++ b/services/backend/src/routes/payments.rs @@ -1,19 +1,27 @@ -//! Packages and payments. Until Stripe is connected, `MOCK_PAYMENTS=true` -//! turns on a stand-in: "paying" grants the package right away, so the paid -//! flow can be used end to end. +//! Packages and payments. With `STRIPE_SECRET_KEY` a package is paid on +//! Stripe's hosted Checkout page and granted when Stripe confirms the payment +//! (webhook, or the return page asking). Without it `MOCK_PAYMENTS=true` +//! turns on a stand-in: "paying" grants the package right away. use axum::Json; -use axum::extract::State; +use axum::body::Bytes; +use axum::extract::{Path, State}; +use axum::http::HeaderMap; use axum_extra::extract::WithRejection; +use db::Role; use serde::Deserialize; use serde_json::{Value, json}; +use time::OffsetDateTime; +use uuid::Uuid; use super::{Body, St}; +use crate::AppState; use crate::auth::AuthUser; +use crate::config::StripeConfig; use crate::credits::{self, Unit}; use crate::error::{ApiError, ApiResult}; use crate::packages::{self, CATALOG, Source}; -use crate::persons; +use crate::{persons, stripe}; /// The package catalog (public). pub async fn catalog() -> Json { @@ -46,7 +54,7 @@ pub async fn mock( auth: AuthUser, WithRejection(Json(req), _): Body, ) -> ApiResult> { - if !state.config.mock_payments { + if !state.config.mock_payments || state.config.stripe.is_some() { return Err(ApiError::NotFound("payment method")); } let id = match (req.package.as_deref(), req.unit) { @@ -65,3 +73,172 @@ pub async fn mock( tracing::info!(user = %auth.id(), package = package.id, "mock payment"); Ok(Json(holdings(&state, &auth).await?)) } + +/// How the frontend should offer purchases: `"stripe"`, `"mock"` or `None` +/// (no purchases). +pub fn method(config: &crate::config::Config) -> Option<&'static str> { + match (&config.stripe, config.mock_payments) { + (Some(_), _) => Some("stripe"), + (None, true) => Some("mock"), + (None, false) => None, + } +} + +/// Stripe, if this user may pay through it (with a test key: admins only, so +/// nobody gets packages with Stripe's test cards). +fn stripe_for<'a>(state: &'a AppState, auth: &AuthUser) -> Result<&'a StripeConfig, ApiError> { + let config = state.config.stripe.as_ref().ok_or(ApiError::NotFound("payment method"))?; + if config.test_mode() && !auth.user.has_role(Role::Admin) { + return Err(ApiError::Forbidden("purchases are being tested; they open soon".into())); + } + Ok(config) +} + +/// The page to come back to after paying: a plain path of this site, without +/// its query (anything else: the packages page). +fn return_path(path: Option<&str>) -> String { + let path = path.unwrap_or("").split(['?', '#']).next().unwrap_or(""); + let plain = path.starts_with('/') + && !path.starts_with("//") + && path.len() <= 200 + && path.chars().all(|c| c.is_ascii_alphanumeric() || "/-_.".contains(c)); + if plain { path.to_string() } else { "/csomagok".to_string() } +} + +#[derive(Deserialize)] +#[serde(deny_unknown_fields)] +pub struct CheckoutRequest { + package: String, + /// The page the purchase started on (default: the packages page). + return_path: Option, +} + +/// Starts paying for a package: returns the address of Stripe's payment page. +pub async fn checkout( + State(state): St, + auth: AuthUser, + WithRejection(Json(req), _): Body, +) -> ApiResult> { + let config = stripe_for(&state, &auth)?; + let package = packages::find(&req.package).ok_or(ApiError::NotFound("package"))?; + let back = format!("{}{}", state.config.public_base_url, return_path(req.return_path.as_deref())); + let field = |k: &str, v: &str| (k.to_string(), v.to_string()); + let form = vec![ + field("mode", "payment"), + field("locale", "hu"), + field("client_reference_id", &auth.id().to_string()), + field("customer_email", &auth.user.email), + // Name and address go on the invoice. + field("billing_address_collection", "required"), + field("line_items[0][quantity]", "1"), + field("line_items[0][price_data][currency]", "huf"), + // Stripe counts forints in fillér. + field("line_items[0][price_data][unit_amount]", &(package.price_huf * 100).to_string()), + field("line_items[0][price_data][product_data][name]", &format!("Sorsfonalak – {}", package.name)), + field("line_items[0][price_data][product_data][description]", package.tagline), + field("metadata[package]", package.id), + field("metadata[user_id]", &auth.id().to_string()), + field("payment_intent_data[description]", &format!("Sorsfonalak – {}", package.name)), + field("payment_intent_data[metadata][package]", package.id), + field("success_url", &format!("{back}?fizetes={{CHECKOUT_SESSION_ID}}")), + field("cancel_url", &format!("{back}?fizetes=megszakitva")), + ]; + let session = state.stripe.create_session(config, &form).await?; + let url = session.url.ok_or_else(|| ApiError::Internal(format!("checkout session {} has no url", session.id)))?; + sqlx::query("INSERT INTO stripe_checkouts (id, user_id, package, price_huf, live) VALUES ($1, $2, $3, $4, $5)") + .bind(&session.id) + .bind(auth.id()) + .bind(package.id) + .bind(package.price_huf as i32) + .bind(!config.test_mode()) + .execute(&state.db) + .await?; + tracing::info!(user = %auth.id(), package = package.id, session = %session.id, "checkout started"); + Ok(Json(json!({ "url": url }))) +} + +/// Grants the package of a paid session, once. `false`: not our session. +async fn complete(state: &AppState, session_id: &str) -> Result { + let mut tx = state.db.begin().await?; + let row: Option<(Uuid, String, Option)> = + sqlx::query_as("SELECT user_id, package, completed_at FROM stripe_checkouts WHERE id = $1 FOR UPDATE") + .bind(session_id) + .fetch_optional(&mut *tx) + .await?; + let Some((user_id, package_id, completed_at)) = row else { return Ok(false) }; + if completed_at.is_some() { + return Ok(true); + } + let package = + packages::find(&package_id).ok_or_else(|| ApiError::Internal(format!("unknown package {package_id}")))?; + let note = format!("Stripe {session_id}"); + let order = packages::grant(&mut tx, user_id, package, Source::Stripe, Some(user_id), Some(¬e)).await?; + sqlx::query("UPDATE stripe_checkouts SET completed_at = now(), order_id = $2 WHERE id = $1") + .bind(session_id) + .bind(order) + .execute(&mut *tx) + .await?; + tx.commit().await?; + tracing::info!(user = %user_id, package = package.id, session = session_id, "package paid"); + Ok(true) +} + +/// Where a payment stands (the return page asks until it is paid). If the +/// webhook has not arrived yet, Stripe is asked directly. +pub async fn checkout_status( + State(state): St, + auth: AuthUser, + WithRejection(Path(id), _): WithRejection, ApiError>, +) -> ApiResult> { + let row: Option<(String, Option)> = + sqlx::query_as("SELECT package, completed_at FROM stripe_checkouts WHERE id = $1 AND user_id = $2") + .bind(&id) + .bind(auth.id()) + .fetch_optional(&state.db) + .await?; + let (package_id, completed_at) = row.ok_or(ApiError::NotFound("payment"))?; + let mut status = if completed_at.is_some() { "paid" } else { "pending" }; + if let (None, Some(config)) = (completed_at, &state.config.stripe) { + let session = state.stripe.get_session(config, &id).await?; + if session.paid() { + complete(&state, &id).await?; + status = "paid"; + } else if session.status.as_deref() == Some("expired") { + status = "expired"; + } + } + Ok(Json(json!({ + "status": status, + "package": package_id, + "name": packages::find(&package_id).map(|p| p.name), + }))) +} + +/// Stripe's webhook (Developers → Webhooks; event `checkout.session.completed`, +/// for delayed methods also `checkout.session.async_payment_succeeded`). +pub async fn stripe_webhook(State(state): St, headers: HeaderMap, body: Bytes) -> ApiResult> { + let secret = state + .config + .stripe + .as_ref() + .and_then(|c| c.webhook_secret.as_deref()) + .ok_or(ApiError::NotFound("payment method"))?; + let signature = headers.get("stripe-signature").and_then(|v| v.to_str().ok()).unwrap_or(""); + let now = OffsetDateTime::now_utc().unix_timestamp(); + if !stripe::verify_signature(secret, signature, &body, now) { + tracing::warn!("stripe webhook with a bad signature"); + return Err(ApiError::BadRequest("invalid signature".into())); + } + let event: Value = serde_json::from_slice(&body).map_err(|e| ApiError::BadRequest(e.to_string()))?; + let kind = event["type"].as_str().unwrap_or_default(); + let session = &event["data"]["object"]; + if matches!(kind, "checkout.session.completed" | "checkout.session.async_payment_succeeded") + && session["payment_status"] == "paid" + { + let id = session["id"].as_str().unwrap_or_default(); + if !complete(&state, id).await? { + tracing::warn!(session = id, "stripe webhook for a session we did not start"); + } + } + Ok(Json(json!({ "received": true }))) +} diff --git a/services/backend/src/stripe.rs b/services/backend/src/stripe.rs new file mode 100644 index 0000000..98f6439 --- /dev/null +++ b/services/backend/src/stripe.rs @@ -0,0 +1,157 @@ +//! The little of Stripe's API we use: Checkout Sessions (a hosted payment +//! page for one package) and webhook signature checking. The package catalog +//! stays in `packages.rs`; each session carries its name and price, so no +//! products have to be kept in the Stripe dashboard. + +use std::time::Duration; + +use hmac::{Hmac, Mac}; +use serde::Deserialize; +use sha2::Sha256; + +use crate::config::StripeConfig; +use crate::error::ApiError; + +/// How old a webhook signature may be (Stripe's own libraries use 5 minutes). +const SIGNATURE_TOLERANCE: i64 = 300; + +#[derive(Debug, Deserialize)] +pub struct Session { + pub id: String, + /// The payment page (only while the session is open). + pub url: Option, + /// `paid`, `unpaid` or `no_payment_required`. + pub payment_status: String, + /// `open`, `complete` or `expired`. + pub status: Option, +} + +impl Session { + pub fn paid(&self) -> bool { + self.payment_status == "paid" + } +} + +pub struct Client { + http: reqwest::Client, +} + +impl Default for Client { + fn default() -> Self { + let http = reqwest::Client::builder().timeout(Duration::from_secs(20)).build().expect("static configuration"); + Self { http } + } +} + +/// What the user sees when Stripe cannot be reached. +fn unavailable(detail: String) -> ApiError { + tracing::error!(error = %detail, "stripe request failed"); + ApiError::Limited { + code: "payment_unavailable", + message: "A fizetési oldal most nem érhető el. Próbáld újra pár perc múlva.".into(), + } +} + +impl Client { + /// Creates a Checkout Session from form fields (Stripe's API takes + /// `application/x-www-form-urlencoded` with `a[b][c]` keys). + pub async fn create_session(&self, config: &StripeConfig, form: &[(String, String)]) -> Result { + let res = self + .http + .post(format!("{}/v1/checkout/sessions", config.api_url)) + .bearer_auth(&config.secret_key) + .form(form) + .send() + .await + .map_err(|e| unavailable(e.to_string()))?; + Self::session(res).await + } + + pub async fn get_session(&self, config: &StripeConfig, id: &str) -> Result { + let res = self + .http + .get(format!("{}/v1/checkout/sessions/{id}", config.api_url)) + .bearer_auth(&config.secret_key) + .send() + .await + .map_err(|e| unavailable(e.to_string()))?; + Self::session(res).await + } + + async fn session(res: reqwest::Response) -> Result { + let status = res.status(); + if !status.is_success() { + let body = res.text().await.unwrap_or_default(); + return Err(unavailable(format!("HTTP {status}: {}", body.chars().take(500).collect::()))); + } + res.json().await.map_err(|e| unavailable(format!("unexpected response: {e}"))) + } +} + +/// Checks a `Stripe-Signature` header (`t=…,v1=…[,v1=…]`): an HMAC-SHA256 of +/// `"{t}.{body}"` with the endpoint's signing secret, at most five minutes old. +pub fn verify_signature(secret: &str, header: &str, body: &[u8], now: i64) -> bool { + let mut timestamp = None; + let mut signatures = Vec::new(); + for part in header.split(',') { + match part.trim().split_once('=') { + Some(("t", v)) => timestamp = v.parse::().ok(), + Some(("v1", v)) => signatures.push(v), + _ => {} + } + } + let Some(timestamp) = timestamp else { return false }; + if (now - timestamp).abs() > SIGNATURE_TOLERANCE { + return false; + } + let mut mac = Hmac::::new_from_slice(secret.as_bytes()).expect("HMAC takes any key length"); + mac.update(timestamp.to_string().as_bytes()); + mac.update(b"."); + mac.update(body); + let expected = mac.finalize().into_bytes(); + signatures.iter().any(|s| decode_hex(s).is_some_and(|sig| constant_time_eq(&sig, &expected))) +} + +/// The signature header for a body, as Stripe would send it (tests). +#[cfg(test)] +pub fn sign(secret: &str, body: &[u8], timestamp: i64) -> String { + let mut mac = Hmac::::new_from_slice(secret.as_bytes()).unwrap(); + mac.update(format!("{timestamp}.").as_bytes()); + mac.update(body); + let hex: String = mac.finalize().into_bytes().iter().map(|b| format!("{b:02x}")).collect(); + format!("t={timestamp},v1={hex}") +} + +fn decode_hex(s: &str) -> Option> { + if !s.len().is_multiple_of(2) { + return None; + } + (0..s.len()).step_by(2).map(|i| u8::from_str_radix(s.get(i..i + 2)?, 16).ok()).collect() +} + +fn constant_time_eq(a: &[u8], b: &[u8]) -> bool { + a.len() == b.len() && a.iter().zip(b).fold(0u8, |acc, (x, y)| acc | (x ^ y)) == 0 +} + +#[cfg(test)] +mod tests { + use super::*; + + #[test] + fn signatures_are_checked() { + let body = br#"{"id":"evt_1"}"#; + let now = 1_800_000_000; + let header = sign("whsec_test", body, now); + assert!(verify_signature("whsec_test", &header, body, now)); + assert!(verify_signature("whsec_test", &header, body, now + 299)); + // Another secret, a changed body, an old or missing timestamp. + assert!(!verify_signature("whsec_other", &header, body, now)); + assert!(!verify_signature("whsec_test", &header, br#"{"id":"evt_2"}"#, now)); + assert!(!verify_signature("whsec_test", &header, body, now + 301)); + assert!(!verify_signature("whsec_test", header.split_once(',').unwrap().1, body, now)); + // One good signature among others (during a secret rotation) is enough. + let rotated = format!("{header},v1=00ff"); + assert!(verify_signature("whsec_test", &rotated, body, now)); + assert!(!verify_signature("whsec_test", "t=1800000000,v1=zz", body, now)); + } +} diff --git a/services/backend/src/tests.rs b/services/backend/src/tests.rs index a6aa502..6948038 100644 --- a/services/backend/src/tests.rs +++ b/services/backend/src/tests.rs @@ -111,9 +111,54 @@ async fn fake_openrouter_models() -> Json { ]})) } +/// Checkout sessions the fake Stripe created: form fields and whether paid. +type FakeSessions = std::sync::Mutex, bool)>>; +static STRIPE_SESSIONS: std::sync::LazyLock = std::sync::LazyLock::new(Default::default); +static STRIPE_IDS: std::sync::atomic::AtomicU64 = std::sync::atomic::AtomicU64::new(1); + +fn stripe_form(id: &str, key: &str) -> Option { + let sessions = STRIPE_SESSIONS.lock().unwrap(); + sessions.get(id)?.0.iter().find(|(k, _)| k == key).map(|(_, v)| v.clone()) +} + +fn stripe_pay(id: &str) { + STRIPE_SESSIONS.lock().unwrap().get_mut(id).unwrap().1 = true; +} + +async fn fake_stripe_create( + headers: HeaderMap, + axum::Form(form): axum::Form>, +) -> (StatusCode, Json) { + if headers.get("authorization").and_then(|v| v.to_str().ok()) != Some("Bearer sk_live_fake") { + return (StatusCode::UNAUTHORIZED, Json(json!({"error": {"message": "bad key"}}))); + } + let id = format!("cs_fake_{}", STRIPE_IDS.fetch_add(1, std::sync::atomic::Ordering::Relaxed)); + STRIPE_SESSIONS.lock().unwrap().insert(id.clone(), (form, false)); + ( + StatusCode::OK, + Json( + json!({"id": id, "url": format!("https://checkout.stripe.test/{id}"), "payment_status": "unpaid", "status": "open"}), + ), + ) +} + +async fn fake_stripe_get(axum::extract::Path(id): axum::extract::Path) -> (StatusCode, Json) { + match STRIPE_SESSIONS.lock().unwrap().get(&id) { + Some((_, paid)) => ( + StatusCode::OK, + Json(json!({"id": id, "url": null, + "payment_status": if *paid { "paid" } else { "unpaid" }, + "status": if *paid { "complete" } else { "open" }})), + ), + None => (StatusCode::NOT_FOUND, Json(json!({"error": {"message": "no such session"}}))), + } +} + async fn fake_services() -> String { let app = Router::new() .route("/openrouter/models", get(fake_openrouter_models)) + .route("/v1/checkout/sessions", post(fake_stripe_create)) + .route("/v1/checkout/sessions/{id}", get(fake_stripe_get)) .route("/v1/natal", post(fake_natal)) .route("/v1/synastry", post(fake_synastry)) .route("/v1/forecast", post(fake_forecast)) @@ -782,8 +827,10 @@ async fn export_and_delete_account(pool: PgPool) { /// config and catalog, shared links, invitation pages, the waitlist and /// unsubscribing. Every other route (charts, calculations, analyses) needs a /// logged-in user, so other apps cannot use them. -const PUBLIC_ROUTES: [&str; 15] = [ +const PUBLIC_ROUTES: [&str; 16] = [ "/healthz", + // Stripe calls it; the signature proves it. + "/v1/payments/stripe/webhook", "/v1/config", "/v1/packages", "/v1/auth/register", @@ -2207,3 +2254,132 @@ async fn a_new_user_from_a_shared_link_earns_an_analysis(pool: PgPool) { .unwrap(); assert_eq!(count, 0); } + +fn with_stripe(config: &mut Config, key: &str) { + config.stripe = Some(crate::config::StripeConfig { + secret_key: key.into(), + webhook_secret: Some("whsec_fake".into()), + api_url: config.horoscope_api_url.clone(), + }); +} + +async fn stripe_orders(pool: &PgPool, email: &str) -> Vec<(String, i32)> { + sqlx::query_as( + "SELECT o.package, o.price_huf FROM package_orders o JOIN users u ON u.id = o.user_id \ + WHERE u.email = $1 AND o.source = 'stripe' ORDER BY o.created_at", + ) + .bind(email) + .fetch_all(pool) + .await + .unwrap() +} + +#[sqlx::test(migrator = "db::MIGRATOR")] +async fn stripe_checkout_grants_the_paid_package_once(pool: PgPool) { + let app = TestApp::with_config(pool, |c| with_stripe(c, "sk_live_fake")).await; + let r = app.get("/v1/config", None).await; + assert_eq!(r.body["payments"], "stripe"); + assert_eq!(r.body["payments_test"], false); + // Stripe replaces the stand-in payment. + assert_eq!(r.body["mock_payments"], false); + let anna = app.register("anna@example.com", "Anna").await; + let r = app.post("/v1/payments/mock", Some(&anna), json!({"package": "couple"})).await; + assert_eq!(r.status, StatusCode::NOT_FOUND); + + let r = app.post("/v1/payments/checkout", Some(&anna), json!({"package": "nincs"})).await; + assert_eq!(r.status, StatusCode::NOT_FOUND); + let r = app + .post("/v1/payments/checkout", Some(&anna), json!({"package": "couple", "return_path": "/kepletek/abc?x=1"})) + .await; + assert_eq!(r.status, StatusCode::OK, "{}", r.body); + let url = r.body["url"].as_str().unwrap(); + let id = url.rsplit('/').next().unwrap().to_string(); + assert_eq!(stripe_form(&id, "line_items[0][price_data][currency]").as_deref(), Some("huf")); + assert_eq!(stripe_form(&id, "line_items[0][price_data][unit_amount]").as_deref(), Some("600000")); + assert_eq!( + stripe_form(&id, "line_items[0][price_data][product_data][name]").as_deref(), + Some("Sorsfonalak – Páros") + ); + assert_eq!(stripe_form(&id, "customer_email").as_deref(), Some("anna@example.com")); + assert_eq!( + stripe_form(&id, "success_url").as_deref(), + Some("https://sorsfonalak.test/kepletek/abc?fizetes={CHECKOUT_SESSION_ID}") + ); + // Only paths of this site to come back to. + let r = app + .post("/v1/payments/checkout", Some(&anna), json!({"package": "single", "return_path": "//evil.example/x"})) + .await; + let other = r.body["url"].as_str().unwrap().rsplit('/').next().unwrap().to_string(); + assert_eq!( + stripe_form(&other, "cancel_url").as_deref(), + Some("https://sorsfonalak.test/csomagok?fizetes=megszakitva") + ); + + // Not paid yet: nothing granted. + let r = app.get(&format!("/v1/payments/checkout/{id}"), Some(&anna)).await; + assert_eq!(r.body["status"], "pending", "{}", r.body); + assert!(stripe_orders(&app.pool, "anna@example.com").await.is_empty()); + // Someone else's payment is not found. + let bela = app.register("bela@example.com", "Béla").await; + let r = app.get(&format!("/v1/payments/checkout/{id}"), Some(&bela)).await; + assert_eq!(r.status, StatusCode::NOT_FOUND); + + // The webhook: a bad signature is refused, a good one grants the package, + // and Stripe's retries do not grant it again. + let event = json!({"id": "evt_1", "type": "checkout.session.completed", + "data": {"object": {"id": id, "payment_status": "paid"}}}); + let body = event.to_string(); + let now = time::OffsetDateTime::now_utc().unix_timestamp(); + let bad = crate::stripe::sign("whsec_other", body.as_bytes(), now); + let r = app + .call_with("POST", "/v1/payments/stripe/webhook", None, Some(event.clone()), &[("stripe-signature", &bad)]) + .await; + assert_eq!(r.status, StatusCode::BAD_REQUEST); + assert!(stripe_orders(&app.pool, "anna@example.com").await.is_empty()); + let good = crate::stripe::sign("whsec_fake", body.as_bytes(), now); + for _ in 0..2 { + let r = app + .call_with("POST", "/v1/payments/stripe/webhook", None, Some(event.clone()), &[("stripe-signature", &good)]) + .await; + assert_eq!(r.status, StatusCode::OK, "{}", r.body); + } + assert_eq!(stripe_orders(&app.pool, "anna@example.com").await, vec![("couple".to_string(), 6000)]); + let r = app.get(&format!("/v1/payments/checkout/{id}"), Some(&anna)).await; + assert_eq!(r.body["status"], "paid"); + assert_eq!(r.body["name"], "Páros"); + let r = app.get("/v1/me", Some(&anna)).await; + assert_eq!(r.status, StatusCode::OK); + + // A session we did not start is ignored. + let stray = json!({"type": "checkout.session.completed", "data": {"object": {"id": "cs_unknown", "payment_status": "paid"}}}); + let sig = crate::stripe::sign("whsec_fake", stray.to_string().as_bytes(), now); + let r = + app.call_with("POST", "/v1/payments/stripe/webhook", None, Some(stray), &[("stripe-signature", &sig)]).await; + assert_eq!(r.status, StatusCode::OK); + + // Without the webhook (late or not set up) the return page asks Stripe. + stripe_pay(&other); + let r = app.get(&format!("/v1/payments/checkout/{other}"), Some(&anna)).await; + assert_eq!(r.body["status"], "paid", "{}", r.body); + let r = app.get(&format!("/v1/payments/checkout/{other}"), Some(&anna)).await; + assert_eq!(r.body["status"], "paid"); + assert_eq!( + stripe_orders(&app.pool, "anna@example.com").await, + vec![("couple".to_string(), 6000), ("single".to_string(), 2000)] + ); +} + +#[sqlx::test(migrator = "db::MIGRATOR")] +async fn stripe_test_mode_is_for_admins_only(pool: PgPool) { + let app = TestApp::with_config(pool, |c| with_stripe(c, "sk_test_fake")).await; + let r = app.get("/v1/config", None).await; + assert_eq!(r.body["payments"], "stripe"); + assert_eq!(r.body["payments_test"], true); + let anna = app.register("anna@example.com", "Anna").await; + let r = app.post("/v1/payments/checkout", Some(&anna), json!({"package": "single"})).await; + assert_eq!(r.status, StatusCode::FORBIDDEN); + // The admin gets as far as Stripe (the fake one only knows the live key). + let admin = app.register("admin@example.com", "Admin").await; + let r = app.post("/v1/payments/checkout", Some(&admin), json!({"package": "single"})).await; + assert_eq!(r.body["error"]["code"], "payment_unavailable", "{}", r.body); +} diff --git a/services/frontend/src/app/api/v1/[...path]/route.ts b/services/frontend/src/app/api/v1/[...path]/route.ts index 8661709..158ee61 100644 --- a/services/frontend/src/app/api/v1/[...path]/route.ts +++ b/services/frontend/src/app/api/v1/[...path]/route.ts @@ -6,7 +6,16 @@ import type { NextRequest } from "next/server"; import { BACKEND_URL } from "@/lib/server"; import { SHARES_TAG } from "@/lib/share"; -const REQUEST_HEADERS = ["accept", "accept-language", "authorization", "content-type", "cookie", "user-agent"]; +// stripe-signature: Stripe's webhook (the body is passed on byte for byte). +const REQUEST_HEADERS = [ + "accept", + "accept-language", + "authorization", + "content-type", + "cookie", + "stripe-signature", + "user-agent", +]; // Hop-by-hop or re-computed by the runtime. const SKIP_RESPONSE_HEADERS = new Set(["connection", "content-encoding", "content-length", "set-cookie", "transfer-encoding"]); diff --git a/services/frontend/src/app/csomagok/page.tsx b/services/frontend/src/app/csomagok/page.tsx index 62b539a..dc42293 100644 --- a/services/frontend/src/app/csomagok/page.tsx +++ b/services/frontend/src/app/csomagok/page.tsx @@ -3,6 +3,7 @@ import type { Metadata } from "next"; import { AiNote } from "@/components/AiNote"; import { PackageCards } from "@/components/PackageCards"; import { RedeemCode } from "@/components/RedeemCode"; +import { payMethod } from "@/lib/payments"; import { backendGet, requireMe } from "@/lib/server"; import type { Package, PublicConfig } from "@/lib/types"; @@ -39,7 +40,7 @@ export default async function PackagesPage() { backendGet("/v1/config"), ]); const packages = catalog?.packages ?? []; - const canPay = config?.mock_payments ?? false; + const canPay = payMethod(config, me); const left = me.analyses_left; const slots = me.persons; diff --git a/services/frontend/src/app/globals.css b/services/frontend/src/app/globals.css index eaf9460..0770685 100644 --- a/services/frontend/src/app/globals.css +++ b/services/frontend/src/app/globals.css @@ -948,3 +948,12 @@ a.pair-row:hover strong { color: var(--gold); } /* Chart page: below the wheel and the summary, the facts and the next steps side by side */ .chart-extras { display: grid; grid-template-columns: repeat(auto-fit, minmax(min(300px, 100%), 1fr)); gap: 16px; align-items: stretch; } .chart-extras > .card { margin: 0; } + +/* Back from Stripe: the payment's result at the bottom of the screen. */ +.pay-return { position: fixed; left: 50%; bottom: 20px; transform: translateX(-50%); z-index: 60; width: min(560px, calc(100% - 32px)); } +.pay-return .msg { + display: flex; align-items: center; justify-content: space-between; gap: 12px; margin: 0; padding: 14px 16px; + background: var(--panel-2); border: 1px solid var(--line); border-radius: 14px; box-shadow: 0 12px 40px rgba(0, 0, 0, 0.45); +} +.pay-return .msg-ok { border-color: color-mix(in srgb, var(--ok) 55%, var(--line)); } +.pay-return .msg-error { border-color: color-mix(in srgb, var(--danger) 55%, var(--line)); } diff --git a/services/frontend/src/app/kepletek/[id]/elorejelzes/page.tsx b/services/frontend/src/app/kepletek/[id]/elorejelzes/page.tsx index 03bf54e..d389fc4 100644 --- a/services/frontend/src/app/kepletek/[id]/elorejelzes/page.tsx +++ b/services/frontend/src/app/kepletek/[id]/elorejelzes/page.tsx @@ -6,6 +6,7 @@ import { ChartWheel } from "@/components/ChartWheel"; import { DetailedAnalysis } from "@/components/DetailedAnalysis"; import { ForecastKeys, ForecastTimeline, ForecastTransits, longDay } from "@/components/ForecastViews"; import { Tabs } from "@/components/Tabs"; +import { payMethod } from "@/lib/payments"; import { backendGet, requireMe } from "@/lib/server"; import type { Analysis, Chart, ForecastDetail, ForecastList, PublicConfig } from "@/lib/types"; @@ -134,7 +135,7 @@ export default async function ForecastPage({ initial={detailed} left={me.analyses_left.forecast} isAdmin={me.user.roles.includes("admin")} - canPay={config?.mock_payments ?? false} + canPay={payMethod(config, me)} questionsLeft={me.analyses_left.question ?? 0} /> ), diff --git a/services/frontend/src/app/kepletek/[id]/page.tsx b/services/frontend/src/app/kepletek/[id]/page.tsx index 295e569..0d46824 100644 --- a/services/frontend/src/app/kepletek/[id]/page.tsx +++ b/services/frontend/src/app/kepletek/[id]/page.tsx @@ -10,6 +10,7 @@ import { ChartWheel, WheelLegend } from "@/components/ChartWheel"; import { CompareButton } from "@/components/CompareButton"; import { Tabs } from "@/components/Tabs"; import { ASPECTS, ELEMENTS, MODALITIES, MOON_PHASES, countryName, formatBirthDate, pointName } from "@/lib/astro"; +import { payMethod } from "@/lib/payments"; import { backendGet, requireMe } from "@/lib/server"; import type { Analysis, Chart, ChartListItem, PublicConfig } from "@/lib/types"; @@ -181,7 +182,7 @@ export default async function ChartPage({ params }: { params: Promise<{ id: stri initial={detailed} left={me.analyses_left.natal} isAdmin={me.user.roles.includes("admin")} - canPay={config?.mock_payments ?? false} + canPay={payMethod(config, me)} questionsLeft={me.analyses_left.question ?? 0} /> ), diff --git a/services/frontend/src/app/layout.tsx b/services/frontend/src/app/layout.tsx index a382e00..c452c83 100644 --- a/services/frontend/src/app/layout.tsx +++ b/services/frontend/src/app/layout.tsx @@ -1,6 +1,8 @@ import type { Metadata } from "next"; import { Cormorant_Garamond, Inter } from "next/font/google"; +import { Suspense } from "react"; +import { PaymentReturn } from "@/components/PaymentReturn"; import { SiteHeader } from "@/components/SiteHeader"; import { getMe } from "@/lib/server"; @@ -25,6 +27,11 @@ export default async function RootLayout({ children }: { children: React.ReactNo {me && } {children} + {me && ( + + + + )} ); diff --git a/services/frontend/src/app/osszevetesek/[id]/page.tsx b/services/frontend/src/app/osszevetesek/[id]/page.tsx index 379244e..db69cea 100644 --- a/services/frontend/src/app/osszevetesek/[id]/page.tsx +++ b/services/frontend/src/app/osszevetesek/[id]/page.tsx @@ -8,6 +8,7 @@ import { CompositeTables, CrossGrid, HouseOverlays, InterAspectList, NatureBar } import { SynastryLegend, SynastryWheel } from "@/components/SynastryWheel"; import { Tabs } from "@/components/Tabs"; import { ASPECTS, formatBirthDate } from "@/lib/astro"; +import { payMethod } from "@/lib/payments"; import { backendGet, requireMe } from "@/lib/server"; import { sideName, sideTimeKnown } from "@/lib/synastry"; import type { Analysis, ChartListItem, PublicConfig, Synastry, SynastrySide } from "@/lib/types"; @@ -127,7 +128,7 @@ export default async function ComparisonPage({ params }: { params: Promise<{ id: initial={detailed} left={me.analyses_left.synastry} isAdmin={me.user.roles.includes("admin")} - canPay={config?.mock_payments ?? false} + canPay={payMethod(config, me)} note={`Az elemzésben az első fél: ${name1}, a második fél: ${name2}.`} questionsLeft={me.analyses_left.question ?? 0} /> diff --git a/services/frontend/src/app/szemelyek/page.tsx b/services/frontend/src/app/szemelyek/page.tsx index 4cd9fe1..0322d6e 100644 --- a/services/frontend/src/app/szemelyek/page.tsx +++ b/services/frontend/src/app/szemelyek/page.tsx @@ -5,6 +5,7 @@ import { ChartCard } from "@/components/ChartCard"; import { PersonActions } from "@/components/PersonActions"; import { PendingInvites } from "@/components/PendingInvites"; import { PersonPacks } from "@/components/PersonPacks"; +import { payMethod } from "@/lib/payments"; import { backendGet, requireMe } from "@/lib/server"; import type { ChartListItem, PublicConfig } from "@/lib/types"; @@ -102,7 +103,7 @@ export default async function PersonsPage() { ? "Elfogytak a helyeid. Újabb személyhez válassz csomagot." : "A felvett személyek képletét és elemzéseit itt éred el. Egy törölt személy helye nem szabadul fel."}

- + )} diff --git a/services/frontend/src/app/szemelyek/uj/page.tsx b/services/frontend/src/app/szemelyek/uj/page.tsx index 05d0fe6..d9ca428 100644 --- a/services/frontend/src/app/szemelyek/uj/page.tsx +++ b/services/frontend/src/app/szemelyek/uj/page.tsx @@ -1,6 +1,7 @@ import type { Metadata } from "next"; import { PersonPacks } from "@/components/PersonPacks"; +import { payMethod } from "@/lib/payments"; import { backendGet, requireMe } from "@/lib/server"; import type { PublicConfig } from "@/lib/types"; @@ -31,7 +32,7 @@ export default async function NewPersonPage() { full={ <>

Elfogytak a helyeid. Újabb személyhez válassz csomagot, vagy hívd meg.

- + } /> diff --git a/services/frontend/src/components/AnalysisQuestions.tsx b/services/frontend/src/components/AnalysisQuestions.tsx index b06aef5..cb1b5a8 100644 --- a/services/frontend/src/components/AnalysisQuestions.tsx +++ b/services/frontend/src/components/AnalysisQuestions.tsx @@ -4,7 +4,7 @@ import Link from "next/link"; import { useCallback, useEffect, useState } from "react"; import { api, ApiError, errorText } from "@/lib/api"; -import type { Question, UnitBalance } from "@/lib/types"; +import type { PayMethod, Question, UnitBalance } from "@/lib/types"; import { AnalysisLoading } from "./AnalysisLoading"; import { PackageChooser } from "./PackageCards"; @@ -49,7 +49,7 @@ export function AnalysisQuestions({ analysisId: string; left: number; isAdmin: boolean; - canPay: boolean; + canPay: PayMethod | null; /** What the analysis is about: the heading and the example question follow it. */ about: "natal" | "synastry" | "forecast"; }) { diff --git a/services/frontend/src/components/DetailedAnalysis.tsx b/services/frontend/src/components/DetailedAnalysis.tsx index 6dfe4e0..5698a8d 100644 --- a/services/frontend/src/components/DetailedAnalysis.tsx +++ b/services/frontend/src/components/DetailedAnalysis.tsx @@ -4,7 +4,7 @@ import Link from "next/link"; import { useEffect, useState } from "react"; import { api, errorText } from "@/lib/api"; -import type { Analysis } from "@/lib/types"; +import type { Analysis, PayMethod } from "@/lib/types"; import { AI_SHORT } from "./AiNote"; import { AnalysisLoading } from "./AnalysisLoading"; @@ -96,8 +96,8 @@ export function DetailedAnalysis({ initial: Analysis | null; left: number; isAdmin: boolean; - /** The stand-in payment is on (MOCK_PAYMENTS). */ - canPay: boolean; + /** How the user can buy a package (null: purchases are off). */ + canPay: PayMethod | null; /** Shown above a finished analysis (e.g. who is the first and the second person). */ note?: string; /** Questions left; given where questions can be asked. */ @@ -245,7 +245,11 @@ export function DetailedAnalysis({ step === "pay" ? (

- Válassz csomagot. A vásárlás után az elemzés azonnal elindul, a maradék elemzések pedig nem járnak le. + Válassz csomagot.{" "} + {canPay === "mock" + ? "A vásárlás után az elemzés azonnal elindul" + : "A fizetés után visszajössz ide, és rögtön elindíthatod az elemzést"} + , a maradék elemzések pedig nem járnak le.

diff --git a/services/frontend/src/components/PackageCards.tsx b/services/frontend/src/components/PackageCards.tsx index 721dca1..6017449 100644 --- a/services/frontend/src/components/PackageCards.tsx +++ b/services/frontend/src/components/PackageCards.tsx @@ -5,7 +5,7 @@ import { useRouter } from "next/navigation"; import { useEffect, useState } from "react"; import { api, errorText } from "@/lib/api"; -import type { Package } from "@/lib/types"; +import type { Package, PayMethod } from "@/lib/types"; export const huf = (n: number) => `${n.toLocaleString("hu-HU")} Ft`; @@ -22,8 +22,9 @@ export function contents(p: Package): string[] { /** * Package cards with a buy button. Bigger packages show what they save and - * how little more they cost than the previous one. Until Stripe is connected - * the payment is a stand-in (MOCK_PAYMENTS) that grants the package at once. + * how little more they cost than the previous one. With Stripe the button + * goes to Stripe's payment page and comes back to this page (PaymentReturn + * shows the result); the stand-in payment (MOCK_PAYMENTS) grants at once. */ export function PackageCards({ packages, @@ -35,15 +36,24 @@ export function PackageCards({ packages: Package[]; /** Which packages, in this order (default: the main ladder). */ ids?: string[]; - canPay: boolean; + /** How the user can pay (null: purchases are off, the buttons say "soon"). */ + canPay: PayMethod | null; compact?: boolean; - /** After a purchase (default: reload the page data). */ + /** After a stand-in purchase (default: reload the page data). */ onBought?: (p: Package) => Promise | void; }) { const router = useRouter(); const [busy, setBusy] = useState(null); const [error, setError] = useState(null); const [done, setDone] = useState(null); + // Back from Stripe's page (the browser may restore this page as it was). + useEffect(() => { + const reset = (e: PageTransitionEvent) => { + if (e.persisted) setBusy(null); + }; + window.addEventListener("pageshow", reset); + return () => window.removeEventListener("pageshow", reset); + }, []); const shown = ids ? ids.map((id) => packages.find((p) => p.id === id)).filter((p): p is Package => p !== undefined) : packages.filter((p) => p.tier === "main"); @@ -53,15 +63,22 @@ export function PackageCards({ setError(null); setDone(null); try { + if (canPay === "stripe" || canPay === "stripe_test") { + const { url } = await api<{ url: string }>("/payments/checkout", { + body: { package: p.id, return_path: window.location.pathname }, + }); + window.location.assign(url); + return; + } await api("/payments/mock", { body: { package: p.id } }); if (onBought) await onBought(p); else { setDone(p.name); router.refresh(); } + setBusy(null); } catch (e) { setError(errorText(e)); - } finally { setBusy(null); } } @@ -110,7 +127,7 @@ export function PackageCards({ onClick={() => buy(p)} disabled={busy !== null} > - {busy === p.id ? "Fizetés…" : "Megveszem"} + {busy === p.id ? (canPay === "mock" ? "Fizetés…" : "Átirányítás…") : "Megveszem"} ) : (
); } @@ -154,7 +183,7 @@ export function PackageChooser({ onBought, }: { ids: string[]; - canPay: boolean; + canPay: PayMethod | null; onBought?: (p: Package) => Promise | void; }) { const packages = usePackages(); diff --git a/services/frontend/src/components/PaymentReturn.tsx b/services/frontend/src/components/PaymentReturn.tsx new file mode 100644 index 0000000..a5d6bef --- /dev/null +++ b/services/frontend/src/components/PaymentReturn.tsx @@ -0,0 +1,90 @@ +"use client"; + +import { usePathname, useRouter, useSearchParams } from "next/navigation"; +import { useEffect, useState } from "react"; + +import { api, errorText } from "@/lib/api"; + +type Notice = { kind: "wait" | "ok" | "info" | "error"; text: string }; + +const POLLS = 20; +const POLL_MS = 2000; + +/** + * Back from Stripe's payment page (`?fizetes=` or + * `?fizetes=megszakitva`): waits until the payment is confirmed, then shows + * it and reloads the page data. Lives in the layout, so it works on every + * page a purchase can start from. + */ +export function PaymentReturn() { + const params = useSearchParams(); + const pathname = usePathname(); + const router = useRouter(); + const value = params.get("fizetes"); + const [notice, setNotice] = useState(null); + + useEffect(() => { + if (!value) return; + // A reload should not show it again. + const clean = () => { + const rest = new URLSearchParams(window.location.search); + rest.delete("fizetes"); + router.replace(rest.size ? `${pathname}?${rest}` : pathname, { scroll: false }); + }; + if (value === "megszakitva") { + setNotice({ kind: "info", text: "A fizetés megszakadt, nem terheltünk semmit." }); + clean(); + return; + } + let stopped = false; + setNotice({ kind: "wait", text: "A fizetés visszaigazolására várunk…" }); + (async () => { + for (let i = 0; i < POLLS && !stopped; i++) { + try { + const r = await api<{ status: string; name: string | null }>( + `/payments/checkout/${encodeURIComponent(value)}`, + ); + if (stopped) return; + if (r.status === "paid") { + setNotice({ kind: "ok", text: `Köszönjük! Jóváírtuk: ${r.name ?? "a csomagod"}.` }); + clean(); + router.refresh(); + return; + } + if (r.status === "expired") { + setNotice({ kind: "info", text: "A fizetési oldal lejárt, nem terheltünk semmit." }); + clean(); + return; + } + } catch (e) { + if (!stopped) setNotice({ kind: "error", text: errorText(e) }); + return; + } + await new Promise((resolve) => setTimeout(resolve, POLL_MS)); + } + if (!stopped) + setNotice({ + kind: "error", + text: "A Stripe még nem igazolta vissza a fizetést. Pár perc múlva frissítsd az oldalt: ha a pénz levonódott, a csomag megérkezik.", + }); + })(); + return () => { + stopped = true; + }; + }, [value, pathname, router]); + + if (!notice) return null; + const cls = notice.kind === "ok" ? "msg msg-ok" : notice.kind === "error" ? "msg msg-error" : "msg"; + return ( +
+

+ {notice.text} + {notice.kind !== "wait" && ( + + )} +

+
+ ); +} diff --git a/services/frontend/src/components/PersonPacks.tsx b/services/frontend/src/components/PersonPacks.tsx index 1177b05..0fe30d3 100644 --- a/services/frontend/src/components/PersonPacks.tsx +++ b/services/frontend/src/components/PersonPacks.tsx @@ -1,8 +1,10 @@ "use client"; +import type { PayMethod } from "@/lib/types"; + import { PackageChooser } from "./PackageCards"; /** Packages that give more persons: a few more, or the family package. */ -export function PersonPacks({ canPay }: { canPay: boolean }) { +export function PersonPacks({ canPay }: { canPay: PayMethod | null }) { return ; } diff --git a/services/frontend/src/lib/payments.ts b/services/frontend/src/lib/payments.ts new file mode 100644 index 0000000..d88f371 --- /dev/null +++ b/services/frontend/src/lib/payments.ts @@ -0,0 +1,9 @@ +import type { Me, PayMethod, PublicConfig } from "./types"; + +/** How this user can buy packages (with a Stripe test key: admins only). */ +export function payMethod(config: PublicConfig | null | undefined, me: Me): PayMethod | null { + if (config?.payments === "mock") return "mock"; + if (config?.payments !== "stripe") return null; + if (!config.payments_test) return "stripe"; + return me.user.roles.includes("admin") ? "stripe_test" : null; +} diff --git a/services/frontend/src/lib/types.ts b/services/frontend/src/lib/types.ts index e74b3e1..ce53995 100644 --- a/services/frontend/src/lib/types.ts +++ b/services/frontend/src/lib/types.ts @@ -92,6 +92,10 @@ export interface PublicConfig { password_login: boolean; password_min_length: number; mock_payments: boolean; + /** How packages are paid: Stripe Checkout, the stand-in, or not at all. */ + payments: "stripe" | "mock" | null; + /** Stripe has a test key: only admins can buy. */ + payments_test: boolean; /** "invite": new accounts need an invitation. */ signup_mode: "invite" | "open"; /** Users may invite others (off until the launch; admins always may). */ @@ -573,3 +577,6 @@ export interface PersonInviteLanding { status: "pending" | "accepted" | "expired"; expires_at: string; } + +/** How this user can buy a package; `null`: purchases are off. */ +export type PayMethod = "stripe" | "stripe_test" | "mock"; -- 2.54.0 From d9e71ed34978602d40378f32cc2423d2f82179f4 Mon Sep 17 00:00:00 2001 From: feco Date: Fri, 20 Nov 2026 06:57:00 +0000 Subject: [PATCH 2/2] Purchases for admins only until the opening; brand images for Stripe PURCHASES_OPEN (default false) keeps Stripe purchases to admins, also with a live key, so nobody types a real card before the opening. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_012vLHzh5qUhFtmJhzkcTbXL --- deploy/docker-compose.yml | 3 +++ docker-compose.yml | 3 +++ docs/brand/README.md | 21 ++++++++++++++++++ docs/brand/sorsfonalak-ikon-512.png | Bin 0 -> 18880 bytes .../brand/sorsfonalak-logo-sotet-hatterre.png | Bin 0 -> 27031 bytes .../sorsfonalak-logo-vilagos-hatterre.png | Bin 0 -> 27056 bytes docs/fizetes.md | 5 +++-- services/backend/src/config.rs | 8 ++++++- services/backend/src/routes/mod.rs | 4 +++- services/backend/src/routes/payments.rs | 12 +++++++--- services/backend/src/tests.rs | 18 +++++++++++++++ services/frontend/src/lib/payments.ts | 9 +++++--- services/frontend/src/lib/types.ts | 4 +++- 13 files changed, 76 insertions(+), 11 deletions(-) create mode 100644 docs/brand/README.md create mode 100644 docs/brand/sorsfonalak-ikon-512.png create mode 100644 docs/brand/sorsfonalak-logo-sotet-hatterre.png create mode 100644 docs/brand/sorsfonalak-logo-vilagos-hatterre.png diff --git a/deploy/docker-compose.yml b/deploy/docker-compose.yml index 5380da2..20d4a33 100644 --- a/deploy/docker-compose.yml +++ b/deploy/docker-compose.yml @@ -88,6 +88,9 @@ services: # Without the Stripe keys purchases are off; packages come from promo # codes and admins (MOCK_PAYMENTS=true: pretend purchases). MOCK_PAYMENTS: ${MOCK_PAYMENTS:-false} + # Stripe purchases for everyone (false: admins only, until the opening; + # with a test key always admins only). + PURCHASES_OPEN: ${PURCHASES_OPEN:-false} # Users inviting others ("Meghívom"): shown but off until the launch. USER_INVITES: ${USER_INVITES:-false} # A new user from a shared link earns the sharer an analysis: off until sign-up opens. diff --git a/docker-compose.yml b/docker-compose.yml index c037b26..43267c0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -55,6 +55,9 @@ services: PASSWORD_LOGIN: ${PASSWORD_LOGIN:-false} # Stand-in payment (adds an analysis unit at once) until Stripe is connected. MOCK_PAYMENTS: ${MOCK_PAYMENTS:-true} + # Stripe purchases for everyone (false: admins only, until the opening; + # with a test key always admins only). + PURCHASES_OPEN: ${PURCHASES_OPEN:-false} FREE_PERSON_SLOTS: ${FREE_PERSON_SLOTS:-0} # invite: new accounts need an invitation (admin page "Meghívók"); open: anyone. SIGNUP_MODE: ${SIGNUP_MODE:-invite} diff --git a/docs/brand/README.md b/docs/brand/README.md new file mode 100644 index 0000000..1d28a15 --- /dev/null +++ b/docs/brand/README.md @@ -0,0 +1,21 @@ +# Arculat + +- `sorsfonalak-ikon-512.png`: négyzetes ikon (512×512, sötét háttér, teljes kitöltés). +- `sorsfonalak-logo-sotet-hatterre.png`: logó átlátszó háttérrel, sötét felületre (1200×300). +- `sorsfonalak-logo-vilagos-hatterre.png`: ugyanez világos felületre. + +A jel forrása: `services/frontend/src/app/icon.svg`. + +## Színek + +| Szerep | Szín | +|---|---| +| Háttér | `#0d1220` | +| Panel | `#111729` | +| Arany (kiemelés, gombok) | `#d9b46a` | +| Arany, világos háttéren | `#a7802f` | +| Szöveg sötét háttéren | `#ece6d8` | +| Szöveg világos háttéren | `#1b2236` | +| Gomb felirata arany gombon | `#141a2c` | + +Stripe (Settings → Branding): Brand color `#0d1220`, Accent color `#d9b46a`, ikon és a sötét háttérre szánt logó. diff --git a/docs/brand/sorsfonalak-ikon-512.png b/docs/brand/sorsfonalak-ikon-512.png new file mode 100644 index 0000000000000000000000000000000000000000..d765836f66d30f447d88f7617e5a7a2af1b666c8 GIT binary patch literal 18880 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 literal 0 HcmV?d00001 diff --git a/docs/brand/sorsfonalak-logo-sotet-hatterre.png b/docs/brand/sorsfonalak-logo-sotet-hatterre.png new file mode 100644 index 0000000000000000000000000000000000000000..e6b61f030b78c8a284abd737c6b1cecf5eb7dd96 GIT binary patch literal 27031 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 JRXni``#-1&sSE%B literal 0 HcmV?d00001 diff --git a/docs/brand/sorsfonalak-logo-vilagos-hatterre.png b/docs/brand/sorsfonalak-logo-vilagos-hatterre.png new file mode 100644 index 0000000000000000000000000000000000000000..86a1dbee5a37c983f61e904bd5d9bb54729b4661 GIT binary patch literal 27056 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 Qqo>0k>KHw!)^dFPKjV#ObN~PV literal 0 HcmV?d00001 diff --git a/docs/fizetes.md b/docs/fizetes.md index d3661b0..33bbf3c 100644 --- a/docs/fizetes.md +++ b/docs/fizetes.md @@ -22,8 +22,9 @@ STRIPE_SECRET_KEY=sk_test_... STRIPE_WEBHOOK_SECRET=whsec_... ``` -- **Teszt kulccsal (`sk_test_…`) csak az adminok vásárolhatnak**, a többieknek a gombok „Hamarosan” feliratúak maradnak; így senki nem jut csomaghoz a Stripe tesztkártyáival. Tesztkártya: `4242 4242 4242 4242`, bármilyen jövőbeli lejárat és CVC. -- Élő kulccsal (`sk_live_…`) mindenki vásárolhat. +- **A megnyitásig csak az adminok vásárolhatnak** (`PURCHASES_OPEN=false`, az alapértelmezés), a többieknek a gombok „Hamarosan” feliratúak; így senki nem ad meg valódi kártyát egy teszt- vagy félkész beállításnál. +- Teszt kulccsal (`sk_test_…`) `PURCHASES_OPEN=true` mellett is csak adminok vásárolhatnak (a Stripe tesztkártyáival senki nem jut csomaghoz). Tesztkártya: `4242 4242 4242 4242`, bármilyen jövőbeli lejárat és CVC. +- Élő kulccsal és `PURCHASES_OPEN=true` mellett mindenki vásárolhat (megnyitáskor, a `.env`-ben). - Kulcs nélkül nincs vásárlás (helyben a `MOCK_PAYMENTS=true` próbafizetés működik; a Stripe-kulcs ezt felülírja). A Stripe felületén: diff --git a/services/backend/src/config.rs b/services/backend/src/config.rs index ab6744d..996ed3b 100644 --- a/services/backend/src/config.rs +++ b/services/backend/src/config.rs @@ -46,8 +46,12 @@ pub struct Config { /// analysis unit at once, until Stripe is connected. pub mock_payments: bool, /// Stripe Checkout, when `STRIPE_SECRET_KEY` is set (it wins over - /// `MOCK_PAYMENTS`). With a test key only admins can buy. + /// `MOCK_PAYMENTS`). pub stripe: Option, + /// `PURCHASES_OPEN` (default `false`): everyone may buy through Stripe. + /// Until the opening only admins can (and with a test key always only + /// admins), so nobody types a real card into a test or unfinished setup. + pub purchases_open: bool, /// `USER_INVITES` (default `false`): users may invite others ("how /// compatible are we?" links, which also let the invitee sign up). Off /// until the launch; admins may always. @@ -166,6 +170,7 @@ impl Config { .trim_end_matches('/') .to_string(), }), + purchases_open: parsed("PURCHASES_OPEN", false)?, user_invites: parsed("USER_INVITES", false)?, referral_rewards: parsed("REFERRAL_REWARDS", false)?, google_client_ids: list("GOOGLE_CLIENT_IDS"), @@ -206,6 +211,7 @@ impl Config { password_login: true, mock_payments: true, stripe: None, + purchases_open: true, user_invites: true, referral_rewards: true, google_client_ids: vec!["test-client.apps.googleusercontent.com".into()], diff --git a/services/backend/src/routes/mod.rs b/services/backend/src/routes/mod.rs index 61030d2..f6a4fb1 100644 --- a/services/backend/src/routes/mod.rs +++ b/services/backend/src/routes/mod.rs @@ -165,8 +165,10 @@ async fn public_config(State(state): St) -> Json { "locales": c.supported_locales, "password_login": c.password_login, "mock_payments": payments::method(c) == Some("mock"), - // "stripe", "mock" or null; with a Stripe test key only admins can buy. + // "stripe", "mock" or null; Stripe purchases are for admins only + // until PURCHASES_OPEN (and always with a test key). "payments": payments::method(c), + "payments_admins_only": payments::admins_only(c), "payments_test": c.stripe.as_ref().is_some_and(|s| s.test_mode()), "user_invites": c.user_invites, "referral_rewards": c.referral_rewards, diff --git a/services/backend/src/routes/payments.rs b/services/backend/src/routes/payments.rs index bea3c18..4b85734 100644 --- a/services/backend/src/routes/payments.rs +++ b/services/backend/src/routes/payments.rs @@ -84,11 +84,17 @@ pub fn method(config: &crate::config::Config) -> Option<&'static str> { } } -/// Stripe, if this user may pay through it (with a test key: admins only, so -/// nobody gets packages with Stripe's test cards). +/// Only admins can buy through Stripe: until purchases open, and always with a +/// test key (nobody gets packages with Stripe's test cards, nobody types a +/// real card into a test page). +pub fn admins_only(config: &crate::config::Config) -> bool { + !config.purchases_open || config.stripe.as_ref().is_some_and(StripeConfig::test_mode) +} + +/// Stripe, if this user may pay through it. fn stripe_for<'a>(state: &'a AppState, auth: &AuthUser) -> Result<&'a StripeConfig, ApiError> { let config = state.config.stripe.as_ref().ok_or(ApiError::NotFound("payment method"))?; - if config.test_mode() && !auth.user.has_role(Role::Admin) { + if admins_only(&state.config) && !auth.user.has_role(Role::Admin) { return Err(ApiError::Forbidden("purchases are being tested; they open soon".into())); } Ok(config) diff --git a/services/backend/src/tests.rs b/services/backend/src/tests.rs index 6948038..2017f13 100644 --- a/services/backend/src/tests.rs +++ b/services/backend/src/tests.rs @@ -2375,6 +2375,7 @@ async fn stripe_test_mode_is_for_admins_only(pool: PgPool) { let r = app.get("/v1/config", None).await; assert_eq!(r.body["payments"], "stripe"); assert_eq!(r.body["payments_test"], true); + assert_eq!(r.body["payments_admins_only"], true); let anna = app.register("anna@example.com", "Anna").await; let r = app.post("/v1/payments/checkout", Some(&anna), json!({"package": "single"})).await; assert_eq!(r.status, StatusCode::FORBIDDEN); @@ -2383,3 +2384,20 @@ async fn stripe_test_mode_is_for_admins_only(pool: PgPool) { let r = app.post("/v1/payments/checkout", Some(&admin), json!({"package": "single"})).await; assert_eq!(r.body["error"]["code"], "payment_unavailable", "{}", r.body); } + +#[sqlx::test(migrator = "db::MIGRATOR")] +async fn stripe_purchases_wait_for_the_opening(pool: PgPool) { + let app = TestApp::with_config(pool, |c| { + with_stripe(c, "sk_live_fake"); + c.purchases_open = false; + }) + .await; + let r = app.get("/v1/config", None).await; + assert_eq!((&r.body["payments_test"], &r.body["payments_admins_only"]), (&json!(false), &json!(true))); + let anna = app.register("anna@example.com", "Anna").await; + let r = app.post("/v1/payments/checkout", Some(&anna), json!({"package": "single"})).await; + assert_eq!(r.status, StatusCode::FORBIDDEN); + let admin = app.register("admin@example.com", "Admin").await; + let r = app.post("/v1/payments/checkout", Some(&admin), json!({"package": "single"})).await; + assert_eq!(r.status, StatusCode::OK, "{}", r.body); +} diff --git a/services/frontend/src/lib/payments.ts b/services/frontend/src/lib/payments.ts index d88f371..946e4a1 100644 --- a/services/frontend/src/lib/payments.ts +++ b/services/frontend/src/lib/payments.ts @@ -1,9 +1,12 @@ import type { Me, PayMethod, PublicConfig } from "./types"; -/** How this user can buy packages (with a Stripe test key: admins only). */ +/** + * How this user can buy packages. Until purchases open (and with a Stripe + * test key) only admins can; everyone else sees "soon". + */ export function payMethod(config: PublicConfig | null | undefined, me: Me): PayMethod | null { if (config?.payments === "mock") return "mock"; if (config?.payments !== "stripe") return null; - if (!config.payments_test) return "stripe"; - return me.user.roles.includes("admin") ? "stripe_test" : null; + if (config.payments_admins_only && !me.user.roles.includes("admin")) return null; + return config.payments_test ? "stripe_test" : "stripe"; } diff --git a/services/frontend/src/lib/types.ts b/services/frontend/src/lib/types.ts index ce53995..bb1559b 100644 --- a/services/frontend/src/lib/types.ts +++ b/services/frontend/src/lib/types.ts @@ -94,7 +94,9 @@ export interface PublicConfig { mock_payments: boolean; /** How packages are paid: Stripe Checkout, the stand-in, or not at all. */ payments: "stripe" | "mock" | null; - /** Stripe has a test key: only admins can buy. */ + /** Only admins can buy through Stripe (until the opening, and with a test key). */ + payments_admins_only: boolean; + /** Stripe has a test key (test cards work, no real money). */ payments_test: boolean; /** "invite": new accounts need an invitation. */ signup_mode: "invite" | "open"; -- 2.54.0