The minimalistic document archiving platform.
fix(subscriptions): added organization deletion restrictions based on active subscriptions (#572)
Corentin Thomassetb1a88230cd30
diff --git a/CLAUDE.md b/CLAUDE.mdindex 17bb7626..55afa699 100644--- a/CLAUDE.md+++ b/CLAUDE.md@@ -166,10 +166,20 @@ pnpm dev # localhost:4321- Use **Vitest** for all testing- Test files: `*.test.ts` for unit tests, `*.int.test.ts` for integration tests-- Use business-oriented test names (avoid `it('should return true')`)- Integration tests may use Testcontainers (Azurite, LocalStack)- All new features require test coverage+### Writing Good Test Names++Test names should explain the **why** (business logic, user scenario, or expected behavior), not the **how** (implementation details or return values).++**Key principles:**+- **Describe blocks** should explain the business goal or rule being tested+- **Test names** should explain the scenario, context, and reason for the behavior+- Avoid implementation details like "returns X", "should be Y", "calls Z method"+- Focus on user scenarios and business rules+- Make tests readable as documentation - someone unfamiliar with the code should understand what's being tested and why+## Code Style- **ESLint config**: `@antfu/eslint-config` (auto-fix on save recommended)diff --git a/apps/papra-client/src/locales/de.dictionary.ts b/apps/papra-client/src/locales/de.dictionary.tsindex a1b20d93..20e14f16 100644--- a/apps/papra-client/src/locales/de.dictionary.ts+++ b/apps/papra-client/src/locales/de.dictionary.ts@@ -157,6 +157,7 @@ export const translations: Partial<TranslationsDictionary> = {'organization.settings.delete.confirm.cancel-button': 'Abbrechen','organization.settings.delete.success': 'Organisation gelöscht','organization.settings.delete.only-owner': 'Nur der Organisationsinhaber kann diese Organisation löschen.',+ 'organization.settings.delete.has-active-subscription': 'Organisation mit aktivem Abonnement kann nicht gelöscht werden, bitte kündigen Sie zuerst Ihr Abonnement oben.','organization.usage.page.title': 'Nutzung','organization.usage.page.description': 'Sehen Sie die aktuelle Nutzung und Limits Ihrer Organisation.',@@ -589,6 +590,7 @@ export const translations: Partial<TranslationsDictionary> = {'api-errors.internal.error': 'Beim Verarbeiten Ihrer Anfrage ist ein Fehler aufgetreten. Bitte versuchen Sie es erneut.','api-errors.auth.invalid_origin': 'Ungültige Anwendungs-Ursprung. Wenn Sie Papra selbst hosten, stellen Sie sicher, dass Ihre APP_BASE_URL-Umgebungsvariable mit Ihrer aktuellen URL übereinstimmt. Weitere Details finden Sie unter https://docs.papra.app/resources/troubleshooting/#invalid-application-origin','api-errors.organization.max_members_count_reached': 'Die maximale Anzahl an Mitgliedern und ausstehenden Einladungen für diese Organisation wurde erreicht. Bitte aktualisieren Sie Ihren Plan, um weitere Mitglieder hinzuzufügen.',+ 'api-errors.organization.has_active_subscription': 'Organisation mit aktivem Abonnement kann nicht gelöscht werden. Bitte kündigen Sie zuerst Ihr Abonnement über die Schaltfläche Abonnement verwalten oben.',// Not founddiff --git a/apps/papra-client/src/locales/en.dictionary.ts b/apps/papra-client/src/locales/en.dictionary.tsindex fd77c088..b2b804f1 100644--- a/apps/papra-client/src/locales/en.dictionary.ts+++ b/apps/papra-client/src/locales/en.dictionary.ts@@ -155,6 +155,7 @@ export const translations = {'organization.settings.delete.confirm.cancel-button': 'Cancel','organization.settings.delete.success': 'Organization deleted','organization.settings.delete.only-owner': 'Only the organization owner can delete this organization.',+ 'organization.settings.delete.has-active-subscription': 'Cannot delete organization with an active subscription, please cancel your subscription above first.','organization.usage.page.title': 'Usage','organization.usage.page.description': 'View your organization\'s current usage and limits.',@@ -587,6 +588,7 @@ export const translations = {'api-errors.internal.error': 'An error occurred while processing your request. Please try again later.','api-errors.auth.invalid_origin': 'Invalid application origin. If you are self-hosting Papra, ensure your APP_BASE_URL environment variable matches your current url. For more details see https://docs.papra.app/resources/troubleshooting/#invalid-application-origin','api-errors.organization.max_members_count_reached': 'The maximum number of members and pending invitations for this organization has been reached. Please upgrade your plan to add more members.',+ 'api-errors.organization.has_active_subscription': 'Cannot delete organization with an active subscription. Please cancel your subscription first using the Manage Subscription button above.',// Not founddiff --git a/apps/papra-client/src/locales/es.dictionary.ts b/apps/papra-client/src/locales/es.dictionary.tsindex aa0bcd76..9ae1808f 100644--- a/apps/papra-client/src/locales/es.dictionary.ts+++ b/apps/papra-client/src/locales/es.dictionary.ts@@ -157,6 +157,7 @@ export const translations: Partial<TranslationsDictionary> = {'organization.settings.delete.confirm.cancel-button': 'Cancelar','organization.settings.delete.success': 'Organización eliminada','organization.settings.delete.only-owner': 'Solo el propietario de la organización puede eliminar esta organización.',+ 'organization.settings.delete.has-active-subscription': 'No se puede eliminar la organización con una suscripción activa, por favor cancela tu suscripción arriba primero.','organization.usage.page.title': 'Uso','organization.usage.page.description': 'Ver el uso y los límites actuales de su organización.',@@ -589,6 +590,7 @@ export const translations: Partial<TranslationsDictionary> = {'api-errors.internal.error': 'Ocurrió un error al procesar tu solicitud. Por favor, inténtalo de nuevo.','api-errors.auth.invalid_origin': 'Origen de la aplicación inválido. Si estás alojando Papra, asegúrate de que la variable de entorno APP_BASE_URL coincida con tu URL actual. Para más detalles, consulta https://docs.papra.app/resources/troubleshooting/#invalid-application-origin','api-errors.organization.max_members_count_reached': 'Se ha alcanzado el número máximo de miembros e invitaciones pendientes para esta organización. Por favor, actualiza tu plan para añadir más miembros.',+ 'api-errors.organization.has_active_subscription': 'No se puede eliminar la organización con una suscripción activa. Por favor, cancela tu suscripción primero usando el botón Gestionar Suscripción arriba.',// Not founddiff --git a/apps/papra-client/src/locales/fr.dictionary.ts b/apps/papra-client/src/locales/fr.dictionary.tsindex f56fa333..9f5a18e5 100644--- a/apps/papra-client/src/locales/fr.dictionary.ts+++ b/apps/papra-client/src/locales/fr.dictionary.ts@@ -157,6 +157,7 @@ export const translations: Partial<TranslationsDictionary> = {'organization.settings.delete.confirm.cancel-button': 'Annuler','organization.settings.delete.success': 'Organisation supprimée','organization.settings.delete.only-owner': 'Seul le propriétaire de l\'organisation peut supprimer cette organisation.',+ 'organization.settings.delete.has-active-subscription': 'Impossible de supprimer l\'organisation avec un abonnement actif, veuillez d\'abord annuler votre abonnement ci-dessus.','organization.usage.page.title': 'Utilisation','organization.usage.page.description': 'Consultez l\'utilisation actuelle et les limites de votre organisation.',@@ -589,6 +590,7 @@ export const translations: Partial<TranslationsDictionary> = {'api-errors.internal.error': 'Une erreur est survenue lors du traitement de votre requête. Veuillez réessayer.','api-errors.auth.invalid_origin': 'Origine de l\'application invalide. Si vous hébergez Papra, assurez-vous que la variable d\'environnement APP_BASE_URL correspond à votre URL actuelle. Pour plus de détails, consultez https://docs.papra.app/resources/troubleshooting/#invalid-application-origin','api-errors.organization.max_members_count_reached': 'Le nombre maximum de membres et d\'invitations en attente pour cette organisation a été atteint. Veuillez mettre à niveau votre plan pour ajouter plus de membres.',+ 'api-errors.organization.has_active_subscription': 'Impossible de supprimer l\'organisation avec un abonnement actif. Veuillez d\'abord annuler votre abonnement en utilisant le bouton Gérer l\'abonnement ci-dessus.',// Not founddiff --git a/apps/papra-client/src/locales/it.dictionary.ts b/apps/papra-client/src/locales/it.dictionary.tsindex 074c8f77..64e34fbd 100644--- a/apps/papra-client/src/locales/it.dictionary.ts+++ b/apps/papra-client/src/locales/it.dictionary.ts@@ -157,6 +157,7 @@ export const translations: Partial<TranslationsDictionary> = {'organization.settings.delete.confirm.cancel-button': 'Annulla','organization.settings.delete.success': 'Organizzazione eliminata','organization.settings.delete.only-owner': 'Solo il proprietario dell\'organizzazione può eliminare questa organizzazione.',+ 'organization.settings.delete.has-active-subscription': 'Impossibile eliminare l\'organizzazione con un abbonamento attivo, si prega di annullare prima l\'abbonamento sopra.','organization.usage.page.title': 'Utilizzo','organization.usage.page.description': 'Visualizza l\'utilizzo attuale e i limiti della tua organizzazione.',@@ -589,6 +590,7 @@ export const translations: Partial<TranslationsDictionary> = {'api-errors.internal.error': 'Si è verificato un errore durante l\'elaborazione della richiesta. Riprova.','api-errors.auth.invalid_origin': 'Origine dell\'applicazione non valida. Se stai ospitando Papra, assicurati che la variabile di ambiente APP_BASE_URL corrisponda all\'URL corrente. Per maggiori dettagli, consulta https://docs.papra.app/resources/troubleshooting/#invalid-application-origin','api-errors.organization.max_members_count_reached': 'È stato raggiunto il numero massimo di membri e inviti in sospeso per questa organizzazione. Aggiorna il tuo piano per aggiungere altri membri.',+ 'api-errors.organization.has_active_subscription': 'Impossibile eliminare l\'organizzazione con un abbonamento attivo. Si prega di annullare prima l\'abbonamento utilizzando il pulsante Gestisci abbonamento sopra.',// Not founddiff --git a/apps/papra-client/src/locales/pl.dictionary.ts b/apps/papra-client/src/locales/pl.dictionary.tsindex 11a04e7d..4164581b 100644--- a/apps/papra-client/src/locales/pl.dictionary.ts+++ b/apps/papra-client/src/locales/pl.dictionary.ts@@ -157,6 +157,7 @@ export const translations: Partial<TranslationsDictionary> = {'organization.settings.delete.confirm.cancel-button': 'Anuluj','organization.settings.delete.success': 'Organizacja została usunięta','organization.settings.delete.only-owner': 'Tylko właściciel organizacji może usunąć tę organizację.',+ 'organization.settings.delete.has-active-subscription': 'Nie można usunąć organizacji z aktywną subskrypcją, proszę najpierw anulować subskrypcję powyżej.','organization.usage.page.title': 'Użycie','organization.usage.page.description': 'Zobacz aktualne użycie i limity Twojej organizacji.',@@ -589,6 +590,7 @@ export const translations: Partial<TranslationsDictionary> = {'api-errors.internal.error': 'Wystąpił błąd podczas przetwarzania żądania. Spróbuj ponownie później.','api-errors.auth.invalid_origin': 'Nieprawidłowa lokalizacja aplikacji. Jeśli hostujesz Papra, upewnij się, że zmienna środowiskowa APP_BASE_URL odpowiada bieżącemu adresowi URL. Aby uzyskać więcej informacji, zobacz https://docs.papra.app/resources/troubleshooting/#invalid-application-origin','api-errors.organization.max_members_count_reached': 'Osiągnięto maksymalną liczbę członków i oczekujących zaproszeń dla tej organizacji. Zaktualizuj swój plan, aby dodać więcej członków.',+ 'api-errors.organization.has_active_subscription': 'Nie można usunąć organizacji z aktywną subskrypcją. Proszę najpierw anulować subskrypcję za pomocą przycisku Zarządzaj subskrypcją powyżej.',// Not founddiff --git a/apps/papra-client/src/locales/pt-BR.dictionary.ts b/apps/papra-client/src/locales/pt-BR.dictionary.tsindex e16103a0..ae4760d2 100644--- a/apps/papra-client/src/locales/pt-BR.dictionary.ts+++ b/apps/papra-client/src/locales/pt-BR.dictionary.ts@@ -157,6 +157,7 @@ export const translations: Partial<TranslationsDictionary> = {'organization.settings.delete.confirm.cancel-button': 'Cancelar','organization.settings.delete.success': 'Organização excluída','organization.settings.delete.only-owner': 'Apenas o proprietário da organização pode excluir esta organização.',+ 'organization.settings.delete.has-active-subscription': 'Não é possível excluir a organização com uma assinatura ativa, por favor cancele sua assinatura acima primeiro.','organization.usage.page.title': 'Uso','organization.usage.page.description': 'Visualize o uso atual e os limites da sua organização.',@@ -589,6 +590,7 @@ export const translations: Partial<TranslationsDictionary> = {'api-errors.internal.error': 'Ocorreu um erro ao processar sua solicitação. Por favor, tente novamente.','api-errors.auth.invalid_origin': 'Origem da aplicação inválida. Se você está hospedando o Papra, certifique-se de que a variável de ambiente APP_BASE_URL corresponde à sua URL atual. Para mais detalhes, consulte https://docs.papra.app/resources/troubleshooting/#invalid-application-origin','api-errors.organization.max_members_count_reached': 'O número máximo de membros e convites pendentes para esta organização foi atingido. Atualize seu plano para adicionar mais membros.',+ 'api-errors.organization.has_active_subscription': 'Não é possível excluir a organização com uma assinatura ativa. Por favor, cancele sua assinatura primeiro usando o botão Gerenciar Assinatura acima.',// Not founddiff --git a/apps/papra-client/src/locales/pt.dictionary.ts b/apps/papra-client/src/locales/pt.dictionary.tsindex dfc64f2b..def7d0e8 100644--- a/apps/papra-client/src/locales/pt.dictionary.ts+++ b/apps/papra-client/src/locales/pt.dictionary.ts@@ -157,6 +157,7 @@ export const translations: Partial<TranslationsDictionary> = {'organization.settings.delete.confirm.cancel-button': 'Cancelar','organization.settings.delete.success': 'Organização eliminada','organization.settings.delete.only-owner': 'Apenas o proprietário da organização pode eliminar esta organização.',+ 'organization.settings.delete.has-active-subscription': 'Não é possível eliminar a organização com uma subscrição ativa, por favor cancele a sua subscrição acima primeiro.','organization.usage.page.title': 'Uso','organization.usage.page.description': 'Visualize o uso atual e os limites da sua organização.',@@ -589,6 +590,7 @@ export const translations: Partial<TranslationsDictionary> = {'api-errors.internal.error': 'Ocorreu um erro ao processar a solicitação. Por favor, tente novamente.','api-errors.auth.invalid_origin': 'Origem da aplicação inválida. Se você está hospedando o Papra, certifique-se de que a variável de ambiente APP_BASE_URL corresponde à sua URL atual. Para mais detalhes, consulte https://docs.papra.app/resources/troubleshooting/#invalid-application-origin','api-errors.organization.max_members_count_reached': 'O número máximo de membros e convites pendentes para esta organização foi atingido. Atualize o seu plano para adicionar mais membros.',+ 'api-errors.organization.has_active_subscription': 'Não é possível eliminar a organização com uma subscrição ativa. Por favor, cancele a sua subscrição primeiro usando o botão Gerir Subscrição acima.',// Not founddiff --git a/apps/papra-client/src/locales/ro.dictionary.ts b/apps/papra-client/src/locales/ro.dictionary.tsindex 2655e7bd..171779c5 100644--- a/apps/papra-client/src/locales/ro.dictionary.ts+++ b/apps/papra-client/src/locales/ro.dictionary.ts@@ -157,6 +157,7 @@ export const translations: Partial<TranslationsDictionary> = {'organization.settings.delete.confirm.cancel-button': 'Anulează','organization.settings.delete.success': 'Organizație ștearsă cu succes','organization.settings.delete.only-owner': 'Doar proprietarul organizației poate șterge această organizație.',+ 'organization.settings.delete.has-active-subscription': 'Nu se poate șterge organizația cu un abonament activ, vă rugăm să anulați mai întâi abonamentul de mai sus.','organization.usage.page.title': 'Utilizare','organization.usage.page.description': 'Vizualizează utilizarea curentă și limitele organizației tale.',@@ -589,6 +590,7 @@ export const translations: Partial<TranslationsDictionary> = {'api-errors.internal.error': 'A apărut o eroare la procesarea cererii. Te rugăm să încerci din nou.','api-errors.auth.invalid_origin': 'Origine invalidă a aplicației. Dacă hospedezi Papra, asigură-te că variabila de mediu APP_BASE_URL corespunde URL-ului actual. Pentru mai multe detalii, consulta https://docs.papra.app/resources/troubleshooting/#invalid-application-origin','api-errors.organization.max_members_count_reached': 'Numărul maxim de membri și invitații în așteptare pentru această organizație a fost atins. Te rugăm să îți actualizezi planul pentru a adăuga mai mulți membri.',+ 'api-errors.organization.has_active_subscription': 'Nu se poate șterge organizația cu un abonament activ. Vă rugăm să anulați mai întâi abonamentul folosind butonul Gestionați abonamentul de mai sus.',// Not founddiff --git a/apps/papra-client/src/modules/organizations/pages/organizations-settings.page.tsx b/apps/papra-client/src/modules/organizations/pages/organizations-settings.page.tsxindex a26b976b..8cdf4885 100644--- a/apps/papra-client/src/modules/organizations/pages/organizations-settings.page.tsx+++ b/apps/papra-client/src/modules/organizations/pages/organizations-settings.page.tsx@@ -1,16 +1,17 @@import type { Component } from 'solid-js';import type { Organization } from '../organizations.types';import { safely } from '@corentinth/chisels';-import { useParams } from '@solidjs/router';+import { useNavigate, useParams } from '@solidjs/router';import { useQuery } from '@tanstack/solid-query';-import { createSignal, Show, Suspense } from 'solid-js';+import { createSignal, Match, Show, Suspense, Switch } from 'solid-js';import * as v from 'valibot';import { buildTimeConfig } from '@/modules/config/config';import { useConfig } from '@/modules/config/config.provider';import { useI18n } from '@/modules/i18n/i18n.provider';import { useConfirmModal } from '@/modules/shared/confirm';import { createForm } from '@/modules/shared/form/form';-import { getCustomerPortalUrl } from '@/modules/subscriptions/subscriptions.services';+import { useI18nApiErrors } from '@/modules/shared/http/composables/i18n-api-errors';+import { fetchOrganizationSubscription, getCustomerPortalUrl } from '@/modules/subscriptions/subscriptions.services';import { Button } from '@/modules/ui/components/button';import { Card, CardContent, CardDescription, CardFooter, CardHeader, CardTitle } from '@/modules/ui/components/card';import { createToast } from '@/modules/ui/components/sonner';@@ -23,9 +24,39 @@ const DeleteOrganizationCard: Component<{ organization: Organization }> = (propsconst { deleteOrganization } = useDeleteOrganization();const { confirm } = useConfirmModal();const { t } = useI18n();+ const { getErrorMessage } = useI18nApiErrors();+ const navigate = useNavigate();+ const { config } = useConfig();const { getIsOwner, query } = useCurrentUserRole({ organizationId: props.organization.id });+ // Fetch subscription to check if organization has an active subscription+ const subscriptionQuery = useQuery(() => ({+ queryKey: ['organizations', props.organization.id, 'subscription'],+ queryFn: () => fetchOrganizationSubscription({ organizationId: props.organization.id }),+ enabled: config.isSubscriptionsEnabled,+ }));++ // Check if subscription blocks deletion (active and not scheduled to cancel)+ const getHasBlockingSubscription = () => {+ if (!config.isSubscriptionsEnabled) {+ return false;+ }++ const subscription = subscriptionQuery.data?.subscription;+ if (!subscription) {+ return false;+ }++ // Allow deletion if subscription is canceled or scheduled to cancel+ if (subscription.status === 'canceled' || subscription.cancelAtPeriodEnd) {+ return false;+ }++ // Block deletion for all other active subscription statuses+ return true;+ };+const handleDelete = async () => {const confirmed = await confirm({title: t('organization.settings.delete.confirm.title'),@@ -40,11 +71,19 @@ const DeleteOrganizationCard: Component<{ organization: Organization }> = (propsshouldType: props.organization.name,});- if (confirmed) {- await deleteOrganization({ organizationId: props.organization.id });+ if (!confirmed) {+ return;+ }- createToast({ type: 'success', message: t('organization.settings.delete.success') });+ const [, error] = await safely(deleteOrganization({ organizationId: props.organization.id }));++ if (error) {+ createToast({ type: 'error', message: getErrorMessage({ error }) });+ return;}++ createToast({ type: 'success', message: t('organization.settings.delete.success') });+ navigate('/organizations');};return (@@ -57,16 +96,25 @@ const DeleteOrganizationCard: Component<{ organization: Organization }> = (props</CardDescription></CardHeader>- <CardFooter class="pt-6 gap-4">- <Button onClick={handleDelete} variant="destructive" disabled={!getIsOwner()}>+ <CardFooter class="pt-6 gap-4 flex-col items-start sm:flex-row sm:items-center">+ <Button class="flex-shrink-0" onClick={handleDelete} variant="destructive" disabled={!getIsOwner() || getHasBlockingSubscription()}>{t('organization.settings.delete.confirm.confirm-button')}</Button>- <Show when={query.isSuccess && !getIsOwner()}>- <span class="text-sm text-muted-foreground">- {t('organization.settings.delete.only-owner')}- </span>- </Show>+ <Switch>+ <Match when={query.isSuccess && !getIsOwner()}>+ <span class="text-xs text-muted-foreground">+ {t('organization.settings.delete.only-owner')}+ </span>+ </Match>++ <Match when={getHasBlockingSubscription()}>+ <span class="text-xs text-muted-foreground">+ {t('organization.settings.delete.has-active-subscription')}+ </span>+ </Match>+ </Switch>+</CardFooter></Card></div>diff --git a/apps/papra-server/src/modules/organizations/organizations.errors.ts b/apps/papra-server/src/modules/organizations/organizations.errors.tsindex 438555eb..1f1902f6 100644--- a/apps/papra-server/src/modules/organizations/organizations.errors.ts+++ b/apps/papra-server/src/modules/organizations/organizations.errors.ts@@ -65,3 +65,9 @@ export const createOnlyPreviousOwnerCanRestoreError = createErrorFactory({code: 'organization.only_previous_owner_can_restore',statusCode: 403,});++export const createOrganizationHasActiveSubscriptionError = createErrorFactory({+ message: 'Cannot delete organization with an active subscription. Please cancel your subscription first.',+ code: 'organization.has_active_subscription',+ statusCode: 403,+});diff --git a/apps/papra-server/src/modules/organizations/organizations.routes.ts b/apps/papra-server/src/modules/organizations/organizations.routes.tsindex 8bdd13fd..3f826e1a 100644--- a/apps/papra-server/src/modules/organizations/organizations.routes.ts+++ b/apps/papra-server/src/modules/organizations/organizations.routes.ts@@ -151,10 +151,11 @@ function setupSoftDeleteOrganizationRoute({ app, db, config }: RouteDefinitionCoconst { organizationId } = context.req.valid('param');const organizationsRepository = createOrganizationsRepository({ db });+ const subscriptionsRepository = createSubscriptionsRepository({ db });await ensureUserIsInOrganization({ userId, organizationId, organizationsRepository });- await softDeleteOrganization({ organizationId, deletedBy: userId, organizationsRepository, config });+ await softDeleteOrganization({ organizationId, deletedBy: userId, organizationsRepository, subscriptionsRepository, config });return context.body(null, 204);},diff --git a/apps/papra-server/src/modules/organizations/organizations.usecases.test.ts b/apps/papra-server/src/modules/organizations/organizations.usecases.test.tsindex 70bd21f6..d576b29b 100644--- a/apps/papra-server/src/modules/organizations/organizations.usecases.test.ts+++ b/apps/papra-server/src/modules/organizations/organizations.usecases.test.ts@@ -11,7 +11,7 @@ import { createTestLogger } from '../shared/logger/logger.test-utils';import { createSubscriptionsRepository } from '../subscriptions/subscriptions.repository';import { createUsersRepository } from '../users/users.repository';import { ORGANIZATION_ROLES } from './organizations.constants';-import { createMaxOrganizationMembersCountReachedError, createOrganizationInvitationAlreadyExistsError, createOrganizationNotFoundError, createUserAlreadyInOrganizationError, createUserMaxOrganizationCountReachedError, createUserNotInOrganizationError, createUserNotOrganizationOwnerError, createUserOrganizationInvitationLimitReachedError } from './organizations.errors';+import { createMaxOrganizationMembersCountReachedError, createOrganizationHasActiveSubscriptionError, createOrganizationInvitationAlreadyExistsError, createOrganizationNotFoundError, createUserAlreadyInOrganizationError, createUserMaxOrganizationCountReachedError, createUserNotInOrganizationError, createUserNotOrganizationOwnerError, createUserOrganizationInvitationLimitReachedError } from './organizations.errors';import { createOrganizationsRepository } from './organizations.repository';import { organizationInvitationsTable, organizationMembersTable, organizationsTable } from './organizations.table';import { checkIfUserCanCreateNewOrganization, ensureUserIsInOrganization, ensureUserIsOwnerOfOrganization, getOrCreateOrganizationCustomerId, inviteMemberToOrganization, purgeExpiredSoftDeletedOrganization, purgeExpiredSoftDeletedOrganizations, removeMemberFromOrganization, softDeleteOrganization } from './organizations.usecases';@@ -968,12 +968,14 @@ describe('organizations usecases', () => {});const organizationsRepository = createOrganizationsRepository({ db });+ const subscriptionsRepository = createSubscriptionsRepository({ db });const config = overrideConfig();await softDeleteOrganization({organizationId: 'organization-1',deletedBy: 'usr_1',organizationsRepository,+ subscriptionsRepository,config,now: new Date('2025-10-05'),});@@ -998,6 +1000,7 @@ describe('organizations usecases', () => {});const organizationsRepository = createOrganizationsRepository({ db });+ const subscriptionsRepository = createSubscriptionsRepository({ db });const config = overrideConfig();await expect(@@ -1005,6 +1008,7 @@ describe('organizations usecases', () => {organizationId: 'organization-1',deletedBy: 'admin-user',organizationsRepository,+ subscriptionsRepository,config,}),).rejects.toThrow(createUserNotOrganizationOwnerError());@@ -1030,12 +1034,14 @@ describe('organizations usecases', () => {});const organizationsRepository = createOrganizationsRepository({ db });+ const subscriptionsRepository = createSubscriptionsRepository({ db });const config = overrideConfig();await softDeleteOrganization({organizationId: 'organization-1',deletedBy: 'usr_1',organizationsRepository,+ subscriptionsRepository,config,});@@ -1052,6 +1058,7 @@ describe('organizations usecases', () => {});const organizationsRepository = createOrganizationsRepository({ db });+ const subscriptionsRepository = createSubscriptionsRepository({ db });const config = overrideConfig();await expect(@@ -1059,6 +1066,7 @@ describe('organizations usecases', () => {organizationId: 'non-existent-org',deletedBy: 'usr_1',organizationsRepository,+ subscriptionsRepository,config,}),).rejects.toThrow(createOrganizationNotFoundError());@@ -1078,12 +1086,14 @@ describe('organizations usecases', () => {});const organizationsRepository = createOrganizationsRepository({ db });+ const subscriptionsRepository = createSubscriptionsRepository({ db });const config = overrideConfig();await softDeleteOrganization({organizationId: 'organization-1',deletedBy: 'usr_1',organizationsRepository,+ subscriptionsRepository,config,now: new Date('2025-10-05'),});@@ -1098,6 +1108,128 @@ describe('organizations usecases', () => {expect(org1?.deletedAt).to.eql(new Date('2025-10-05'));expect(org2?.deletedAt).to.eql(null);});++ test('cannot delete organization with an active subscription', async () => {+ const { db } = await createInMemoryDatabase({+ users: [{ id: 'usr_1', email: '[email protected]' }],+ organizations: [{ id: 'organization-1', name: 'Test Org', customerId: 'cus_123' }],+ organizationMembers: [+ { organizationId: 'organization-1', userId: 'usr_1', role: ORGANIZATION_ROLES.OWNER },+ ],+ organizationSubscriptions: [+ {+ id: 'sub_123',+ organizationId: 'organization-1',+ customerId: 'cus_123',+ planId: 'plan_pro',+ status: 'active',+ seatsCount: 5,+ currentPeriodStart: new Date('2025-10-01'),+ currentPeriodEnd: new Date('2025-11-01'),+ cancelAtPeriodEnd: false,+ },+ ],+ });++ const organizationsRepository = createOrganizationsRepository({ db });+ const subscriptionsRepository = createSubscriptionsRepository({ db });+ const config = overrideConfig();++ await expect(+ softDeleteOrganization({+ organizationId: 'organization-1',+ deletedBy: 'usr_1',+ organizationsRepository,+ subscriptionsRepository,+ config,+ }),+ ).rejects.toThrow(createOrganizationHasActiveSubscriptionError());++ // Organization should not be deleted+ const [organization] = await db.select().from(organizationsTable);+ expect(organization?.deletedAt).to.eql(null);+ });++ test('can delete organization with subscription scheduled to cancel at period end', async () => {+ const { db } = await createInMemoryDatabase({+ users: [{ id: 'usr_1', email: '[email protected]' }],+ organizations: [{ id: 'organization-1', name: 'Test Org', customerId: 'cus_123' }],+ organizationMembers: [+ { organizationId: 'organization-1', userId: 'usr_1', role: ORGANIZATION_ROLES.OWNER },+ ],+ organizationSubscriptions: [+ {+ id: 'sub_123',+ organizationId: 'organization-1',+ customerId: 'cus_123',+ planId: 'plan_pro',+ status: 'active',+ seatsCount: 5,+ currentPeriodStart: new Date('2025-10-01'),+ currentPeriodEnd: new Date('2025-11-01'),+ cancelAtPeriodEnd: true, // User already canceled, allow org deletion+ },+ ],+ });++ const organizationsRepository = createOrganizationsRepository({ db });+ const subscriptionsRepository = createSubscriptionsRepository({ db });+ const config = overrideConfig();++ await softDeleteOrganization({+ organizationId: 'organization-1',+ deletedBy: 'usr_1',+ organizationsRepository,+ subscriptionsRepository,+ config,+ now: new Date('2025-10-05'),+ });++ // Organization should be deleted+ const [organization] = await db.select().from(organizationsTable);+ expect(organization?.deletedAt).to.eql(new Date('2025-10-05'));+ expect(organization?.deletedBy).to.eql('usr_1');+ });++ test('can delete organization after subscription is canceled', async () => {+ const { db } = await createInMemoryDatabase({+ users: [{ id: 'usr_1', email: '[email protected]' }],+ organizations: [{ id: 'organization-1', name: 'Test Org', customerId: 'cus_123' }],+ organizationMembers: [+ { organizationId: 'organization-1', userId: 'usr_1', role: ORGANIZATION_ROLES.OWNER },+ ],+ organizationSubscriptions: [+ {+ id: 'sub_123',+ organizationId: 'organization-1',+ customerId: 'cus_123',+ planId: 'plan_pro',+ status: 'canceled',+ seatsCount: 5,+ currentPeriodStart: new Date('2025-10-01'),+ currentPeriodEnd: new Date('2025-11-01'),+ cancelAtPeriodEnd: false,+ },+ ],+ });++ const organizationsRepository = createOrganizationsRepository({ db });+ const subscriptionsRepository = createSubscriptionsRepository({ db });+ const config = overrideConfig();++ await softDeleteOrganization({+ organizationId: 'organization-1',+ deletedBy: 'usr_1',+ organizationsRepository,+ subscriptionsRepository,+ config,+ now: new Date('2025-10-05'),+ });++ const [organization] = await db.select().from(organizationsTable);+ expect(organization?.deletedAt).to.eql(new Date('2025-10-05'));+ expect(organization?.deletedBy).to.eql('usr_1');+ });});});diff --git a/apps/papra-server/src/modules/organizations/organizations.usecases.ts b/apps/papra-server/src/modules/organizations/organizations.usecases.tsindex fef2fc94..18525da1 100644--- a/apps/papra-server/src/modules/organizations/organizations.usecases.ts+++ b/apps/papra-server/src/modules/organizations/organizations.usecases.ts@@ -17,10 +17,12 @@ import { getOrganizationPlan } from '../plans/plans.usecases';import { sanitize } from '../shared/html/html';import { createLogger } from '../shared/logger/logger';import { isDefined } from '../shared/utils';+import { doesSubscriptionBlockDeletion } from '../subscriptions/subscriptions.models';import { ORGANIZATION_INVITATION_STATUS, ORGANIZATION_ROLES } from './organizations.constants';import {createMaxOrganizationMembersCountReachedError,createOnlyPreviousOwnerCanRestoreError,+ createOrganizationHasActiveSubscriptionError,createOrganizationInvitationAlreadyExistsError,createOrganizationNotDeletedError,createOrganizationNotFoundError,@@ -456,17 +458,26 @@ export async function softDeleteOrganization({organizationId,deletedBy,organizationsRepository,+ subscriptionsRepository,config,now = new Date(),}: {organizationId: string;deletedBy: string;organizationsRepository: OrganizationsRepository;+ subscriptionsRepository: SubscriptionsRepository;config: Config;now?: Date;}) {await ensureUserIsOwnerOfOrganization({ userId: deletedBy, organizationId, organizationsRepository });+ // Check if organization has a subscription that blocks deletion+ const { subscription } = await subscriptionsRepository.getActiveOrganizationSubscription({ organizationId });++ if (doesSubscriptionBlockDeletion(subscription)) {+ throw createOrganizationHasActiveSubscriptionError();+ }+await organizationsRepository.deleteAllMembersFromOrganization({ organizationId });await organizationsRepository.deleteAllOrganizationInvitations({ organizationId });await organizationsRepository.softDeleteOrganization({diff --git a/apps/papra-server/src/modules/subscriptions/subscriptions.models.test.ts b/apps/papra-server/src/modules/subscriptions/subscriptions.models.test.tsindex a34220db..2ca537cf 100644--- a/apps/papra-server/src/modules/subscriptions/subscriptions.models.test.ts+++ b/apps/papra-server/src/modules/subscriptions/subscriptions.models.test.ts@@ -1,5 +1,5 @@import { describe, expect, test } from 'vitest';-import { coerceStripeTimestampToDate, isSignatureHeaderFormatValid } from './subscriptions.models';+import { coerceStripeTimestampToDate, doesSubscriptionBlockDeletion, isSignatureHeaderFormatValid } from './subscriptions.models';describe('subscriptions models', () => {describe('coerceStripeTimestampToDate', () => {@@ -19,4 +19,180 @@ describe('subscriptions models', () => {expect(isSignatureHeaderFormatValid('v1_1234567890')).toBe(true);});});++ describe('doesSubscriptionBlockDeletion', () => {+ describe('organization deletion is blocked to prevent orphaned active subscriptions', () => {+ test('active subscription with ongoing billing blocks deletion', () => {+ const subscription = {+ id: 'sub_123',+ organizationId: 'org_123',+ customerId: 'cus_123',+ planId: 'plan_pro',+ status: 'active',+ seatsCount: 5,+ currentPeriodStart: new Date('2025-10-01'),+ currentPeriodEnd: new Date('2025-11-01'),+ cancelAtPeriodEnd: false,+ createdAt: new Date('2025-10-01'),+ updatedAt: new Date('2025-10-01'),+ };++ expect(doesSubscriptionBlockDeletion(subscription)).toBe(true);+ });++ test('fully active subscription not scheduled for cancellation blocks deletion', () => {+ const subscription = {+ id: 'sub_123',+ organizationId: 'org_123',+ customerId: 'cus_123',+ planId: 'plan_pro',+ status: 'active',+ seatsCount: 5,+ currentPeriodStart: new Date('2025-10-01'),+ currentPeriodEnd: new Date('2025-11-01'),+ cancelAtPeriodEnd: false, // Fully active, not scheduled to cancel+ createdAt: new Date('2025-10-01'),+ updatedAt: new Date('2025-10-01'),+ };++ expect(doesSubscriptionBlockDeletion(subscription)).toBe(true);+ });++ test('subscription with payment issues still has access and blocks deletion', () => {+ const subscription = {+ id: 'sub_123',+ organizationId: 'org_123',+ customerId: 'cus_123',+ planId: 'plan_pro',+ status: 'past_due',+ seatsCount: 5,+ currentPeriodStart: new Date('2025-10-01'),+ currentPeriodEnd: new Date('2025-11-01'),+ cancelAtPeriodEnd: false,+ createdAt: new Date('2025-10-01'),+ updatedAt: new Date('2025-10-01'),+ };++ expect(doesSubscriptionBlockDeletion(subscription)).toBe(true);+ });++ test('subscription in trial period blocks deletion to maintain trial access', () => {+ const subscription = {+ id: 'sub_123',+ organizationId: 'org_123',+ customerId: 'cus_123',+ planId: 'plan_pro',+ status: 'trialing',+ seatsCount: 5,+ currentPeriodStart: new Date('2025-10-01'),+ currentPeriodEnd: new Date('2025-11-01'),+ cancelAtPeriodEnd: false,+ createdAt: new Date('2025-10-01'),+ updatedAt: new Date('2025-10-01'),+ };++ expect(doesSubscriptionBlockDeletion(subscription)).toBe(true);+ });++ test('subscription awaiting payment completion blocks deletion', () => {+ const subscription = {+ id: 'sub_123',+ organizationId: 'org_123',+ customerId: 'cus_123',+ planId: 'plan_pro',+ status: 'incomplete',+ seatsCount: 5,+ currentPeriodStart: new Date('2025-10-01'),+ currentPeriodEnd: new Date('2025-11-01'),+ cancelAtPeriodEnd: false,+ createdAt: new Date('2025-10-01'),+ updatedAt: new Date('2025-10-01'),+ };++ expect(doesSubscriptionBlockDeletion(subscription)).toBe(true);+ });++ test('subscription with failed payment setup blocks deletion to prevent data loss', () => {+ const subscription = {+ id: 'sub_123',+ organizationId: 'org_123',+ customerId: 'cus_123',+ planId: 'plan_pro',+ status: 'incomplete_expired',+ seatsCount: 5,+ currentPeriodStart: new Date('2025-10-01'),+ currentPeriodEnd: new Date('2025-11-01'),+ cancelAtPeriodEnd: false,+ createdAt: new Date('2025-10-01'),+ updatedAt: new Date('2025-10-01'),+ };++ expect(doesSubscriptionBlockDeletion(subscription)).toBe(true);+ });++ test('subscription with failed payment still maintains access and blocks deletion', () => {+ const subscription = {+ id: 'sub_123',+ organizationId: 'org_123',+ customerId: 'cus_123',+ planId: 'plan_pro',+ status: 'unpaid',+ seatsCount: 5,+ currentPeriodStart: new Date('2025-10-01'),+ currentPeriodEnd: new Date('2025-11-01'),+ cancelAtPeriodEnd: false,+ createdAt: new Date('2025-10-01'),+ updatedAt: new Date('2025-10-01'),+ };++ expect(doesSubscriptionBlockDeletion(subscription)).toBe(true);+ });+ });++ describe('organization deletion is allowed when subscription is terminated or user has canceled', () => {+ test('fully canceled subscription allows deletion since billing has ended', () => {+ const subscription = {+ id: 'sub_123',+ organizationId: 'org_123',+ customerId: 'cus_123',+ planId: 'plan_pro',+ status: 'canceled',+ seatsCount: 5,+ currentPeriodStart: new Date('2025-10-01'),+ currentPeriodEnd: new Date('2025-11-01'),+ cancelAtPeriodEnd: false,+ createdAt: new Date('2025-10-01'),+ updatedAt: new Date('2025-10-01'),+ };++ expect(doesSubscriptionBlockDeletion(subscription)).toBe(false);+ });++ test('organization without subscription can be deleted freely', () => {+ expect(doesSubscriptionBlockDeletion(null)).toBe(false);+ });++ test('organization with no subscription record can be deleted', () => {+ expect(doesSubscriptionBlockDeletion(undefined)).toBe(false);+ });++ test('user who canceled subscription via customer portal can immediately delete organization', () => {+ const subscription = {+ id: 'sub_123',+ organizationId: 'org_123',+ customerId: 'cus_123',+ planId: 'plan_pro',+ status: 'active',+ seatsCount: 5,+ currentPeriodStart: new Date('2025-10-01'),+ currentPeriodEnd: new Date('2025-11-01'),+ cancelAtPeriodEnd: true, // User canceled via customer portal, will end at period end+ createdAt: new Date('2025-10-01'),+ updatedAt: new Date('2025-10-01'),+ };++ expect(doesSubscriptionBlockDeletion(subscription)).toBe(false);+ });+ });+ });});diff --git a/apps/papra-server/src/modules/subscriptions/subscriptions.models.ts b/apps/papra-server/src/modules/subscriptions/subscriptions.models.tsindex c98e8469..9828990b 100644--- a/apps/papra-server/src/modules/subscriptions/subscriptions.models.ts+++ b/apps/papra-server/src/modules/subscriptions/subscriptions.models.ts@@ -1,3 +1,4 @@+import type { Subscription } from './subscriptions.types';import { isNil, isNonEmptyString } from '../shared/utils';export function coerceStripeTimestampToDate(timestamp: number) {@@ -11,3 +12,44 @@ export function isSignatureHeaderFormatValid(signature: string | undefined): sigreturn isNonEmptyString(signature);}++/**+ * Determines if a subscription should prevent organization deletion.+ *+ * Organization deletion is allowed when:+ * - No subscription exists (null/undefined)+ * - Subscription status is 'canceled' (fully terminated)+ * - Subscription is scheduled to cancel at period end (cancelAtPeriodEnd is true)+ * - User has already expressed intent to cancel+ * - Organization will lose access at period end anyway+ *+ * Organization deletion is blocked for active subscriptions with:+ * - 'active' status AND cancelAtPeriodEnd is false+ * - 'past_due' status (payment issues, but still has access)+ * - 'trialing' status (in trial period)+ * - 'incomplete' status (payment not completed)+ * - 'incomplete_expired' status (payment failed to complete)+ * - 'unpaid' status (payment failed)+ *+ * @param subscription - The subscription to check, or null/undefined if no subscription exists+ * @returns true if the subscription blocks deletion, false otherwise+ */+export function doesSubscriptionBlockDeletion(subscription: Subscription | null | undefined): boolean {+ if (!subscription) {+ return false;+ }++ // Fully canceled subscriptions don't block deletion+ if (subscription.status === 'canceled') {+ return false;+ }++ // Subscriptions scheduled to cancel at period end don't block deletion+ // User has already expressed intent to cancel, so let them delete the org+ if (subscription.cancelAtPeriodEnd) {+ return false;+ }++ // All other subscription statuses block deletion+ return true;+}