The minimalistic document archiving platform.
feat(subscriptions): enhance subscription webhook handling (#569)
Corentin Thomassetd40514c0433a
diff --git a/apps/papra-server/src/modules/plans/plans.usecases.ts b/apps/papra-server/src/modules/plans/plans.usecases.tsindex 3b4b9922..998db7c5 100644--- a/apps/papra-server/src/modules/plans/plans.usecases.ts+++ b/apps/papra-server/src/modules/plans/plans.usecases.ts@@ -3,7 +3,7 @@ import type { PlansRepository } from './plans.repository';import { FREE_PLAN_ID } from './plans.constants';export async function getOrganizationPlan({ organizationId, subscriptionsRepository, plansRepository }: { organizationId: string; subscriptionsRepository: SubscriptionsRepository; plansRepository: PlansRepository }) {- const { subscription } = await subscriptionsRepository.getOrganizationSubscription({ organizationId });+ const { subscription } = await subscriptionsRepository.getActiveOrganizationSubscription({ organizationId });const planId = subscription?.planId ?? FREE_PLAN_ID;diff --git a/apps/papra-server/src/modules/subscriptions/subscriptions.repository.ts b/apps/papra-server/src/modules/subscriptions/subscriptions.repository.tsindex 96176bf7..2f78a668 100644--- a/apps/papra-server/src/modules/subscriptions/subscriptions.repository.ts+++ b/apps/papra-server/src/modules/subscriptions/subscriptions.repository.ts@@ -1,7 +1,7 @@import type { Database } from '../app/database/database.types';import type { DbInsertableSubscription } from './subscriptions.types';import { injectArguments } from '@corentinth/chisels';-import { eq } from 'drizzle-orm';+import { and, eq, ne } from 'drizzle-orm';import { omitUndefined } from '../shared/utils';import { organizationSubscriptionsTable } from './subscriptions.tables';@@ -10,7 +10,7 @@ export type SubscriptionsRepository = ReturnType<typeof createSubscriptionsReposexport function createSubscriptionsRepository({ db }: { db: Database }) {return injectArguments({- getOrganizationSubscription,+ getActiveOrganizationSubscription,createSubscription,updateSubscription,},@@ -20,12 +20,15 @@ export function createSubscriptionsRepository({ db }: { db: Database }) {);}-async function getOrganizationSubscription({ organizationId, db }: { organizationId: string; db: Database }) {+async function getActiveOrganizationSubscription({ organizationId, db }: { organizationId: string; db: Database }) {const [subscription] = await db.select().from(organizationSubscriptionsTable).where(- eq(organizationSubscriptionsTable.organizationId, organizationId),+ and(+ eq(organizationSubscriptionsTable.organizationId, organizationId),+ ne(organizationSubscriptionsTable.status, 'canceled'),+ ),);return { subscription };diff --git a/apps/papra-server/src/modules/subscriptions/subscriptions.routes.ts b/apps/papra-server/src/modules/subscriptions/subscriptions.routes.tsindex f829ab3e..d2e8746e 100644--- a/apps/papra-server/src/modules/subscriptions/subscriptions.routes.ts+++ b/apps/papra-server/src/modules/subscriptions/subscriptions.routes.ts@@ -172,7 +172,7 @@ function setupGetOrganizationSubscriptionRoute({ app, db, config }: RouteDefinitorganizationsRepository,});- const { subscription } = await subscriptionsRepository.getOrganizationSubscription({+ const { subscription } = await subscriptionsRepository.getActiveOrganizationSubscription({organizationId,});diff --git a/apps/papra-server/src/modules/subscriptions/subscriptions.usecases.ts b/apps/papra-server/src/modules/subscriptions/subscriptions.usecases.tsindex c6e9a4a9..70490ebe 100644--- a/apps/papra-server/src/modules/subscriptions/subscriptions.usecases.ts+++ b/apps/papra-server/src/modules/subscriptions/subscriptions.usecases.ts@@ -68,5 +68,52 @@ export async function handleStripeWebhookEvent({cancelAtPeriodEnd,planId: organizationPlan.id,});++ return;+ }++ if (event.type === 'customer.subscription.deleted') {+ const subscriptionId = event.data.object.id;++ if (isNil(subscriptionId)) {+ return;+ }++ await subscriptionsRepository.updateSubscription({+ subscriptionId,+ status: 'canceled',+ });+ }++ if (event.type === 'invoice.payment_failed') {+ const subscriptionId = get(event, 'data.object.subscription') as string | undefined;++ if (isNil(subscriptionId)) {+ return;+ }++ await subscriptionsRepository.updateSubscription({+ subscriptionId,+ status: 'past_due',+ });++ return;+ }++ if (event.type === 'invoice.payment_succeeded') {+ const subscriptionId = get(event, 'data.object.subscription') as string | undefined;+ const currentPeriodEnd = coerceStripeTimestampToDate(get(event, 'data.object.lines.data[0].period.end'));+ const currentPeriodStart = coerceStripeTimestampToDate(get(event, 'data.object.lines.data[0].period.start'));++ if (isNil(subscriptionId)) {+ return;+ }++ await subscriptionsRepository.updateSubscription({+ subscriptionId,+ status: 'active',+ currentPeriodEnd,+ currentPeriodStart,+ });}}