The minimalistic document archiving platform.
feat(organizations): restrict organization deletion to owners only (#517)
Corentin Thomasseta3f9f05c664b
diff --git a/.changeset/odd-kiwis-enter.md b/.changeset/odd-kiwis-enter.mdnew file mode 100644index 00000000..e3a50495--- /dev/null+++ b/.changeset/odd-kiwis-enter.md@@ -0,0 +1,6 @@+---+"@papra/app-client": patch+"@papra/app-server": patch+---++Prevented organization deletion by non-organization ownerdiff --git a/apps/papra-client/src/locales/de.dictionary.ts b/apps/papra-client/src/locales/de.dictionary.tsindex 9b570ed8..e5ebe423 100644--- a/apps/papra-client/src/locales/de.dictionary.ts+++ b/apps/papra-client/src/locales/de.dictionary.ts@@ -143,6 +143,7 @@ export const translations: Partial<TranslationsDictionary> = {'organization.settings.delete.confirm.confirm-button': 'Organisation löschen','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.','organizations.members.title': 'Mitglieder','organizations.members.description': 'Verwalten Sie Ihre Organisationsmitglieder',diff --git a/apps/papra-client/src/locales/en.dictionary.ts b/apps/papra-client/src/locales/en.dictionary.tsindex e8d222b3..05a8701a 100644--- a/apps/papra-client/src/locales/en.dictionary.ts+++ b/apps/papra-client/src/locales/en.dictionary.ts@@ -141,6 +141,7 @@ export const translations = {'organization.settings.delete.confirm.confirm-button': 'Delete organization','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.','organizations.members.title': 'Members','organizations.members.description': 'Manage your organization members',diff --git a/apps/papra-client/src/locales/es.dictionary.ts b/apps/papra-client/src/locales/es.dictionary.tsindex b037a77b..cd100ac2 100644--- a/apps/papra-client/src/locales/es.dictionary.ts+++ b/apps/papra-client/src/locales/es.dictionary.ts@@ -143,6 +143,7 @@ export const translations: Partial<TranslationsDictionary> = {'organization.settings.delete.confirm.confirm-button': 'Eliminar organización','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.','organizations.members.title': 'Miembros','organizations.members.description': 'Administra los miembros de tu organización',diff --git a/apps/papra-client/src/locales/fr.dictionary.ts b/apps/papra-client/src/locales/fr.dictionary.tsindex 75f38c12..1f69634a 100644--- a/apps/papra-client/src/locales/fr.dictionary.ts+++ b/apps/papra-client/src/locales/fr.dictionary.ts@@ -143,6 +143,7 @@ export const translations: Partial<TranslationsDictionary> = {'organization.settings.delete.confirm.confirm-button': 'Supprimer l\'organisation','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.','organizations.members.title': 'Membres','organizations.members.description': 'Gérez les membres de votre organisation.',diff --git a/apps/papra-client/src/locales/it.dictionary.ts b/apps/papra-client/src/locales/it.dictionary.tsindex a708229f..9aaecde9 100644--- a/apps/papra-client/src/locales/it.dictionary.ts+++ b/apps/papra-client/src/locales/it.dictionary.ts@@ -143,6 +143,7 @@ export const translations: Partial<TranslationsDictionary> = {'organization.settings.delete.confirm.confirm-button': 'Elimina organizzazione','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.','organizations.members.title': 'Membri','organizations.members.description': 'Gestisci i membri della tua organizzazione',diff --git a/apps/papra-client/src/locales/pl.dictionary.ts b/apps/papra-client/src/locales/pl.dictionary.tsindex ce6e7a61..1d35b04a 100644--- a/apps/papra-client/src/locales/pl.dictionary.ts+++ b/apps/papra-client/src/locales/pl.dictionary.ts@@ -143,6 +143,7 @@ export const translations: Partial<TranslationsDictionary> = {'organization.settings.delete.confirm.confirm-button': 'Usuń organizację','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ę.','organizations.members.title': 'Członkowie','organizations.members.description': 'Zarządzaj członkami swojej organizacji',diff --git a/apps/papra-client/src/locales/pt-BR.dictionary.ts b/apps/papra-client/src/locales/pt-BR.dictionary.tsindex a576e185..fad2edad 100644--- a/apps/papra-client/src/locales/pt-BR.dictionary.ts+++ b/apps/papra-client/src/locales/pt-BR.dictionary.ts@@ -143,6 +143,7 @@ export const translations: Partial<TranslationsDictionary> = {'organization.settings.delete.confirm.confirm-button': 'Excluir organização','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.','organizations.members.title': 'Membros','organizations.members.description': 'Gerencie os membros da sua organização',diff --git a/apps/papra-client/src/locales/pt.dictionary.ts b/apps/papra-client/src/locales/pt.dictionary.tsindex 347755e7..b2a048c5 100644--- a/apps/papra-client/src/locales/pt.dictionary.ts+++ b/apps/papra-client/src/locales/pt.dictionary.ts@@ -143,6 +143,7 @@ export const translations: Partial<TranslationsDictionary> = {'organization.settings.delete.confirm.confirm-button': 'Eliminar organização','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.','organizations.members.title': 'Membros','organizations.members.description': 'Gira os membros da sua organização',diff --git a/apps/papra-client/src/locales/ro.dictionary.ts b/apps/papra-client/src/locales/ro.dictionary.tsindex bb716b04..271a2943 100644--- a/apps/papra-client/src/locales/ro.dictionary.ts+++ b/apps/papra-client/src/locales/ro.dictionary.ts@@ -143,6 +143,7 @@ export const translations: Partial<TranslationsDictionary> = {'organization.settings.delete.confirm.confirm-button': 'Șterge organizație','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.','organizations.members.title': 'Membri','organizations.members.description': 'Gestionează membrii organizației tale',diff --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 161606ed..d76a9c5e 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@@ -15,7 +15,7 @@ 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';import { TextField, TextFieldLabel, TextFieldRoot } from '@/modules/ui/components/textfield';-import { useDeleteOrganization, useUpdateOrganization } from '../organizations.composables';+import { useCurrentUserRole, useDeleteOrganization, useUpdateOrganization } from '../organizations.composables';import { organizationNameSchema } from '../organizations.schemas';import { fetchOrganization } from '../organizations.services';@@ -24,6 +24,8 @@ const DeleteOrganizationCard: Component<{ organization: Organization }> = (propsconst { confirm } = useConfirmModal();const { t } = useI18n();+ const { getIsOwner, query } = useCurrentUserRole({ organizationId: props.organization.id });+const handleDelete = async () => {const confirmed = await confirm({title: t('organization.settings.delete.confirm.title'),@@ -54,10 +56,16 @@ const DeleteOrganizationCard: Component<{ organization: Organization }> = (props</CardDescription></CardHeader>- <CardFooter class="pt-6">- <Button onClick={handleDelete} variant="destructive">+ <CardFooter class="pt-6 gap-4">+ <Button onClick={handleDelete} variant="destructive" disabled={!getIsOwner()}>{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></CardFooter></Card></div>diff --git a/apps/papra-server/src/modules/organizations/organizations.routes.ts b/apps/papra-server/src/modules/organizations/organizations.routes.tsindex ea37ac06..da35aceb 100644--- a/apps/papra-server/src/modules/organizations/organizations.routes.ts+++ b/apps/papra-server/src/modules/organizations/organizations.routes.ts@@ -8,7 +8,7 @@ import { createUsersRepository } from '../users/users.repository';import { memberIdSchema, organizationIdSchema } from './organization.schemas';import { ORGANIZATION_ROLES } from './organizations.constants';import { createOrganizationsRepository } from './organizations.repository';-import { checkIfUserCanCreateNewOrganization, createOrganization, ensureUserIsInOrganization, inviteMemberToOrganization, removeMemberFromOrganization, updateOrganizationMemberRole } from './organizations.usecases';+import { checkIfUserCanCreateNewOrganization, createOrganization, ensureUserIsInOrganization, ensureUserIsOwnerOfOrganization, inviteMemberToOrganization, removeMemberFromOrganization, updateOrganizationMemberRole } from './organizations.usecases';export function registerOrganizationsRoutes(context: RouteDefinitionContext) {setupGetOrganizationsRoute(context);@@ -130,7 +130,9 @@ function setupDeleteOrganizationRoute({ app, db }: RouteDefinitionContext) {const organizationsRepository = createOrganizationsRepository({ db });+ // No Promise.all as we want to ensure consistency in error handlingawait ensureUserIsInOrganization({ userId, organizationId, organizationsRepository });+ await ensureUserIsOwnerOfOrganization({ userId, organizationId, organizationsRepository });await organizationsRepository.deleteOrganization({ organizationId });