forked from coracle/caravel
Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 41602e21c2 | |||
| c47727b909 | |||
| 0705da8b09 | |||
| ca26d41eef | |||
| 44f9928070 |
@@ -28,5 +28,5 @@ LIVEKIT_API_SECRET=
|
|||||||
|
|
||||||
# Billing
|
# Billing
|
||||||
NWC_URL= # Nostr Wallet Connect URL for generating Lightning invoices
|
NWC_URL= # Nostr Wallet Connect URL for generating Lightning invoices
|
||||||
STRIPE_SECRET_KEY= # Stripe API secret key (sk_...)
|
STRIPE_SECRET_KEY= # Required Stripe API secret key (sk_...)
|
||||||
STRIPE_WEBHOOK_SECRET= # Secret for verifying Stripe webhook signatures (whsec_...)
|
STRIPE_WEBHOOK_SECRET=whsec_test_00000000000000000000000000 # Webhook signing secret (use real value in production)
|
||||||
|
|||||||
+26
-24
@@ -30,27 +30,29 @@ backend/
|
|||||||
|
|
||||||
Environment variables:
|
Environment variables:
|
||||||
|
|
||||||
| Variable | Description | Default |
|
| Variable | Description | Default |
|
||||||
|---|---|---|
|
| ------------------------ | ----------------------------------------------------------------------- | ------------------------------------ |
|
||||||
| `DATABASE_URL` | SQLite URL. Relative paths are resolved under `backend/`. | `sqlite://<backend>/data/caravel.db` |
|
| `DATABASE_URL` | SQLite URL. Relative paths are resolved under `backend/`. | `sqlite://<backend>/data/caravel.db` |
|
||||||
| `HOST` | API bind host (also used for NIP-98 `u` host check) | `127.0.0.1` |
|
| `HOST` | API bind host (also used for NIP-98 `u` host check) | `127.0.0.1` |
|
||||||
| `PORT` | API bind port | `2892` |
|
| `PORT` | API bind port | `2892` |
|
||||||
| `ADMINS` | Comma-separated admin pubkeys (hex) | _optional_ |
|
| `ADMINS` | Comma-separated admin pubkeys (hex) | _optional_ |
|
||||||
| `ALLOW_ORIGINS` | Comma-separated CORS origins. If empty, CORS is permissive. | _optional_ |
|
| `ALLOW_ORIGINS` | Comma-separated CORS origins. If empty, CORS is permissive. | _optional_ |
|
||||||
| `ZOOID_API_URL` | Zooid API base URL used by infra worker | _required for infra sync_ |
|
| `ZOOID_API_URL` | Zooid API base URL used by infra worker | _required for infra sync_ |
|
||||||
| `ZOOID_API_SECRET` | Nostr secret key used for authentication of requests to the zooid API | _required_ |
|
| `ZOOID_API_SECRET` | Nostr secret key used for authentication of requests to the zooid API | _required_ |
|
||||||
| `RELAY_DOMAIN` | Base domain appended to relay subdomains | empty |
|
| `RELAY_DOMAIN` | Base domain appended to relay subdomains | empty |
|
||||||
| `LIVEKIT_URL` | LiveKit URL sent to zooid when relay livekit is enabled | _optional_ |
|
| `LIVEKIT_URL` | LiveKit URL sent to zooid when relay livekit is enabled | _optional_ |
|
||||||
| `LIVEKIT_API_KEY` | LiveKit API key sent to zooid | _optional_ |
|
| `LIVEKIT_API_KEY` | LiveKit API key sent to zooid | _optional_ |
|
||||||
| `LIVEKIT_API_SECRET` | LiveKit API secret sent to zooid | _optional_ |
|
| `LIVEKIT_API_SECRET` | LiveKit API secret sent to zooid | _optional_ |
|
||||||
| `NWC_URL` | Platform NWC URL used to generate BOLT11 invoices | _required for invoice generation_ |
|
| `NWC_URL` | Platform NWC URL used to generate BOLT11 invoices | _required for invoice generation_ |
|
||||||
| `ROBOT_SECRET` | Robot Nostr secret key | _required_ |
|
| `STRIPE_SECRET_KEY` | Stripe API secret key used for billing API operations | _required_ |
|
||||||
| `ROBOT_NAME` | Robot display name (kind `0`) | _optional_ |
|
| `STRIPE_WEBHOOK_SECRET` | Stripe webhook signing secret used to verify `Stripe-Signature` headers | _required_ |
|
||||||
| `ROBOT_DESCRIPTION` | Robot description (kind `0`) | _optional_ |
|
| `ROBOT_SECRET` | Robot Nostr secret key | _required_ |
|
||||||
| `ROBOT_PICTURE` | Robot picture URL (kind `0`) | _optional_ |
|
| `ROBOT_NAME` | Robot display name (kind `0`) | _optional_ |
|
||||||
| `ROBOT_OUTBOX_RELAYS` | Comma-separated relays published as kind `10002` | _required_ |
|
| `ROBOT_DESCRIPTION` | Robot description (kind `0`) | _optional_ |
|
||||||
| `ROBOT_INDEXER_RELAYS` | Comma-separated relays used for recipient relay discovery | _required_ |
|
| `ROBOT_PICTURE` | Robot picture URL (kind `0`) | _optional_ |
|
||||||
| `ROBOT_MESSAGING_RELAYS` | Comma-separated relays published as kind `10050` | _required_ |
|
| `ROBOT_OUTBOX_RELAYS` | Comma-separated relays published as kind `10002` | _required_ |
|
||||||
|
| `ROBOT_INDEXER_RELAYS` | Comma-separated relays used for recipient relay discovery | _required_ |
|
||||||
|
| `ROBOT_MESSAGING_RELAYS` | Comma-separated relays published as kind `10050` | _required_ |
|
||||||
|
|
||||||
Relay list env vars are comma-separated and trimmed. If a relay has no `ws://` or `wss://` scheme, `wss://` is prepended.
|
Relay list env vars are comma-separated and trimmed. If a relay has no `ws://` or `wss://` scheme, `wss://` is prepended.
|
||||||
|
|
||||||
@@ -66,11 +68,11 @@ Public exceptions:
|
|||||||
|
|
||||||
- `GET /plans`
|
- `GET /plans`
|
||||||
- `GET /plans/:id`
|
- `GET /plans/:id`
|
||||||
- `POST /stripe/webhook` (validated with Stripe signatures instead)
|
- `POST /stripe/webhook` (validated with Stripe signatures)
|
||||||
|
|
||||||
- `GET /identity` — get auth identity (`pubkey`, `is_admin`)
|
- `GET /identity` — get auth identity (`pubkey`, `is_admin`); side-effect-free
|
||||||
- `GET /tenants` — list tenants (admin)
|
- `GET /tenants` — list tenants (admin)
|
||||||
- `POST /tenants` — create current auth pubkey as tenant
|
- `POST /tenants` — idempotently ensure a tenant row exists for the current auth pubkey (creates Stripe customer + tenant on first call, returns existing tenant otherwise)
|
||||||
- `GET /tenants/:pubkey` — get tenant (admin or same tenant)
|
- `GET /tenants/:pubkey` — get tenant (admin or same tenant)
|
||||||
- `PUT /tenants/:pubkey/billing` — update tenant `nwc_url` (admin or same tenant)
|
- `PUT /tenants/:pubkey/billing` — update tenant `nwc_url` (admin or same tenant)
|
||||||
- `GET /relays` — list relays (`?tenant=<pubkey>` allowed for admin only)
|
- `GET /relays` — list relays (`?tenant=<pubkey>` allowed for admin only)
|
||||||
|
|||||||
+15
-3
@@ -46,9 +46,8 @@ Notes:
|
|||||||
|
|
||||||
- Serves `GET /identity`
|
- Serves `GET /identity`
|
||||||
- Authorizes anyone, but must be authorized
|
- Authorizes anyone, but must be authorized
|
||||||
- If a tenant for the identity doesn't exist:
|
- Side-effect-free: returns `{ pubkey, is_admin }` only
|
||||||
- Call the Stripe API to create a new customer
|
- Clients must call `POST /tenants` before any tenant-scoped write
|
||||||
- Create a new tenant using `command.create_tenant` with payload and `stripe_customer_id`. No subscription is created yet — that happens when the first relay is added.
|
|
||||||
- Return `data` is an `Identity` struct
|
- Return `data` is an `Identity` struct
|
||||||
|
|
||||||
--- Tenant routes
|
--- Tenant routes
|
||||||
@@ -59,6 +58,18 @@ Notes:
|
|||||||
- Authorizes admin only
|
- Authorizes admin only
|
||||||
- Return `data` is a list of tenant structs from `query.list_tenants`
|
- Return `data` is a list of tenant structs from `query.list_tenants`
|
||||||
|
|
||||||
|
## `async fn create_tenant(...) -> Response`
|
||||||
|
|
||||||
|
- Serves `POST /tenants`
|
||||||
|
- Authorizes anyone, but must be authorized
|
||||||
|
- No request body; target pubkey is derived from NIP-98 auth
|
||||||
|
- Idempotent: if a tenant already exists for the auth pubkey, return it without calling Stripe or writing to the DB
|
||||||
|
- Otherwise, call the Stripe API to create a new customer and create a new tenant using `command.create_tenant` with the resulting `stripe_customer_id`. No subscription is created yet — that happens when the first relay is added.
|
||||||
|
- On unique-constraint race (`pubkey-exists`), re-fetch and return the existing tenant
|
||||||
|
- If Stripe customer creation fails, return `code=stripe-customer-create-failed`
|
||||||
|
- Always returns `200` (create-or-get is uniform)
|
||||||
|
- Return `data` is a single `Tenant` struct
|
||||||
|
|
||||||
## `async fn get_tenant(...) -> Response`
|
## `async fn get_tenant(...) -> Response`
|
||||||
|
|
||||||
- Serves `GET /tenants/:pubkey`
|
- Serves `GET /tenants/:pubkey`
|
||||||
@@ -178,6 +189,7 @@ Notes:
|
|||||||
- Reads raw request body and `Stripe-Signature` header
|
- Reads raw request body and `Stripe-Signature` header
|
||||||
- Calls `billing.handle_webhook(payload, signature)`
|
- Calls `billing.handle_webhook(payload, signature)`
|
||||||
- Returns `200` on success, `400` on signature verification failure
|
- Returns `200` on success, `400` on signature verification failure
|
||||||
|
- Startup requires non-empty `STRIPE_WEBHOOK_SECRET`
|
||||||
|
|
||||||
--- Utilities
|
--- Utilities
|
||||||
|
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ Billing encapsulates logic related to synchronizing state with Stripe, processin
|
|||||||
Members:
|
Members:
|
||||||
|
|
||||||
- `nwc_url: String` - a nostr wallet connect URL used to **create** bolt11 invoices (i.e. receive payments), from `NWC_URL`
|
- `nwc_url: String` - a nostr wallet connect URL used to **create** bolt11 invoices (i.e. receive payments), from `NWC_URL`
|
||||||
|
- `stripe_secret_key: String` - Stripe API key used for billing API operations, from `STRIPE_SECRET_KEY`
|
||||||
- `stripe_webhook_secret: String` - secret for verifying Stripe webhook signatures, from `STRIPE_WEBHOOK_SECRET`
|
- `stripe_webhook_secret: String` - secret for verifying Stripe webhook signatures, from `STRIPE_WEBHOOK_SECRET`
|
||||||
- `query: Query`
|
- `query: Query`
|
||||||
- `command: Command`
|
- `command: Command`
|
||||||
@@ -13,6 +14,8 @@ Members:
|
|||||||
## `pub fn new(query: Query, command: Command, robot: Robot) -> Self`
|
## `pub fn new(query: Query, command: Command, robot: Robot) -> Self`
|
||||||
|
|
||||||
- Reads environment and populates members
|
- Reads environment and populates members
|
||||||
|
- Panics if `STRIPE_SECRET_KEY` is missing/empty
|
||||||
|
- Panics if `STRIPE_WEBHOOK_SECRET` is missing/empty
|
||||||
|
|
||||||
## `pub fn start(&self)`
|
## `pub fn start(&self)`
|
||||||
|
|
||||||
@@ -109,4 +112,3 @@ Skip invoices with `amount_due` of 0.
|
|||||||
|
|
||||||
- Look up tenant by `stripe_customer_id`
|
- Look up tenant by `stripe_customer_id`
|
||||||
- Clear `stripe_subscription_id` via `command.clear_tenant_subscription`
|
- Clear `stripe_subscription_id` via `command.clear_tenant_subscription`
|
||||||
|
|
||||||
|
|||||||
@@ -30,5 +30,6 @@ Members:
|
|||||||
## `async fn sync_relay(&self, relay: &Relay, is_new: bool)`
|
## `async fn sync_relay(&self, relay: &Relay, is_new: bool)`
|
||||||
|
|
||||||
- If `is_new`, sends `POST /relay/:id` to create the relay in zooid.
|
- If `is_new`, sends `POST /relay/:id` to create the relay in zooid.
|
||||||
- Otherwise, sends `PUT /relay/:id` to update it.
|
- Otherwise, sends `PATCH /relay/:id` to update it.
|
||||||
- Passes full relay configuration in the body including host, schema, secret, inactive flag, info, policy, groups, management, blossom, livekit, push, and roles.
|
- Includes `secret` only for relay creation (`POST`) so updates do not rotate relay identity.
|
||||||
|
- Passes relay configuration in the body including host, schema, inactive flag, info, policy, groups, management, blossom, livekit, push, and roles.
|
||||||
|
|||||||
@@ -85,9 +85,8 @@ A relay is a nostr relay owned by a `tenant` and hosted by the attached zooid in
|
|||||||
|
|
||||||
Some attributes persisted to zooid via API have special handling:
|
Some attributes persisted to zooid via API have special handling:
|
||||||
|
|
||||||
- The relay's `secret` is generated once and persisted to the zooid configuration but isn't stored in the database.
|
- The relay's `secret` is generated once on relay creation, persisted to the zooid configuration, and isn't stored in the database. Relay updates do not resend `secret`.
|
||||||
- The relay's `host` is calculated based on `subdomain` + `RELAY_DOMAIN`
|
- The relay's `host` is calculated based on `subdomain` + `RELAY_DOMAIN`
|
||||||
- The value of `inactive` is calculated based on `status`
|
- The value of `inactive` is calculated based on `status`
|
||||||
- The relay's `livekit_*` configuration is inferred based on environment variables and `livekit_enabled`.
|
- The relay's `livekit_*` configuration is inferred based on environment variables and `livekit_enabled`.
|
||||||
- The relay's `roles` are hard-coded for now.
|
- The relay's `roles` are hard-coded for now.
|
||||||
|
|
||||||
|
|||||||
+40
-24
@@ -139,11 +139,11 @@ impl Api {
|
|||||||
api: Arc::new(self),
|
api: Arc::new(self),
|
||||||
};
|
};
|
||||||
|
|
||||||
Router::new()
|
let router = Router::new()
|
||||||
.route("/identity", get(get_identity))
|
.route("/identity", get(get_identity))
|
||||||
.route("/plans", get(list_plans))
|
.route("/plans", get(list_plans))
|
||||||
.route("/plans/:id", get(get_plan))
|
.route("/plans/:id", get(get_plan))
|
||||||
.route("/tenants", get(list_tenants))
|
.route("/tenants", get(list_tenants).post(create_tenant))
|
||||||
.route("/tenants/:pubkey", get(get_tenant).put(update_tenant))
|
.route("/tenants/:pubkey", get(get_tenant).put(update_tenant))
|
||||||
.route("/tenants/:pubkey/relays", get(list_tenant_relays))
|
.route("/tenants/:pubkey/relays", get(list_tenant_relays))
|
||||||
.route("/relays", get(list_relays).post(create_relay))
|
.route("/relays", get(list_relays).post(create_relay))
|
||||||
@@ -158,8 +158,9 @@ impl Api {
|
|||||||
"/tenants/:pubkey/stripe/session",
|
"/tenants/:pubkey/stripe/session",
|
||||||
get(create_stripe_session),
|
get(create_stripe_session),
|
||||||
)
|
)
|
||||||
.route("/stripe/webhook", post(stripe_webhook))
|
.route("/stripe/webhook", post(stripe_webhook));
|
||||||
.with_state(state)
|
|
||||||
|
router.with_state(state)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn extract_auth_pubkey(&self, headers: &HeaderMap) -> std::result::Result<String, ApiError> {
|
fn extract_auth_pubkey(&self, headers: &HeaderMap) -> std::result::Result<String, ApiError> {
|
||||||
@@ -400,10 +401,17 @@ async fn get_identity(
|
|||||||
) -> std::result::Result<Response, ApiError> {
|
) -> std::result::Result<Response, ApiError> {
|
||||||
let pubkey = state.api.extract_auth_pubkey(&headers)?;
|
let pubkey = state.api.extract_auth_pubkey(&headers)?;
|
||||||
let is_admin = state.api.admins.iter().any(|a| a == &pubkey);
|
let is_admin = state.api.admins.iter().any(|a| a == &pubkey);
|
||||||
|
Ok(ok(StatusCode::OK, IdentityResponse { pubkey, is_admin }))
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn create_tenant(
|
||||||
|
State(state): State<AppState>,
|
||||||
|
headers: HeaderMap,
|
||||||
|
) -> std::result::Result<Response, ApiError> {
|
||||||
|
let pubkey = state.api.extract_auth_pubkey(&headers)?;
|
||||||
|
|
||||||
// Ensure tenant exists.
|
|
||||||
match state.api.query.get_tenant(&pubkey).await {
|
match state.api.query.get_tenant(&pubkey).await {
|
||||||
Ok(Some(_)) => {}
|
Ok(Some(t)) => Ok(ok(StatusCode::OK, t)),
|
||||||
Ok(None) => {
|
Ok(None) => {
|
||||||
let stripe_customer_id = match state.api.billing.stripe_create_customer(&pubkey).await {
|
let stripe_customer_id = match state.api.billing.stripe_create_customer(&pubkey).await {
|
||||||
Ok(id) => id,
|
Ok(id) => id,
|
||||||
@@ -427,27 +435,35 @@ async fn get_identity(
|
|||||||
};
|
};
|
||||||
|
|
||||||
match state.api.command.create_tenant(&tenant).await {
|
match state.api.command.create_tenant(&tenant).await {
|
||||||
Ok(()) => {}
|
Ok(()) => Ok(ok(StatusCode::OK, tenant)),
|
||||||
Err(e) if matches!(map_unique_error(&e), Some("pubkey-exists")) => {}
|
Err(e) if matches!(map_unique_error(&e), Some("pubkey-exists")) => {
|
||||||
Err(e) => {
|
match state.api.query.get_tenant(&pubkey).await {
|
||||||
return Ok(err(
|
Ok(Some(t)) => Ok(ok(StatusCode::OK, t)),
|
||||||
StatusCode::INTERNAL_SERVER_ERROR,
|
Ok(None) => Ok(err(
|
||||||
"internal",
|
StatusCode::INTERNAL_SERVER_ERROR,
|
||||||
&e.to_string(),
|
"internal",
|
||||||
));
|
"tenant row missing after unique-constraint race",
|
||||||
|
)),
|
||||||
|
Err(e) => Ok(err(
|
||||||
|
StatusCode::INTERNAL_SERVER_ERROR,
|
||||||
|
"internal",
|
||||||
|
&e.to_string(),
|
||||||
|
)),
|
||||||
|
}
|
||||||
}
|
}
|
||||||
};
|
Err(e) => Ok(err(
|
||||||
}
|
StatusCode::INTERNAL_SERVER_ERROR,
|
||||||
Err(e) => {
|
"internal",
|
||||||
return Ok(err(
|
&e.to_string(),
|
||||||
StatusCode::INTERNAL_SERVER_ERROR,
|
)),
|
||||||
"internal",
|
}
|
||||||
&e.to_string(),
|
|
||||||
));
|
|
||||||
}
|
}
|
||||||
|
Err(e) => Ok(err(
|
||||||
|
StatusCode::INTERNAL_SERVER_ERROR,
|
||||||
|
"internal",
|
||||||
|
&e.to_string(),
|
||||||
|
)),
|
||||||
}
|
}
|
||||||
|
|
||||||
Ok(ok(StatusCode::OK, IdentityResponse { pubkey, is_admin }))
|
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn get_plan(Path(id): Path<String>) -> Response {
|
async fn get_plan(Path(id): Path<String>) -> Response {
|
||||||
|
|||||||
+105
-6
@@ -95,6 +95,9 @@ impl Billing {
|
|||||||
panic!("missing STRIPE_SECRET_KEY environment variable");
|
panic!("missing STRIPE_SECRET_KEY environment variable");
|
||||||
}
|
}
|
||||||
let stripe_webhook_secret = std::env::var("STRIPE_WEBHOOK_SECRET").unwrap_or_default();
|
let stripe_webhook_secret = std::env::var("STRIPE_WEBHOOK_SECRET").unwrap_or_default();
|
||||||
|
if stripe_webhook_secret.trim().is_empty() {
|
||||||
|
panic!("missing STRIPE_WEBHOOK_SECRET environment variable");
|
||||||
|
}
|
||||||
let btc_quote_api_base =
|
let btc_quote_api_base =
|
||||||
std::env::var("BTC_PRICE_API_BASE").unwrap_or_else(|_| COINBASE_SPOT_API.to_string());
|
std::env::var("BTC_PRICE_API_BASE").unwrap_or_else(|_| COINBASE_SPOT_API.to_string());
|
||||||
Self {
|
Self {
|
||||||
@@ -949,7 +952,8 @@ mod tests {
|
|||||||
use sqlx::SqlitePool;
|
use sqlx::SqlitePool;
|
||||||
use sqlx::sqlite::{SqliteConnectOptions, SqlitePoolOptions};
|
use sqlx::sqlite::{SqliteConnectOptions, SqlitePoolOptions};
|
||||||
use std::str::FromStr;
|
use std::str::FromStr;
|
||||||
use std::sync::{Mutex, OnceLock};
|
use std::sync::OnceLock;
|
||||||
|
use tokio::sync::Mutex;
|
||||||
|
|
||||||
fn env_lock() -> &'static Mutex<()> {
|
fn env_lock() -> &'static Mutex<()> {
|
||||||
static LOCK: OnceLock<Mutex<()>> = OnceLock::new();
|
static LOCK: OnceLock<Mutex<()>> = OnceLock::new();
|
||||||
@@ -964,6 +968,14 @@ mod tests {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[allow(unused_unsafe)]
|
||||||
|
fn set_stripe_webhook_secret(value: Option<&str>) {
|
||||||
|
match value {
|
||||||
|
Some(v) => unsafe { std::env::set_var("STRIPE_WEBHOOK_SECRET", v) },
|
||||||
|
None => unsafe { std::env::remove_var("STRIPE_WEBHOOK_SECRET") },
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
struct StripeSecretKeyGuard {
|
struct StripeSecretKeyGuard {
|
||||||
previous: Option<String>,
|
previous: Option<String>,
|
||||||
}
|
}
|
||||||
@@ -982,6 +994,24 @@ mod tests {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
struct StripeWebhookSecretGuard {
|
||||||
|
previous: Option<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl StripeWebhookSecretGuard {
|
||||||
|
fn set(value: Option<&str>) -> Self {
|
||||||
|
let previous = std::env::var("STRIPE_WEBHOOK_SECRET").ok();
|
||||||
|
set_stripe_webhook_secret(value);
|
||||||
|
Self { previous }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Drop for StripeWebhookSecretGuard {
|
||||||
|
fn drop(&mut self) {
|
||||||
|
set_stripe_webhook_secret(self.previous.as_deref());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
async fn test_pool() -> SqlitePool {
|
async fn test_pool() -> SqlitePool {
|
||||||
let connect_options = SqliteConnectOptions::from_str("sqlite::memory:")
|
let connect_options = SqliteConnectOptions::from_str("sqlite::memory:")
|
||||||
.expect("valid sqlite memory url")
|
.expect("valid sqlite memory url")
|
||||||
@@ -1003,8 +1033,9 @@ mod tests {
|
|||||||
|
|
||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
async fn billing_new_panics_without_stripe_secret_key() {
|
async fn billing_new_panics_without_stripe_secret_key() {
|
||||||
let _lock = env_lock().lock().expect("acquire env lock");
|
let _lock = env_lock().lock().await;
|
||||||
let _env = StripeSecretKeyGuard::set(None);
|
let _secret_env = StripeSecretKeyGuard::set(None);
|
||||||
|
let _webhook_env = StripeWebhookSecretGuard::set(Some("whsec_test_dummy"));
|
||||||
|
|
||||||
let pool = test_pool().await;
|
let pool = test_pool().await;
|
||||||
let query = Query::new(pool.clone());
|
let query = Query::new(pool.clone());
|
||||||
@@ -1034,9 +1065,76 @@ mod tests {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
async fn billing_new_accepts_non_empty_stripe_secret_key() {
|
async fn billing_new_panics_without_stripe_webhook_secret() {
|
||||||
let _lock = env_lock().lock().expect("acquire env lock");
|
let _lock = env_lock().lock().await;
|
||||||
let _env = StripeSecretKeyGuard::set(Some("sk_test_dummy"));
|
let _secret_env = StripeSecretKeyGuard::set(Some("sk_test_dummy"));
|
||||||
|
let _webhook_env = StripeWebhookSecretGuard::set(None);
|
||||||
|
|
||||||
|
let pool = test_pool().await;
|
||||||
|
let query = Query::new(pool.clone());
|
||||||
|
let command = Command::new(pool);
|
||||||
|
let robot = Robot::test_stub();
|
||||||
|
|
||||||
|
let result = std::panic::catch_unwind(std::panic::AssertUnwindSafe(|| {
|
||||||
|
Billing::new(query, command, robot)
|
||||||
|
}));
|
||||||
|
|
||||||
|
let panic_payload = match result {
|
||||||
|
Ok(_) => panic!("constructor should panic when STRIPE_WEBHOOK_SECRET is missing"),
|
||||||
|
Err(payload) => payload,
|
||||||
|
};
|
||||||
|
let panic_msg = if let Some(msg) = panic_payload.downcast_ref::<&str>() {
|
||||||
|
(*msg).to_string()
|
||||||
|
} else if let Some(msg) = panic_payload.downcast_ref::<String>() {
|
||||||
|
msg.clone()
|
||||||
|
} else {
|
||||||
|
String::new()
|
||||||
|
};
|
||||||
|
|
||||||
|
assert!(
|
||||||
|
panic_msg.contains("missing STRIPE_WEBHOOK_SECRET environment variable"),
|
||||||
|
"unexpected panic: {panic_msg}"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tokio::test]
|
||||||
|
async fn billing_new_panics_with_blank_stripe_webhook_secret() {
|
||||||
|
let _lock = env_lock().lock().await;
|
||||||
|
let _secret_env = StripeSecretKeyGuard::set(Some("sk_test_dummy"));
|
||||||
|
let _webhook_env = StripeWebhookSecretGuard::set(Some(" "));
|
||||||
|
|
||||||
|
let pool = test_pool().await;
|
||||||
|
let query = Query::new(pool.clone());
|
||||||
|
let command = Command::new(pool);
|
||||||
|
let robot = Robot::test_stub();
|
||||||
|
|
||||||
|
let result = std::panic::catch_unwind(std::panic::AssertUnwindSafe(|| {
|
||||||
|
Billing::new(query, command, robot)
|
||||||
|
}));
|
||||||
|
|
||||||
|
let panic_payload = match result {
|
||||||
|
Ok(_) => panic!("constructor should panic when STRIPE_WEBHOOK_SECRET is blank"),
|
||||||
|
Err(payload) => payload,
|
||||||
|
};
|
||||||
|
let panic_msg = if let Some(msg) = panic_payload.downcast_ref::<&str>() {
|
||||||
|
(*msg).to_string()
|
||||||
|
} else if let Some(msg) = panic_payload.downcast_ref::<String>() {
|
||||||
|
msg.clone()
|
||||||
|
} else {
|
||||||
|
String::new()
|
||||||
|
};
|
||||||
|
|
||||||
|
assert!(
|
||||||
|
panic_msg.contains("missing STRIPE_WEBHOOK_SECRET environment variable"),
|
||||||
|
"unexpected panic: {panic_msg}"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tokio::test]
|
||||||
|
async fn billing_new_accepts_non_empty_stripe_secrets() {
|
||||||
|
let _lock = env_lock().lock().await;
|
||||||
|
let _secret_env = StripeSecretKeyGuard::set(Some("sk_test_dummy"));
|
||||||
|
let _webhook_env = StripeWebhookSecretGuard::set(Some("whsec_test_dummy"));
|
||||||
|
|
||||||
let pool = test_pool().await;
|
let pool = test_pool().await;
|
||||||
let billing = Billing::new(
|
let billing = Billing::new(
|
||||||
@@ -1046,5 +1144,6 @@ mod tests {
|
|||||||
);
|
);
|
||||||
|
|
||||||
assert_eq!(billing.stripe_secret_key, "sk_test_dummy");
|
assert_eq!(billing.stripe_secret_key, "sk_test_dummy");
|
||||||
|
assert_eq!(billing.stripe_webhook_secret, "whsec_test_dummy");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -32,7 +32,7 @@ impl Command {
|
|||||||
.fetch_one(&mut **tx)
|
.fetch_one(&mut **tx)
|
||||||
.await?
|
.await?
|
||||||
}
|
}
|
||||||
_ => anyhow::bail!("unknown resource_type: {}", resource_type),
|
_ => anyhow::bail!("unknown resource_type: {resource_type}"),
|
||||||
};
|
};
|
||||||
|
|
||||||
let id = uuid::Uuid::new_v4().to_string();
|
let id = uuid::Uuid::new_v4().to_string();
|
||||||
|
|||||||
+69
-49
@@ -2,7 +2,7 @@ use anyhow::Result;
|
|||||||
use nostr_sdk::prelude::*;
|
use nostr_sdk::prelude::*;
|
||||||
|
|
||||||
use crate::command::Command;
|
use crate::command::Command;
|
||||||
use crate::models::{Activity, RELAY_STATUS_DELINQUENT, RELAY_STATUS_INACTIVE};
|
use crate::models::{Activity, Relay, RELAY_STATUS_DELINQUENT, RELAY_STATUS_INACTIVE};
|
||||||
use crate::query::Query;
|
use crate::query::Query;
|
||||||
|
|
||||||
#[derive(Clone)]
|
#[derive(Clone)]
|
||||||
@@ -70,7 +70,7 @@ impl Infra {
|
|||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn sync_and_report(&self, relay: &crate::models::Relay, is_new: bool) {
|
async fn sync_and_report(&self, relay: &Relay, is_new: bool) {
|
||||||
match self.sync_relay(relay, is_new).await {
|
match self.sync_relay(relay, is_new).await {
|
||||||
Ok(()) => {
|
Ok(()) => {
|
||||||
tracing::info!(relay = %relay.id, "relay sync succeeded");
|
tracing::info!(relay = %relay.id, "relay sync succeeded");
|
||||||
@@ -96,7 +96,7 @@ impl Infra {
|
|||||||
Ok(auth)
|
Ok(auth)
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn sync_relay(&self, relay: &crate::models::Relay, is_new: bool) -> Result<()> {
|
async fn sync_relay(&self, relay: &Relay, is_new: bool) -> Result<()> {
|
||||||
let client = reqwest::Client::new();
|
let client = reqwest::Client::new();
|
||||||
let base = self.api_url.trim_end_matches('/');
|
let base = self.api_url.trim_end_matches('/');
|
||||||
|
|
||||||
@@ -106,8 +106,6 @@ impl Infra {
|
|||||||
format!("{}.{}", relay.subdomain, self.relay_domain)
|
format!("{}.{}", relay.subdomain, self.relay_domain)
|
||||||
};
|
};
|
||||||
|
|
||||||
let secret = Keys::generate().secret_key().to_secret_hex();
|
|
||||||
|
|
||||||
let livekit = if relay.livekit_enabled == 1 {
|
let livekit = if relay.livekit_enabled == 1 {
|
||||||
serde_json::json!({
|
serde_json::json!({
|
||||||
"enabled": true,
|
"enabled": true,
|
||||||
@@ -119,62 +117,84 @@ impl Infra {
|
|||||||
serde_json::json!({ "enabled": false })
|
serde_json::json!({ "enabled": false })
|
||||||
};
|
};
|
||||||
|
|
||||||
let body = serde_json::json!({
|
let body = relay_sync_body(
|
||||||
"host": host,
|
relay,
|
||||||
"schema": relay.schema,
|
host,
|
||||||
"secret": secret,
|
livekit,
|
||||||
"inactive": relay.status == RELAY_STATUS_INACTIVE
|
is_new.then(|| Keys::generate().secret_key().to_secret_hex()),
|
||||||
|| relay.status == RELAY_STATUS_DELINQUENT,
|
);
|
||||||
"info": {
|
|
||||||
"name": relay.info_name,
|
|
||||||
"icon": relay.info_icon,
|
|
||||||
"description": relay.info_description,
|
|
||||||
"pubkey": relay.tenant,
|
|
||||||
},
|
|
||||||
"policy": {
|
|
||||||
"public_join": relay.policy_public_join == 1,
|
|
||||||
"strip_signatures": relay.policy_strip_signatures == 1,
|
|
||||||
},
|
|
||||||
"groups": { "enabled": relay.groups_enabled == 1 },
|
|
||||||
"management": { "enabled": relay.management_enabled == 1 },
|
|
||||||
"blossom": { "enabled": relay.blossom_enabled == 1 },
|
|
||||||
"livekit": livekit,
|
|
||||||
"push": { "enabled": relay.push_enabled == 1 },
|
|
||||||
"roles": {
|
|
||||||
"admin": { "can_manage": true, "can_invite": true },
|
|
||||||
"member": { "can_invite": true },
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
let response = if is_new {
|
let url = format!("{}/relay/{}", base, relay.id);
|
||||||
let url = format!("{}/relay/{}", base, relay.id);
|
let auth = self.nip98_auth(&url, zooid_sync_http_method(is_new)).await?;
|
||||||
let auth = self.nip98_auth(&url, HttpMethod::POST).await?;
|
|
||||||
client
|
let request = if is_new {
|
||||||
.post(&url)
|
client.post(&url)
|
||||||
.header("Authorization", auth)
|
|
||||||
.json(&body)
|
|
||||||
.send()
|
|
||||||
.await?
|
|
||||||
} else {
|
} else {
|
||||||
let url = format!("{}/relay/{}", base, relay.id);
|
client.patch(&url)
|
||||||
let auth = self.nip98_auth(&url, HttpMethod::PUT).await?;
|
|
||||||
client
|
|
||||||
.put(&url)
|
|
||||||
.header("Authorization", auth)
|
|
||||||
.json(&body)
|
|
||||||
.send()
|
|
||||||
.await?
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
let response = request
|
||||||
|
.header("Authorization", auth)
|
||||||
|
.json(&body)
|
||||||
|
.send()
|
||||||
|
.await?;
|
||||||
|
|
||||||
if !response.status().is_success() {
|
if !response.status().is_success() {
|
||||||
let status = response.status();
|
let status = response.status();
|
||||||
let body = response.text().await.unwrap_or_default();
|
let body = response.text().await.unwrap_or_default();
|
||||||
anyhow::bail!("zooid sync returned {}: {}", status, body)
|
anyhow::bail!("zooid sync returned {status}: {body}")
|
||||||
}
|
}
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn zooid_sync_http_method(is_new: bool) -> HttpMethod {
|
||||||
|
if is_new {
|
||||||
|
HttpMethod::POST
|
||||||
|
} else {
|
||||||
|
HttpMethod::PATCH
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn relay_sync_body(
|
||||||
|
relay: &Relay,
|
||||||
|
host: String,
|
||||||
|
livekit: serde_json::Value,
|
||||||
|
secret: Option<String>,
|
||||||
|
) -> serde_json::Value {
|
||||||
|
let mut body = serde_json::json!({
|
||||||
|
"host": host,
|
||||||
|
"schema": relay.schema,
|
||||||
|
"inactive": relay.status == RELAY_STATUS_INACTIVE
|
||||||
|
|| relay.status == RELAY_STATUS_DELINQUENT,
|
||||||
|
"info": {
|
||||||
|
"name": relay.info_name,
|
||||||
|
"icon": relay.info_icon,
|
||||||
|
"description": relay.info_description,
|
||||||
|
"pubkey": relay.tenant,
|
||||||
|
},
|
||||||
|
"policy": {
|
||||||
|
"public_join": relay.policy_public_join == 1,
|
||||||
|
"strip_signatures": relay.policy_strip_signatures == 1,
|
||||||
|
},
|
||||||
|
"groups": { "enabled": relay.groups_enabled == 1 },
|
||||||
|
"management": { "enabled": relay.management_enabled == 1 },
|
||||||
|
"blossom": { "enabled": relay.blossom_enabled == 1 },
|
||||||
|
"livekit": livekit,
|
||||||
|
"push": { "enabled": relay.push_enabled == 1 },
|
||||||
|
"roles": {
|
||||||
|
"admin": { "can_manage": true, "can_invite": true },
|
||||||
|
"member": { "can_invite": true },
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
if let (Some(secret), Some(body_obj)) = (secret, body.as_object_mut()) {
|
||||||
|
body_obj.insert("secret".to_string(), serde_json::Value::String(secret));
|
||||||
|
}
|
||||||
|
|
||||||
|
body
|
||||||
|
}
|
||||||
|
|
||||||
fn should_sync_relay_activity(activity_type: &str) -> bool {
|
fn should_sync_relay_activity(activity_type: &str) -> bool {
|
||||||
matches!(
|
matches!(
|
||||||
activity_type,
|
activity_type,
|
||||||
|
|||||||
+1
-1
@@ -3,8 +3,8 @@ mod billing;
|
|||||||
mod command;
|
mod command;
|
||||||
mod infra;
|
mod infra;
|
||||||
mod models;
|
mod models;
|
||||||
mod query;
|
|
||||||
mod pool;
|
mod pool;
|
||||||
|
mod query;
|
||||||
mod robot;
|
mod robot;
|
||||||
|
|
||||||
use anyhow::Result;
|
use anyhow::Result;
|
||||||
|
|||||||
+1
-2
@@ -21,8 +21,7 @@ pub async fn create_pool() -> Result<SqlitePool> {
|
|||||||
std::fs::create_dir_all(parent)?;
|
std::fs::create_dir_all(parent)?;
|
||||||
}
|
}
|
||||||
|
|
||||||
let connect_options =
|
let connect_options = SqliteConnectOptions::from_str(&database_url)?.create_if_missing(true);
|
||||||
SqliteConnectOptions::from_str(&database_url)?.create_if_missing(true);
|
|
||||||
|
|
||||||
let pool = SqlitePoolOptions::new()
|
let pool = SqlitePoolOptions::new()
|
||||||
.max_connections(5)
|
.max_connections(5)
|
||||||
|
|||||||
@@ -25,7 +25,7 @@ async fn quote_endpoint_can_be_stubbed_deterministically() {
|
|||||||
|
|
||||||
assert_eq!(btc_price, 50_000.0);
|
assert_eq!(btc_price, 50_000.0);
|
||||||
|
|
||||||
let msats = fiat_minor_to_msats_from_quote(100, "USD", btc_price)
|
let msats =
|
||||||
.expect("convert quoted fiat amount");
|
fiat_minor_to_msats_from_quote(100, "USD", btc_price).expect("convert quoted fiat amount");
|
||||||
assert_eq!(msats, 2_000_000);
|
assert_eq!(msats, 2_000_000);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -203,6 +203,13 @@ export default function RelayDetailCard(props: RelayDetailCardProps) {
|
|||||||
</Show>
|
</Show>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<Show when={r().sync_error}>
|
||||||
|
<div class="rounded-lg border border-red-200 bg-red-50 px-4 py-3">
|
||||||
|
<p class="text-sm font-semibold text-red-800">Provisioning error</p>
|
||||||
|
<p class="mt-1 text-sm text-red-700 font-mono break-all">{r().sync_error}</p>
|
||||||
|
</div>
|
||||||
|
</Show>
|
||||||
|
|
||||||
<hr class="border-gray-200" />
|
<hr class="border-gray-200" />
|
||||||
|
|
||||||
<DetailSection title="Policy">
|
<DetailSection title="Policy">
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
import { A } from "@solidjs/router"
|
import { A } from "@solidjs/router"
|
||||||
|
import { Show } from "solid-js"
|
||||||
import type { Relay } from "@/lib/api"
|
import type { Relay } from "@/lib/api"
|
||||||
|
|
||||||
type RelayListItemProps = {
|
type RelayListItemProps = {
|
||||||
@@ -19,7 +20,17 @@ export default function RelayListItem(props: RelayListItemProps) {
|
|||||||
<p class="text-xs text-gray-500 break-all mt-1">Tenant: {props.relay.tenant}</p>
|
<p class="text-xs text-gray-500 break-all mt-1">Tenant: {props.relay.tenant}</p>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
<p class="text-xs uppercase tracking-wide text-gray-500">{props.relay.status}</p>
|
<Show
|
||||||
|
when={props.relay.sync_error}
|
||||||
|
fallback={<p class="text-xs uppercase tracking-wide text-gray-500">{props.relay.status}</p>}
|
||||||
|
>
|
||||||
|
<span
|
||||||
|
class="inline-flex items-center rounded-full border border-red-200 bg-red-50 px-2.5 py-0.5 text-xs font-medium text-red-700 max-w-56 truncate"
|
||||||
|
title={props.relay.sync_error}
|
||||||
|
>
|
||||||
|
{props.relay.sync_error}
|
||||||
|
</span>
|
||||||
|
</Show>
|
||||||
</div>
|
</div>
|
||||||
</A>
|
</A>
|
||||||
</li>
|
</li>
|
||||||
|
|||||||
@@ -205,6 +205,10 @@ export function getIdentity() {
|
|||||||
return callApi<undefined, Identity>("GET", "/identity")
|
return callApi<undefined, Identity>("GET", "/identity")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function createTenant() {
|
||||||
|
return callApi<undefined, Tenant>("POST", "/tenants")
|
||||||
|
}
|
||||||
|
|
||||||
export function getPlan(id: string) {
|
export function getPlan(id: string) {
|
||||||
return callApi<undefined, Plan>("GET", `/plans/${id}`)
|
return callApi<undefined, Plan>("GET", `/plans/${id}`)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import { PasswordSigner } from "applesauce-signers"
|
|||||||
import QrScanner from "qr-scanner"
|
import QrScanner from "qr-scanner"
|
||||||
import QRCode from "qrcode"
|
import QRCode from "qrcode"
|
||||||
import { accountManager, identity, PLATFORM_NAME } from "@/lib/state"
|
import { accountManager, identity, PLATFORM_NAME } from "@/lib/state"
|
||||||
|
import { createTenant } from "@/lib/api"
|
||||||
import useMinLoading from "@/components/useMinLoading"
|
import useMinLoading from "@/components/useMinLoading"
|
||||||
|
|
||||||
const NIP46_RELAYS = ['wss://bucket.coracle.social', 'wss://ephemeral.snowflare.cc']
|
const NIP46_RELAYS = ['wss://bucket.coracle.social', 'wss://ephemeral.snowflare.cc']
|
||||||
@@ -69,6 +70,12 @@ export default function Login(props: LoginPageProps = {}) {
|
|||||||
async function completeLogin(account: ExtensionAccount | NostrConnectAccount | PrivateKeyAccount | PasswordAccount) {
|
async function completeLogin(account: ExtensionAccount | NostrConnectAccount | PrivateKeyAccount | PasswordAccount) {
|
||||||
accountManager.addAccount(account)
|
accountManager.addAccount(account)
|
||||||
accountManager.setActive(account)
|
accountManager.setActive(account)
|
||||||
|
try {
|
||||||
|
await createTenant()
|
||||||
|
} catch (e) {
|
||||||
|
accountManager.removeAccount(account)
|
||||||
|
throw e
|
||||||
|
}
|
||||||
await props.onAuthenticated?.()
|
await props.onAuthenticated?.()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user