Consolidate audit-fixes branch: webhooks, integrations, and deploy hardening
Batch commit of the pending working tree on security/audit-fixes-2026-07. Major areas: - Outbound webhooks / Zapier: schema + signed delivery with retries, public v1 API (REST-hook subscribe/unsubscribe), settings UI, cron drain. - Deploy hardening: email via SMTP2GO (Resend fully removed), verified DB TLS (DATABASE_SSL=require + DATABASE_CA), storage fails loud in production when Spaces is unconfigured instead of silently using ephemeral disk. - Integrations & features (concurrent work): accounting (QuickBooks/Xero), e-signature (DocuSign/Dropbox Sign), PayPal, geocoding/maps, onboarding, expanded legal pages. - DB migrations 0006–0009. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
co-authored by
Claude Opus 4.8
parent
969d5d4c8a
commit
c9968531e4
@@ -0,0 +1,32 @@
|
||||
import { NextResponse } from "next/server"
|
||||
import { eq } from "drizzle-orm"
|
||||
import { db } from "@/lib/db"
|
||||
import { profiles } from "@/lib/db/schema"
|
||||
import { getSessionUser } from "@/lib/session"
|
||||
import { cancelSubscription } from "@/lib/paypal/checkout"
|
||||
|
||||
// Cancel the signed-in user's PayPal subscription. The account keeps access
|
||||
// until the paid period ends; the BILLING.SUBSCRIPTION.CANCELLED webhook does
|
||||
// the final downgrade to starter.
|
||||
export async function POST() {
|
||||
const user = await getSessionUser()
|
||||
if (!user) return NextResponse.json({ error: "Unauthorized" }, { status: 401 })
|
||||
|
||||
const profile = await db.query.profiles.findFirst({
|
||||
where: eq(profiles.id, user.id),
|
||||
columns: { paypal_subscription_id: true },
|
||||
})
|
||||
if (!profile?.paypal_subscription_id) {
|
||||
return NextResponse.json({ error: "No PayPal subscription to cancel" }, { status: 400 })
|
||||
}
|
||||
|
||||
const ok = await cancelSubscription(profile.paypal_subscription_id)
|
||||
if (!ok) return NextResponse.json({ error: "PayPal cancellation failed" }, { status: 502 })
|
||||
|
||||
await db
|
||||
.update(profiles)
|
||||
.set({ subscription_status: "canceled" })
|
||||
.where(eq(profiles.id, user.id))
|
||||
|
||||
return NextResponse.json({ ok: true })
|
||||
}
|
||||
@@ -0,0 +1,73 @@
|
||||
import { NextResponse } from "next/server"
|
||||
import { eq } from "drizzle-orm"
|
||||
import { db } from "@/lib/db"
|
||||
import { profiles } from "@/lib/db/schema"
|
||||
import { getSessionUser } from "@/lib/session"
|
||||
import { paypalConfigured } from "@/lib/paypal/client"
|
||||
import { getPaypalPlanId } from "@/lib/paypal/plans"
|
||||
import { createSubscription, createOrder } from "@/lib/paypal/checkout"
|
||||
import { PLAN_AMOUNTS } from "@/lib/stripe/plans"
|
||||
|
||||
const RECURRING = new Set(["pro", "landlord"])
|
||||
|
||||
// Start a PayPal checkout for a plan upgrade and return the approval URL.
|
||||
// Recurring plans → Subscriptions API; lifetime → one-time Orders API.
|
||||
export async function POST(request: Request) {
|
||||
if (!paypalConfigured()) {
|
||||
return NextResponse.json({ error: "PayPal is not configured" }, { status: 400 })
|
||||
}
|
||||
const user = await getSessionUser()
|
||||
if (!user) return NextResponse.json({ error: "Unauthorized" }, { status: 401 })
|
||||
|
||||
const { plan, interval } = (await request.json().catch(() => ({}))) as {
|
||||
plan?: string
|
||||
interval?: "month" | "year"
|
||||
}
|
||||
if (!plan || (plan !== "lifetime" && !RECURRING.has(plan))) {
|
||||
return NextResponse.json({ error: "Invalid plan" }, { status: 400 })
|
||||
}
|
||||
|
||||
const appUrl = process.env.NEXT_PUBLIC_APP_URL!
|
||||
const cancelUrl = `${appUrl}/settings/billing?canceled=true`
|
||||
|
||||
try {
|
||||
if (plan === "lifetime") {
|
||||
const { approveUrl } = await createOrder({
|
||||
amount: PLAN_AMOUNTS.lifetime,
|
||||
userId: user.id,
|
||||
plan: "lifetime",
|
||||
returnUrl: `${appUrl}/api/paypal/return?type=order`,
|
||||
cancelUrl,
|
||||
})
|
||||
if (!approveUrl) throw new Error("PayPal did not return an approval URL")
|
||||
return NextResponse.json({ url: approveUrl })
|
||||
}
|
||||
|
||||
const billingInterval = interval === "year" ? "year" : "month"
|
||||
const planId = getPaypalPlanId(plan as "pro" | "landlord", billingInterval)
|
||||
if (!planId) {
|
||||
return NextResponse.json({ error: "That plan isn't available on PayPal yet." }, { status: 400 })
|
||||
}
|
||||
|
||||
const profile = await db.query.profiles.findFirst({
|
||||
where: eq(profiles.id, user.id),
|
||||
columns: { email: true },
|
||||
})
|
||||
|
||||
const { approveUrl } = await createSubscription({
|
||||
planId,
|
||||
userId: user.id,
|
||||
plan,
|
||||
email: profile?.email ?? user.email,
|
||||
returnUrl: `${appUrl}/api/paypal/return?type=subscription`,
|
||||
cancelUrl,
|
||||
})
|
||||
if (!approveUrl) throw new Error("PayPal did not return an approval URL")
|
||||
return NextResponse.json({ url: approveUrl })
|
||||
} catch (e) {
|
||||
return NextResponse.json(
|
||||
{ error: (e as Error).message || "PayPal checkout failed" },
|
||||
{ status: 502 }
|
||||
)
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,52 @@
|
||||
import { NextResponse } from "next/server"
|
||||
import { getSessionUser } from "@/lib/session"
|
||||
import { captureOrder, getSubscription, decodeCustomId } from "@/lib/paypal/checkout"
|
||||
import { fulfillSubscription, fulfillLifetime } from "@/lib/paypal/fulfill"
|
||||
|
||||
// PayPal redirects the approver back here. We finalize synchronously (capture
|
||||
// the order / confirm the subscription) so the plan is live the moment they
|
||||
// land on the billing page — the webhook is a backstop, not the only path.
|
||||
export async function GET(request: Request) {
|
||||
const url = new URL(request.url)
|
||||
const type = url.searchParams.get("type")
|
||||
const appUrl = process.env.NEXT_PUBLIC_APP_URL!
|
||||
const ok = NextResponse.redirect(`${appUrl}/settings/billing?success=true`)
|
||||
const fail = NextResponse.redirect(`${appUrl}/settings/billing?error=paypal`)
|
||||
|
||||
const user = await getSessionUser()
|
||||
if (!user) return NextResponse.redirect(`${appUrl}/login`)
|
||||
|
||||
try {
|
||||
if (type === "order") {
|
||||
const orderId = url.searchParams.get("token")
|
||||
if (!orderId) return fail
|
||||
const captured = await captureOrder(orderId)
|
||||
if (!captured || captured.status !== "COMPLETED") return fail
|
||||
const decoded = decodeCustomId(captured.custom_id)
|
||||
if (!decoded || decoded.userId !== user.id) return fail
|
||||
await fulfillLifetime(user.id)
|
||||
return ok
|
||||
}
|
||||
|
||||
// Subscription approval.
|
||||
const subId = url.searchParams.get("subscription_id")
|
||||
if (!subId) return fail
|
||||
const sub = await getSubscription(subId)
|
||||
if (!sub) return fail
|
||||
const decoded = decodeCustomId(sub.custom_id)
|
||||
// Only accept a subscription whose custom_id matches the signed-in user.
|
||||
if (!decoded || decoded.userId !== user.id) return fail
|
||||
|
||||
const active = sub.status === "ACTIVE" || sub.status === "APPROVED"
|
||||
await fulfillSubscription(
|
||||
user.id,
|
||||
decoded.plan,
|
||||
sub.id,
|
||||
sub.billing_info?.next_billing_time,
|
||||
active ? "active" : sub.status.toLowerCase()
|
||||
)
|
||||
return ok
|
||||
} catch {
|
||||
return fail
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,89 @@
|
||||
import { NextResponse } from "next/server"
|
||||
import { verifyPaypalWebhook } from "@/lib/paypal/webhook"
|
||||
import { decodeCustomId, getSubscription } from "@/lib/paypal/checkout"
|
||||
import { fulfillSubscription, fulfillLifetime, markPaypalSubscriptionInactive } from "@/lib/paypal/fulfill"
|
||||
|
||||
// Inbound PayPal webhook. Signature is verified via PayPal's API using
|
||||
// PAYPAL_WEBHOOK_ID; unverified events are rejected.
|
||||
export async function POST(request: Request) {
|
||||
const body = await request.text()
|
||||
|
||||
const valid = await verifyPaypalWebhook(request.headers, body)
|
||||
if (!valid) return NextResponse.json({ error: "invalid signature" }, { status: 400 })
|
||||
|
||||
let event: { event_type?: string; resource?: Record<string, unknown> }
|
||||
try {
|
||||
event = JSON.parse(body)
|
||||
} catch {
|
||||
return NextResponse.json({ ok: true })
|
||||
}
|
||||
|
||||
const type = event.event_type ?? ""
|
||||
const resource = (event.resource ?? {}) as Record<string, any>
|
||||
|
||||
try {
|
||||
switch (type) {
|
||||
case "BILLING.SUBSCRIPTION.ACTIVATED":
|
||||
case "BILLING.SUBSCRIPTION.UPDATED": {
|
||||
const decoded = decodeCustomId(resource.custom_id)
|
||||
if (decoded && resource.id) {
|
||||
await fulfillSubscription(
|
||||
decoded.userId,
|
||||
decoded.plan,
|
||||
resource.id,
|
||||
resource.billing_info?.next_billing_time,
|
||||
"active"
|
||||
)
|
||||
}
|
||||
break
|
||||
}
|
||||
|
||||
case "PAYMENT.SALE.COMPLETED": {
|
||||
// A recurring payment cleared — refresh status + next billing date.
|
||||
const subId = resource.billing_agreement_id as string | undefined
|
||||
if (subId) {
|
||||
const sub = await getSubscription(subId)
|
||||
const decoded = decodeCustomId(sub?.custom_id)
|
||||
if (sub && decoded) {
|
||||
await fulfillSubscription(
|
||||
decoded.userId,
|
||||
decoded.plan,
|
||||
subId,
|
||||
sub.billing_info?.next_billing_time,
|
||||
"active"
|
||||
)
|
||||
}
|
||||
}
|
||||
break
|
||||
}
|
||||
|
||||
case "BILLING.SUBSCRIPTION.CANCELLED":
|
||||
case "BILLING.SUBSCRIPTION.EXPIRED": {
|
||||
if (resource.id) {
|
||||
await markPaypalSubscriptionInactive(
|
||||
resource.id,
|
||||
type.endsWith("CANCELLED") ? "canceled" : "expired",
|
||||
true
|
||||
)
|
||||
}
|
||||
break
|
||||
}
|
||||
|
||||
case "BILLING.SUBSCRIPTION.SUSPENDED": {
|
||||
if (resource.id) await markPaypalSubscriptionInactive(resource.id, "suspended", false)
|
||||
break
|
||||
}
|
||||
|
||||
case "PAYMENT.CAPTURE.COMPLETED": {
|
||||
// Lifetime order capture (backup to the return handler).
|
||||
const decoded = decodeCustomId(resource.custom_id)
|
||||
if (decoded && decoded.plan === "lifetime") await fulfillLifetime(decoded.userId)
|
||||
break
|
||||
}
|
||||
}
|
||||
} catch {
|
||||
// Never loop forever on a handler bug — PayPal retries non-2xx.
|
||||
}
|
||||
|
||||
return NextResponse.json({ received: true })
|
||||
}
|
||||
Reference in New Issue
Block a user