Compare commits
6
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
cf4d419e52 | ||
|
|
d63cdf737a | ||
|
|
810de0cb24 | ||
|
|
4676f7860f | ||
|
|
e68f7407f3 | ||
|
|
1b768d558d |
@@ -0,0 +1,4 @@
|
|||||||
|
-- When the worker asked Billingo for the invoice. Set before the request: if
|
||||||
|
-- the answer is lost (a timeout after Billingo made it), the next attempt
|
||||||
|
-- looks the invoice up instead of making a second one.
|
||||||
|
ALTER TABLE invoices ADD COLUMN document_requested_at timestamptz;
|
||||||
+7
-2
@@ -4,7 +4,8 @@
|
|||||||
{
|
{
|
||||||
servers {
|
servers {
|
||||||
# Cloudflare ranges (https://www.cloudflare.com/ips): the visitor's
|
# Cloudflare ranges (https://www.cloudflare.com/ips): the visitor's
|
||||||
# address is taken from CF-Connecting-IP and passed on in X-Forwarded-For.
|
# address ({client_ip}) is taken from CF-Connecting-IP, only when the
|
||||||
|
# request comes from Cloudflare.
|
||||||
trusted_proxies static 173.245.48.0/20 103.21.244.0/22 103.22.200.0/22 103.31.4.0/22 141.101.64.0/18 108.162.192.0/18 190.93.240.0/20 188.114.96.0/20 197.234.240.0/22 198.41.128.0/17 162.158.0.0/15 104.16.0.0/13 104.24.0.0/14 172.64.0.0/13 131.0.72.0/22 2400:cb00::/32 2606:4700::/32 2803:f800::/32 2405:b500::/32 2405:8100::/32 2a06:98c0::/29 2c0f:f248::/32
|
trusted_proxies static 173.245.48.0/20 103.21.244.0/22 103.22.200.0/22 103.31.4.0/22 141.101.64.0/18 108.162.192.0/18 190.93.240.0/20 188.114.96.0/20 197.234.240.0/22 198.41.128.0/17 162.158.0.0/15 104.16.0.0/13 104.24.0.0/14 172.64.0.0/13 131.0.72.0/22 2400:cb00::/32 2606:4700::/32 2803:f800::/32 2405:b500::/32 2405:8100::/32 2a06:98c0::/29 2c0f:f248::/32
|
||||||
client_ip_headers CF-Connecting-IP
|
client_ip_headers CF-Connecting-IP
|
||||||
}
|
}
|
||||||
@@ -14,7 +15,11 @@
|
|||||||
# No basic auth any more: the site is open, and new accounts need an
|
# No basic auth any more: the site is open, and new accounts need an
|
||||||
# invitation (SIGNUP_MODE=invite in the backend).
|
# invitation (SIGNUP_MODE=invite in the backend).
|
||||||
encode zstd gzip
|
encode zstd gzip
|
||||||
reverse_proxy frontend:3000
|
reverse_proxy frontend:3000 {
|
||||||
|
# The address the backend trusts (rate limits, share visits); it
|
||||||
|
# overwrites whatever the browser sent in this header.
|
||||||
|
header_up X-Real-IP {client_ip}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
www.{$DOMAIN} {
|
www.{$DOMAIN} {
|
||||||
|
|||||||
@@ -81,6 +81,8 @@ services:
|
|||||||
HOROSCOPE_API_URL: http://horoscope-api:8080
|
HOROSCOPE_API_URL: http://horoscope-api:8080
|
||||||
PUBLIC_BASE_URL: https://${DOMAIN}
|
PUBLIC_BASE_URL: https://${DOMAIN}
|
||||||
GOOGLE_CLIENT_IDS: ${GOOGLE_CLIENT_IDS:-}
|
GOOGLE_CLIENT_IDS: ${GOOGLE_CLIENT_IDS:-}
|
||||||
|
# Sign in with Apple: the Services ID (e.g. hu.sorsfonalak.web); empty: off.
|
||||||
|
APPLE_CLIENT_IDS: ${APPLE_CLIENT_IDS:-}
|
||||||
BOOTSTRAP_ADMIN_EMAILS: ${BOOTSTRAP_ADMIN_EMAILS:-}
|
BOOTSTRAP_ADMIN_EMAILS: ${BOOTSTRAP_ADMIN_EMAILS:-}
|
||||||
ANALYSIS_MODEL: ${ANALYSIS_MODEL:-}
|
ANALYSIS_MODEL: ${ANALYSIS_MODEL:-}
|
||||||
SUMMARY_MODEL: ${SUMMARY_MODEL:-}
|
SUMMARY_MODEL: ${SUMMARY_MODEL:-}
|
||||||
@@ -131,7 +133,7 @@ services:
|
|||||||
# SMTP_URL or the SES credentials come from .env.secrets (docs/levelkuldes.md);
|
# SMTP_URL or the SES credentials come from .env.secrets (docs/levelkuldes.md);
|
||||||
# listing them here with an empty default would override that file.
|
# listing them here with an empty default would override that file.
|
||||||
SES_REGION: ${SES_REGION:-eu-central-1}
|
SES_REGION: ${SES_REGION:-eu-central-1}
|
||||||
MAIL_FROM: ${MAIL_FROM:-Sorsfonalak <hello@sorsfonalak.hu>}
|
MAIL_FROM: ${MAIL_FROM:-Sorsfonalak <noreply@sorsfonalak.hu>}
|
||||||
PUBLIC_BASE_URL: https://${DOMAIN}
|
PUBLIC_BASE_URL: https://${DOMAIN}
|
||||||
LOG_DIR: /logs
|
LOG_DIR: /logs
|
||||||
# On a deploy the e-mails and invoices being sent finish first.
|
# On a deploy the e-mails and invoices being sent finish first.
|
||||||
|
|||||||
@@ -46,6 +46,7 @@ services:
|
|||||||
# Plain HTTP in development; leave the default (true) in production.
|
# Plain HTTP in development; leave the default (true) in production.
|
||||||
COOKIE_SECURE: ${COOKIE_SECURE:-false}
|
COOKIE_SECURE: ${COOKIE_SECURE:-false}
|
||||||
GOOGLE_CLIENT_IDS: ${GOOGLE_CLIENT_IDS:-}
|
GOOGLE_CLIENT_IDS: ${GOOGLE_CLIENT_IDS:-}
|
||||||
|
APPLE_CLIENT_IDS: ${APPLE_CLIENT_IDS:-}
|
||||||
BOOTSTRAP_ADMIN_EMAILS: ${BOOTSTRAP_ADMIN_EMAILS:-}
|
BOOTSTRAP_ADMIN_EMAILS: ${BOOTSTRAP_ADMIN_EMAILS:-}
|
||||||
# Paid detailed analyses (empty: anthropic/claude-opus-5.5).
|
# Paid detailed analyses (empty: anthropic/claude-opus-5.5).
|
||||||
ANALYSIS_MODEL: ${ANALYSIS_MODEL:-}
|
ANALYSIS_MODEL: ${ANALYSIS_MODEL:-}
|
||||||
|
|||||||
+1
-1
@@ -68,7 +68,7 @@ A droplet saját tűzfala (`sorsfonalak-fw`, DigitalOcean → Networking → Fir
|
|||||||
|
|
||||||
## 6. Indítás
|
## 6. Indítás
|
||||||
|
|
||||||
- A `.env` fájlban opcionális: `MAIL_FROM=Sorsfonalak <hello@sorsfonalak.hu>` (ez az alapérték is).
|
- A `.env` fájlban opcionális: `MAIL_FROM=Sorsfonalak <noreply@sorsfonalak.hu>` (élesben ez van beállítva, és ez a deploy compose alapértéke is). Az Apple „Email Communication” beállításában ugyanez a cím van regisztrálva: ha változik, ott is át kell írni, különben az Apple-továbbítócímekre nem érkeznek meg a levelek.
|
||||||
- Utána: `docker compose up -d worker`. A naplóban ennek kell megjelennie: `e-mail delivery enabled`, `via=Amazon SES eu-central-1:2587, credentials from …`.
|
- Utána: `docker compose up -d worker`. A naplóban ennek kell megjelennie: `e-mail delivery enabled`, `via=Amazon SES eu-central-1:2587, credentials from …`.
|
||||||
- Az eddig várakozó levelek ekkor kimennek. Ha ezt nem szeretnéd, előtte töröld őket: `DELETE FROM email_outbox WHERE sent_at IS NULL;`.
|
- Az eddig várakozó levelek ekkor kimennek. Ha ezt nem szeretnéd, előtte töröld őket: `DELETE FROM email_outbox WHERE sent_at IS NULL;`.
|
||||||
- Hibaüzenetek a naplóban:
|
- Hibaüzenetek a naplóban:
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ Felhasználók, belépés, mentett születési képletek, szinasztriák és megh
|
|||||||
| `FREE_PERSON_SLOTS` | `0` | ennyi személyt vehet fel csomag nélkül egy felhasználó |
|
| `FREE_PERSON_SLOTS` | `0` | ennyi személyt vehet fel csomag nélkül egy felhasználó |
|
||||||
| `SIGNUP_MODE` | `invite` | `invite`: új fiók csak meghívóval jön létre (403 `not_invited`); `open`: bárki regisztrálhat |
|
| `SIGNUP_MODE` | `invite` | `invite`: új fiók csak meghívóval jön létre (403 `not_invited`); `open`: bárki regisztrálhat |
|
||||||
| `GOOGLE_CLIENT_IDS` | – | Google OAuth kliens-azonosító(k); üresen a Google-belépés ki van kapcsolva |
|
| `GOOGLE_CLIENT_IDS` | – | Google OAuth kliens-azonosító(k); üresen a Google-belépés ki van kapcsolva |
|
||||||
|
| `APPLE_CLIENT_IDS` | – | Sign in with Apple: a Services ID(k) vesszővel elválasztva (pl. `hu.sorsfonalak.web`), az ID token `aud` mezője ezek egyike kell legyen; üresen az Apple-belépés ki van kapcsolva |
|
||||||
| `BOOTSTRAP_ADMIN_EMAILS` | – | ezek a címek regisztrációkor vagy belépéskor admin szerepet kapnak (így lesz meg az első admin) |
|
| `BOOTSTRAP_ADMIN_EMAILS` | – | ezek a címek regisztrációkor vagy belépéskor admin szerepet kapnak (így lesz meg az első admin) |
|
||||||
| `SUPPORTED_LOCALES` | `hu,en` | felület- és elemzésnyelvek; az első az alapértelmezett |
|
| `SUPPORTED_LOCALES` | `hu,en` | felület- és elemzésnyelvek; az első az alapértelmezett |
|
||||||
| `ANALYSIS_MODEL` | `anthropic/claude-opus-5.5` | az elemzések, előrejelzések és válaszok alapmodellje, és a tartalék, ha a választott modell hibára fut |
|
| `ANALYSIS_MODEL` | `anthropic/claude-opus-5.5` | az elemzések, előrejelzések és válaszok alapmodellje, és a tartalék, ha a választott modell hibára fut |
|
||||||
|
|||||||
@@ -75,6 +75,12 @@ pub struct Config {
|
|||||||
pub google_client_ids: Vec<String>,
|
pub google_client_ids: Vec<String>,
|
||||||
/// `GOOGLE_JWKS_URL` (default Google's certificate endpoint).
|
/// `GOOGLE_JWKS_URL` (default Google's certificate endpoint).
|
||||||
pub google_jwks_url: String,
|
pub google_jwks_url: String,
|
||||||
|
/// `APPLE_CLIENT_IDS`: comma-separated Services IDs (e.g.
|
||||||
|
/// `hu.sorsfonalak.web`) accepted as the ID token audience; empty
|
||||||
|
/// disables Sign in with Apple.
|
||||||
|
pub apple_client_ids: Vec<String>,
|
||||||
|
/// `APPLE_JWKS_URL` (default Apple's key endpoint).
|
||||||
|
pub apple_jwks_url: String,
|
||||||
/// `BOOTSTRAP_ADMIN_EMAILS`: these users get the admin role when they
|
/// `BOOTSTRAP_ADMIN_EMAILS`: these users get the admin role when they
|
||||||
/// register or log in (to create the first administrator).
|
/// register or log in (to create the first administrator).
|
||||||
pub bootstrap_admin_emails: Vec<String>,
|
pub bootstrap_admin_emails: Vec<String>,
|
||||||
@@ -197,6 +203,8 @@ impl Config {
|
|||||||
google_client_ids: list("GOOGLE_CLIENT_IDS"),
|
google_client_ids: list("GOOGLE_CLIENT_IDS"),
|
||||||
google_jwks_url: var("GOOGLE_JWKS_URL")
|
google_jwks_url: var("GOOGLE_JWKS_URL")
|
||||||
.unwrap_or_else(|| "https://www.googleapis.com/oauth2/v3/certs".into()),
|
.unwrap_or_else(|| "https://www.googleapis.com/oauth2/v3/certs".into()),
|
||||||
|
apple_client_ids: list("APPLE_CLIENT_IDS"),
|
||||||
|
apple_jwks_url: var("APPLE_JWKS_URL").unwrap_or_else(|| "https://appleid.apple.com/auth/keys".into()),
|
||||||
bootstrap_admin_emails: list("BOOTSTRAP_ADMIN_EMAILS").into_iter().map(|e| e.to_lowercase()).collect(),
|
bootstrap_admin_emails: list("BOOTSTRAP_ADMIN_EMAILS").into_iter().map(|e| e.to_lowercase()).collect(),
|
||||||
supported_locales,
|
supported_locales,
|
||||||
analysis_model: var("ANALYSIS_MODEL").unwrap_or_else(|| "anthropic/claude-opus-5.5".into()),
|
analysis_model: var("ANALYSIS_MODEL").unwrap_or_else(|| "anthropic/claude-opus-5.5".into()),
|
||||||
@@ -240,6 +248,8 @@ impl Config {
|
|||||||
user_invites: true,
|
user_invites: true,
|
||||||
referral_rewards: true,
|
referral_rewards: true,
|
||||||
google_client_ids: vec!["test-client.apps.googleusercontent.com".into()],
|
google_client_ids: vec!["test-client.apps.googleusercontent.com".into()],
|
||||||
|
apple_client_ids: vec!["hu.sorsfonalak.test".into()],
|
||||||
|
apple_jwks_url: google_jwks_url.clone(),
|
||||||
google_jwks_url,
|
google_jwks_url,
|
||||||
bootstrap_admin_emails: vec!["admin@example.com".into()],
|
bootstrap_admin_emails: vec!["admin@example.com".into()],
|
||||||
supported_locales: vec!["hu".into(), "en".into()],
|
supported_locales: vec!["hu".into(), "en".into()],
|
||||||
|
|||||||
@@ -1,107 +0,0 @@
|
|||||||
//! Google Sign-In: verification of Google ID tokens.
|
|
||||||
//!
|
|
||||||
//! The frontend obtains an ID token with Google Identity Services (button or
|
|
||||||
//! One Tap) and posts it to `POST /v1/auth/google`. The token is a JWT signed
|
|
||||||
//! by Google; it is verified here against Google's published keys (JWKS,
|
|
||||||
//! cached), the configured client ids (audience) and the issuer.
|
|
||||||
|
|
||||||
use std::time::{Duration, Instant};
|
|
||||||
|
|
||||||
use jsonwebtoken::{Algorithm, DecodingKey, Validation, decode, decode_header};
|
|
||||||
use serde::Deserialize;
|
|
||||||
use tokio::sync::RwLock;
|
|
||||||
|
|
||||||
use crate::error::ApiError;
|
|
||||||
|
|
||||||
const ISSUERS: [&str; 2] = ["accounts.google.com", "https://accounts.google.com"];
|
|
||||||
const JWKS_MAX_AGE: Duration = Duration::from_secs(3600);
|
|
||||||
|
|
||||||
#[derive(Debug, Deserialize)]
|
|
||||||
pub struct GoogleClaims {
|
|
||||||
/// Stable Google account id.
|
|
||||||
pub sub: String,
|
|
||||||
pub email: Option<String>,
|
|
||||||
#[serde(default)]
|
|
||||||
pub email_verified: bool,
|
|
||||||
pub name: Option<String>,
|
|
||||||
pub locale: Option<String>,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Debug, Clone, Deserialize)]
|
|
||||||
struct Jwk {
|
|
||||||
kid: String,
|
|
||||||
n: String,
|
|
||||||
e: String,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Debug, Deserialize)]
|
|
||||||
struct JwkSet {
|
|
||||||
keys: Vec<Jwk>,
|
|
||||||
}
|
|
||||||
|
|
||||||
pub struct GoogleVerifier {
|
|
||||||
client_ids: Vec<String>,
|
|
||||||
jwks_url: String,
|
|
||||||
http: reqwest::Client,
|
|
||||||
cache: RwLock<Option<(Instant, Vec<Jwk>)>>,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl GoogleVerifier {
|
|
||||||
pub fn new(client_ids: Vec<String>, jwks_url: String) -> Self {
|
|
||||||
let http = reqwest::Client::builder().timeout(Duration::from_secs(10)).build().expect("static configuration");
|
|
||||||
Self { client_ids, jwks_url, http, cache: RwLock::new(None) }
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn enabled(&self) -> bool {
|
|
||||||
!self.client_ids.is_empty()
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn fetch_keys(&self) -> Result<Vec<Jwk>, ApiError> {
|
|
||||||
let set: JwkSet = self
|
|
||||||
.http
|
|
||||||
.get(&self.jwks_url)
|
|
||||||
.send()
|
|
||||||
.await
|
|
||||||
.and_then(|r| r.error_for_status())
|
|
||||||
.map_err(|e| ApiError::Internal(format!("fetching Google keys: {e}")))?
|
|
||||||
.json()
|
|
||||||
.await
|
|
||||||
.map_err(|e| ApiError::Internal(format!("parsing Google keys: {e}")))?;
|
|
||||||
Ok(set.keys)
|
|
||||||
}
|
|
||||||
|
|
||||||
/// The key with `kid`; the key set is refetched when it is stale or the
|
|
||||||
/// key is unknown (Google rotates its keys).
|
|
||||||
async fn key(&self, kid: &str) -> Result<Jwk, ApiError> {
|
|
||||||
if let Some((fetched, keys)) = self.cache.read().await.as_ref()
|
|
||||||
&& fetched.elapsed() < JWKS_MAX_AGE
|
|
||||||
&& let Some(k) = keys.iter().find(|k| k.kid == kid)
|
|
||||||
{
|
|
||||||
return Ok(k.clone());
|
|
||||||
}
|
|
||||||
let keys = self.fetch_keys().await?;
|
|
||||||
let found = keys.iter().find(|k| k.kid == kid).cloned();
|
|
||||||
*self.cache.write().await = Some((Instant::now(), keys));
|
|
||||||
found.ok_or_else(|| ApiError::InvalidCredentials("the Google token is signed with an unknown key".into()))
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn verify(&self, id_token: &str) -> Result<GoogleClaims, ApiError> {
|
|
||||||
if !self.enabled() {
|
|
||||||
return Err(ApiError::Forbidden("Google login is not configured".into()));
|
|
||||||
}
|
|
||||||
let invalid =
|
|
||||||
|e: jsonwebtoken::errors::Error| ApiError::InvalidCredentials(format!("invalid Google token: {e}"));
|
|
||||||
let header = decode_header(id_token).map_err(invalid)?;
|
|
||||||
if header.alg != Algorithm::RS256 {
|
|
||||||
return Err(ApiError::InvalidCredentials("invalid Google token: unexpected algorithm".into()));
|
|
||||||
}
|
|
||||||
let kid = header.kid.ok_or_else(|| ApiError::InvalidCredentials("invalid Google token: no key id".into()))?;
|
|
||||||
let jwk = self.key(&kid).await?;
|
|
||||||
let key = DecodingKey::from_rsa_components(&jwk.n, &jwk.e).map_err(invalid)?;
|
|
||||||
let mut validation = Validation::new(Algorithm::RS256);
|
|
||||||
validation.set_audience(&self.client_ids);
|
|
||||||
validation.set_issuer(&ISSUERS);
|
|
||||||
validation.set_required_spec_claims(&["exp", "iss", "aud", "sub"]);
|
|
||||||
Ok(decode::<GoogleClaims>(id_token, &key, &validation).map_err(invalid)?.claims)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -65,7 +65,11 @@ fn text(v: &Value) -> Option<String> {
|
|||||||
|
|
||||||
impl Buyer {
|
impl Buyer {
|
||||||
/// A company ("buying as a business") gives its name and tax id: a
|
/// A company ("buying as a business") gives its name and tax id: a
|
||||||
/// Hungarian tax number (`hu_tin`) is preferred to an EU VAT number.
|
/// Hungarian tax number (`hu_tin`) is preferred to an EU VAT number. A
|
||||||
|
/// Hungarian company with only an EU VAT number (`HU12345678`) is invoiced
|
||||||
|
/// without a tax type number: Billingo takes only the full domestic
|
||||||
|
/// number (`12345678-1-23`) for HAS_TAX_NUMBER; the EU number still goes
|
||||||
|
/// on the invoice, in its comment (the worker adds it).
|
||||||
pub fn from_stripe(details: &Value, fallback_email: Option<&str>) -> Self {
|
pub fn from_stripe(details: &Value, fallback_email: Option<&str>) -> Self {
|
||||||
let address = &details["address"];
|
let address = &details["address"];
|
||||||
let tax_ids = details["tax_ids"].as_array().map(Vec::as_slice).unwrap_or_default();
|
let tax_ids = details["tax_ids"].as_array().map(Vec::as_slice).unwrap_or_default();
|
||||||
@@ -74,8 +78,8 @@ impl Buyer {
|
|||||||
let country = text(&address["country"]).unwrap_or_else(|| "HU".into()).to_uppercase();
|
let country = text(&address["country"]).unwrap_or_else(|| "HU".into()).to_uppercase();
|
||||||
let tax_type = match (&tax_number, country.as_str()) {
|
let tax_type = match (&tax_number, country.as_str()) {
|
||||||
(_, c) if c != "HU" => "FOREIGN",
|
(_, c) if c != "HU" => "FOREIGN",
|
||||||
(Some(_), _) => "HAS_TAX_NUMBER",
|
(Some(_), _) if tax_id("hu_tin").is_some() => "HAS_TAX_NUMBER",
|
||||||
(None, _) => "NO_TAX_NUMBER",
|
_ => "NO_TAX_NUMBER",
|
||||||
};
|
};
|
||||||
let street = [text(&address["line1"]), text(&address["line2"])].into_iter().flatten().collect::<Vec<_>>();
|
let street = [text(&address["line1"]), text(&address["line2"])].into_iter().flatten().collect::<Vec<_>>();
|
||||||
Self {
|
Self {
|
||||||
@@ -176,6 +180,14 @@ mod tests {
|
|||||||
assert_eq!(company.email.as_deref(), Some("anna@example.com"));
|
assert_eq!(company.email.as_deref(), Some("anna@example.com"));
|
||||||
assert_eq!((company.tax_type, company.tax_number.as_deref()), ("HAS_TAX_NUMBER", Some("12345678-1-23")));
|
assert_eq!((company.tax_type, company.tax_number.as_deref()), ("HAS_TAX_NUMBER", Some("12345678-1-23")));
|
||||||
|
|
||||||
|
let eu_only = Buyer::from_stripe(
|
||||||
|
&json!({"name": "Kovács Anna", "business_name": "Csillag Kft.", "address": {"country": "HU"},
|
||||||
|
"tax_ids": [{"type": "eu_vat", "value": "HU12345678"}]}),
|
||||||
|
None,
|
||||||
|
);
|
||||||
|
assert_eq!(eu_only.name, "Csillag Kft.");
|
||||||
|
assert_eq!((eu_only.tax_type, eu_only.tax_number.as_deref()), ("NO_TAX_NUMBER", Some("HU12345678")));
|
||||||
|
|
||||||
let abroad = Buyer::from_stripe(&json!({"name": "Anna", "address": {"country": "at"}}), None);
|
let abroad = Buyer::from_stripe(&json!({"name": "Anna", "address": {"country": "at"}}), None);
|
||||||
assert_eq!((abroad.country.as_str(), abroad.tax_type), ("AT", "FOREIGN"));
|
assert_eq!((abroad.country.as_str(), abroad.tax_type), ("AT", "FOREIGN"));
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -12,9 +12,9 @@ mod birth_changes;
|
|||||||
mod config;
|
mod config;
|
||||||
mod credits;
|
mod credits;
|
||||||
mod error;
|
mod error;
|
||||||
mod google;
|
|
||||||
mod invoices;
|
mod invoices;
|
||||||
mod models;
|
mod models;
|
||||||
|
mod oidc;
|
||||||
mod packages;
|
mod packages;
|
||||||
mod persons;
|
mod persons;
|
||||||
mod routes;
|
mod routes;
|
||||||
@@ -32,7 +32,7 @@ use sqlx::PgPool;
|
|||||||
|
|
||||||
use crate::auth::LoginLimiter;
|
use crate::auth::LoginLimiter;
|
||||||
use crate::config::Config;
|
use crate::config::Config;
|
||||||
use crate::google::GoogleVerifier;
|
use crate::oidc::IdTokenVerifier;
|
||||||
|
|
||||||
const DEFAULT_BIND_ADDR: &str = "0.0.0.0:8081";
|
const DEFAULT_BIND_ADDR: &str = "0.0.0.0:8081";
|
||||||
|
|
||||||
@@ -40,7 +40,8 @@ pub struct AppState {
|
|||||||
pub db: PgPool,
|
pub db: PgPool,
|
||||||
pub config: Config,
|
pub config: Config,
|
||||||
pub horoscope: HoroscopeClient,
|
pub horoscope: HoroscopeClient,
|
||||||
pub google: GoogleVerifier,
|
pub google: IdTokenVerifier,
|
||||||
|
pub apple: IdTokenVerifier,
|
||||||
pub login_limiter: LoginLimiter,
|
pub login_limiter: LoginLimiter,
|
||||||
pub models: models::Catalog,
|
pub models: models::Catalog,
|
||||||
pub stripe: stripe::Client,
|
pub stripe: stripe::Client,
|
||||||
@@ -50,7 +51,8 @@ impl AppState {
|
|||||||
pub fn new(db: PgPool, config: Config) -> Self {
|
pub fn new(db: PgPool, config: Config) -> Self {
|
||||||
Self {
|
Self {
|
||||||
horoscope: HoroscopeClient::new(&config.horoscope_api_url),
|
horoscope: HoroscopeClient::new(&config.horoscope_api_url),
|
||||||
google: GoogleVerifier::new(config.google_client_ids.clone(), config.google_jwks_url.clone()),
|
google: IdTokenVerifier::google(config.google_client_ids.clone(), config.google_jwks_url.clone()),
|
||||||
|
apple: IdTokenVerifier::apple(config.apple_client_ids.clone(), config.apple_jwks_url.clone()),
|
||||||
login_limiter: LoginLimiter::new(10, Duration::from_secs(15 * 60)),
|
login_limiter: LoginLimiter::new(10, Duration::from_secs(15 * 60)),
|
||||||
models: models::Catalog::new(&config.openrouter_models_url),
|
models: models::Catalog::new(&config.openrouter_models_url),
|
||||||
stripe: stripe::Client::default(),
|
stripe: stripe::Client::default(),
|
||||||
@@ -72,6 +74,7 @@ async fn main() -> anyhow::Result<()> {
|
|||||||
db::migrate(&pool).await.context("running database migrations")?;
|
db::migrate(&pool).await.context("running database migrations")?;
|
||||||
tracing::info!(
|
tracing::info!(
|
||||||
google_login = !config.google_client_ids.is_empty(),
|
google_login = !config.google_client_ids.is_empty(),
|
||||||
|
apple_login = !config.apple_client_ids.is_empty(),
|
||||||
horoscope_api = %config.horoscope_api_url,
|
horoscope_api = %config.horoscope_api_url,
|
||||||
"database ready"
|
"database ready"
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -0,0 +1,139 @@
|
|||||||
|
//! Sign-in with Google and Apple: verification of their ID tokens.
|
||||||
|
//!
|
||||||
|
//! The frontend obtains an ID token (Google Identity Services, or Sign in with
|
||||||
|
//! Apple JS) and posts it to `POST /v1/auth/google` / `/v1/auth/apple`. The
|
||||||
|
//! token is a JWT signed by the provider; it is verified here against the
|
||||||
|
//! provider's published keys (JWKS, cached), the configured client ids
|
||||||
|
//! (audience: Google client ids, Apple Services IDs) and the issuer.
|
||||||
|
|
||||||
|
use std::time::{Duration, Instant};
|
||||||
|
|
||||||
|
use jsonwebtoken::{Algorithm, DecodingKey, Validation, decode, decode_header};
|
||||||
|
use serde::Deserialize;
|
||||||
|
use tokio::sync::RwLock;
|
||||||
|
|
||||||
|
use crate::error::ApiError;
|
||||||
|
|
||||||
|
const GOOGLE_ISSUERS: &[&str] = &["accounts.google.com", "https://accounts.google.com"];
|
||||||
|
const APPLE_ISSUERS: &[&str] = &["https://appleid.apple.com"];
|
||||||
|
const JWKS_MAX_AGE: Duration = Duration::from_secs(3600);
|
||||||
|
|
||||||
|
#[derive(Debug, Deserialize)]
|
||||||
|
pub struct IdClaims {
|
||||||
|
/// Stable account id at the provider.
|
||||||
|
pub sub: String,
|
||||||
|
pub email: Option<String>,
|
||||||
|
/// Apple sends it as a string ("true").
|
||||||
|
#[serde(default, deserialize_with = "flexible_bool")]
|
||||||
|
pub email_verified: bool,
|
||||||
|
/// Google only; Apple gives the name to the frontend, at the first sign-in.
|
||||||
|
pub name: Option<String>,
|
||||||
|
pub locale: Option<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
fn flexible_bool<'de, D: serde::Deserializer<'de>>(d: D) -> Result<bool, D::Error> {
|
||||||
|
Ok(match serde_json::Value::deserialize(d)? {
|
||||||
|
serde_json::Value::Bool(b) => b,
|
||||||
|
serde_json::Value::String(s) => s == "true",
|
||||||
|
_ => false,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, Deserialize)]
|
||||||
|
struct Jwk {
|
||||||
|
kid: String,
|
||||||
|
n: String,
|
||||||
|
e: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Deserialize)]
|
||||||
|
struct JwkSet {
|
||||||
|
keys: Vec<Jwk>,
|
||||||
|
}
|
||||||
|
|
||||||
|
pub struct IdTokenVerifier {
|
||||||
|
/// "Google" or "Apple", for messages.
|
||||||
|
provider: &'static str,
|
||||||
|
issuers: &'static [&'static str],
|
||||||
|
client_ids: Vec<String>,
|
||||||
|
jwks_url: String,
|
||||||
|
http: reqwest::Client,
|
||||||
|
cache: RwLock<Option<(Instant, Vec<Jwk>)>>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl IdTokenVerifier {
|
||||||
|
fn new(
|
||||||
|
provider: &'static str,
|
||||||
|
issuers: &'static [&'static str],
|
||||||
|
client_ids: Vec<String>,
|
||||||
|
jwks_url: String,
|
||||||
|
) -> Self {
|
||||||
|
let http = reqwest::Client::builder().timeout(Duration::from_secs(10)).build().expect("static configuration");
|
||||||
|
Self { provider, issuers, client_ids, jwks_url, http, cache: RwLock::new(None) }
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn google(client_ids: Vec<String>, jwks_url: String) -> Self {
|
||||||
|
Self::new("Google", GOOGLE_ISSUERS, client_ids, jwks_url)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn apple(client_ids: Vec<String>, jwks_url: String) -> Self {
|
||||||
|
Self::new("Apple", APPLE_ISSUERS, client_ids, jwks_url)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn enabled(&self) -> bool {
|
||||||
|
!self.client_ids.is_empty()
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn fetch_keys(&self) -> Result<Vec<Jwk>, ApiError> {
|
||||||
|
let set: JwkSet = self
|
||||||
|
.http
|
||||||
|
.get(&self.jwks_url)
|
||||||
|
.send()
|
||||||
|
.await
|
||||||
|
.and_then(|r| r.error_for_status())
|
||||||
|
.map_err(|e| ApiError::Internal(format!("fetching {} keys: {e}", self.provider)))?
|
||||||
|
.json()
|
||||||
|
.await
|
||||||
|
.map_err(|e| ApiError::Internal(format!("parsing {} keys: {e}", self.provider)))?;
|
||||||
|
Ok(set.keys)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The key with `kid`; the key set is refetched when it is stale or the
|
||||||
|
/// key is unknown (the providers rotate their keys).
|
||||||
|
async fn key(&self, kid: &str) -> Result<Jwk, ApiError> {
|
||||||
|
if let Some((fetched, keys)) = self.cache.read().await.as_ref()
|
||||||
|
&& fetched.elapsed() < JWKS_MAX_AGE
|
||||||
|
&& let Some(k) = keys.iter().find(|k| k.kid == kid)
|
||||||
|
{
|
||||||
|
return Ok(k.clone());
|
||||||
|
}
|
||||||
|
let keys = self.fetch_keys().await?;
|
||||||
|
let found = keys.iter().find(|k| k.kid == kid).cloned();
|
||||||
|
*self.cache.write().await = Some((Instant::now(), keys));
|
||||||
|
found.ok_or_else(|| {
|
||||||
|
ApiError::InvalidCredentials(format!("the {} token is signed with an unknown key", self.provider))
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn verify(&self, id_token: &str) -> Result<IdClaims, ApiError> {
|
||||||
|
let provider = self.provider;
|
||||||
|
if !self.enabled() {
|
||||||
|
return Err(ApiError::Forbidden(format!("{provider} login is not configured")));
|
||||||
|
}
|
||||||
|
let invalid =
|
||||||
|
|e: jsonwebtoken::errors::Error| ApiError::InvalidCredentials(format!("invalid {provider} token: {e}"));
|
||||||
|
let header = decode_header(id_token).map_err(invalid)?;
|
||||||
|
if header.alg != Algorithm::RS256 {
|
||||||
|
return Err(ApiError::InvalidCredentials(format!("invalid {provider} token: unexpected algorithm")));
|
||||||
|
}
|
||||||
|
let kid =
|
||||||
|
header.kid.ok_or_else(|| ApiError::InvalidCredentials(format!("invalid {provider} token: no key id")))?;
|
||||||
|
let jwk = self.key(&kid).await?;
|
||||||
|
let key = DecodingKey::from_rsa_components(&jwk.n, &jwk.e).map_err(invalid)?;
|
||||||
|
let mut validation = Validation::new(Algorithm::RS256);
|
||||||
|
validation.set_audience(&self.client_ids);
|
||||||
|
validation.set_issuer(self.issuers);
|
||||||
|
validation.set_required_spec_claims(&["exp", "iss", "aud", "sub"]);
|
||||||
|
Ok(decode::<IdClaims>(id_token, &key, &validation).map_err(invalid)?.claims)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -183,6 +183,11 @@ pub(super) async fn queue(
|
|||||||
let (model, fallback) = &crate::models::models_for(state, Kind::parse(kind).expect("known kind")).await?;
|
let (model, fallback) = &crate::models::models_for(state, Kind::parse(kind).expect("known kind")).await?;
|
||||||
let (cache_key, prompt_version) = &versions(state, kind, hash, model, language).await?;
|
let (cache_key, prompt_version) = &versions(state, kind, hash, model, language).await?;
|
||||||
|
|
||||||
|
// One request at a time per user (a double click must not queue and pay
|
||||||
|
// for the same analysis twice): the user row is locked until commit.
|
||||||
|
let mut tx = state.db.begin().await?;
|
||||||
|
sqlx::query("SELECT id FROM users WHERE id = $1 FOR UPDATE").bind(user).execute(&mut *tx).await?;
|
||||||
|
|
||||||
// Already requested for this chart/synastry: return it.
|
// Already requested for this chart/synastry: return it.
|
||||||
let existing: Option<AnalysisRow> = sqlx::query_as(&format!(
|
let existing: Option<AnalysisRow> = sqlx::query_as(&format!(
|
||||||
"SELECT {ANALYSIS_COLUMNS} FROM analyses \
|
"SELECT {ANALYSIS_COLUMNS} FROM analyses \
|
||||||
@@ -193,7 +198,7 @@ pub(super) async fn queue(
|
|||||||
.bind(synastry_id)
|
.bind(synastry_id)
|
||||||
.bind(cache_key)
|
.bind(cache_key)
|
||||||
.bind(forecast_id)
|
.bind(forecast_id)
|
||||||
.fetch_optional(&state.db)
|
.fetch_optional(&mut *tx)
|
||||||
.await?;
|
.await?;
|
||||||
if let Some(row) = existing {
|
if let Some(row) = existing {
|
||||||
return Ok((StatusCode::OK, row));
|
return Ok((StatusCode::OK, row));
|
||||||
@@ -214,7 +219,7 @@ pub(super) async fn queue(
|
|||||||
)
|
)
|
||||||
.bind(cache_key)
|
.bind(cache_key)
|
||||||
.bind(prompt_version)
|
.bind(prompt_version)
|
||||||
.fetch_optional(&state.db)
|
.fetch_optional(&mut *tx)
|
||||||
.await?;
|
.await?;
|
||||||
if let Some((content, input_tokens, output_tokens)) = cached {
|
if let Some((content, input_tokens, output_tokens)) = cached {
|
||||||
let row: AnalysisRow = sqlx::query_as(&insert)
|
let row: AnalysisRow = sqlx::query_as(&insert)
|
||||||
@@ -235,13 +240,13 @@ pub(super) async fn queue(
|
|||||||
.bind(OffsetDateTime::now_utc())
|
.bind(OffsetDateTime::now_utc())
|
||||||
.bind(forecast_id)
|
.bind(forecast_id)
|
||||||
.bind(fallback)
|
.bind(fallback)
|
||||||
.fetch_one(&state.db)
|
.fetch_one(&mut *tx)
|
||||||
.await?;
|
.await?;
|
||||||
|
tx.commit().await?;
|
||||||
return Ok((StatusCode::CREATED, row));
|
return Ok((StatusCode::CREATED, row));
|
||||||
}
|
}
|
||||||
|
|
||||||
// New analysis: spend a unit and queue it for the worker.
|
// New analysis: spend a unit and queue it for the worker.
|
||||||
let mut tx = state.db.begin().await?;
|
|
||||||
let row: AnalysisRow = sqlx::query_as(&insert)
|
let row: AnalysisRow = sqlx::query_as(&insert)
|
||||||
.bind(id)
|
.bind(id)
|
||||||
.bind(kind)
|
.bind(kind)
|
||||||
|
|||||||
@@ -307,20 +307,78 @@ pub async fn google(
|
|||||||
WithRejection(Json(req), _): Body<GoogleRequest>,
|
WithRejection(Json(req), _): Body<GoogleRequest>,
|
||||||
) -> ApiResult<impl IntoResponse> {
|
) -> ApiResult<impl IntoResponse> {
|
||||||
let claims = state.google.verify(&req.id_token).await?;
|
let claims = state.google.verify(&req.id_token).await?;
|
||||||
|
let signup = Signup {
|
||||||
|
name: claims.name.clone(),
|
||||||
|
locale: claims.locale.clone(),
|
||||||
|
invite_token: req.invite_token,
|
||||||
|
referral: req.referral,
|
||||||
|
};
|
||||||
|
social_login(&state, headers, jar, "google", claims, signup).await
|
||||||
|
}
|
||||||
|
|
||||||
|
// --- Apple ------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
#[derive(Deserialize)]
|
||||||
|
#[serde(deny_unknown_fields)]
|
||||||
|
pub struct AppleRequest {
|
||||||
|
/// ID token (JWT) from Sign in with Apple JS.
|
||||||
|
id_token: String,
|
||||||
|
/// The name Apple gives the page at the first sign-in only (it is not in
|
||||||
|
/// the token): used when the account is created.
|
||||||
|
name: Option<String>,
|
||||||
|
invite_token: Option<String>,
|
||||||
|
referral: Option<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Logs in with Apple, like [`google`]. The address may be an Apple relay
|
||||||
|
/// (`…@privaterelay.appleid.com`), which forwards our e-mails.
|
||||||
|
pub async fn apple(
|
||||||
|
State(state): St,
|
||||||
|
headers: HeaderMap,
|
||||||
|
jar: CookieJar,
|
||||||
|
WithRejection(Json(req), _): Body<AppleRequest>,
|
||||||
|
) -> ApiResult<impl IntoResponse> {
|
||||||
|
let claims = state.apple.verify(&req.id_token).await?;
|
||||||
|
let signup = Signup { name: req.name, locale: None, invite_token: req.invite_token, referral: req.referral };
|
||||||
|
social_login(&state, headers, jar, "apple", claims, signup).await
|
||||||
|
}
|
||||||
|
|
||||||
|
/// What a new account starts with.
|
||||||
|
struct Signup {
|
||||||
|
name: Option<String>,
|
||||||
|
locale: Option<String>,
|
||||||
|
invite_token: Option<String>,
|
||||||
|
referral: Option<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Logs in with a verified provider identity: the linked user, else the user
|
||||||
|
/// with the same (provider-verified) e-mail address, else a new user.
|
||||||
|
async fn social_login(
|
||||||
|
state: &AppState,
|
||||||
|
headers: HeaderMap,
|
||||||
|
jar: CookieJar,
|
||||||
|
provider: &'static str,
|
||||||
|
claims: crate::oidc::IdClaims,
|
||||||
|
signup: Signup,
|
||||||
|
) -> ApiResult<impl IntoResponse + use<>> {
|
||||||
let email = match (claims.email.as_deref(), claims.email_verified) {
|
let email = match (claims.email.as_deref(), claims.email_verified) {
|
||||||
(Some(e), true) => normalize_email(e)?,
|
(Some(e), true) => normalize_email(e)?,
|
||||||
_ => return Err(ApiError::InvalidCredentials("the Google account has no verified e-mail address".into())),
|
_ => {
|
||||||
|
return Err(ApiError::InvalidCredentials(format!("the {provider} account has no verified e-mail address")));
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
let mut tx = state.db.begin().await?;
|
let mut tx = state.db.begin().await?;
|
||||||
let linked: Option<(Uuid,)> =
|
let linked: Option<(Uuid,)> =
|
||||||
sqlx::query_as("SELECT user_id FROM auth_identities WHERE provider = 'google' AND subject = $1")
|
sqlx::query_as("SELECT user_id FROM auth_identities WHERE provider = $1 AND subject = $2")
|
||||||
|
.bind(provider)
|
||||||
.bind(&claims.sub)
|
.bind(&claims.sub)
|
||||||
.fetch_optional(&mut *tx)
|
.fetch_optional(&mut *tx)
|
||||||
.await?;
|
.await?;
|
||||||
let (user_id, created) = match linked {
|
let (user_id, created) = match linked {
|
||||||
Some((id,)) => {
|
Some((id,)) => {
|
||||||
sqlx::query("UPDATE auth_identities SET last_used_at = now() WHERE provider = 'google' AND subject = $1")
|
sqlx::query("UPDATE auth_identities SET last_used_at = now() WHERE provider = $1 AND subject = $2")
|
||||||
|
.bind(provider)
|
||||||
.bind(&claims.sub)
|
.bind(&claims.sub)
|
||||||
.execute(&mut *tx)
|
.execute(&mut *tx)
|
||||||
.await?;
|
.await?;
|
||||||
@@ -331,7 +389,24 @@ pub async fn google(
|
|||||||
sqlx::query_as("SELECT id FROM users WHERE email = $1").bind(&email).fetch_optional(&mut *tx).await?;
|
sqlx::query_as("SELECT id FROM users WHERE email = $1").bind(&email).fetch_optional(&mut *tx).await?;
|
||||||
let (id, created) = match existing {
|
let (id, created) = match existing {
|
||||||
Some((id,)) => {
|
Some((id,)) => {
|
||||||
// Google has verified the address, so it counts as verified here too.
|
// An account whose address was never confirmed may have
|
||||||
|
// been made by someone else with this address: its
|
||||||
|
// password and sessions go, the provider has proven who
|
||||||
|
// owns the address.
|
||||||
|
let unverified: bool =
|
||||||
|
sqlx::query_scalar("SELECT email_verified_at IS NULL FROM users WHERE id = $1 FOR UPDATE")
|
||||||
|
.bind(id)
|
||||||
|
.fetch_one(&mut *tx)
|
||||||
|
.await?;
|
||||||
|
if unverified {
|
||||||
|
sqlx::query("DELETE FROM auth_identities WHERE user_id = $1 AND provider = 'password'")
|
||||||
|
.bind(id)
|
||||||
|
.execute(&mut *tx)
|
||||||
|
.await?;
|
||||||
|
sqlx::query("DELETE FROM sessions WHERE user_id = $1").bind(id).execute(&mut *tx).await?;
|
||||||
|
tracing::warn!(user = %id, provider, "unconfirmed password account taken over by its address's owner");
|
||||||
|
}
|
||||||
|
// The provider has verified the address, so it counts as verified here too.
|
||||||
sqlx::query(
|
sqlx::query(
|
||||||
"UPDATE users SET email_verified_at = COALESCE(email_verified_at, now()) WHERE id = $1",
|
"UPDATE users SET email_verified_at = COALESCE(email_verified_at, now()) WHERE id = $1",
|
||||||
)
|
)
|
||||||
@@ -341,9 +416,9 @@ pub async fn google(
|
|||||||
(id, false)
|
(id, false)
|
||||||
}
|
}
|
||||||
None => {
|
None => {
|
||||||
super::invitations::admit(&state, &mut tx, &email, req.invite_token.as_deref()).await?;
|
super::invitations::admit(state, &mut tx, &email, signup.invite_token.as_deref()).await?;
|
||||||
let id = Uuid::now_v7();
|
let id = Uuid::now_v7();
|
||||||
let locale = claims
|
let locale = signup
|
||||||
.locale
|
.locale
|
||||||
.as_deref()
|
.as_deref()
|
||||||
.and_then(|l| l.split(['-', '_']).next())
|
.and_then(|l| l.split(['-', '_']).next())
|
||||||
@@ -355,7 +430,7 @@ pub async fn google(
|
|||||||
)
|
)
|
||||||
.bind(id)
|
.bind(id)
|
||||||
.bind(&email)
|
.bind(&email)
|
||||||
.bind(clean_name(claims.name.clone()))
|
.bind(clean_name(signup.name))
|
||||||
.bind(locale)
|
.bind(locale)
|
||||||
.execute(&mut *tx)
|
.execute(&mut *tx)
|
||||||
.await?;
|
.await?;
|
||||||
@@ -363,21 +438,27 @@ pub async fn google(
|
|||||||
&mut tx,
|
&mut tx,
|
||||||
id,
|
id,
|
||||||
&email,
|
&email,
|
||||||
req.invite_token.as_deref(),
|
signup.invite_token.as_deref(),
|
||||||
state.config.free_person_slots,
|
state.config.free_person_slots,
|
||||||
)
|
)
|
||||||
.await?;
|
.await?;
|
||||||
super::shares::record_referral(&mut tx, state.config.referral_rewards, id, req.referral.as_deref())
|
super::shares::record_referral(
|
||||||
.await?;
|
&mut tx,
|
||||||
|
state.config.referral_rewards,
|
||||||
|
id,
|
||||||
|
signup.referral.as_deref(),
|
||||||
|
)
|
||||||
|
.await?;
|
||||||
(id, true)
|
(id, true)
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
sqlx::query(
|
sqlx::query(
|
||||||
"INSERT INTO auth_identities (id, user_id, provider, subject, email, last_used_at) \
|
"INSERT INTO auth_identities (id, user_id, provider, subject, email, last_used_at) \
|
||||||
VALUES ($1, $2, 'google', $3, $4, now())",
|
VALUES ($1, $2, $3, $4, $5, now())",
|
||||||
)
|
)
|
||||||
.bind(Uuid::now_v7())
|
.bind(Uuid::now_v7())
|
||||||
.bind(id)
|
.bind(id)
|
||||||
|
.bind(provider)
|
||||||
.bind(&claims.sub)
|
.bind(&claims.sub)
|
||||||
.bind(&email)
|
.bind(&email)
|
||||||
.execute(&mut *tx)
|
.execute(&mut *tx)
|
||||||
@@ -386,11 +467,11 @@ pub async fn google(
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
let mut user = load_user(&mut tx, user_id).await?;
|
let mut user = load_user(&mut tx, user_id).await?;
|
||||||
apply_bootstrap_admin(&state, &mut tx, &mut user).await?;
|
apply_bootstrap_admin(state, &mut tx, &mut user).await?;
|
||||||
tx.commit().await?;
|
tx.commit().await?;
|
||||||
|
|
||||||
let session = create_session(&state.db, &state.config, user.id, user_agent(&headers)).await?;
|
let session = create_session(&state.db, &state.config, user.id, user_agent(&headers)).await?;
|
||||||
Ok(login_response(&state, jar, &user, session, created))
|
Ok(login_response(state, jar, &user, session, created))
|
||||||
}
|
}
|
||||||
|
|
||||||
// --- logout -------------------------------------------------------------------------------
|
// --- logout -------------------------------------------------------------------------------
|
||||||
|
|||||||
@@ -342,7 +342,9 @@ async fn corrected_birth(
|
|||||||
let (analysed, foreign_synastry): (bool, bool) = sqlx::query_as(
|
let (analysed, foreign_synastry): (bool, bool) = sqlx::query_as(
|
||||||
"SELECT EXISTS (SELECT 1 FROM analyses WHERE chart_id = $1 AND kind <> 'summary' AND status <> 'failed') \
|
"SELECT EXISTS (SELECT 1 FROM analyses WHERE chart_id = $1 AND kind <> 'summary' AND status <> 'failed') \
|
||||||
OR EXISTS (SELECT 1 FROM analyses a JOIN synastries s ON s.id = a.synastry_id \
|
OR EXISTS (SELECT 1 FROM analyses a JOIN synastries s ON s.id = a.synastry_id \
|
||||||
WHERE (s.chart1_id = $1 OR s.chart2_id = $1) AND a.status <> 'failed'), \
|
WHERE (s.chart1_id = $1 OR s.chart2_id = $1) AND a.status <> 'failed') \
|
||||||
|
OR EXISTS (SELECT 1 FROM analyses a JOIN forecasts f ON f.id = a.forecast_id \
|
||||||
|
WHERE f.chart_id = $1 AND a.status <> 'failed'), \
|
||||||
EXISTS (SELECT 1 FROM synastries WHERE (chart1_id = $1 OR chart2_id = $1) AND owner_id <> $2)",
|
EXISTS (SELECT 1 FROM synastries WHERE (chart1_id = $1 OR chart2_id = $1) AND owner_id <> $2)",
|
||||||
)
|
)
|
||||||
.bind(chart.id)
|
.bind(chart.id)
|
||||||
|
|||||||
@@ -89,8 +89,8 @@ pub async fn mark_accepted(
|
|||||||
let hash = token.map(|t| db::token_hash(t.trim()));
|
let hash = token.map(|t| db::token_hash(t.trim()));
|
||||||
sqlx::query(
|
sqlx::query(
|
||||||
"UPDATE invitations SET accepted_at = now(), accepted_by = $1 \
|
"UPDATE invitations SET accepted_at = now(), accepted_by = $1 \
|
||||||
WHERE accepted_at IS NULL AND revoked_at IS NULL \
|
WHERE accepted_at IS NULL AND revoked_at IS NULL AND expires_at > now() \
|
||||||
AND (email = $2 OR (expires_at > now() AND id IN (SELECT invitation_id FROM invitation_tokens WHERE token_hash = $3)))",
|
AND (email = $2 OR id IN (SELECT invitation_id FROM invitation_tokens WHERE token_hash = $3))",
|
||||||
)
|
)
|
||||||
.bind(user_id)
|
.bind(user_id)
|
||||||
.bind(email)
|
.bind(email)
|
||||||
@@ -603,10 +603,19 @@ pub async fn unsubscribe(
|
|||||||
.bind(db::token_hash(&email))
|
.bind(db::token_hash(&email))
|
||||||
.execute(&mut *tx)
|
.execute(&mut *tx)
|
||||||
.await?;
|
.await?;
|
||||||
sqlx::query(
|
let revoked: Vec<Uuid> = sqlx::query_scalar(
|
||||||
"UPDATE invitations SET revoked_at = now() WHERE email = $1 AND accepted_at IS NULL AND revoked_at IS NULL",
|
"UPDATE invitations SET revoked_at = now() WHERE email = $1 AND accepted_at IS NULL AND revoked_at IS NULL \
|
||||||
|
RETURNING id",
|
||||||
)
|
)
|
||||||
.bind(&email)
|
.bind(&email)
|
||||||
|
.fetch_all(&mut *tx)
|
||||||
|
.await?;
|
||||||
|
// Their packages go with them, as when an admin revokes an invitation.
|
||||||
|
sqlx::query(
|
||||||
|
"UPDATE promo_codes SET revoked_at = now() \
|
||||||
|
WHERE invitation_id = ANY($1) AND redeemed_at IS NULL AND revoked_at IS NULL",
|
||||||
|
)
|
||||||
|
.bind(&revoked)
|
||||||
.execute(&mut *tx)
|
.execute(&mut *tx)
|
||||||
.await?;
|
.await?;
|
||||||
sqlx::query("DELETE FROM waitlist WHERE email = $1").bind(&email).execute(&mut *tx).await?;
|
sqlx::query("DELETE FROM waitlist WHERE email = $1").bind(&email).execute(&mut *tx).await?;
|
||||||
@@ -630,12 +639,7 @@ pub async fn join_waitlist(
|
|||||||
let email = normalize_email(&req.email)?;
|
let email = normalize_email(&req.email)?;
|
||||||
let locale = validate_locale(&state, req.locale.as_deref())?;
|
let locale = validate_locale(&state, req.locale.as_deref())?;
|
||||||
// Every sign-up sends an e-mail: a few per address, so the form cannot be used to flood someone.
|
// Every sign-up sends an e-mail: a few per address, so the form cannot be used to flood someone.
|
||||||
let ip = headers
|
let ip = super::client_ip(&headers).unwrap_or_else(|| "unknown".into());
|
||||||
.get("x-forwarded-for")
|
|
||||||
.and_then(|v| v.to_str().ok())
|
|
||||||
.and_then(|v| v.split(',').next())
|
|
||||||
.map(str::trim)
|
|
||||||
.unwrap_or("unknown");
|
|
||||||
let key = format!("waitlist:{ip}");
|
let key = format!("waitlist:{ip}");
|
||||||
state.login_limiter.check(&key)?;
|
state.login_limiter.check(&key)?;
|
||||||
let token = db::new_token();
|
let token = db::new_token();
|
||||||
|
|||||||
@@ -122,9 +122,16 @@ pub async fn restart(
|
|||||||
.rows_affected()
|
.rows_affected()
|
||||||
} else {
|
} else {
|
||||||
let Some(row) = find_analysis(&state.db, id).await? else { continue };
|
let Some(row) = find_analysis(&state.db, id).await? else { continue };
|
||||||
let Some(hash) = target_hash(&state.db, &row).await? else { continue };
|
let (model, fallback, cache_key, prompt_version) = if kind == "tarot" {
|
||||||
let (model, fallback) = models_for(&state, Kind::parse(&kind).unwrap_or(Kind::Natal)).await?;
|
// A tarot reading: the analysis model, the same cards, never cached.
|
||||||
let (cache_key, prompt_version) = versions(&state, &kind, &hash, &model, &row.language).await?;
|
let (model, fallback) = models_for(&state, Kind::Natal).await?;
|
||||||
|
(model, fallback, format!("tarot|{id}"), state.config.prompt_version.clone())
|
||||||
|
} else {
|
||||||
|
let Some(hash) = target_hash(&state.db, &row).await? else { continue };
|
||||||
|
let (model, fallback) = models_for(&state, Kind::parse(&kind).unwrap_or(Kind::Natal)).await?;
|
||||||
|
let (cache_key, prompt_version) = versions(&state, &kind, &hash, &model, &row.language).await?;
|
||||||
|
(model, fallback, cache_key, prompt_version)
|
||||||
|
};
|
||||||
sqlx::query(
|
sqlx::query(
|
||||||
"UPDATE analyses SET status = 'pending', model = $2, fallback_model = $3, on_fallback = false, \
|
"UPDATE analyses SET status = 'pending', model = $2, fallback_model = $3, on_fallback = false, \
|
||||||
cache_key = $4, prompt_version = $5, attempts = 0, next_attempt_at = now(), started_at = NULL, \
|
cache_key = $4, prompt_version = $5, attempts = 0, next_attempt_at = now(), started_at = NULL, \
|
||||||
|
|||||||
@@ -57,6 +57,15 @@ where
|
|||||||
serde::Deserialize::deserialize(d).map(Some)
|
serde::Deserialize::deserialize(d).map(Some)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// The visitor's address from `X-Real-IP`: Caddy sets it (overwriting what
|
||||||
|
/// the browser sent) from Cloudflare's `CF-Connecting-IP`, trusted only from
|
||||||
|
/// Cloudflare's ranges, and the frontend's proxy passes it on. Not
|
||||||
|
/// `X-Forwarded-For`, whose first entry the browser can write.
|
||||||
|
pub(crate) fn client_ip(headers: &axum::http::HeaderMap) -> Option<String> {
|
||||||
|
let ip = headers.get("x-real-ip")?.to_str().ok()?.trim();
|
||||||
|
(!ip.is_empty()).then(|| ip.to_string())
|
||||||
|
}
|
||||||
|
|
||||||
pub fn router(state: Arc<AppState>) -> Router {
|
pub fn router(state: Arc<AppState>) -> Router {
|
||||||
Router::new()
|
Router::new()
|
||||||
.route("/healthz", get(health))
|
.route("/healthz", get(health))
|
||||||
@@ -66,6 +75,7 @@ pub fn router(state: Arc<AppState>) -> Router {
|
|||||||
.route("/v1/auth/register", post(auth::register))
|
.route("/v1/auth/register", post(auth::register))
|
||||||
.route("/v1/auth/login", post(auth::login))
|
.route("/v1/auth/login", post(auth::login))
|
||||||
.route("/v1/auth/google", post(auth::google))
|
.route("/v1/auth/google", post(auth::google))
|
||||||
|
.route("/v1/auth/apple", post(auth::apple))
|
||||||
.route("/v1/auth/logout", post(auth::logout))
|
.route("/v1/auth/logout", post(auth::logout))
|
||||||
.route("/v1/auth/logout-all", post(auth::logout_all))
|
.route("/v1/auth/logout-all", post(auth::logout_all))
|
||||||
.route("/v1/auth/verify-email", post(auth::verify_email))
|
.route("/v1/auth/verify-email", post(auth::verify_email))
|
||||||
@@ -164,6 +174,7 @@ async fn public_config(State(state): St) -> Json<Value> {
|
|||||||
let c = &state.config;
|
let c = &state.config;
|
||||||
Json(json!({
|
Json(json!({
|
||||||
"google_login": { "enabled": state.google.enabled(), "client_id": c.google_client_ids.first() },
|
"google_login": { "enabled": state.google.enabled(), "client_id": c.google_client_ids.first() },
|
||||||
|
"apple_login": { "enabled": state.apple.enabled(), "client_id": c.apple_client_ids.first() },
|
||||||
"locales": c.supported_locales,
|
"locales": c.supported_locales,
|
||||||
"password_login": c.password_login,
|
"password_login": c.password_login,
|
||||||
"mock_payments": payments::method(c) == Some("mock"),
|
"mock_payments": payments::method(c) == Some("mock"),
|
||||||
|
|||||||
@@ -61,12 +61,7 @@ struct ShareRow {
|
|||||||
const SHARE_COLUMNS: &str = "id, owner_id, slug, kind, chart_id, synastry_id, analysis_id, title, show_birth_data, \
|
const SHARE_COLUMNS: &str = "id, owner_id, slug, kind, chart_id, synastry_id, analysis_id, title, show_birth_data, \
|
||||||
view_count, created_at, revoked_at, owner_ip_hash";
|
view_count, created_at, revoked_at, owner_ip_hash";
|
||||||
|
|
||||||
/// The visitor's address: the first `X-Forwarded-For` entry (Caddy writes it
|
use super::client_ip;
|
||||||
/// from Cloudflare's, the frontend passes it on).
|
|
||||||
fn client_ip(headers: &HeaderMap) -> Option<String> {
|
|
||||||
let first = headers.get("x-forwarded-for")?.to_str().ok()?.split(',').next()?.trim();
|
|
||||||
(!first.is_empty()).then(|| first.to_string())
|
|
||||||
}
|
|
||||||
|
|
||||||
/// An address salted with the slug, so the stored value says nothing by itself.
|
/// An address salted with the slug, so the stored value says nothing by itself.
|
||||||
fn ip_hash(slug: &str, ip: &str) -> Vec<u8> {
|
fn ip_hash(slug: &str, ip: &str) -> Vec<u8> {
|
||||||
@@ -231,8 +226,9 @@ pub async fn revoke(State(state): St, auth: AuthUser, WithRejection(Path(id), _)
|
|||||||
// --- public view -------------------------------------------------------------------------------
|
// --- public view -------------------------------------------------------------------------------
|
||||||
|
|
||||||
fn public_chart_block(chart: &ChartRow, share: &ShareRow) -> Value {
|
fn public_chart_block(chart: &ChartRow, share: &ShareRow) -> Value {
|
||||||
// Birth data only of the sharer's own chart, never of a partner's.
|
// Birth data only of the sharer's own chart, never of a partner's or of a
|
||||||
let show = share.show_birth_data && chart.owner_id == share.owner_id;
|
// person they added (that is someone else's data).
|
||||||
|
let show = share.show_birth_data && chart.owner_id == share.owner_id && chart.kind == "own";
|
||||||
json!({ "label": chart.label, "chart": public_chart(&chart.result, show) })
|
json!({ "label": chart.label, "chart": public_chart(&chart.result, show) })
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -469,10 +469,10 @@ pub async fn accept_invite(
|
|||||||
let my_chart = chart_or_primary(&state.db, req.chart_id, auth.id()).await?;
|
let my_chart = chart_or_primary(&state.db, req.chart_id, auth.id()).await?;
|
||||||
let inviter_chart =
|
let inviter_chart =
|
||||||
find_chart(&state.db, invite.inviter_chart_id).await?.ok_or(ApiError::NotFound("invitation"))?;
|
find_chart(&state.db, invite.inviter_chart_id).await?.ok_or(ApiError::NotFound("invitation"))?;
|
||||||
let (row, _) = compute_synastry(&state, invite.inviter_id, &inviter_chart, &my_chart).await?;
|
let (row, created) = compute_synastry(&state, invite.inviter_id, &inviter_chart, &my_chart).await?;
|
||||||
|
|
||||||
let mut tx = state.db.begin().await?;
|
let mut tx = state.db.begin().await?;
|
||||||
sqlx::query(
|
let accepted = sqlx::query(
|
||||||
"UPDATE synastry_invites SET accepted_at = now(), accepted_by = $1, synastry_id = $2 \
|
"UPDATE synastry_invites SET accepted_at = now(), accepted_by = $1, synastry_id = $2 \
|
||||||
WHERE id = $3 AND accepted_at IS NULL",
|
WHERE id = $3 AND accepted_at IS NULL",
|
||||||
)
|
)
|
||||||
@@ -480,7 +480,17 @@ pub async fn accept_invite(
|
|||||||
.bind(row.id)
|
.bind(row.id)
|
||||||
.bind(invite.id)
|
.bind(invite.id)
|
||||||
.execute(&mut *tx)
|
.execute(&mut *tx)
|
||||||
.await?;
|
.await?
|
||||||
|
.rows_affected();
|
||||||
|
if accepted == 0 {
|
||||||
|
// Someone else accepted it at the same moment: the comparison made
|
||||||
|
// for this attempt goes, the link is used up.
|
||||||
|
drop(tx);
|
||||||
|
if created {
|
||||||
|
sqlx::query("DELETE FROM synastries WHERE id = $1").bind(row.id).execute(&state.db).await?;
|
||||||
|
}
|
||||||
|
return Err(ApiError::Gone("this invitation has already been accepted".into()));
|
||||||
|
}
|
||||||
let inviter: Option<db::User> = sqlx::query_as(&format!("SELECT {USER_COLUMNS} FROM users WHERE id = $1"))
|
let inviter: Option<db::User> = sqlx::query_as(&format!("SELECT {USER_COLUMNS} FROM users WHERE id = $1"))
|
||||||
.bind(invite.inviter_id)
|
.bind(invite.inviter_id)
|
||||||
.fetch_optional(&mut *tx)
|
.fetch_optional(&mut *tx)
|
||||||
|
|||||||
@@ -195,6 +195,18 @@ fn google_token(sub: &str, email: &str, audience: &str) -> String {
|
|||||||
jsonwebtoken::encode(&header, &claims, &jsonwebtoken::EncodingKey::from_rsa_pem(GOOGLE_KEY_PEM).unwrap()).unwrap()
|
jsonwebtoken::encode(&header, &claims, &jsonwebtoken::EncodingKey::from_rsa_pem(GOOGLE_KEY_PEM).unwrap()).unwrap()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn apple_token(sub: &str, email: &str, audience: &str) -> String {
|
||||||
|
let now = time::OffsetDateTime::now_utc().unix_timestamp();
|
||||||
|
// Apple sends email_verified as a string and no name.
|
||||||
|
let claims = json!({
|
||||||
|
"iss": "https://appleid.apple.com", "aud": audience, "sub": sub, "email": email,
|
||||||
|
"email_verified": "true", "is_private_email": "true", "iat": now, "exp": now + 600
|
||||||
|
});
|
||||||
|
let mut header = jsonwebtoken::Header::new(jsonwebtoken::Algorithm::RS256);
|
||||||
|
header.kid = Some("test-key".into());
|
||||||
|
jsonwebtoken::encode(&header, &claims, &jsonwebtoken::EncodingKey::from_rsa_pem(GOOGLE_KEY_PEM).unwrap()).unwrap()
|
||||||
|
}
|
||||||
|
|
||||||
// --- test client -------------------------------------------------------------------------------
|
// --- test client -------------------------------------------------------------------------------
|
||||||
|
|
||||||
struct TestApp {
|
struct TestApp {
|
||||||
@@ -418,14 +430,31 @@ async fn google_login_creates_links_and_rejects(pool: PgPool) {
|
|||||||
.await;
|
.await;
|
||||||
assert_eq!((r.status, &r.body["created"]), (StatusCode::OK, &json!(false)));
|
assert_eq!((r.status, &r.body["created"]), (StatusCode::OK, &json!(false)));
|
||||||
|
|
||||||
// an existing password account with the same address gets Google linked
|
// an existing, confirmed password account with the same address gets Google linked
|
||||||
let token = app.register("anna@example.com", "Anna").await;
|
let token = app.register("anna@example.com", "Anna").await;
|
||||||
|
sqlx::query("UPDATE users SET email_verified_at = now() WHERE email = 'anna@example.com'")
|
||||||
|
.execute(&app.pool)
|
||||||
|
.await
|
||||||
|
.unwrap();
|
||||||
let r = app
|
let r = app
|
||||||
.post("/v1/auth/google", None, json!({"id_token": google_token("g-2", "anna@example.com", GOOGLE_CLIENT)}))
|
.post("/v1/auth/google", None, json!({"id_token": google_token("g-2", "anna@example.com", GOOGLE_CLIENT)}))
|
||||||
.await;
|
.await;
|
||||||
assert_eq!((r.status, &r.body["created"]), (StatusCode::OK, &json!(false)));
|
assert_eq!((r.status, &r.body["created"]), (StatusCode::OK, &json!(false)));
|
||||||
assert_eq!(app.get("/v1/me", Some(&token)).await.body["providers"], json!(["password", "google"]));
|
assert_eq!(app.get("/v1/me", Some(&token)).await.body["providers"], json!(["password", "google"]));
|
||||||
|
|
||||||
|
// an unconfirmed one may be someone else's: its password and sessions go
|
||||||
|
let squatter = app.register("victim@example.com", "Valaki").await;
|
||||||
|
let r = app
|
||||||
|
.post("/v1/auth/google", None, json!({"id_token": google_token("g-4", "victim@example.com", GOOGLE_CLIENT)}))
|
||||||
|
.await;
|
||||||
|
assert_eq!(r.status, StatusCode::OK, "{}", r.body);
|
||||||
|
let owner = r.body["session"]["token"].as_str().unwrap().to_string();
|
||||||
|
assert_eq!(app.get("/v1/me", Some(&squatter)).await.status, StatusCode::UNAUTHORIZED);
|
||||||
|
assert_eq!(app.get("/v1/me", Some(&owner)).await.body["providers"], json!(["google"]));
|
||||||
|
let r =
|
||||||
|
app.post("/v1/auth/login", None, json!({"email": "victim@example.com", "password": "titkos-jelszo-123"})).await;
|
||||||
|
assert_eq!(r.status, StatusCode::UNAUTHORIZED);
|
||||||
|
|
||||||
let r = app
|
let r = app
|
||||||
.post("/v1/auth/google", None, json!({"id_token": google_token("g-3", "x@gmail.com", "other-client")}))
|
.post("/v1/auth/google", None, json!({"id_token": google_token("g-3", "x@gmail.com", "other-client")}))
|
||||||
.await;
|
.await;
|
||||||
@@ -851,7 +880,7 @@ async fn export_and_delete_account(pool: PgPool) {
|
|||||||
/// config and catalog, shared links, invitation pages, the waitlist and
|
/// config and catalog, shared links, invitation pages, the waitlist and
|
||||||
/// unsubscribing. Every other route (charts, calculations, analyses) needs a
|
/// unsubscribing. Every other route (charts, calculations, analyses) needs a
|
||||||
/// logged-in user, so other apps cannot use them.
|
/// logged-in user, so other apps cannot use them.
|
||||||
const PUBLIC_ROUTES: [&str; 16] = [
|
const PUBLIC_ROUTES: [&str; 17] = [
|
||||||
"/healthz",
|
"/healthz",
|
||||||
// Stripe calls it; the signature proves it.
|
// Stripe calls it; the signature proves it.
|
||||||
"/v1/payments/stripe/webhook",
|
"/v1/payments/stripe/webhook",
|
||||||
@@ -860,6 +889,7 @@ const PUBLIC_ROUTES: [&str; 16] = [
|
|||||||
"/v1/auth/register",
|
"/v1/auth/register",
|
||||||
"/v1/auth/login",
|
"/v1/auth/login",
|
||||||
"/v1/auth/google",
|
"/v1/auth/google",
|
||||||
|
"/v1/auth/apple",
|
||||||
"/v1/auth/verify-email",
|
"/v1/auth/verify-email",
|
||||||
"/v1/auth/password-reset",
|
"/v1/auth/password-reset",
|
||||||
"/v1/auth/password-reset/confirm",
|
"/v1/auth/password-reset/confirm",
|
||||||
@@ -877,7 +907,7 @@ async fn a_visit_by_someone_else_earns_one_question_once(pool: PgPool) {
|
|||||||
let anna = app.register("anna@example.com", "Anna").await;
|
let anna = app.register("anna@example.com", "Anna").await;
|
||||||
let chart = app.chart(&anna, "Saját", true, "1990-03-15").await;
|
let chart = app.chart(&anna, "Saját", true, "1990-03-15").await;
|
||||||
let share = json!({"kind": "chart", "target_id": chart["id"]});
|
let share = json!({"kind": "chart", "target_id": chart["id"]});
|
||||||
let home = ("x-forwarded-for", "203.0.113.7");
|
let home = ("x-real-ip", "203.0.113.7");
|
||||||
let r = app.call_with("POST", "/v1/shares", Some(&anna), Some(share), &[home]).await;
|
let r = app.call_with("POST", "/v1/shares", Some(&anna), Some(share), &[home]).await;
|
||||||
assert_eq!(r.status, StatusCode::CREATED, "{}", r.body);
|
assert_eq!(r.status, StatusCode::CREATED, "{}", r.body);
|
||||||
let visit = format!("/v1/public/shares/{}/visit", r.body["slug"].as_str().unwrap());
|
let visit = format!("/v1/public/shares/{}/visit", r.body["slug"].as_str().unwrap());
|
||||||
@@ -886,7 +916,9 @@ async fn a_visit_by_someone_else_earns_one_question_once(pool: PgPool) {
|
|||||||
let before = me().await["analyses_left"]["question"].as_i64().unwrap();
|
let before = me().await["analyses_left"]["question"].as_i64().unwrap();
|
||||||
|
|
||||||
// robots, a missing user agent, the sharer's address and the sharer do not count
|
// robots, a missing user agent, the sharer's address and the sharer do not count
|
||||||
let elsewhere = ("x-forwarded-for", "198.51.100.1, 172.70.1.1");
|
// A browser cannot pose as the sharer through X-Forwarded-For: only X-Real-IP
|
||||||
|
// (set by Caddy) counts.
|
||||||
|
let elsewhere = ("x-real-ip", "198.51.100.1");
|
||||||
for (token, headers) in [
|
for (token, headers) in [
|
||||||
(None, vec![("user-agent", "facebookexternalhit/1.1"), elsewhere]),
|
(None, vec![("user-agent", "facebookexternalhit/1.1"), elsewhere]),
|
||||||
(None, vec![elsewhere]),
|
(None, vec![elsewhere]),
|
||||||
@@ -1955,6 +1987,18 @@ async fn admins_restart_open_generations_with_the_current_models(pool: PgPool) {
|
|||||||
(status.as_str(), model.as_str(), fallback, started, attempts),
|
(status.as_str(), model.as_str(), fallback, started, attempts),
|
||||||
("pending", "anthropic/claude-test", None, None, 0)
|
("pending", "anthropic/claude-test", None, None, 0)
|
||||||
);
|
);
|
||||||
|
// a stuck tarot reading restarts too
|
||||||
|
app.add_own_units(&admin, "tarot", 1).await;
|
||||||
|
let reading = app.post("/v1/tarot/readings", Some(&admin), json!({"spread": "daily"})).await;
|
||||||
|
let reading_id = reading.body["id"].as_str().unwrap().to_string();
|
||||||
|
sqlx::query("UPDATE analyses SET status = 'running', started_at = now() WHERE id = $1::uuid")
|
||||||
|
.bind(&reading_id)
|
||||||
|
.execute(&pool)
|
||||||
|
.await
|
||||||
|
.unwrap();
|
||||||
|
let r = app.post("/v1/admin/jobs/restart", Some(&admin), json!({ "ids": [reading_id] })).await;
|
||||||
|
assert_eq!(r.body["restarted"], 1, "{}", r.body);
|
||||||
|
|
||||||
// finished ones are left alone
|
// finished ones are left alone
|
||||||
sqlx::query("UPDATE analyses SET status = 'done', content = '{}'").execute(&pool).await.unwrap();
|
sqlx::query("UPDATE analyses SET status = 'done', content = '{}'").execute(&pool).await.unwrap();
|
||||||
assert_eq!(app.post("/v1/admin/jobs/restart", Some(&admin), json!({})).await.body["restarted"], 0);
|
assert_eq!(app.post("/v1/admin/jobs/restart", Some(&admin), json!({})).await.body["restarted"], 0);
|
||||||
@@ -2161,7 +2205,7 @@ async fn an_invitation_brings_its_package_and_codes_fill_up(pool: PgPool) {
|
|||||||
async fn the_waitlist_confirms_and_can_be_left(pool: PgPool) {
|
async fn the_waitlist_confirms_and_can_be_left(pool: PgPool) {
|
||||||
let app = TestApp::with_config(pool.clone(), |c| c.signup_mode = crate::config::SignupMode::Invite).await;
|
let app = TestApp::with_config(pool.clone(), |c| c.signup_mode = crate::config::SignupMode::Invite).await;
|
||||||
let admin = app.register("admin@example.com", "Admin").await;
|
let admin = app.register("admin@example.com", "Admin").await;
|
||||||
let from = |ip: &'static str| [("x-forwarded-for", ip)];
|
let from = |ip: &'static str| [("x-real-ip", ip)];
|
||||||
|
|
||||||
// one confirmation per address, even when sent again
|
// one confirmation per address, even when sent again
|
||||||
for _ in 0..2 {
|
for _ in 0..2 {
|
||||||
@@ -2673,3 +2717,93 @@ async fn tarot_readings_draw_on_the_server_and_use_tarot_units(pool: PgPool) {
|
|||||||
assert_eq!(r.status, StatusCode::NO_CONTENT, "{}", r.body);
|
assert_eq!(r.status, StatusCode::NO_CONTENT, "{}", r.body);
|
||||||
assert_eq!(count().await, 0);
|
assert_eq!(count().await, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[sqlx::test(migrator = "db::MIGRATOR")]
|
||||||
|
async fn apple_login_creates_links_and_rejects(pool: PgPool) {
|
||||||
|
let app = TestApp::new(pool).await;
|
||||||
|
let r = app.get("/v1/config", None).await;
|
||||||
|
assert_eq!(r.body["apple_login"], json!({"enabled": true, "client_id": "hu.sorsfonalak.test"}));
|
||||||
|
let relay = "x7k2p9@privaterelay.appleid.com";
|
||||||
|
// The name comes from the page (Apple gives it at the first sign-in only).
|
||||||
|
let r = app
|
||||||
|
.post(
|
||||||
|
"/v1/auth/apple",
|
||||||
|
None,
|
||||||
|
json!({"id_token": apple_token("a-1", relay, "hu.sorsfonalak.test"), "name": "Kovács Anna"}),
|
||||||
|
)
|
||||||
|
.await;
|
||||||
|
assert_eq!(r.status, StatusCode::CREATED, "{}", r.body);
|
||||||
|
assert_eq!((&r.body["created"], &r.body["user"]["display_name"]), (&json!(true), &json!("Kovács Anna")));
|
||||||
|
assert_eq!(r.body["user"]["email"], relay);
|
||||||
|
let r =
|
||||||
|
app.post("/v1/auth/apple", None, json!({"id_token": apple_token("a-1", relay, "hu.sorsfonalak.test")})).await;
|
||||||
|
assert_eq!((r.status, &r.body["created"]), (StatusCode::OK, &json!(false)));
|
||||||
|
assert_eq!(r.body["user"]["display_name"], "Kovács Anna");
|
||||||
|
|
||||||
|
// the same address as a Google account: both log into one user
|
||||||
|
let google = app
|
||||||
|
.post("/v1/auth/google", None, json!({"id_token": google_token("g-9", "bela@example.com", GOOGLE_CLIENT)}))
|
||||||
|
.await;
|
||||||
|
let token = google.body["session"]["token"].as_str().unwrap().to_string();
|
||||||
|
let r = app
|
||||||
|
.post(
|
||||||
|
"/v1/auth/apple",
|
||||||
|
None,
|
||||||
|
json!({"id_token": apple_token("a-2", "bela@example.com", "hu.sorsfonalak.test")}),
|
||||||
|
)
|
||||||
|
.await;
|
||||||
|
assert_eq!((r.status, &r.body["created"]), (StatusCode::OK, &json!(false)));
|
||||||
|
assert_eq!(app.get("/v1/me", Some(&token)).await.body["providers"], json!(["google", "apple"]));
|
||||||
|
|
||||||
|
// a Google token is no Apple token, nor one for another Services ID
|
||||||
|
let r = app
|
||||||
|
.post("/v1/auth/apple", None, json!({"id_token": google_token("g-1", "gabor@gmail.com", GOOGLE_CLIENT)}))
|
||||||
|
.await;
|
||||||
|
assert_eq!(r.status, StatusCode::UNAUTHORIZED);
|
||||||
|
let r = app.post("/v1/auth/apple", None, json!({"id_token": apple_token("a-3", relay, "other.service")})).await;
|
||||||
|
assert_eq!(r.status, StatusCode::UNAUTHORIZED);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[sqlx::test(migrator = "db::MIGRATOR")]
|
||||||
|
async fn apple_login_can_be_off(pool: PgPool) {
|
||||||
|
let app = TestApp::with_config(pool, |c| c.apple_client_ids.clear()).await;
|
||||||
|
assert_eq!(app.get("/v1/config", None).await.body["apple_login"]["enabled"], false);
|
||||||
|
let r = app
|
||||||
|
.post("/v1/auth/apple", None, json!({"id_token": apple_token("a-1", "a@b.hu", "hu.sorsfonalak.test")}))
|
||||||
|
.await;
|
||||||
|
assert_eq!(r.status, StatusCode::FORBIDDEN);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[sqlx::test(migrator = "db::MIGRATOR")]
|
||||||
|
async fn a_double_click_queues_and_pays_one_analysis(pool: PgPool) {
|
||||||
|
let app = TestApp::new(pool.clone()).await;
|
||||||
|
let anna = app.register("anna@example.com", "Anna").await;
|
||||||
|
let chart = app.chart(&anna, "Saját", true, "1990-03-15").await;
|
||||||
|
grant_units(&app, &anna, "natal", 2).await;
|
||||||
|
let url = format!("/v1/charts/{}/analyses", chart["id"].as_str().unwrap());
|
||||||
|
let (a, b) = tokio::join!(app.call("POST", &url, Some(&anna), None), app.call("POST", &url, Some(&anna), None));
|
||||||
|
assert!(a.status.is_success() && b.status.is_success(), "{} {}", a.body, b.body);
|
||||||
|
assert_eq!(a.body["id"], b.body["id"]);
|
||||||
|
let count: i64 =
|
||||||
|
sqlx::query_scalar("SELECT count(*) FROM analyses WHERE kind = 'natal'").fetch_one(&pool).await.unwrap();
|
||||||
|
assert_eq!(count, 1);
|
||||||
|
assert_eq!(app.get("/v1/me", Some(&anna)).await.body["analyses_left"]["natal"], 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[sqlx::test(migrator = "db::MIGRATOR")]
|
||||||
|
async fn a_paid_forecast_fixes_the_person(pool: PgPool) {
|
||||||
|
let app = TestApp::new(pool).await;
|
||||||
|
let anna = app.register("anna@example.com", "Anna").await;
|
||||||
|
app.chart(&anna, "Saját", true, "1990-03-15").await;
|
||||||
|
let bela = app.chart(&anna, "Béla", false, "1985-08-02").await;
|
||||||
|
let bela_id = bela["id"].as_str().unwrap();
|
||||||
|
let forecast = app.post(&format!("/v1/charts/{bela_id}/forecasts"), Some(&anna), json!({})).await;
|
||||||
|
assert_eq!(forecast.status, StatusCode::CREATED, "{}", forecast.body);
|
||||||
|
grant_units(&app, &anna, "forecast", 1).await;
|
||||||
|
let id = forecast.body["id"].as_str().unwrap();
|
||||||
|
let r = app.call("POST", &format!("/v1/forecasts/{id}/analyses"), Some(&anna), None).await;
|
||||||
|
assert_eq!(r.status, StatusCode::ACCEPTED, "{}", r.body);
|
||||||
|
let corrected = json!({"birth": {"date": "1985-08-03", "time": "10:00", "country": "HU", "place": "Szeged"}});
|
||||||
|
let r = app.call("PATCH", &format!("/v1/charts/{bela_id}"), Some(&anna), Some(corrected)).await;
|
||||||
|
assert_eq!((r.status, r.body["error"]["code"].as_str()), (StatusCode::CONFLICT, Some("person_analysed")));
|
||||||
|
}
|
||||||
|
|||||||
@@ -57,7 +57,10 @@ export default async function PrivacyPage() {
|
|||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
<tr>
|
<tr>
|
||||||
<td>Google-fiókod neve, e-mail-címe és azonosítója (belépéskor a Google adja át)</td>
|
<td>
|
||||||
|
Google- vagy Apple-fiókod neve, e-mail-címe és azonosítója (belépéskor a Google, illetve az Apple adja
|
||||||
|
át)
|
||||||
|
</td>
|
||||||
<td>Fiókod létrehozása, belépés, kapcsolattartás</td>
|
<td>Fiókod létrehozása, belépés, kapcsolattartás</td>
|
||||||
<td>Szerződés teljesítése (GDPR 6. cikk (1) b)</td>
|
<td>Szerződés teljesítése (GDPR 6. cikk (1) b)</td>
|
||||||
</tr>
|
</tr>
|
||||||
@@ -168,6 +171,13 @@ export default async function PrivacyPage() {
|
|||||||
</a>{" "}
|
</a>{" "}
|
||||||
szabályzatnak, beleértve a „Limited Use” (korlátozott felhasználás) követelményeit.
|
szabályzatnak, beleértve a „Limited Use” (korlátozott felhasználás) követelményeit.
|
||||||
</p>
|
</p>
|
||||||
|
<p>
|
||||||
|
<strong>Belépés Apple-fiókkal:</strong> ha az „Apple-bejelentkezést” választod, az Apple a fiókod egyedi
|
||||||
|
azonosítóját és az e-mail-címedet adja át, az első belépéskor a nevedet is. Ha az e-mail-címedet elrejted,
|
||||||
|
egy Apple-továbbítócímet kapunk (<code>…@privaterelay.appleid.com</code>): az erre küldött leveleinket az Apple
|
||||||
|
továbbítja hozzád. Ezeket ugyanarra és ugyanúgy használjuk, mint a Google-adatokat. A hozzáférést az Apple ID
|
||||||
|
beállításaidban vonhatod vissza (Bejelentkezés és biztonság › Bejelentkezés az Apple-lel).
|
||||||
|
</p>
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
<section>
|
<section>
|
||||||
|
|||||||
@@ -28,8 +28,10 @@ async function forward(req: NextRequest, ctx: { params: Promise<{ path: string[]
|
|||||||
const value = req.headers.get(name);
|
const value = req.headers.get(name);
|
||||||
if (value) headers.set(name, value);
|
if (value) headers.set(name, value);
|
||||||
}
|
}
|
||||||
const forwardedFor = req.headers.get("x-forwarded-for");
|
// The visitor's address as Caddy set it (from Cloudflare's CF-Connecting-IP,
|
||||||
if (forwardedFor) headers.set("x-forwarded-for", forwardedFor);
|
// overwriting any the browser sent).
|
||||||
|
const realIp = req.headers.get("x-real-ip");
|
||||||
|
if (realIp) headers.set("x-real-ip", realIp);
|
||||||
|
|
||||||
let res: Response;
|
let res: Response;
|
||||||
try {
|
try {
|
||||||
|
|||||||
@@ -0,0 +1,152 @@
|
|||||||
|
"use client";
|
||||||
|
|
||||||
|
import Script from "next/script";
|
||||||
|
import { useRouter } from "next/navigation";
|
||||||
|
import { useState } from "react";
|
||||||
|
|
||||||
|
import { Waitlist } from "@/components/Waitlist";
|
||||||
|
import { ApiError, api, errorText } from "@/lib/api";
|
||||||
|
|
||||||
|
/** The part of Sign in with Apple JS (appleid.auth.js) we use. */
|
||||||
|
interface AppleSignInResponse {
|
||||||
|
authorization: { id_token: string; code: string; state?: string };
|
||||||
|
/** Only at the first sign-in of this Apple ID on the site. */
|
||||||
|
user?: { email?: string; name?: { firstName?: string; lastName?: string } };
|
||||||
|
}
|
||||||
|
|
||||||
|
declare global {
|
||||||
|
interface Window {
|
||||||
|
AppleID?: {
|
||||||
|
auth: {
|
||||||
|
init(options: { clientId: string; scope: string; redirectURI: string; state?: string; usePopup: boolean }): void;
|
||||||
|
signIn(): Promise<AppleSignInResponse>;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Apple's logo (Sign in with Apple guidelines: the logo left of the label). */
|
||||||
|
function AppleMark() {
|
||||||
|
return (
|
||||||
|
<svg width="18" height="20" viewBox="0 0 17 20" aria-hidden="true" fill="currentColor">
|
||||||
|
<path d="M13.77 10.62c-.02-2.2 1.8-3.26 1.88-3.31-1.03-1.5-2.62-1.7-3.18-1.73-1.35-.14-2.64.8-3.33.8-.69 0-1.74-.78-2.86-.76-1.47.02-2.83.86-3.59 2.17-1.53 2.65-.39 6.57 1.1 8.72.73 1.05 1.6 2.23 2.73 2.19 1.1-.04 1.51-.71 2.84-.71 1.32 0 1.7.71 2.86.69 1.18-.02 1.93-1.07 2.65-2.12.84-1.22 1.18-2.4 1.2-2.46-.03-.01-2.29-.88-2.3-3.48zM11.6 4.17c.6-.73 1.01-1.75.9-2.76-.87.04-1.92.58-2.54 1.31-.56.65-1.05 1.69-.92 2.68.97.08 1.96-.49 2.56-1.23z" />
|
||||||
|
</svg>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** The e-mail address inside Apple's ID token (only for the waitlist form; the backend verifies the token). */
|
||||||
|
function tokenEmail(idToken: string): string {
|
||||||
|
try {
|
||||||
|
const part = idToken.split(".")[1].replace(/-/g, "+").replace(/_/g, "/");
|
||||||
|
const bytes = Uint8Array.from(atob(part), (c) => c.charCodeAt(0));
|
||||||
|
const email = JSON.parse(new TextDecoder().decode(bytes)).email;
|
||||||
|
return typeof email === "string" ? email : "";
|
||||||
|
} catch {
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* "Continue with Apple": Apple's sign-in opens in a popup and returns an ID
|
||||||
|
* token, which the backend verifies. Apple gives the name only at the first
|
||||||
|
* sign-in, so it is sent along then (Hungarian order: family name first).
|
||||||
|
*/
|
||||||
|
export function AppleLogin({
|
||||||
|
clientId,
|
||||||
|
target,
|
||||||
|
inviteToken = null,
|
||||||
|
}: {
|
||||||
|
clientId: string;
|
||||||
|
target: string;
|
||||||
|
inviteToken?: string | null;
|
||||||
|
}) {
|
||||||
|
const router = useRouter();
|
||||||
|
const [ready, setReady] = useState(false);
|
||||||
|
const [busy, setBusy] = useState(false);
|
||||||
|
const [error, setError] = useState<string | null>(null);
|
||||||
|
const [uninvited, setUninvited] = useState<string | null>(null);
|
||||||
|
|
||||||
|
function loaded() {
|
||||||
|
window.AppleID?.auth.init({
|
||||||
|
clientId,
|
||||||
|
scope: "name email",
|
||||||
|
redirectURI: `${window.location.origin}/belepes`,
|
||||||
|
usePopup: true,
|
||||||
|
});
|
||||||
|
setReady(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
async function signIn() {
|
||||||
|
const apple = window.AppleID;
|
||||||
|
if (!apple) return;
|
||||||
|
setError(null);
|
||||||
|
setUninvited(null);
|
||||||
|
let response: AppleSignInResponse;
|
||||||
|
try {
|
||||||
|
response = await apple.auth.signIn();
|
||||||
|
} catch (e) {
|
||||||
|
// Closing the popup is not an error worth showing.
|
||||||
|
const code = (e as { error?: string } | null)?.error;
|
||||||
|
if (code !== "popup_closed_by_user" && code !== "user_cancelled_authorize") {
|
||||||
|
setError("Az Apple-belépés nem sikerült. Próbáld újra.");
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
setBusy(true);
|
||||||
|
const name = [response.user?.name?.lastName, response.user?.name?.firstName].filter(Boolean).join(" ") || null;
|
||||||
|
try {
|
||||||
|
let referral: string | null = null;
|
||||||
|
try {
|
||||||
|
referral = localStorage.getItem("sf_ref");
|
||||||
|
} catch {
|
||||||
|
// storage blocked
|
||||||
|
}
|
||||||
|
await api("/auth/apple", {
|
||||||
|
body: { id_token: response.authorization.id_token, name, invite_token: inviteToken, referral },
|
||||||
|
});
|
||||||
|
try {
|
||||||
|
localStorage.removeItem("sf_ref");
|
||||||
|
} catch {
|
||||||
|
// storage blocked
|
||||||
|
}
|
||||||
|
router.replace(target);
|
||||||
|
router.refresh();
|
||||||
|
} catch (e) {
|
||||||
|
if (e instanceof ApiError && e.code === "not_invited") setUninvited(tokenEmail(response.authorization.id_token));
|
||||||
|
else setError(errorText(e));
|
||||||
|
setBusy(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="field">
|
||||||
|
<Script
|
||||||
|
src="https://appleid.cdn-apple.com/appleauth/static/jsapi/appleid/1/hu_HU/appleid.auth.js"
|
||||||
|
strategy="afterInteractive"
|
||||||
|
onReady={loaded}
|
||||||
|
onError={() => setError("Nem sikerült betölteni az Apple-belépést. Ellenőrizd a hálózatot vagy a reklámblokkolót.")}
|
||||||
|
/>
|
||||||
|
<button type="button" className="btn-social btn-apple" onClick={signIn} disabled={!ready || busy}>
|
||||||
|
<span className="btn-social-icon">
|
||||||
|
<AppleMark />
|
||||||
|
</span>
|
||||||
|
{busy ? "Belépés…" : "Folytatás Apple-fiókkal"}
|
||||||
|
</button>
|
||||||
|
{error && (
|
||||||
|
<p className="msg msg-error" role="alert">
|
||||||
|
{error}
|
||||||
|
</p>
|
||||||
|
)}
|
||||||
|
{uninvited !== null && (
|
||||||
|
<>
|
||||||
|
<p className="msg msg-error" role="alert">
|
||||||
|
{inviteToken
|
||||||
|
? "Ez a meghívó már nem érvényes, és ehhez az Apple-fiókhoz sem tartozik másik."
|
||||||
|
: "A Sorsfonalak jelenleg meghívásos, és ehhez az Apple-fiókhoz nem tartozik meghívó. Ha kaptál meghívót, nyisd meg a levélben kapott linket, vagy lépj be azzal a fiókkal, amelynek a címére a meghívó szólt."}
|
||||||
|
</p>
|
||||||
|
<Waitlist email={uninvited.endsWith("@privaterelay.appleid.com") ? "" : uninvited} />
|
||||||
|
</>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -8,14 +8,19 @@ import { BACKEND_URL, getMe } from "@/lib/server";
|
|||||||
import { formatDate } from "@/lib/astro";
|
import { formatDate } from "@/lib/astro";
|
||||||
import type { InvitationLanding, PublicConfig } from "@/lib/types";
|
import type { InvitationLanding, PublicConfig } from "@/lib/types";
|
||||||
|
|
||||||
|
import { AppleLogin } from "./AppleLogin";
|
||||||
import { GoogleLogin } from "./GoogleLogin";
|
import { GoogleLogin } from "./GoogleLogin";
|
||||||
|
|
||||||
export const metadata: Metadata = { title: "Belépés" };
|
export const metadata: Metadata = { title: "Belépés" };
|
||||||
|
|
||||||
/** Only local paths, so the login cannot redirect to another site. */
|
/**
|
||||||
|
* Only local paths, so the login cannot redirect to another site: one leading
|
||||||
|
* slash, no backslash (browsers read "/\\evil.com" as "//evil.com") and no
|
||||||
|
* control characters.
|
||||||
|
*/
|
||||||
function safeTarget(value: string | string[] | undefined): string {
|
function safeTarget(value: string | string[] | undefined): string {
|
||||||
const v = Array.isArray(value) ? value[0] : value;
|
const v = Array.isArray(value) ? value[0] : value;
|
||||||
return v && v.startsWith("/") && !v.startsWith("//") ? v : "/";
|
return v && /^\/(?![/\\])[^\\\u0000-\u001f]*$/.test(v) ? v : "/";
|
||||||
}
|
}
|
||||||
|
|
||||||
async function loadConfig(): Promise<PublicConfig | null> {
|
async function loadConfig(): Promise<PublicConfig | null> {
|
||||||
@@ -43,7 +48,7 @@ const CLOSED: Record<string, string> = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
/** The invitation the visitor came with: who sent it and what they wrote. */
|
/** The invitation the visitor came with: who sent it and what they wrote. */
|
||||||
function InvitationCard({ invitation }: { invitation: InvitationLanding | null }) {
|
function InvitationCard({ invitation, apple }: { invitation: InvitationLanding | null; apple: boolean }) {
|
||||||
if (!invitation) {
|
if (!invitation) {
|
||||||
return (
|
return (
|
||||||
<p className="msg msg-error" role="alert">
|
<p className="msg msg-error" role="alert">
|
||||||
@@ -66,7 +71,7 @@ function InvitationCard({ invitation }: { invitation: InvitationLanding | null }
|
|||||||
</p>
|
</p>
|
||||||
{invitation.message && <blockquote className="invite-quote">{invitation.message}</blockquote>}
|
{invitation.message && <blockquote className="invite-quote">{invitation.message}</blockquote>}
|
||||||
<p className="hint" style={{ margin: 0 }}>
|
<p className="hint" style={{ margin: 0 }}>
|
||||||
Bármelyik Google-fiókoddal elfogadhatod. Érvényes: {formatDate(invitation.expires_at).replace(/\.$/, "")}-ig.
|
Bármelyik {apple ? "Google- vagy Apple-fiókoddal" : "Google-fiókoddal"} elfogadhatod. Érvényes: {formatDate(invitation.expires_at).replace(/\.$/, "")}-ig.
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
@@ -83,6 +88,8 @@ export default async function LoginPage({ searchParams }: { searchParams: Promis
|
|||||||
inviteToken ? loadInvitation(inviteToken) : Promise.resolve(null),
|
inviteToken ? loadInvitation(inviteToken) : Promise.resolve(null),
|
||||||
]);
|
]);
|
||||||
const clientId = config?.google_login.enabled ? config.google_login.client_id : null;
|
const clientId = config?.google_login.enabled ? config.google_login.client_id : null;
|
||||||
|
const appleId = config?.apple_login?.enabled ? config.apple_login.client_id : null;
|
||||||
|
const pendingInvite = invitation?.status === "pending" ? inviteToken : null;
|
||||||
const inviteOnly = config?.signup_mode === "invite";
|
const inviteOnly = config?.signup_mode === "invite";
|
||||||
|
|
||||||
return (
|
return (
|
||||||
@@ -107,17 +114,16 @@ export default async function LoginPage({ searchParams }: { searchParams: Promis
|
|||||||
<h1 style={{ fontSize: 44 }}>{rawToken ? "Meghívó" : "Belépés"}</h1>
|
<h1 style={{ fontSize: 44 }}>{rawToken ? "Meghívó" : "Belépés"}</h1>
|
||||||
<p className="muted">{rawToken ? "Lépj be, és már kezdheted is." : "Üdv újra! Lépj be a fiókodba."}</p>
|
<p className="muted">{rawToken ? "Lépj be, és már kezdheted is." : "Üdv újra! Lépj be a fiókodba."}</p>
|
||||||
</div>
|
</div>
|
||||||
{rawToken && <InvitationCard invitation={inviteToken ? invitation : null} />}
|
{rawToken && <InvitationCard invitation={inviteToken ? invitation : null} apple={appleId !== null} />}
|
||||||
{config === null ? (
|
{config === null ? (
|
||||||
<p className="msg msg-error" role="alert">
|
<p className="msg msg-error" role="alert">
|
||||||
A szerver most nem érhető el. Próbáld újra egy kicsit később.
|
A szerver most nem érhető el. Próbáld újra egy kicsit később.
|
||||||
</p>
|
</p>
|
||||||
) : clientId ? (
|
) : clientId ? (
|
||||||
<GoogleLogin
|
<div className="field" style={{ gap: 12 }}>
|
||||||
clientId={clientId}
|
<GoogleLogin clientId={clientId} target={target} inviteToken={pendingInvite} />
|
||||||
target={target}
|
{appleId && <AppleLogin clientId={appleId} target={target} inviteToken={pendingInvite} />}
|
||||||
inviteToken={invitation?.status === "pending" ? inviteToken : null}
|
</div>
|
||||||
/>
|
|
||||||
) : (
|
) : (
|
||||||
<p className="msg msg-error" role="alert">
|
<p className="msg msg-error" role="alert">
|
||||||
A Google-belépés még nincs beállítva (a backend <code>GOOGLE_CLIENT_IDS</code> változója üres).
|
A Google-belépés még nincs beállítva (a backend <code>GOOGLE_CLIENT_IDS</code> változója üres).
|
||||||
|
|||||||
@@ -210,6 +210,11 @@ td.num { font-variant-numeric: tabular-nums; white-space: nowrap; }
|
|||||||
.social-login:hover .btn-social { border-color: #5a6790; background: rgba(255, 255, 255, 0.03); }
|
.social-login:hover .btn-social { border-color: #5a6790; background: rgba(255, 255, 255, 0.03); }
|
||||||
.social-login:focus-within .btn-social { outline: 2px solid var(--gold); outline-offset: 2px; }
|
.social-login:focus-within .btn-social { outline: 2px solid var(--gold); outline-offset: 2px; }
|
||||||
.social-login[data-ready="false"] .btn-social { opacity: 0.6; }
|
.social-login[data-ready="false"] .btn-social { opacity: 0.6; }
|
||||||
|
/* Sign in with Apple: Apple's white button style. */
|
||||||
|
.btn-apple { background: #fff; border-color: #fff; color: #000; cursor: pointer; }
|
||||||
|
.btn-apple:hover:not(:disabled) { background: #e8e8ed; border-color: #e8e8ed; }
|
||||||
|
.btn-apple:focus-visible { outline: 2px solid var(--gold); outline-offset: 2px; }
|
||||||
|
.btn-apple:disabled { opacity: 0.6; cursor: default; }
|
||||||
.gsi-overlay {
|
.gsi-overlay {
|
||||||
position: absolute; inset: 0; display: flex; align-items: center; justify-content: center;
|
position: absolute; inset: 0; display: flex; align-items: center; justify-content: center;
|
||||||
opacity: 0.001; overflow: hidden; cursor: pointer;
|
opacity: 0.001; overflow: hidden; cursor: pointer;
|
||||||
@@ -1099,3 +1104,13 @@ span.tarot-fan-card { cursor: default; }
|
|||||||
@media (prefers-reduced-motion: reduce) {
|
@media (prefers-reduced-motion: reduce) {
|
||||||
.tarot-flip-inner, .tarot-fan-card, .tarot-demo-text { transition: none; animation: none; }
|
.tarot-flip-inner, .tarot-fan-card, .tarot-demo-text { transition: none; animation: none; }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Birth date and time: our own Hungarian fields (not the browser's date and time inputs) */
|
||||||
|
.birth-fields { border: 0; margin: 0; padding: 0; min-width: 0; }
|
||||||
|
.birth-fields legend { padding: 0; margin-bottom: 8px; }
|
||||||
|
.birth-row { display: flex; align-items: center; gap: 8px; }
|
||||||
|
.birth-year { width: 5.5em; flex: none; }
|
||||||
|
.birth-month { flex: 1 1 auto; min-width: 0; }
|
||||||
|
.birth-day { width: 5.2em; flex: none; }
|
||||||
|
.birth-time { width: 4.4em; flex: none; text-align: center; }
|
||||||
|
.birth-colon { color: var(--muted); font-weight: 600; }
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ export const metadata: Metadata = {
|
|||||||
|
|
||||||
const DATA: [string, string, string][] = [
|
const DATA: [string, string, string][] = [
|
||||||
[
|
[
|
||||||
"Your Google account's name, e-mail address and ID (passed on by Google when you sign in)",
|
"Your Google or Apple account's name, e-mail address and ID (passed on by Google or Apple when you sign in)",
|
||||||
"Creating your account, signing you in, contacting you",
|
"Creating your account, signing you in, contacting you",
|
||||||
"Performance of a contract (GDPR Art. 6(1)(b))",
|
"Performance of a contract (GDPR Art. 6(1)(b))",
|
||||||
],
|
],
|
||||||
@@ -168,6 +168,13 @@ export default async function PrivacyPolicyPage() {
|
|||||||
</a>
|
</a>
|
||||||
, including the Limited Use requirements.
|
, including the Limited Use requirements.
|
||||||
</p>
|
</p>
|
||||||
|
<p>
|
||||||
|
<strong>Signing in with Apple:</strong> if you choose “Sign in with Apple”, Apple passes us your account's
|
||||||
|
unique ID and your e-mail address, and your name the first time. If you hide your address, we get an Apple
|
||||||
|
relay address (<code>…@privaterelay.appleid.com</code>) and Apple forwards our e-mails to you. We use these
|
||||||
|
for the same purposes and in the same way as the Google data. You can revoke access in your Apple ID settings
|
||||||
|
(Sign-In and Security › Sign in with Apple).
|
||||||
|
</p>
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
<section>
|
<section>
|
||||||
|
|||||||
@@ -16,6 +16,41 @@ const ERRORS: Record<string, string> = {
|
|||||||
invalid_date: "Érvénytelen dátum.",
|
invalid_date: "Érvénytelen dátum.",
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const MONTHS = [
|
||||||
|
"január",
|
||||||
|
"február",
|
||||||
|
"március",
|
||||||
|
"április",
|
||||||
|
"május",
|
||||||
|
"június",
|
||||||
|
"július",
|
||||||
|
"augusztus",
|
||||||
|
"szeptember",
|
||||||
|
"október",
|
||||||
|
"november",
|
||||||
|
"december",
|
||||||
|
];
|
||||||
|
|
||||||
|
const pad = (n: number) => String(n).padStart(2, "0");
|
||||||
|
const daysIn = (year: number, month: number) => new Date(Date.UTC(year || 2000, month, 0)).getUTCDate();
|
||||||
|
|
||||||
|
/** "YYYY-MM-DD" from the three fields, or null while it is not a real date. */
|
||||||
|
function composeDate(year: string, month: string, day: string): string | null {
|
||||||
|
const y = Number(year);
|
||||||
|
const m = Number(month);
|
||||||
|
const d = Number(day);
|
||||||
|
if (!/^\d{4}$/.test(year) || y < 1000 || !m || !d || d > daysIn(y, m)) return null;
|
||||||
|
return `${year}-${pad(m)}-${pad(d)}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** "HH:MM" from the two fields, or null while it is not a real time. */
|
||||||
|
function composeTime(hour: string, minute: string): string | null {
|
||||||
|
if (!/^\d{1,2}$/.test(hour) || !/^\d{1,2}$/.test(minute)) return null;
|
||||||
|
const h = Number(hour);
|
||||||
|
const m = Number(minute);
|
||||||
|
return h <= 23 && m <= 59 ? `${pad(h)}:${pad(m)}` : null;
|
||||||
|
}
|
||||||
|
|
||||||
/** Someone else's chart: added with a name, or (with `chartId`) corrected. */
|
/** Someone else's chart: added with a name, or (with `chartId`) corrected. */
|
||||||
export type PersonTarget = { chartId?: string; name?: string };
|
export type PersonTarget = { chartId?: string; name?: string };
|
||||||
|
|
||||||
@@ -32,8 +67,16 @@ export function BirthForm({
|
|||||||
onSaved: (chartId: string) => void;
|
onSaved: (chartId: string) => void;
|
||||||
}) {
|
}) {
|
||||||
const [name, setName] = useState(person?.name ?? "");
|
const [name, setName] = useState(person?.name ?? "");
|
||||||
const [date, setDate] = useState(initial?.date ?? "");
|
// Our own fields, not the browser's date and time inputs: those follow the
|
||||||
const [time, setTime] = useState(initial?.time?.slice(0, 5) ?? "");
|
// operating system's or the browser's region (US order, AM/PM in Safari).
|
||||||
|
const [year, setYear] = useState(initial?.date?.slice(0, 4) ?? "");
|
||||||
|
const [month, setMonth] = useState(initial?.date ? String(Number(initial.date.slice(5, 7))) : "");
|
||||||
|
const [day, setDay] = useState(initial?.date ? String(Number(initial.date.slice(8, 10))) : "");
|
||||||
|
const [hour, setHour] = useState(initial?.time?.slice(0, 2) ?? "");
|
||||||
|
const [minute, setMinute] = useState(initial?.time?.slice(3, 5) ?? "");
|
||||||
|
const minuteRef = useRef<HTMLInputElement>(null);
|
||||||
|
const date = composeDate(year, month, day) ?? "";
|
||||||
|
const time = composeTime(hour, minute) ?? "";
|
||||||
const [timeUnknown, setTimeUnknown] = useState(initial ? !initial.time : false);
|
const [timeUnknown, setTimeUnknown] = useState(initial ? !initial.time : false);
|
||||||
const [country, setCountry] = useState(initial?.country ?? "HU");
|
const [country, setCountry] = useState(initial?.country ?? "HU");
|
||||||
const [place, setPlace] = useState<Place | null>(
|
const [place, setPlace] = useState<Place | null>(
|
||||||
@@ -57,8 +100,11 @@ export function BirthForm({
|
|||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
setError(null);
|
setError(null);
|
||||||
if (person && !name.trim()) return setError("Add meg a nevét.");
|
if (person && !name.trim()) return setError("Add meg a nevét.");
|
||||||
if (!date) return setError("Add meg a születési dátumot.");
|
if (!year && !month && !day) return setError("Add meg a születési dátumot.");
|
||||||
if (!timeUnknown && !time) return setError("Add meg a születési időt, vagy jelöld, hogy nem tudod.");
|
if (!date) return setError("Ellenőrizd a dátumot: az év négy számjegy, és a nap legyen az adott hónapban.");
|
||||||
|
if (date > today) return setError("A születési dátum nem lehet a jövőben.");
|
||||||
|
if (!timeUnknown && !hour && !minute) return setError("Add meg a születési időt, vagy jelöld, hogy nem tudod.");
|
||||||
|
if (!timeUnknown && !time) return setError("Ellenőrizd az időt: óra 0–23, perc 0–59.");
|
||||||
if (!place) return setError("Válaszd ki a születési helyet a listából.");
|
if (!place) return setError("Válaszd ki a születési helyet a listából.");
|
||||||
setBusy(true);
|
setBusy(true);
|
||||||
try {
|
try {
|
||||||
@@ -120,37 +166,106 @@ export function BirthForm({
|
|||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
<div className="grid-2">
|
<div className="grid-2">
|
||||||
<div className="field">
|
<fieldset className="field birth-fields">
|
||||||
<label htmlFor="birth-date">Születési dátum</label>
|
<legend className="label">Születési dátum</legend>
|
||||||
<input
|
<div className="birth-row">
|
||||||
id="birth-date"
|
<label className="sr-only" htmlFor="birth-year">
|
||||||
type="date"
|
Év
|
||||||
className="inp"
|
</label>
|
||||||
min="1000-01-01"
|
<input
|
||||||
max={today}
|
id="birth-year"
|
||||||
value={date}
|
className="inp birth-year"
|
||||||
onChange={(e) => setDate(e.target.value)}
|
inputMode="numeric"
|
||||||
required
|
autoComplete="bday-year"
|
||||||
/>
|
placeholder="év"
|
||||||
</div>
|
maxLength={4}
|
||||||
<div className="field">
|
value={year}
|
||||||
<label htmlFor="birth-time">Születési idő (helyi idő)</label>
|
onChange={(e) => setYear(e.target.value.replace(/\D/g, ""))}
|
||||||
<input
|
/>
|
||||||
id="birth-time"
|
<label className="sr-only" htmlFor="birth-month">
|
||||||
type="time"
|
Hónap
|
||||||
className="inp"
|
</label>
|
||||||
value={timeUnknown ? "" : time}
|
<select
|
||||||
disabled={timeUnknown}
|
id="birth-month"
|
||||||
onChange={(e) => {
|
className="inp birth-month"
|
||||||
setTime(e.target.value);
|
autoComplete="bday-month"
|
||||||
setAmbiguous(false);
|
value={month}
|
||||||
}}
|
onChange={(e) => setMonth(e.target.value)}
|
||||||
/>
|
>
|
||||||
|
<option value="">hónap</option>
|
||||||
|
{MONTHS.map((m, i) => (
|
||||||
|
<option key={m} value={i + 1}>
|
||||||
|
{m}
|
||||||
|
</option>
|
||||||
|
))}
|
||||||
|
</select>
|
||||||
|
<label className="sr-only" htmlFor="birth-day">
|
||||||
|
Nap
|
||||||
|
</label>
|
||||||
|
<select
|
||||||
|
id="birth-day"
|
||||||
|
className="inp birth-day"
|
||||||
|
autoComplete="bday-day"
|
||||||
|
value={day}
|
||||||
|
onChange={(e) => setDay(e.target.value)}
|
||||||
|
>
|
||||||
|
<option value="">nap</option>
|
||||||
|
{Array.from({ length: month ? daysIn(Number(year), Number(month)) : 31 }, (_, i) => (
|
||||||
|
<option key={i + 1} value={i + 1}>
|
||||||
|
{i + 1}.
|
||||||
|
</option>
|
||||||
|
))}
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
</fieldset>
|
||||||
|
<fieldset className="field birth-fields">
|
||||||
|
<legend className="label">Születési idő (helyi idő)</legend>
|
||||||
|
<div className="birth-row">
|
||||||
|
<label className="sr-only" htmlFor="birth-hour">
|
||||||
|
Óra
|
||||||
|
</label>
|
||||||
|
<input
|
||||||
|
id="birth-hour"
|
||||||
|
className="inp birth-time"
|
||||||
|
inputMode="numeric"
|
||||||
|
placeholder="óra"
|
||||||
|
maxLength={2}
|
||||||
|
value={timeUnknown ? "" : hour}
|
||||||
|
disabled={timeUnknown}
|
||||||
|
onChange={(e) => {
|
||||||
|
const v = e.target.value.replace(/\D/g, "");
|
||||||
|
setHour(v);
|
||||||
|
setAmbiguous(false);
|
||||||
|
// Two digits (or one that cannot start a valid hour): on to the minutes.
|
||||||
|
if (v.length === 2 || (v.length === 1 && Number(v) > 2)) minuteRef.current?.focus();
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
<span className="birth-colon" aria-hidden="true">
|
||||||
|
:
|
||||||
|
</span>
|
||||||
|
<label className="sr-only" htmlFor="birth-minute">
|
||||||
|
Perc
|
||||||
|
</label>
|
||||||
|
<input
|
||||||
|
id="birth-minute"
|
||||||
|
ref={minuteRef}
|
||||||
|
className="inp birth-time"
|
||||||
|
inputMode="numeric"
|
||||||
|
placeholder="perc"
|
||||||
|
maxLength={2}
|
||||||
|
value={timeUnknown ? "" : minute}
|
||||||
|
disabled={timeUnknown}
|
||||||
|
onChange={(e) => {
|
||||||
|
setMinute(e.target.value.replace(/\D/g, ""));
|
||||||
|
setAmbiguous(false);
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
<label className="check">
|
<label className="check">
|
||||||
<input type="checkbox" checked={timeUnknown} onChange={(e) => setTimeUnknown(e.target.checked)} />
|
<input type="checkbox" checked={timeUnknown} onChange={(e) => setTimeUnknown(e.target.checked)} />
|
||||||
Nem tudom a születési időt
|
Nem tudom a születési időt
|
||||||
</label>
|
</label>
|
||||||
</div>
|
</fieldset>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="grid-2">
|
<div className="grid-2">
|
||||||
|
|||||||
@@ -94,6 +94,8 @@ export interface Question {
|
|||||||
|
|
||||||
export interface PublicConfig {
|
export interface PublicConfig {
|
||||||
google_login: { enabled: boolean; client_id: string | null };
|
google_login: { enabled: boolean; client_id: string | null };
|
||||||
|
/** Sign in with Apple; `client_id` is the Services ID. */
|
||||||
|
apple_login?: { enabled: boolean; client_id: string | null };
|
||||||
locales: string[];
|
locales: string[];
|
||||||
password_login: boolean;
|
password_login: boolean;
|
||||||
password_min_length: number;
|
password_min_length: number;
|
||||||
|
|||||||
@@ -334,6 +334,8 @@ impl Analyzer {
|
|||||||
result = work => result,
|
result = work => result,
|
||||||
() = self.superseded("analyses", job.id, job.started_at) => {
|
() = self.superseded("analyses", job.id, job.started_at) => {
|
||||||
tracing::info!(id = %job.id, "analysis restarted by an admin; this attempt is dropped");
|
tracing::info!(id = %job.id, "analysis restarted by an admin; this attempt is dropped");
|
||||||
|
// Not ours any more: a stop must not hand it back to the queue.
|
||||||
|
self.running.lock().unwrap().remove(&job.id);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -111,6 +111,8 @@ impl Analyzer {
|
|||||||
result = work => result,
|
result = work => result,
|
||||||
() = self.superseded("questions", job.id, job.started_at) => {
|
() = self.superseded("questions", job.id, job.started_at) => {
|
||||||
tracing::info!(id = %job.id, "answer restarted by an admin; this attempt is dropped");
|
tracing::info!(id = %job.id, "answer restarted by an admin; this attempt is dropped");
|
||||||
|
// Not ours any more: a stop must not hand it back to the queue.
|
||||||
|
self.running.lock().unwrap().remove(&job.id);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|||||||
+147
-25
@@ -4,9 +4,12 @@
|
|||||||
//! the item as they go on the invoice. This job takes the due rows and, step
|
//! the item as they go on the invoice. This job takes the due rows and, step
|
||||||
//! by step, creates the Billingo partner, the invoice (paid by card,
|
//! by step, creates the Billingo partner, the invoice (paid by card,
|
||||||
//! electronic) and e-mails it to the buyer. Each step's result is saved before
|
//! electronic) and e-mails it to the buyer. Each step's result is saved before
|
||||||
//! the next one, so a retry continues where it stopped and never issues a
|
//! the next one, so a retry continues where it stopped. The invoice request is
|
||||||
//! second invoice. Billingo's whole answer is kept; the PDF is not (the
|
//! marked before it is sent: when Billingo's answer was lost, the retry finds
|
||||||
//! backend fetches it when the user downloads it).
|
//! the invoice under the invoice's own partner instead of issuing a second
|
||||||
|
//! one. An invoice that was issued but could not be e-mailed still counts as
|
||||||
|
//! issued (it can be downloaded). Billingo's whole answer is kept; the PDF is
|
||||||
|
//! not (the backend fetches it when the user downloads it).
|
||||||
|
|
||||||
use std::time::Duration;
|
use std::time::Duration;
|
||||||
|
|
||||||
@@ -93,6 +96,7 @@ struct Due {
|
|||||||
payment_method: String,
|
payment_method: String,
|
||||||
billingo_partner_id: Option<i64>,
|
billingo_partner_id: Option<i64>,
|
||||||
billingo_document_id: Option<i64>,
|
billingo_document_id: Option<i64>,
|
||||||
|
document_requested_at: Option<OffsetDateTime>,
|
||||||
sent_at: Option<OffsetDateTime>,
|
sent_at: Option<OffsetDateTime>,
|
||||||
paid_at: OffsetDateTime,
|
paid_at: OffsetDateTime,
|
||||||
}
|
}
|
||||||
@@ -131,7 +135,8 @@ pub async fn run_once(db: &PgPool, billingo: &Billingo, max_attempts: i32) -> Re
|
|||||||
AND next_attempt_at <= now() ORDER BY next_attempt_at FOR UPDATE SKIP LOCKED LIMIT 1) \
|
AND next_attempt_at <= now() ORDER BY next_attempt_at FOR UPDATE SKIP LOCKED LIMIT 1) \
|
||||||
RETURNING i.id, i.attempts, i.buyer_name, i.buyer_email, i.buyer_country, i.buyer_post_code, \
|
RETURNING i.id, i.attempts, i.buyer_name, i.buyer_email, i.buyer_country, i.buyer_post_code, \
|
||||||
i.buyer_city, i.buyer_address, i.buyer_tax_type, i.buyer_tax_number, i.item_name, i.item_comment, i.item_unit, i.gross_huf, \
|
i.buyer_city, i.buyer_address, i.buyer_tax_type, i.buyer_tax_number, i.item_name, i.item_comment, i.item_unit, i.gross_huf, \
|
||||||
i.vat_rate, i.payment_method, i.billingo_partner_id, i.billingo_document_id, i.sent_at, \
|
i.vat_rate, i.payment_method, i.billingo_partner_id, i.billingo_document_id, \
|
||||||
|
i.document_requested_at, i.sent_at, \
|
||||||
coalesce(c.completed_at, i.created_at) AS paid_at"
|
coalesce(c.completed_at, i.created_at) AS paid_at"
|
||||||
))
|
))
|
||||||
.fetch_optional(db)
|
.fetch_optional(db)
|
||||||
@@ -144,12 +149,28 @@ pub async fn run_once(db: &PgPool, billingo: &Billingo, max_attempts: i32) -> Re
|
|||||||
}
|
}
|
||||||
Err(Failure::Db(e)) => return Err(e),
|
Err(Failure::Db(e)) => return Err(e),
|
||||||
Err(Failure::Billingo(error)) if due.attempts >= max_attempts => {
|
Err(Failure::Billingo(error)) if due.attempts >= max_attempts => {
|
||||||
tracing::error!(invoice = %due.id, %error, "invoice failed; an admin has to look at it");
|
// Issued but never e-mailed: it is still an invoice (the user downloads it).
|
||||||
sqlx::query("UPDATE invoices SET status = 'failed', last_error = $2 WHERE id = $1")
|
let issued: Option<(Option<String>,)> = sqlx::query_as(
|
||||||
.bind(due.id)
|
"UPDATE invoices SET status = 'issued', issued_at = now(), last_error = $2 \
|
||||||
.bind(&error)
|
WHERE id = $1 AND billingo_document_id IS NOT NULL RETURNING invoice_number",
|
||||||
.execute(db)
|
)
|
||||||
.await?;
|
.bind(due.id)
|
||||||
|
.bind(format!("issued, not e-mailed: {error}"))
|
||||||
|
.fetch_optional(db)
|
||||||
|
.await?;
|
||||||
|
match issued {
|
||||||
|
Some((number,)) => {
|
||||||
|
tracing::warn!(invoice = %due.id, number = ?number, %error, "invoice issued but not e-mailed")
|
||||||
|
}
|
||||||
|
None => {
|
||||||
|
tracing::error!(invoice = %due.id, %error, "invoice failed; an admin has to look at it");
|
||||||
|
sqlx::query("UPDATE invoices SET status = 'failed', last_error = $2 WHERE id = $1")
|
||||||
|
.bind(due.id)
|
||||||
|
.bind(&error)
|
||||||
|
.execute(db)
|
||||||
|
.await?;
|
||||||
|
}
|
||||||
|
}
|
||||||
done += 1;
|
done += 1;
|
||||||
}
|
}
|
||||||
Err(Failure::Billingo(error)) => {
|
Err(Failure::Billingo(error)) => {
|
||||||
@@ -208,7 +229,13 @@ async fn issue(db: &PgPool, billingo: &Billingo, due: &Due) -> Result<String, Fa
|
|||||||
"address": due.buyer_address,
|
"address": due.buyer_address,
|
||||||
},
|
},
|
||||||
"emails": due.buyer_email.iter().collect::<Vec<_>>(),
|
"emails": due.buyer_email.iter().collect::<Vec<_>>(),
|
||||||
"taxcode": due.buyer_tax_number.clone().unwrap_or_default(),
|
// Without a tax type number (a Hungarian company with only an
|
||||||
|
// EU VAT number) the number goes into the invoice's comment.
|
||||||
|
"taxcode": if due.buyer_tax_type == "NO_TAX_NUMBER" {
|
||||||
|
String::new()
|
||||||
|
} else {
|
||||||
|
due.buyer_tax_number.clone().unwrap_or_default()
|
||||||
|
},
|
||||||
"tax_type": due.buyer_tax_type,
|
"tax_type": due.buyer_tax_type,
|
||||||
});
|
});
|
||||||
let partner = billingo.call(Method::POST, "/partners", Some(&body)).await?;
|
let partner = billingo.call(Method::POST, "/partners", Some(&body)).await?;
|
||||||
@@ -246,13 +273,28 @@ async fn issue(db: &PgPool, billingo: &Billingo, due: &Due) -> Result<String, Fa
|
|||||||
"vat": due.vat_rate,
|
"vat": due.vat_rate,
|
||||||
"comment": due.item_comment.clone().unwrap_or_default(),
|
"comment": due.item_comment.clone().unwrap_or_default(),
|
||||||
}],
|
}],
|
||||||
"comment": if due.vat_rate == "AAM" {
|
"comment": document_comment(due),
|
||||||
"Bankkártyával kifizetve (Stripe). Alanyi adómentes."
|
|
||||||
} else {
|
|
||||||
"Bankkártyával kifizetve (Stripe)."
|
|
||||||
},
|
|
||||||
});
|
});
|
||||||
let doc = billingo.call(Method::POST, "/documents", Some(&body)).await?;
|
// An earlier attempt asked already: its invoice may exist although
|
||||||
|
// the answer never came. The partner is this invoice's own, so any
|
||||||
|
// invoice of it is ours.
|
||||||
|
let earlier = match due.document_requested_at {
|
||||||
|
Some(_) => find_document(billingo, partner).await?,
|
||||||
|
None => None,
|
||||||
|
};
|
||||||
|
let doc = match earlier {
|
||||||
|
Some(doc) => {
|
||||||
|
tracing::warn!(invoice = %due.id, number = ?doc["invoice_number"], "found the invoice of an earlier attempt");
|
||||||
|
doc
|
||||||
|
}
|
||||||
|
None => {
|
||||||
|
sqlx::query("UPDATE invoices SET document_requested_at = now() WHERE id = $1")
|
||||||
|
.bind(due.id)
|
||||||
|
.execute(db)
|
||||||
|
.await?;
|
||||||
|
billingo.call(Method::POST, "/documents", Some(&body)).await?
|
||||||
|
}
|
||||||
|
};
|
||||||
let id = doc["id"].as_i64().ok_or("Billingo invoice without id")?;
|
let id = doc["id"].as_i64().ok_or("Billingo invoice without id")?;
|
||||||
let item = &doc["items"][0];
|
let item = &doc["items"][0];
|
||||||
sqlx::query(
|
sqlx::query(
|
||||||
@@ -293,6 +335,34 @@ async fn issue(db: &PgPool, billingo: &Billingo, due: &Due) -> Result<String, Fa
|
|||||||
Ok(number.unwrap_or_default())
|
Ok(number.unwrap_or_default())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// The invoice's comment: how it was paid, the VAT exemption, and a
|
||||||
|
/// Hungarian company's EU VAT number when it gave no domestic one.
|
||||||
|
fn document_comment(due: &Due) -> String {
|
||||||
|
let mut comment = String::from("Bankkártyával kifizetve (Stripe).");
|
||||||
|
if due.vat_rate == "AAM" {
|
||||||
|
comment.push_str(" Alanyi adómentes.");
|
||||||
|
}
|
||||||
|
if due.buyer_tax_type == "NO_TAX_NUMBER"
|
||||||
|
&& let Some(eu) = &due.buyer_tax_number
|
||||||
|
{
|
||||||
|
comment.push_str(&format!(" A vevő közösségi adószáma: {eu}."));
|
||||||
|
}
|
||||||
|
comment
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The invoice already issued to `partner`, if any (an error is a failed
|
||||||
|
/// attempt: an invoice is never made without knowing there is none).
|
||||||
|
async fn find_document(billingo: &Billingo, partner: i64) -> Result<Option<Value>, Failure> {
|
||||||
|
let list = billingo
|
||||||
|
.call(reqwest::Method::GET, &format!("/documents?partner_id={partner}&type=invoice&per_page=10"), None)
|
||||||
|
.await?;
|
||||||
|
let items = list["data"].as_array().or_else(|| list.as_array()).ok_or("Billingo document list without data")?;
|
||||||
|
Ok(items
|
||||||
|
.iter()
|
||||||
|
.find(|d| d["id"].as_i64().is_some() && d["partner"]["id"].as_i64().is_none_or(|p| p == partner))
|
||||||
|
.cloned())
|
||||||
|
}
|
||||||
|
|
||||||
pub async fn run(db: PgPool, billingo: Billingo, max_attempts: i32, interval: Duration, stop: watch::Receiver<bool>) {
|
pub async fn run(db: PgPool, billingo: Billingo, max_attempts: i32, interval: Duration, stop: watch::Receiver<bool>) {
|
||||||
loop {
|
loop {
|
||||||
if let Err(e) = run_once(&db, &billingo, max_attempts).await {
|
if let Err(e) = run_once(&db, &billingo, max_attempts).await {
|
||||||
@@ -338,6 +408,10 @@ mod tests {
|
|||||||
send_failures: AtomicUsize,
|
send_failures: AtomicUsize,
|
||||||
/// Partners are refused (a permanent error).
|
/// Partners are refused (a permanent error).
|
||||||
refuse_partners: std::sync::atomic::AtomicBool,
|
refuse_partners: std::sync::atomic::AtomicBool,
|
||||||
|
/// The next invoice is made, but its answer is lost (an error instead).
|
||||||
|
lose_document_answer: std::sync::atomic::AtomicBool,
|
||||||
|
/// The invoices made so far, for the list.
|
||||||
|
made: std::sync::Mutex<Vec<Value>>,
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn fake_billingo(fake: Arc<Fake>) -> String {
|
async fn fake_billingo(fake: Arc<Fake>) -> String {
|
||||||
@@ -355,13 +429,25 @@ mod tests {
|
|||||||
async fn document(State(f): State<Arc<Fake>>, Json(body): Json<Value>) -> (StatusCode, Json<Value>) {
|
async fn document(State(f): State<Arc<Fake>>, Json(body): Json<Value>) -> (StatusCode, Json<Value>) {
|
||||||
f.requests.lock().unwrap().push(("document".into(), body.clone()));
|
f.requests.lock().unwrap().push(("document".into(), body.clone()));
|
||||||
let n = f.documents.fetch_add(1, Ordering::SeqCst) + 1;
|
let n = f.documents.fetch_add(1, Ordering::SeqCst) + 1;
|
||||||
(
|
let doc = json!({"id": 900 + n, "invoice_number": format!("SF-2026-{n}"), "invoice_date": "2026-11-20",
|
||||||
StatusCode::CREATED,
|
"fulfillment_date": body["fulfillment_date"], "due_date": body["due_date"],
|
||||||
Json(json!({"id": 900 + n, "invoice_number": format!("SF-2026-{n}"), "invoice_date": "2026-11-20",
|
"gross_total": 6000.0, "partner": {"id": body["partner_id"]},
|
||||||
"fulfillment_date": body["fulfillment_date"], "due_date": body["due_date"],
|
"items": [{"name": "x", "net_amount": 6000.0, "vat_amount": 0.0, "gross_amount": 6000.0}]});
|
||||||
"gross_total": 6000.0,
|
f.made.lock().unwrap().push(doc.clone());
|
||||||
"items": [{"name": "x", "net_amount": 6000.0, "vat_amount": 0.0, "gross_amount": 6000.0}]})),
|
if f.lose_document_answer.swap(false, Ordering::SeqCst) {
|
||||||
)
|
return (StatusCode::GATEWAY_TIMEOUT, Json(json!({"error": "timeout"})));
|
||||||
|
}
|
||||||
|
(StatusCode::CREATED, Json(doc))
|
||||||
|
}
|
||||||
|
async fn documents(
|
||||||
|
State(f): State<Arc<Fake>>,
|
||||||
|
axum::extract::Query(q): axum::extract::Query<std::collections::HashMap<String, String>>,
|
||||||
|
) -> Json<Value> {
|
||||||
|
f.requests.lock().unwrap().push(("list".into(), json!(q)));
|
||||||
|
let partner: i64 = q.get("partner_id").and_then(|p| p.parse().ok()).unwrap_or(-1);
|
||||||
|
let data: Vec<Value> =
|
||||||
|
f.made.lock().unwrap().iter().filter(|d| d["partner"]["id"] == partner).cloned().collect();
|
||||||
|
Json(json!({"data": data, "total": data.len()}))
|
||||||
}
|
}
|
||||||
async fn send(
|
async fn send(
|
||||||
State(f): State<Arc<Fake>>,
|
State(f): State<Arc<Fake>>,
|
||||||
@@ -378,7 +464,7 @@ mod tests {
|
|||||||
let app = Router::new()
|
let app = Router::new()
|
||||||
.route("/document-blocks", get(blocks))
|
.route("/document-blocks", get(blocks))
|
||||||
.route("/partners", post(partner))
|
.route("/partners", post(partner))
|
||||||
.route("/documents", post(document))
|
.route("/documents", post(document).get(documents))
|
||||||
.route("/documents/{id}/send", post(send))
|
.route("/documents/{id}/send", post(send))
|
||||||
.with_state(fake);
|
.with_state(fake);
|
||||||
let listener = tokio::net::TcpListener::bind("127.0.0.1:0").await.unwrap();
|
let listener = tokio::net::TcpListener::bind("127.0.0.1:0").await.unwrap();
|
||||||
@@ -497,4 +583,40 @@ mod tests {
|
|||||||
assert!(error.contains("422") && error.contains("invalid tax code"), "{error}");
|
assert!(error.contains("422") && error.contains("invalid tax code"), "{error}");
|
||||||
assert_eq!(fake.documents.load(Ordering::SeqCst), 0);
|
assert_eq!(fake.documents.load(Ordering::SeqCst), 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[sqlx::test(migrator = "db::MIGRATOR")]
|
||||||
|
async fn a_lost_answer_does_not_make_a_second_invoice(db: PgPool) {
|
||||||
|
let fake = Arc::new(Fake::default());
|
||||||
|
fake.lose_document_answer.store(true, Ordering::SeqCst);
|
||||||
|
let billingo = Billingo::new(&fake_billingo(fake.clone()).await, "key", Some(7));
|
||||||
|
let id = paid(&db, None).await;
|
||||||
|
// Billingo makes the invoice, but its answer is lost.
|
||||||
|
assert_eq!(run_once(&db, &billingo, 5).await.unwrap(), 0);
|
||||||
|
assert_eq!(state(&db, id).await.2, None);
|
||||||
|
// The retry finds it instead of making another.
|
||||||
|
sqlx::query("UPDATE invoices SET next_attempt_at = now()").execute(&db).await.unwrap();
|
||||||
|
assert_eq!(run_once(&db, &billingo, 5).await.unwrap(), 1);
|
||||||
|
let (status, number, document, sent, _) = state(&db, id).await;
|
||||||
|
assert_eq!(
|
||||||
|
(status.as_str(), number.as_deref(), document, sent),
|
||||||
|
("issued", Some("SF-2026-1"), Some(901), true)
|
||||||
|
);
|
||||||
|
assert_eq!(fake.documents.load(Ordering::SeqCst), 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[sqlx::test(migrator = "db::MIGRATOR")]
|
||||||
|
async fn an_invoice_that_cannot_be_emailed_still_counts_as_issued(db: PgPool) {
|
||||||
|
let fake = Arc::new(Fake::default());
|
||||||
|
fake.send_failures.store(100, Ordering::SeqCst);
|
||||||
|
let billingo = Billingo::new(&fake_billingo(fake.clone()).await, "key", Some(7));
|
||||||
|
let id = paid(&db, None).await;
|
||||||
|
run_once(&db, &billingo, 2).await.unwrap();
|
||||||
|
sqlx::query("UPDATE invoices SET next_attempt_at = now()").execute(&db).await.unwrap();
|
||||||
|
assert_eq!(run_once(&db, &billingo, 2).await.unwrap(), 1);
|
||||||
|
let (status, number, _, sent, _) = state(&db, id).await;
|
||||||
|
assert_eq!((status.as_str(), number.as_deref(), sent), ("issued", Some("SF-2026-1"), false));
|
||||||
|
let (error,): (String,) =
|
||||||
|
sqlx::query_as("SELECT last_error FROM invoices WHERE id = $1").bind(id).fetch_one(&db).await.unwrap();
|
||||||
|
assert!(error.starts_with("issued, not e-mailed"), "{error}");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user