The minimalistic document archiving platform.
feat(organizations): added max members count check for organization invitations (#536)
Corentin Thomassete52bc261db54
diff --git a/apps/papra-client/src/locales/de.dictionary.ts b/apps/papra-client/src/locales/de.dictionary.tsindex 6f7233a6..23fd0dd3 100644--- a/apps/papra-client/src/locales/de.dictionary.ts+++ b/apps/papra-client/src/locales/de.dictionary.ts@@ -575,6 +575,7 @@ export const translations: Partial<TranslationsDictionary> = {'api-errors.tags.already_exists': 'Ein Tag mit diesem Namen existiert bereits für diese Organisation','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.',// Not founddiff --git a/apps/papra-client/src/locales/en.dictionary.ts b/apps/papra-client/src/locales/en.dictionary.tsindex fe16ad81..b1762975 100644--- a/apps/papra-client/src/locales/en.dictionary.ts+++ b/apps/papra-client/src/locales/en.dictionary.ts@@ -573,6 +573,7 @@ export const translations = {'api-errors.tags.already_exists': 'A tag with this name already exists for this organization','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.',// Not founddiff --git a/apps/papra-client/src/locales/es.dictionary.ts b/apps/papra-client/src/locales/es.dictionary.tsindex f36ea5cb..0731b03c 100644--- a/apps/papra-client/src/locales/es.dictionary.ts+++ b/apps/papra-client/src/locales/es.dictionary.ts@@ -575,6 +575,7 @@ export const translations: Partial<TranslationsDictionary> = {'api-errors.tags.already_exists': 'Ya existe una etiqueta con este nombre en esta organización','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.',// Not founddiff --git a/apps/papra-client/src/locales/fr.dictionary.ts b/apps/papra-client/src/locales/fr.dictionary.tsindex 3ce7b478..3540df20 100644--- a/apps/papra-client/src/locales/fr.dictionary.ts+++ b/apps/papra-client/src/locales/fr.dictionary.ts@@ -575,6 +575,7 @@ export const translations: Partial<TranslationsDictionary> = {'api-errors.tags.already_exists': 'Un tag avec ce nom existe déjà pour cette organisation','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.',// Not founddiff --git a/apps/papra-client/src/locales/it.dictionary.ts b/apps/papra-client/src/locales/it.dictionary.tsindex 564bc564..f7997fb4 100644--- a/apps/papra-client/src/locales/it.dictionary.ts+++ b/apps/papra-client/src/locales/it.dictionary.ts@@ -575,6 +575,7 @@ export const translations: Partial<TranslationsDictionary> = {'api-errors.tags.already_exists': 'Esiste già un tag con questo nome per questa organizzazione','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.',// Not founddiff --git a/apps/papra-client/src/locales/pl.dictionary.ts b/apps/papra-client/src/locales/pl.dictionary.tsindex 0567e99f..4475d70e 100644--- a/apps/papra-client/src/locales/pl.dictionary.ts+++ b/apps/papra-client/src/locales/pl.dictionary.ts@@ -575,6 +575,7 @@ export const translations: Partial<TranslationsDictionary> = {'api-errors.tags.already_exists': 'Tag o tej nazwie już istnieje w tej organizacji','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.',// Not founddiff --git a/apps/papra-client/src/locales/pt-BR.dictionary.ts b/apps/papra-client/src/locales/pt-BR.dictionary.tsindex eba23baf..a7248424 100644--- a/apps/papra-client/src/locales/pt-BR.dictionary.ts+++ b/apps/papra-client/src/locales/pt-BR.dictionary.ts@@ -575,6 +575,7 @@ export const translations: Partial<TranslationsDictionary> = {'api-errors.tags.already_exists': 'Já existe uma tag com este nome nesta organização','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.',// Not founddiff --git a/apps/papra-client/src/locales/pt.dictionary.ts b/apps/papra-client/src/locales/pt.dictionary.tsindex d8fb101a..6834d522 100644--- a/apps/papra-client/src/locales/pt.dictionary.ts+++ b/apps/papra-client/src/locales/pt.dictionary.ts@@ -575,6 +575,7 @@ export const translations: Partial<TranslationsDictionary> = {'api-errors.tags.already_exists': 'Já existe uma etiqueta com este nome nesta organização','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.',// Not founddiff --git a/apps/papra-client/src/locales/ro.dictionary.ts b/apps/papra-client/src/locales/ro.dictionary.tsindex bb88af78..78699e60 100644--- a/apps/papra-client/src/locales/ro.dictionary.ts+++ b/apps/papra-client/src/locales/ro.dictionary.ts@@ -575,6 +575,7 @@ export const translations: Partial<TranslationsDictionary> = {'api-errors.tags.already_exists': 'O etichetă cu acest nume există deja pentru aceasta organizație','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.',// Not founddiff --git a/apps/papra-server/src/modules/organizations/organizations.errors.ts b/apps/papra-server/src/modules/organizations/organizations.errors.tsindex 5bc71a59..78f4c378 100644--- a/apps/papra-server/src/modules/organizations/organizations.errors.ts+++ b/apps/papra-server/src/modules/organizations/organizations.errors.ts@@ -47,3 +47,9 @@ export const createUserAlreadyInOrganizationError = createErrorFactory({code: 'user.already_in_organization',statusCode: 400,});++export const createMaxOrganizationMembersCountReachedError = createErrorFactory({+ message: 'You have reached the maximum number of members in this organization.',+ code: 'organization.max_members_count_reached',+ statusCode: 403,+});diff --git a/apps/papra-server/src/modules/organizations/organizations.repository.ts b/apps/papra-server/src/modules/organizations/organizations.repository.tsindex 32053c49..800de034 100644--- a/apps/papra-server/src/modules/organizations/organizations.repository.ts+++ b/apps/papra-server/src/modules/organizations/organizations.repository.ts@@ -42,6 +42,7 @@ export function createOrganizationsRepository({ db }: { db: Database }) {getOrganizationMemberByEmail,getOrganizationInvitations,updateExpiredPendingInvitationsStatus,+ getOrganizationPendingInvitationsCount,},{ db },);@@ -444,3 +445,27 @@ async function updateExpiredPendingInvitationsStatus({ db, now = new Date() }: {),);}++async function getOrganizationPendingInvitationsCount({ organizationId, db }: { organizationId: string; db: Database }) {+ const [record] = await db+ .select({+ pendingInvitationsCount: count(organizationInvitationsTable.id),+ })+ .from(organizationInvitationsTable)+ .where(+ and(+ eq(organizationInvitationsTable.organizationId, organizationId),+ eq(organizationInvitationsTable.status, ORGANIZATION_INVITATION_STATUS.PENDING),+ ),+ );++ if (!record) {+ throw createOrganizationNotFoundError();+ }++ const { pendingInvitationsCount } = record;++ return {+ pendingInvitationsCount,+ };+}diff --git a/apps/papra-server/src/modules/organizations/organizations.routes.ts b/apps/papra-server/src/modules/organizations/organizations.routes.tsindex da35aceb..e6020a22 100644--- a/apps/papra-server/src/modules/organizations/organizations.routes.ts+++ b/apps/papra-server/src/modules/organizations/organizations.routes.ts@@ -3,7 +3,9 @@ import { z } from 'zod';import { createForbiddenError } from '../app/auth/auth.errors';import { requireAuthentication } from '../app/auth/auth.middleware';import { getUser } from '../app/auth/auth.models';+import { createPlansRepository } from '../plans/plans.repository';import { validateJsonBody, validateParams } from '../shared/validation/validation';+import { createSubscriptionsRepository } from '../subscriptions/subscriptions.repository';import { createUsersRepository } from '../users/users.repository';import { memberIdSchema, organizationIdSchema } from './organization.schemas';import { ORGANIZATION_ROLES } from './organizations.constants';@@ -254,6 +256,8 @@ function setupInviteOrganizationMemberRoute({ app, db, config, emailsServices }:const { email, role } = context.req.valid('json');const organizationsRepository = createOrganizationsRepository({ db });+ const subscriptionsRepository = createSubscriptionsRepository({ db });+ const plansRepository = createPlansRepository({ config });await ensureUserIsInOrganization({ userId, organizationId, organizationsRepository });@@ -262,6 +266,8 @@ function setupInviteOrganizationMemberRoute({ app, db, config, emailsServices }:role,organizationId,organizationsRepository,+ subscriptionsRepository,+ plansRepository,inviterId: userId,expirationDelayDays: config.organizations.invitationExpirationDelayDays,maxInvitationsPerDay: config.organizations.maxUserInvitationsPerDay,diff --git a/apps/papra-server/src/modules/organizations/organizations.usecases.test.ts b/apps/papra-server/src/modules/organizations/organizations.usecases.test.tsindex f014097e..b243528b 100644--- a/apps/papra-server/src/modules/organizations/organizations.usecases.test.ts+++ b/apps/papra-server/src/modules/organizations/organizations.usecases.test.ts@@ -1,3 +1,4 @@+import type { EmailsServices } from '../emails/emails.services';import type { PlansRepository } from '../plans/plans.repository';import type { SubscriptionsServices } from '../subscriptions/subscriptions.services';import { describe, expect, test } from 'vitest';@@ -10,10 +11,10 @@ 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 { createOrganizationDocumentStorageLimitReachedError, createOrganizationNotFoundError, createUserMaxOrganizationCountReachedError, createUserNotInOrganizationError, createUserNotOrganizationOwnerError } from './organizations.errors';+import { createMaxOrganizationMembersCountReachedError, createOrganizationDocumentStorageLimitReachedError, createOrganizationInvitationAlreadyExistsError, createOrganizationNotFoundError, createUserAlreadyInOrganizationError, createUserMaxOrganizationCountReachedError, createUserNotInOrganizationError, createUserNotOrganizationOwnerError, createUserOrganizationInvitationLimitReachedError } from './organizations.errors';import { createOrganizationsRepository } from './organizations.repository';-import { organizationMembersTable, organizationsTable } from './organizations.table';-import { checkIfOrganizationCanCreateNewDocument, checkIfUserCanCreateNewOrganization, ensureUserIsInOrganization, ensureUserIsOwnerOfOrganization, getOrCreateOrganizationCustomerId, removeMemberFromOrganization } from './organizations.usecases';+import { organizationInvitationsTable, organizationMembersTable, organizationsTable } from './organizations.table';+import { checkIfOrganizationCanCreateNewDocument, checkIfUserCanCreateNewOrganization, ensureUserIsInOrganization, ensureUserIsOwnerOfOrganization, getOrCreateOrganizationCustomerId, inviteMemberToOrganization, removeMemberFromOrganization } from './organizations.usecases';describe('organizations usecases', () => {describe('ensureUserIsInOrganization', () => {@@ -463,4 +464,565 @@ describe('organizations usecases', () => {]);});});++ describe('inviteMemberToOrganization', () => {+ test('only organization owners and admins can invite members, regular members cannot send invitations', async () => {+ const { logger, getLogs } = createTestLogger();+ const { db } = await createInMemoryDatabase({+ users: [+ { id: 'user-1', email: '[email protected]' },+ { id: 'user-2', email: '[email protected]' },+ { id: 'user-3', email: '[email protected]' },+ ],+ organizations: [{ id: 'organization-1', name: 'Organization 1' }],+ organizationMembers: [+ { organizationId: 'organization-1', userId: 'user-1', role: ORGANIZATION_ROLES.OWNER },+ { organizationId: 'organization-1', userId: 'user-2', role: ORGANIZATION_ROLES.ADMIN },+ { organizationId: 'organization-1', userId: 'user-3', role: ORGANIZATION_ROLES.MEMBER },+ ],+ });++ const organizationsRepository = createOrganizationsRepository({ db });+ const subscriptionsRepository = createSubscriptionsRepository({ db });+ const config = overrideConfig({ organizations: { invitationExpirationDelayDays: 7, maxUserInvitationsPerDay: 10 } });+ const plansRepository = {+ getOrganizationPlanById: async () => ({+ organizationPlan: {+ limits: {+ maxOrganizationsMembersCount: 100,+ },+ },+ }),+ } as unknown as PlansRepository;++ const sentEmails: unknown[] = [];+ const emailsServices = {+ sendEmail: async (args: unknown) => sentEmails.push(args),+ } as unknown as EmailsServices;++ // Owner can invite+ const { organizationInvitation: ownerInvitation } = await inviteMemberToOrganization({+ email: '[email protected]',+ role: ORGANIZATION_ROLES.MEMBER,+ organizationId: 'organization-1',+ organizationsRepository,+ subscriptionsRepository,+ plansRepository,+ inviterId: 'user-1',+ expirationDelayDays: 7,+ maxInvitationsPerDay: 10,+ emailsServices,+ config,+ });++ expect(ownerInvitation?.email).toBe('[email protected]');++ // Admin can invite+ const { organizationInvitation: adminInvitation } = await inviteMemberToOrganization({+ email: '[email protected]',+ role: ORGANIZATION_ROLES.MEMBER,+ organizationId: 'organization-1',+ organizationsRepository,+ subscriptionsRepository,+ plansRepository,+ inviterId: 'user-2',+ expirationDelayDays: 7,+ maxInvitationsPerDay: 10,+ emailsServices,+ config,+ });++ expect(adminInvitation?.email).toBe('[email protected]');++ // Member cannot invite+ await expect(+ inviteMemberToOrganization({+ email: '[email protected]',+ role: ORGANIZATION_ROLES.MEMBER,+ organizationId: 'organization-1',+ organizationsRepository,+ subscriptionsRepository,+ plansRepository,+ inviterId: 'user-3',+ expirationDelayDays: 7,+ maxInvitationsPerDay: 10,+ logger,+ emailsServices,+ config,+ }),+ ).rejects.toThrow(createForbiddenError());++ expect(getLogs({ excludeTimestampMs: true })).toEqual([+ {+ level: 'error',+ message: 'Inviter does not have permission to invite members to organization',+ namespace: 'test',+ data: {+ inviterId: 'user-3',+ organizationId: 'organization-1',+ },+ },+ ]);+ });++ test('it is not possible to create an invitation for the owner role to prevent multiple owners in an organization', async () => {+ const { logger, getLogs } = createTestLogger();+ const { db } = await createInMemoryDatabase({+ users: [{ id: 'user-1', email: '[email protected]' }],+ organizations: [{ id: 'organization-1', name: 'Organization 1' }],+ organizationMembers: [+ { organizationId: 'organization-1', userId: 'user-1', role: ORGANIZATION_ROLES.OWNER },+ ],+ });++ const organizationsRepository = createOrganizationsRepository({ db });+ const subscriptionsRepository = createSubscriptionsRepository({ db });+ const config = overrideConfig({ organizations: { invitationExpirationDelayDays: 7, maxUserInvitationsPerDay: 10 } });+ const plansRepository = {+ getOrganizationPlanById: async () => ({+ organizationPlan: {+ limits: {+ maxOrganizationsMembersCount: 100,+ },+ },+ }),+ } as unknown as PlansRepository;++ const emailsServices = {+ sendEmail: async () => {},+ } as unknown as EmailsServices;++ await expect(+ inviteMemberToOrganization({+ email: '[email protected]',+ role: ORGANIZATION_ROLES.OWNER,+ organizationId: 'organization-1',+ organizationsRepository,+ subscriptionsRepository,+ plansRepository,+ inviterId: 'user-1',+ expirationDelayDays: 7,+ maxInvitationsPerDay: 10,+ logger,+ emailsServices,+ config,+ }),+ ).rejects.toThrow(createForbiddenError());++ expect(getLogs({ excludeTimestampMs: true })).toEqual([+ {+ level: 'error',+ message: 'Cannot create another owner in organization',+ namespace: 'test',+ data: {+ inviterId: 'user-1',+ organizationId: 'organization-1',+ },+ },+ ]);+ });++ test('cannot invite a user who is already a member of the organization to prevent duplicate memberships', async () => {+ const { logger, getLogs } = createTestLogger();+ const { db } = await createInMemoryDatabase({+ users: [+ { id: 'user-1', email: '[email protected]' },+ { id: 'user-2', email: '[email protected]' },+ ],+ organizations: [{ id: 'organization-1', name: 'Organization 1' }],+ organizationMembers: [+ { organizationId: 'organization-1', userId: 'user-1', role: ORGANIZATION_ROLES.OWNER },+ { id: 'member-2', organizationId: 'organization-1', userId: 'user-2', role: ORGANIZATION_ROLES.MEMBER },+ ],+ });++ const organizationsRepository = createOrganizationsRepository({ db });+ const subscriptionsRepository = createSubscriptionsRepository({ db });+ const config = overrideConfig({ organizations: { invitationExpirationDelayDays: 7, maxUserInvitationsPerDay: 10 } });+ const plansRepository = {+ getOrganizationPlanById: async () => ({+ organizationPlan: {+ limits: {+ maxOrganizationsMembersCount: 100,+ },+ },+ }),+ } as unknown as PlansRepository;++ const emailsServices = {+ sendEmail: async () => {},+ } as unknown as EmailsServices;++ await expect(+ inviteMemberToOrganization({+ email: '[email protected]',+ role: ORGANIZATION_ROLES.MEMBER,+ organizationId: 'organization-1',+ organizationsRepository,+ subscriptionsRepository,+ plansRepository,+ inviterId: 'user-1',+ expirationDelayDays: 7,+ maxInvitationsPerDay: 10,+ logger,+ emailsServices,+ config,+ }),+ ).rejects.toThrow(createUserAlreadyInOrganizationError());++ expect(getLogs({ excludeTimestampMs: true })).toEqual([+ {+ level: 'error',+ message: 'User already in organization',+ namespace: 'test',+ data: {+ inviterId: 'user-1',+ organizationId: 'organization-1',+ email: '[email protected]',+ memberId: 'member-2',+ memberUserId: 'user-2',+ },+ },+ ]);+ });++ test('cannot create multiple invitations for the same email address to the same organization to prevent spam and confusion', async () => {+ const { logger, getLogs } = createTestLogger();+ const { db } = await createInMemoryDatabase({+ users: [{ id: 'user-1', email: '[email protected]' }],+ organizations: [{ id: 'organization-1', name: 'Organization 1' }],+ organizationMembers: [+ { organizationId: 'organization-1', userId: 'user-1', role: ORGANIZATION_ROLES.OWNER },+ ],+ organizationInvitations: [+ {+ id: 'invitation-1',+ organizationId: 'organization-1',+ email: '[email protected]',+ role: ORGANIZATION_ROLES.MEMBER,+ inviterId: 'user-1',+ status: 'pending',+ expiresAt: new Date('2025-12-31'),+ },+ ],+ });++ const organizationsRepository = createOrganizationsRepository({ db });+ const subscriptionsRepository = createSubscriptionsRepository({ db });+ const config = overrideConfig({ organizations: { invitationExpirationDelayDays: 7, maxUserInvitationsPerDay: 10 } });+ const plansRepository = {+ getOrganizationPlanById: async () => ({+ organizationPlan: {+ limits: {+ maxOrganizationsMembersCount: 100,+ },+ },+ }),+ } as unknown as PlansRepository;++ const emailsServices = {+ sendEmail: async () => {},+ } as unknown as EmailsServices;++ await expect(+ inviteMemberToOrganization({+ email: '[email protected]',+ role: ORGANIZATION_ROLES.MEMBER,+ organizationId: 'organization-1',+ organizationsRepository,+ subscriptionsRepository,+ plansRepository,+ inviterId: 'user-1',+ expirationDelayDays: 7,+ maxInvitationsPerDay: 10,+ logger,+ emailsServices,+ config,+ }),+ ).rejects.toThrow(createOrganizationInvitationAlreadyExistsError());++ expect(getLogs({ excludeTimestampMs: true })).toEqual([+ {+ level: 'error',+ message: 'Invitation already exists',+ namespace: 'test',+ data: {+ inviterId: 'user-1',+ organizationId: 'organization-1',+ email: '[email protected]',+ invitationId: 'invitation-1',+ },+ },+ ]);+ });++ test('cannot invite new members when the organization has reached its maximum member count (including pending invitations) defined by the plan to enforce subscription limits', async () => {+ const { logger, getLogs } = createTestLogger();+ const { db } = await createInMemoryDatabase({+ users: [+ { id: 'user-1', email: '[email protected]' },+ ],+ organizations: [{ id: 'organization-1', name: 'Organization 1' }],+ organizationMembers: [+ { organizationId: 'organization-1', userId: 'user-1', role: ORGANIZATION_ROLES.OWNER },+ ],+ organizationInvitations: [+ {+ organizationId: 'organization-1',+ email: '[email protected]',+ role: ORGANIZATION_ROLES.MEMBER,+ inviterId: 'user-1',+ status: 'pending',+ expiresAt: new Date('2025-12-31'),+ },+ ],+ });++ const organizationsRepository = createOrganizationsRepository({ db });+ const subscriptionsRepository = createSubscriptionsRepository({ db });+ const config = overrideConfig({ organizations: { invitationExpirationDelayDays: 7, maxUserInvitationsPerDay: 10 } });+ const plansRepository = {+ getOrganizationPlanById: async () => ({+ organizationPlan: {+ limits: {+ maxOrganizationsMembersCount: 2,+ },+ },+ }),+ } as unknown as PlansRepository;++ const emailsServices = {+ sendEmail: async () => {},+ } as unknown as EmailsServices;++ await expect(+ inviteMemberToOrganization({+ email: '[email protected]',+ role: ORGANIZATION_ROLES.MEMBER,+ organizationId: 'organization-1',+ organizationsRepository,+ subscriptionsRepository,+ plansRepository,+ inviterId: 'user-1',+ expirationDelayDays: 7,+ maxInvitationsPerDay: 10,+ logger,+ emailsServices,+ config,+ }),+ ).rejects.toThrow(createMaxOrganizationMembersCountReachedError());++ expect(getLogs({ excludeTimestampMs: true })).toEqual([+ {+ level: 'error',+ message: 'Organization has reached its maximum number of members',+ namespace: 'test',+ data: {+ inviterId: 'user-1',+ organizationId: 'organization-1',+ membersCount: 1,+ maxMembers: 2,+ },+ },+ ]);+ });++ test('users have a daily invitation limit to prevent spam and abuse of the invitation system', async () => {+ const { db } = await createInMemoryDatabase({+ users: [{ id: 'user-1', email: '[email protected]' }],+ organizations: [{ id: 'organization-1', name: 'Organization 1' }],+ organizationMembers: [+ { organizationId: 'organization-1', userId: 'user-1', role: ORGANIZATION_ROLES.OWNER },+ ],+ organizationInvitations: [+ {+ organizationId: 'organization-1',+ email: '[email protected]',+ role: ORGANIZATION_ROLES.MEMBER,+ inviterId: 'user-1',+ status: 'pending',+ expiresAt: new Date('2025-12-31'),+ createdAt: new Date('2025-10-05T10:00:00Z'),+ },+ {+ organizationId: 'organization-1',+ email: '[email protected]',+ role: ORGANIZATION_ROLES.MEMBER,+ inviterId: 'user-1',+ status: 'pending',+ expiresAt: new Date('2025-12-31'),+ createdAt: new Date('2025-10-05T14:00:00Z'),+ },+ ],+ });++ const organizationsRepository = createOrganizationsRepository({ db });+ const subscriptionsRepository = createSubscriptionsRepository({ db });+ const config = overrideConfig({ organizations: { invitationExpirationDelayDays: 7, maxUserInvitationsPerDay: 2 } });+ const plansRepository = {+ getOrganizationPlanById: async () => ({+ organizationPlan: {+ limits: {+ maxOrganizationsMembersCount: 100,+ },+ },+ }),+ } as unknown as PlansRepository;++ const emailsServices = {+ sendEmail: async () => {},+ } as unknown as EmailsServices;++ await expect(+ inviteMemberToOrganization({+ email: '[email protected]',+ role: ORGANIZATION_ROLES.MEMBER,+ organizationId: 'organization-1',+ organizationsRepository,+ subscriptionsRepository,+ plansRepository,+ inviterId: 'user-1',+ expirationDelayDays: 7,+ maxInvitationsPerDay: 2,+ now: new Date('2025-10-05T18:00:00Z'),+ emailsServices,+ config,+ }),+ ).rejects.toThrow(createUserOrganizationInvitationLimitReachedError());+ });++ test('invitations are created with the correct expiration date and an email notification is sent to the invited user', async () => {+ const { db } = await createInMemoryDatabase({+ users: [{ id: 'user-1', email: '[email protected]' }],+ organizations: [{ id: 'organization-1', name: 'Organization 1' }],+ organizationMembers: [+ { organizationId: 'organization-1', userId: 'user-1', role: ORGANIZATION_ROLES.OWNER },+ ],+ });++ const organizationsRepository = createOrganizationsRepository({ db });+ const subscriptionsRepository = createSubscriptionsRepository({ db });+ const config = overrideConfig({+ organizations: { invitationExpirationDelayDays: 7, maxUserInvitationsPerDay: 10 },+ client: { baseUrl: 'https://app.example.com' },+ });+ const plansRepository = {+ getOrganizationPlanById: async () => ({+ organizationPlan: {+ limits: {+ maxOrganizationsMembersCount: 100,+ },+ },+ }),+ } as unknown as PlansRepository;++ const sentEmails: unknown[] = [];+ const emailsServices = {+ sendEmail: async (args: unknown) => sentEmails.push(args),+ } as unknown as EmailsServices;++ const now = new Date('2025-10-05T12:00:00Z');+ const { organizationInvitation } = await inviteMemberToOrganization({+ email: '[email protected]',+ role: ORGANIZATION_ROLES.ADMIN,+ organizationId: 'organization-1',+ organizationsRepository,+ subscriptionsRepository,+ plansRepository,+ inviterId: 'user-1',+ expirationDelayDays: 7,+ maxInvitationsPerDay: 10,+ now,+ emailsServices,+ config,+ });++ expect(organizationInvitation).toMatchObject({+ email: '[email protected]',+ role: ORGANIZATION_ROLES.ADMIN,+ organizationId: 'organization-1',+ inviterId: 'user-1',+ status: 'pending',+ expiresAt: new Date('2025-10-12T12:00:00Z'),+ });++ // Verify email was sent+ expect(sentEmails).toHaveLength(1);+ expect(sentEmails[0]).toMatchObject({+ to: '[email protected]',+ subject: 'You are invited to join an organization',+ });++ // Verify invitation was saved in database+ const invitations = await db.select().from(organizationInvitationsTable);+ expect(invitations).toHaveLength(1);+ expect(invitations[0]).toMatchObject({+ email: '[email protected]',+ role: ORGANIZATION_ROLES.ADMIN,+ organizationId: 'organization-1',+ inviterId: 'user-1',+ status: 'pending',+ });+ });++ test('users who are not members of the organization cannot send invitations to prevent unauthorized access', async () => {+ const { logger, getLogs } = createTestLogger();+ const { db } = await createInMemoryDatabase({+ users: [+ { id: 'user-1', email: '[email protected]' },+ { id: 'user-2', email: '[email protected]' },+ ],+ organizations: [{ id: 'organization-1', name: 'Organization 1' }],+ organizationMembers: [+ { organizationId: 'organization-1', userId: 'user-1', role: ORGANIZATION_ROLES.OWNER },+ ],+ });++ const organizationsRepository = createOrganizationsRepository({ db });+ const subscriptionsRepository = createSubscriptionsRepository({ db });+ const config = overrideConfig({ organizations: { invitationExpirationDelayDays: 7, maxUserInvitationsPerDay: 10 } });+ const plansRepository = {+ getOrganizationPlanById: async () => ({+ organizationPlan: {+ limits: {+ maxOrganizationsMembersCount: 100,+ },+ },+ }),+ } as unknown as PlansRepository;++ const emailsServices = {+ sendEmail: async () => {},+ } as unknown as EmailsServices;++ await expect(+ inviteMemberToOrganization({+ email: '[email protected]',+ role: ORGANIZATION_ROLES.MEMBER,+ organizationId: 'organization-1',+ organizationsRepository,+ subscriptionsRepository,+ plansRepository,+ inviterId: 'user-2',+ expirationDelayDays: 7,+ maxInvitationsPerDay: 10,+ logger,+ emailsServices,+ config,+ }),+ ).rejects.toThrow(createUserNotInOrganizationError());++ expect(getLogs({ excludeTimestampMs: true })).toEqual([+ {+ level: 'error',+ message: 'Inviter not found in organization',+ namespace: 'test',+ data: {+ inviterId: 'user-2',+ organizationId: 'organization-1',+ },+ },+ ]);+ });+ });});diff --git a/apps/papra-server/src/modules/organizations/organizations.usecases.ts b/apps/papra-server/src/modules/organizations/organizations.usecases.tsindex 6ae18806..0dd4d93c 100644--- a/apps/papra-server/src/modules/organizations/organizations.usecases.ts+++ b/apps/papra-server/src/modules/organizations/organizations.usecases.ts@@ -18,6 +18,7 @@ import { createLogger } from '../shared/logger/logger';import { isDefined } from '../shared/utils';import { ORGANIZATION_INVITATION_STATUS, ORGANIZATION_ROLES } from './organizations.constants';import {+ createMaxOrganizationMembersCountReachedError,createOrganizationDocumentStorageLimitReachedError,createOrganizationInvitationAlreadyExistsError,createOrganizationNotFoundError,@@ -212,6 +213,8 @@ export async function inviteMemberToOrganization({role,organizationId,organizationsRepository,+ subscriptionsRepository,+ plansRepository,inviterId,expirationDelayDays,maxInvitationsPerDay,@@ -224,6 +227,8 @@ export async function inviteMemberToOrganization({role: OrganizationRole;organizationId: string;organizationsRepository: OrganizationsRepository;+ subscriptionsRepository: SubscriptionsRepository;+ plansRepository: PlansRepository;inviterId: string;expirationDelayDays: number;maxInvitationsPerDay: number;@@ -263,6 +268,15 @@ export async function inviteMemberToOrganization({throw createOrganizationInvitationAlreadyExistsError();}+ const { membersCount } = await organizationsRepository.getOrganizationMembersCount({ organizationId });+ const { pendingInvitationsCount } = await organizationsRepository.getOrganizationPendingInvitationsCount({ organizationId });+ const { organizationPlan } = await getOrganizationPlan({ organizationId, subscriptionsRepository, plansRepository });++ if ((membersCount + pendingInvitationsCount) >= organizationPlan.limits.maxOrganizationsMembersCount) {+ logger.error({ inviterId, organizationId, membersCount, maxMembers: organizationPlan.limits.maxOrganizationsMembersCount }, 'Organization has reached its maximum number of members');+ throw createMaxOrganizationMembersCountReachedError();+ }+await checkIfUserHasReachedOrganizationInvitationLimit({userId: inviterId,maxInvitationsPerDay,