Compare commits

...

1 Commits

5 changed files with 78 additions and 9 deletions
+43 -7
View File
@@ -445,6 +445,31 @@ struct IdentityResponse {
is_admin: bool, is_admin: bool,
} }
#[derive(Serialize)]
struct TenantResponse {
pubkey: String,
nwc_is_set: bool,
nwc_error: Option<String>,
created_at: i64,
stripe_customer_id: String,
stripe_subscription_id: Option<String>,
past_due_at: Option<i64>,
}
impl From<Tenant> for TenantResponse {
fn from(t: Tenant) -> Self {
TenantResponse {
nwc_is_set: !t.nwc_url.is_empty(),
pubkey: t.pubkey,
nwc_error: t.nwc_error,
created_at: t.created_at,
stripe_customer_id: t.stripe_customer_id,
stripe_subscription_id: t.stripe_subscription_id,
past_due_at: t.past_due_at,
}
}
}
#[derive(Deserialize)] #[derive(Deserialize)]
struct CreateRelayRequest { struct CreateRelayRequest {
tenant: String, tenant: String,
@@ -486,7 +511,13 @@ async fn list_tenants(
state.api.require_admin(&pubkey)?; state.api.require_admin(&pubkey)?;
match state.api.query.list_tenants().await { match state.api.query.list_tenants().await {
Ok(tenants) => Ok(ok(StatusCode::OK, tenants)), Ok(tenants) => Ok(ok(
StatusCode::OK,
tenants
.into_iter()
.map(TenantResponse::from)
.collect::<Vec<_>>(),
)),
Err(e) => Ok(err( Err(e) => Ok(err(
StatusCode::INTERNAL_SERVER_ERROR, StatusCode::INTERNAL_SERVER_ERROR,
"internal", "internal",
@@ -515,7 +546,7 @@ async fn create_tenant(
let pubkey = state.api.extract_auth_pubkey(&headers)?; let pubkey = state.api.extract_auth_pubkey(&headers)?;
match state.api.query.get_tenant(&pubkey).await { match state.api.query.get_tenant(&pubkey).await {
Ok(Some(t)) => Ok(ok(StatusCode::OK, t)), Ok(Some(t)) => Ok(ok(StatusCode::OK, TenantResponse::from(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,
@@ -539,10 +570,10 @@ async fn create_tenant(
}; };
match state.api.command.create_tenant(&tenant).await { match state.api.command.create_tenant(&tenant).await {
Ok(()) => Ok(ok(StatusCode::OK, tenant)), Ok(()) => Ok(ok(StatusCode::OK, TenantResponse::from(tenant))),
Err(e) if matches!(map_unique_error(&e), Some("pubkey-exists")) => { Err(e) if matches!(map_unique_error(&e), Some("pubkey-exists")) => {
match state.api.query.get_tenant(&pubkey).await { match state.api.query.get_tenant(&pubkey).await {
Ok(Some(t)) => Ok(ok(StatusCode::OK, t)), Ok(Some(t)) => Ok(ok(StatusCode::OK, TenantResponse::from(t))),
Ok(None) => Ok(err( Ok(None) => Ok(err(
StatusCode::INTERNAL_SERVER_ERROR, StatusCode::INTERNAL_SERVER_ERROR,
"internal", "internal",
@@ -585,7 +616,7 @@ async fn get_tenant(
let auth = state.api.extract_auth_pubkey(&headers)?; let auth = state.api.extract_auth_pubkey(&headers)?;
state.api.require_admin_or_tenant(&auth, &pubkey)?; state.api.require_admin_or_tenant(&auth, &pubkey)?;
let tenant = state.api.get_tenant_or_404(&pubkey).await?; let tenant = state.api.get_tenant_or_404(&pubkey).await?;
Ok(ok(StatusCode::OK, tenant)) Ok(ok(StatusCode::OK, TenantResponse::from(tenant)))
} }
async fn list_relays( async fn list_relays(
@@ -1103,7 +1134,12 @@ async fn update_tenant(
let nwc_previously_empty = tenant.nwc_url.is_empty(); let nwc_previously_empty = tenant.nwc_url.is_empty();
if let Some(nwc_url) = payload.nwc_url { if let Some(nwc_url) = payload.nwc_url {
tenant.nwc_url = nwc_url; if nwc_url.is_empty() {
tenant.nwc_url = String::new();
} else {
tenant.nwc_url =
crate::cipher::encrypt(&nwc_url).map_err(|e| ApiError::Internal(e.to_string()))?;
}
} }
match state.api.command.update_tenant(&tenant).await { match state.api.command.update_tenant(&tenant).await {
@@ -1122,7 +1158,7 @@ async fn update_tenant(
} }
}); });
} }
Ok(ok(StatusCode::OK, tenant)) Ok(ok(StatusCode::OK, TenantResponse::from(tenant)))
} }
Err(e) => Ok(err( Err(e) => Ok(err(
StatusCode::INTERNAL_SERVER_ERROR, StatusCode::INTERNAL_SERVER_ERROR,
+5 -2
View File
@@ -422,13 +422,14 @@ impl Billing {
// 1. NWC auto-pay: if the tenant has a nwc_url // 1. NWC auto-pay: if the tenant has a nwc_url
if !tenant.nwc_url.is_empty() { if !tenant.nwc_url.is_empty() {
let plain_nwc_url = crate::cipher::decrypt(&tenant.nwc_url)?;
match self match self
.nwc_pay_invoice( .nwc_pay_invoice(
invoice_id, invoice_id,
&tenant.pubkey, &tenant.pubkey,
amount_due, amount_due,
currency, currency,
&tenant.nwc_url, &plain_nwc_url,
) )
.await? .await?
{ {
@@ -857,6 +858,8 @@ impl Billing {
return Ok(()); return Ok(());
} }
let plain_nwc_url = crate::cipher::decrypt(&tenant.nwc_url)?;
let invoices = self let invoices = self
.stripe_list_invoices(&tenant.stripe_customer_id) .stripe_list_invoices(&tenant.stripe_customer_id)
.await?; .await?;
@@ -878,7 +881,7 @@ impl Billing {
&tenant.pubkey, &tenant.pubkey,
amount_due, amount_due,
currency, currency,
&tenant.nwc_url, &plain_nwc_url,
) )
.await? .await?
{ {
+28
View File
@@ -0,0 +1,28 @@
use anyhow::{Result, anyhow};
use nostr_sdk::prelude::*;
pub fn encrypt(plaintext: &str) -> Result<String> {
let keys = load_key()?;
nip44::encrypt(
keys.secret_key(),
&keys.public_key(),
plaintext,
nip44::Version::V2,
)
.map_err(|e| anyhow!("encryption failed: {e}"))
}
pub fn decrypt(ciphertext: &str) -> Result<String> {
let keys = load_key()?;
nip44::decrypt(keys.secret_key(), &keys.public_key(), ciphertext)
.map_err(|e| anyhow!("decryption failed: {e}"))
}
fn load_key() -> Result<Keys> {
let secret = std::env::var("ENCRYPTION_SECRET")
.map_err(|_| anyhow!("missing ENCRYPTION_SECRET environment variable"))?;
if secret.trim().is_empty() {
return Err(anyhow!("ENCRYPTION_SECRET is empty"));
}
Keys::parse(&secret).map_err(|e| anyhow!("invalid ENCRYPTION_SECRET: {e}"))
}
+1
View File
@@ -1,5 +1,6 @@
pub mod api; pub mod api;
pub mod billing; pub mod billing;
pub mod cipher;
pub mod command; pub mod command;
pub mod infra; pub mod infra;
pub mod models; pub mod models;
+1
View File
@@ -1,5 +1,6 @@
mod api; mod api;
mod billing; mod billing;
mod cipher;
mod command; mod command;
mod infra; mod infra;
mod models; mod models;