Stripe: company purchases, payment details kept for the invoice
The checkout offers buying as a company (name, tax number). A confirmed payment keeps Stripe's payment id, the amount charged and the buyer's billing details, and queues the invoice for a background job (Billingo, once the company exists). Payments outlive a deleted account for the accounting law's 8 years. The package cards, the FAQ and the privacy policy say that card details go to Stripe only. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_012vLHzh5qUhFtmJhzkcTbXL
This commit is contained in:
@@ -134,8 +134,11 @@ pub async fn checkout(
|
||||
field("locale", "hu"),
|
||||
field("client_reference_id", &auth.id().to_string()),
|
||||
field("customer_email", &auth.user.email),
|
||||
// Name and address go on the invoice.
|
||||
// Name and address go on the invoice; a company also gives its name
|
||||
// and tax number ("I'm buying as a business").
|
||||
field("billing_address_collection", "required"),
|
||||
field("tax_id_collection[enabled]", "true"),
|
||||
field("customer_creation", "always"),
|
||||
field("line_items[0][quantity]", "1"),
|
||||
field("line_items[0][price_data][currency]", "huf"),
|
||||
// Stripe counts forints in fillér.
|
||||
@@ -163,29 +166,47 @@ pub async fn checkout(
|
||||
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<bool, ApiError> {
|
||||
/// Records a paid session (what was charged, the buyer's billing details),
|
||||
/// grants its package and queues the invoice, once. `false`: not our session.
|
||||
async fn complete(state: &AppState, session: &stripe::Session) -> Result<bool, ApiError> {
|
||||
let mut tx = state.db.begin().await?;
|
||||
let row: Option<(Uuid, String, Option<OffsetDateTime>)> =
|
||||
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) };
|
||||
let row: Option<(Option<Uuid>, String, i32, Option<OffsetDateTime>)> = sqlx::query_as(
|
||||
"SELECT user_id, package, price_huf, completed_at FROM stripe_checkouts WHERE id = $1 FOR UPDATE",
|
||||
)
|
||||
.bind(&session.id)
|
||||
.fetch_optional(&mut *tx)
|
||||
.await?;
|
||||
let Some((user_id, package_id, price_huf, 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?;
|
||||
let amount_huf = session.amount_total.map(|minor| minor / 100);
|
||||
if amount_huf != Some(i64::from(price_huf)) || session.currency.as_deref() != Some("huf") {
|
||||
tracing::error!(session = %session.id, ?amount_huf, currency = ?session.currency, price_huf, "paid amount differs from the price");
|
||||
}
|
||||
// A deleted account still gets its invoice, but no package.
|
||||
let order = match user_id {
|
||||
Some(user_id) => {
|
||||
let package = packages::find(&package_id)
|
||||
.ok_or_else(|| ApiError::Internal(format!("unknown package {package_id}")))?;
|
||||
let note = format!("Stripe {}", session.id);
|
||||
Some(packages::grant(&mut tx, user_id, package, Source::Stripe, Some(user_id), Some(¬e)).await?)
|
||||
}
|
||||
None => None,
|
||||
};
|
||||
sqlx::query(
|
||||
"UPDATE stripe_checkouts SET completed_at = now(), order_id = $2, payment_intent = $3, amount_huf = $4, \
|
||||
customer = $5, invoice_status = 'pending' WHERE id = $1",
|
||||
)
|
||||
.bind(&session.id)
|
||||
.bind(order)
|
||||
.bind(&session.payment_intent)
|
||||
.bind(amount_huf.map(|a| a as i32))
|
||||
.bind(&session.customer_details)
|
||||
.execute(&mut *tx)
|
||||
.await?;
|
||||
tx.commit().await?;
|
||||
tracing::info!(user = %user_id, package = package.id, session = session_id, "package paid");
|
||||
tracing::info!(user = ?user_id, package = %package_id, session = %session.id, "package paid");
|
||||
Ok(true)
|
||||
}
|
||||
|
||||
@@ -207,7 +228,7 @@ pub async fn checkout_status(
|
||||
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?;
|
||||
complete(&state, &session).await?;
|
||||
status = "paid";
|
||||
} else if session.status.as_deref() == Some("expired") {
|
||||
status = "expired";
|
||||
@@ -235,15 +256,13 @@ pub async fn stripe_webhook(State(state): St, headers: HeaderMap, body: Bytes) -
|
||||
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 mut 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");
|
||||
if matches!(kind, "checkout.session.completed" | "checkout.session.async_payment_succeeded") {
|
||||
let session: stripe::Session = serde_json::from_value(event["data"]["object"].take())
|
||||
.map_err(|e| ApiError::BadRequest(format!("checkout session: {e}")))?;
|
||||
if session.paid() && !complete(&state, &session).await? {
|
||||
tracing::warn!(session = %session.id, "stripe webhook for a session we did not start");
|
||||
}
|
||||
}
|
||||
Ok(Json(json!({ "received": true })))
|
||||
|
||||
@@ -7,6 +7,7 @@ use std::time::Duration;
|
||||
|
||||
use hmac::{Hmac, Mac};
|
||||
use serde::Deserialize;
|
||||
use serde_json::Value;
|
||||
use sha2::Sha256;
|
||||
|
||||
use crate::config::StripeConfig;
|
||||
@@ -24,6 +25,17 @@ pub struct Session {
|
||||
pub payment_status: String,
|
||||
/// `open`, `complete` or `expired`.
|
||||
pub status: Option<String>,
|
||||
/// In the smallest unit (fillér for forints).
|
||||
#[serde(default)]
|
||||
pub amount_total: Option<i64>,
|
||||
#[serde(default)]
|
||||
pub currency: Option<String>,
|
||||
/// The PaymentIntent's id.
|
||||
#[serde(default)]
|
||||
pub payment_intent: Option<String>,
|
||||
/// Name, e-mail, billing address; for a company its name and tax ids.
|
||||
#[serde(default)]
|
||||
pub customer_details: Option<Value>,
|
||||
}
|
||||
|
||||
impl Session {
|
||||
|
||||
@@ -148,7 +148,10 @@ async fn fake_stripe_get(axum::extract::Path(id): axum::extract::Path<String>) -
|
||||
StatusCode::OK,
|
||||
Json(json!({"id": id, "url": null,
|
||||
"payment_status": if *paid { "paid" } else { "unpaid" },
|
||||
"status": if *paid { "complete" } else { "open" }})),
|
||||
"status": if *paid { "complete" } else { "open" },
|
||||
"amount_total": 200000, "currency": "huf", "payment_intent": "pi_fake",
|
||||
"customer_details": {"name": "Anna Teszt", "email": "anna@example.com",
|
||||
"address": {"city": "Szeged", "country": "HU"}, "tax_ids": []}})),
|
||||
),
|
||||
None => (StatusCode::NOT_FOUND, Json(json!({"error": {"message": "no such session"}}))),
|
||||
}
|
||||
@@ -2301,6 +2304,8 @@ async fn stripe_checkout_grants_the_paid_package_once(pool: PgPool) {
|
||||
Some("Sorsfonalak – Páros")
|
||||
);
|
||||
assert_eq!(stripe_form(&id, "customer_email").as_deref(), Some("anna@example.com"));
|
||||
assert_eq!(stripe_form(&id, "tax_id_collection[enabled]").as_deref(), Some("true"));
|
||||
assert_eq!(stripe_form(&id, "billing_address_collection").as_deref(), Some("required"));
|
||||
assert_eq!(
|
||||
stripe_form(&id, "success_url").as_deref(),
|
||||
Some("https://sorsfonalak.test/kepletek/abc?fizetes={CHECKOUT_SESSION_ID}")
|
||||
@@ -2327,7 +2332,12 @@ async fn stripe_checkout_grants_the_paid_package_once(pool: PgPool) {
|
||||
// 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"}}});
|
||||
"data": {"object": {"id": id, "payment_status": "paid", "status": "complete",
|
||||
"amount_total": 600000, "currency": "huf", "payment_intent": "pi_1",
|
||||
"customer_details": {"name": "Kovács Anna", "email": "anna@example.com",
|
||||
"business_name": "Csillag Kft.",
|
||||
"address": {"line1": "Fő utca 1.", "city": "Szeged", "postal_code": "6720", "country": "HU"},
|
||||
"tax_ids": [{"type": "hu_tin", "value": "12345678-1-23"}]}}}});
|
||||
let body = event.to_string();
|
||||
let now = time::OffsetDateTime::now_utc().unix_timestamp();
|
||||
let bad = crate::stripe::sign("whsec_other", body.as_bytes(), now);
|
||||
@@ -2344,6 +2354,17 @@ async fn stripe_checkout_grants_the_paid_package_once(pool: PgPool) {
|
||||
assert_eq!(r.status, StatusCode::OK, "{}", r.body);
|
||||
}
|
||||
assert_eq!(stripe_orders(&app.pool, "anna@example.com").await, vec![("couple".to_string(), 6000)]);
|
||||
// What the invoice needs is kept, and the invoice is queued.
|
||||
let (intent, amount, customer, invoice): (String, i32, Value, String) = sqlx::query_as(
|
||||
"SELECT payment_intent, amount_huf, customer, invoice_status FROM stripe_checkouts WHERE id = $1",
|
||||
)
|
||||
.bind(&id)
|
||||
.fetch_one(&app.pool)
|
||||
.await
|
||||
.unwrap();
|
||||
assert_eq!((intent.as_str(), amount, invoice.as_str()), ("pi_1", 6000, "pending"));
|
||||
assert_eq!(customer["tax_ids"][0]["value"], "12345678-1-23");
|
||||
assert_eq!(customer["address"]["postal_code"], "6720");
|
||||
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");
|
||||
@@ -2367,6 +2388,23 @@ async fn stripe_checkout_grants_the_paid_package_once(pool: PgPool) {
|
||||
stripe_orders(&app.pool, "anna@example.com").await,
|
||||
vec![("couple".to_string(), 6000), ("single".to_string(), 2000)]
|
||||
);
|
||||
let (name, invoice): (String, String) =
|
||||
sqlx::query_as("SELECT customer->>'name', invoice_status FROM stripe_checkouts WHERE id = $1")
|
||||
.bind(&other)
|
||||
.fetch_one(&app.pool)
|
||||
.await
|
||||
.unwrap();
|
||||
assert_eq!((name.as_str(), invoice.as_str()), ("Anna Teszt", "pending"));
|
||||
|
||||
// Deleting the account keeps the payments (accounting law).
|
||||
let r = app.call("DELETE", "/v1/me", Some(&anna), Some(json!({"confirm": "DELETE"}))).await;
|
||||
assert!(r.status.is_success(), "{}", r.body);
|
||||
let (kept,): (i64,) =
|
||||
sqlx::query_as("SELECT count(*) FROM stripe_checkouts WHERE user_id IS NULL AND completed_at IS NOT NULL")
|
||||
.fetch_one(&app.pool)
|
||||
.await
|
||||
.unwrap();
|
||||
assert_eq!(kept, 2);
|
||||
}
|
||||
|
||||
#[sqlx::test(migrator = "db::MIGRATOR")]
|
||||
|
||||
Reference in New Issue
Block a user