The minimalistic document archiving platform.
feat(invitations): add invitations management page (#319)
Corentin Thomasset60059c895c48
diff --git a/.changeset/neat-teeth-unite.md b/.changeset/neat-teeth-unite.mdnew file mode 100644index 00000000..4412cb65--- /dev/null+++ b/.changeset/neat-teeth-unite.md@@ -0,0 +1,6 @@+---+"@papra/app-client": minor+"@papra/app-server": minor+---++Added pending invitation management pagediff --git a/apps/papra-client/src/locales/en.yml b/apps/papra-client/src/locales/en.ymlindex fe45aeef..5a4ceb1a 100644--- a/apps/papra-client/src/locales/en.yml+++ b/apps/papra-client/src/locales/en.yml@@ -156,6 +156,7 @@ organizations.members.update-role.success: Member role updatedorganizations.members.table.headers.name: Nameorganizations.members.table.headers.email: Emailorganizations.members.table.headers.role: Role+organizations.members.table.headers.created: Createdorganizations.members.table.headers.actions: Actionsorganizations.invite-member.title: Invite member@@ -169,11 +170,32 @@ organizations.invite-member.success.message: Member invitedorganizations.invite-member.success.description: The email has been invited to the organization.organizations.invite-member.error.message: Failed to invite member+organizations.invitations.title: Invitations+organizations.invitations.description: Manage your organization invitations+organizations.invitations.list.cta: Invite member+organizations.invitations.list.empty.title: No pending invitations+organizations.invitations.list.empty.description: You haven't been invited to any organizations yet.+organizations.invitations.status.pending: Pending+organizations.invitations.status.accepted: Accepted+organizations.invitations.status.rejected: Rejected+organizations.invitations.status.expired: Expired+organizations.invitations.status.cancelled: Cancelled+organizations.invitations.resend: Resend invitation+organizations.invitations.cancel.title: Cancel invitation+organizations.invitations.cancel.description: Are you sure you want to cancel this invitation?+organizations.invitations.cancel.confirm: Cancel invitation+organizations.invitations.cancel.cancel: Cancel+organizations.invitations.resend.title: Resend invitation+organizations.invitations.resend.description: Are you sure you want to resend this invitation? This will send a new email to the recipient.+organizations.invitations.resend.confirm: Resend invitation+organizations.invitations.resend.cancel: Cancel+invitations.list.title: Invitationsinvitations.list.description: Manage your organization invitationsinvitations.list.empty.title: No pending invitationsinvitations.list.empty.description: You haven't been invited to any organizations yet.invitations.list.headers.organization: Organization+invitations.list.headers.status: Statusinvitations.list.headers.created: Createdinvitations.list.headers.actions: Actionsinvitations.list.actions.accept: Acceptdiff --git a/apps/papra-client/src/locales/fr.yml b/apps/papra-client/src/locales/fr.ymlindex aadcdae1..ba171410 100644--- a/apps/papra-client/src/locales/fr.yml+++ b/apps/papra-client/src/locales/fr.yml@@ -156,6 +156,7 @@ organizations.members.update-role.success: Rôle du membre mis à jourorganizations.members.table.headers.name: Nomorganizations.members.table.headers.email: Emailorganizations.members.table.headers.role: Rôle+# organizations.members.table.headers.created: Createdorganizations.members.table.headers.actions: Actionsorganizations.invite-member.title: Inviter un membre@@ -169,11 +170,32 @@ organizations.invite-member.success.message: Membre invitéorganizations.invite-member.success.description: L'email a été invité à l'organisation.organizations.invite-member.error.message: Échec de l'invitation du membre+organizations.invitations.title: Invitations+organizations.invitations.description: Gérez les invitations de votre organisation.+organizations.invitations.list.cta: Inviter un membre+organizations.invitations.list.empty.title: Aucune invitation en attente+organizations.invitations.list.empty.description: Vous n'avez pas été invité à aucune organisation.+organizations.invitations.status.pending: En attente+organizations.invitations.status.accepted: Accepté+organizations.invitations.status.rejected: Refusé+organizations.invitations.status.expired: Expiré+organizations.invitations.status.cancelled: Annulé+organizations.invitations.resend: Renvoyer l'invitation+organizations.invitations.cancel.title: Annuler l'invitation+organizations.invitations.cancel.description: Êtes-vous sûr de vouloir annuler cette invitation ?+organizations.invitations.cancel.confirm: Annuler l'invitation+organizations.invitations.cancel.cancel: Annuler+organizations.invitations.resend.title: Renvoyer l'invitation+organizations.invitations.resend.description: Êtes-vous sûr de vouloir renvoyer cette invitation ? Cela enverra un nouvel email à l'invité.+organizations.invitations.resend.confirm: Renvoyer l'invitation+organizations.invitations.resend.cancel: Annuler+invitations.list.title: Invitationsinvitations.list.description: Gérez les invitations de votre organisation.invitations.list.empty.title: Aucune invitation en attenteinvitations.list.empty.description: Vous n'avez pas été invité à aucune organisation.invitations.list.headers.organization: Organisation+# invitations.list.headers.status: Statusinvitations.list.headers.created: Crééinvitations.list.headers.actions: Actionsinvitations.list.actions.accept: Accepterdiff --git a/apps/papra-client/src/modules/i18n/locales.test.ts b/apps/papra-client/src/modules/i18n/locales.test.tsindex 2a33700f..9b2c1699 100644--- a/apps/papra-client/src/modules/i18n/locales.test.ts+++ b/apps/papra-client/src/modules/i18n/locales.test.ts@@ -42,6 +42,7 @@ describe('locales', () => {/^api-keys\.permissions\.[a-z0-9:]+\.[a-z0-9:]+$/, // api-keys.permissions.documents.documents:delete/^organizations\.members\.roles\.[a-z0-9]+$/, // organizations.members.roles.admin/^activity\.document\.[a-z0-9:]+$/, // activity.document.created+ /^organizations\.invitations\.status\.[a-z0-9:]+$/, // organizations.invitations.status.pending];const keys = new Set(diff --git a/apps/papra-client/src/modules/i18n/locales.types.ts b/apps/papra-client/src/modules/i18n/locales.types.tsindex 055aaf3d..2af64633 100644--- a/apps/papra-client/src/modules/i18n/locales.types.ts+++ b/apps/papra-client/src/modules/i18n/locales.types.ts@@ -140,6 +140,7 @@ export type LocaleKeys =| 'organizations.members.table.headers.name'| 'organizations.members.table.headers.email'| 'organizations.members.table.headers.role'+ | 'organizations.members.table.headers.created'| 'organizations.members.table.headers.actions'| 'organizations.invite-member.title'| 'organizations.invite-member.description'@@ -151,11 +152,31 @@ export type LocaleKeys =| 'organizations.invite-member.success.message'| 'organizations.invite-member.success.description'| 'organizations.invite-member.error.message'+ | 'organizations.invitations.title'+ | 'organizations.invitations.description'+ | 'organizations.invitations.list.cta'+ | 'organizations.invitations.list.empty.title'+ | 'organizations.invitations.list.empty.description'+ | 'organizations.invitations.status.pending'+ | 'organizations.invitations.status.accepted'+ | 'organizations.invitations.status.rejected'+ | 'organizations.invitations.status.expired'+ | 'organizations.invitations.status.cancelled'+ | 'organizations.invitations.resend'+ | 'organizations.invitations.cancel.title'+ | 'organizations.invitations.cancel.description'+ | 'organizations.invitations.cancel.confirm'+ | 'organizations.invitations.cancel.cancel'+ | 'organizations.invitations.resend.title'+ | 'organizations.invitations.resend.description'+ | 'organizations.invitations.resend.confirm'+ | 'organizations.invitations.resend.cancel'| 'invitations.list.title'| 'invitations.list.description'| 'invitations.list.empty.title'| 'invitations.list.empty.description'| 'invitations.list.headers.organization'+ | 'invitations.list.headers.status'| 'invitations.list.headers.created'| 'invitations.list.headers.actions'| 'invitations.list.actions.accept'diff --git a/apps/papra-client/src/modules/invitations/invitations.services.ts b/apps/papra-client/src/modules/invitations/invitations.services.tsindex 2f939f6d..9fe55cf6 100644--- a/apps/papra-client/src/modules/invitations/invitations.services.ts+++ b/apps/papra-client/src/modules/invitations/invitations.services.ts@@ -25,13 +25,6 @@ export async function fetchPendingInvitationsCount() {return { pendingInvitationsCount };}-export async function cancelInvitation({ invitationId }: { invitationId: string }) {- await apiClient({- path: `/api/invitations/${invitationId}`,- method: 'DELETE',- });-}-export async function acceptInvitation({ invitationId }: { invitationId: string }) {await apiClient({path: `/api/invitations/${invitationId}/accept`,@@ -45,3 +38,17 @@ export async function rejectInvitation({ invitationId }: { invitationId: stringmethod: 'POST',});}++export async function resendInvitation({ invitationId }: { invitationId: string }) {+ await apiClient({+ path: `/api/invitations/${invitationId}/resend`,+ method: 'POST',+ });+}++export async function cancelInvitation({ invitationId }: { invitationId: string }) {+ await apiClient({+ path: `/api/invitations/${invitationId}/cancel`,+ method: 'POST',+ });+}diff --git a/apps/papra-client/src/modules/organizations/organizations.constants.ts b/apps/papra-client/src/modules/organizations/organizations.constants.tsindex bb78d405..a1d1ad16 100644--- a/apps/papra-client/src/modules/organizations/organizations.constants.ts+++ b/apps/papra-client/src/modules/organizations/organizations.constants.ts@@ -5,3 +5,13 @@ export const ORGANIZATION_ROLES = {} as const;export const ORGANIZATION_ROLES_LIST = Object.values(ORGANIZATION_ROLES);++export const ORGANIZATION_INVITATION_STATUS = {+ PENDING: 'pending',+ ACCEPTED: 'accepted',+ REJECTED: 'rejected',+ EXPIRED: 'expired',+ CANCELLED: 'cancelled',+} as const;++export const ORGANIZATION_INVITATION_STATUS_LIST = Object.values(ORGANIZATION_INVITATION_STATUS);diff --git a/apps/papra-client/src/modules/organizations/organizations.services.ts b/apps/papra-client/src/modules/organizations/organizations.services.tsindex 013b54e8..ba11c29f 100644--- a/apps/papra-client/src/modules/organizations/organizations.services.ts+++ b/apps/papra-client/src/modules/organizations/organizations.services.ts@@ -1,5 +1,5 @@import type { AsDto } from '../shared/http/http-client.types';-import type { Organization, OrganizationMember, OrganizationMemberRole } from './organizations.types';+import type { Organization, OrganizationInvitation, OrganizationMember, OrganizationMemberRole } from './organizations.types';import { apiClient } from '../shared/http/api-client';import { coerceDates } from '../shared/http/http-client.models';@@ -75,6 +75,17 @@ export async function fetchOrganizationMembers({ organizationId }: { organizatio};}+export async function fetchOrganizationInvitations({ organizationId }: { organizationId: string }) {+ const { invitations } = await apiClient<{ invitations: AsDto<OrganizationInvitation>[] }>({+ path: `/api/organizations/${organizationId}/members/invitations`,+ method: 'GET',+ });++ return {+ invitations: invitations.map(coerceDates),+ };+}+export async function removeOrganizationMember({ organizationId, memberId }: { organizationId: string; memberId: string }) {await apiClient({path: `/api/organizations/${organizationId}/members/${memberId}`,diff --git a/apps/papra-client/src/modules/organizations/organizations.types.ts b/apps/papra-client/src/modules/organizations/organizations.types.tsindex 11a2090b..71344471 100644--- a/apps/papra-client/src/modules/organizations/organizations.types.ts+++ b/apps/papra-client/src/modules/organizations/organizations.types.ts@@ -1,4 +1,5 @@import type { User } from 'better-auth/types';+import type { ORGANIZATION_INVITATION_STATUS_LIST } from './organizations.constants';export type Organization = {id: string;@@ -15,3 +16,14 @@ export type OrganizationMember = {};export type OrganizationMemberRole = 'owner' | 'admin' | 'member';++export type OrganizationInvitationStatus = typeof ORGANIZATION_INVITATION_STATUS_LIST[number];++export type OrganizationInvitation = {+ id: string;+ organizationId: string;+ email: string;+ status: OrganizationInvitationStatus;+ role: OrganizationMemberRole;+ createdAt: Date;+};diff --git a/apps/papra-client/src/modules/organizations/pages/invitations-list.page.tsx b/apps/papra-client/src/modules/organizations/pages/invitations-list.page.tsxnew file mode 100644index 00000000..91fe85c8--- /dev/null+++ b/apps/papra-client/src/modules/organizations/pages/invitations-list.page.tsx@@ -0,0 +1,239 @@+import type { Component } from 'solid-js';+import type { OrganizationInvitation, OrganizationInvitationStatus, OrganizationMemberRole } from '../organizations.types';+import { A, useNavigate, useParams } from '@solidjs/router';+import { useMutation, useQuery } from '@tanstack/solid-query';+import { createSolidTable, flexRender, getCoreRowModel, getPaginationRowModel } from '@tanstack/solid-table';+import { For, Match, onMount, Show, Switch } from 'solid-js';+import { useI18n } from '@/modules/i18n/i18n.provider';+import { cancelInvitation, resendInvitation } from '@/modules/invitations/invitations.services';+import { useConfirmModal } from '@/modules/shared/confirm';+import { timeAgo } from '@/modules/shared/date/time-ago';+import { queryClient } from '@/modules/shared/query/query-client';+import { Badge } from '@/modules/ui/components/badge';+import { Button } from '@/modules/ui/components/button';+import { EmptyState } from '@/modules/ui/components/empty';+import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from '@/modules/ui/components/table';+import { useCurrentUserRole } from '../organizations.composables';+import { ORGANIZATION_INVITATION_STATUS } from '../organizations.constants';+import { fetchOrganizationInvitations } from '../organizations.services';++const InvitationStatusBadge: Component<{ status: OrganizationInvitationStatus }> = (props) => {+ const { t } = useI18n();++ const getStatus = () => t(`organizations.invitations.status.${props.status}`);+ const getVariant = () => ({+ [ORGANIZATION_INVITATION_STATUS.PENDING]: 'default',+ [ORGANIZATION_INVITATION_STATUS.ACCEPTED]: 'default',+ [ORGANIZATION_INVITATION_STATUS.REJECTED]: 'destructive',+ [ORGANIZATION_INVITATION_STATUS.EXPIRED]: 'destructive',+ [ORGANIZATION_INVITATION_STATUS.CANCELLED]: 'destructive',+ } as const)[props.status] ?? 'default';++ return <Badge variant={getVariant()}>{getStatus()}</Badge>;+};++const InvitationActions: Component<{ invitation: OrganizationInvitation }> = (props) => {+ const { t } = useI18n();+ const { confirm } = useConfirmModal();++ const cancelMutation = useMutation(() => ({+ mutationFn: (invitationId: string) => cancelInvitation({ invitationId }),+ onSuccess: async () => {+ await queryClient.invalidateQueries({ queryKey: ['organizations', props.invitation.organizationId, 'invitations'] });+ },+ }));++ const resendMutation = useMutation(() => ({+ mutationFn: (invitationId: string) => resendInvitation({ invitationId }),+ onSuccess: async () => {+ await queryClient.invalidateQueries({ queryKey: ['organizations', props.invitation.organizationId, 'invitations'] });+ },+ }));++ const handleCancel = async () => {+ const isConfirmed = await confirm({+ title: t('organizations.invitations.cancel.title'),+ message: t('organizations.invitations.cancel.description'),+ confirmButton: {+ text: t('organizations.invitations.cancel.confirm'),+ variant: 'destructive',+ },+ cancelButton: {+ text: t('organizations.invitations.cancel.cancel'),+ },+ });++ if (!isConfirmed) {+ return;+ }++ cancelMutation.mutate(props.invitation.id);+ };++ const handleResend = async () => {+ const isConfirmed = await confirm({+ title: t('organizations.invitations.resend.title'),+ message: t('organizations.invitations.resend.description'),+ confirmButton: {+ text: t('organizations.invitations.resend.confirm'),+ variant: 'default',+ },+ cancelButton: {+ text: t('organizations.invitations.resend.cancel'),+ },+ });++ if (!isConfirmed) {+ return;+ }++ resendMutation.mutate(props.invitation.id);+ };++ return (+ <Switch>+ <Match when={props.invitation.status === ORGANIZATION_INVITATION_STATUS.PENDING}>+ <Button+ variant="destructive"+ size="sm"+ onClick={handleCancel}+ disabled={cancelMutation.isPending}+ >+ <div class="i-tabler-x size-4 mr-2" />+ {t('organizations.invitations.cancel.confirm')}+ </Button>+ </Match>++ <Match when={([+ ORGANIZATION_INVITATION_STATUS.REJECTED,+ ORGANIZATION_INVITATION_STATUS.EXPIRED,+ ORGANIZATION_INVITATION_STATUS.CANCELLED,+ ] as OrganizationInvitationStatus[]).includes(props.invitation.status)}+ >+ <Button+ size="sm"+ variant="outline"+ onClick={handleResend}+ disabled={resendMutation.isPending}+ >+ <div class="i-tabler-refresh size-4 mr-2" />+ {t('organizations.invitations.resend')}+ </Button>+ </Match>++ </Switch>+ );+};++const InvitationsList: Component = () => {+ const params = useParams();+ const { t } = useI18n();+ const query = useQuery(() => ({+ queryKey: ['organizations', params.organizationId, 'invitations'],+ queryFn: () => fetchOrganizationInvitations({ organizationId: params.organizationId }),+ }));++ const table = createSolidTable({+ get data() {+ return query.data?.invitations.filter(invitation => !([ORGANIZATION_INVITATION_STATUS.ACCEPTED] as OrganizationInvitationStatus[]).includes(invitation.status)) ?? [];+ },+ columns: [+ { header: t('organizations.members.table.headers.email'), accessorKey: 'email' },+ { header: t('organizations.members.table.headers.role'), accessorKey: 'role', cell: data => t(`organizations.members.roles.${data.getValue<OrganizationMemberRole>()}`) },+ {+ header: t('invitations.list.headers.status'),+ accessorKey: 'status',+ cell: data => <InvitationStatusBadge status={data.getValue()} />,+ },+ {+ header: t('organizations.members.table.headers.created'),+ accessorKey: 'createdAt',+ cell: data => <span title={data.getValue<Date>().toLocaleString()} class="text-muted-foreground">{timeAgo({ date: data.getValue<Date>() })}</span>,+ },+ {+ header: '',+ id: 'actions',+ cell: data => (+ <div class="flex items-center justify-end">+ <InvitationActions invitation={data.row.original} />+ </div>+ ),+ },+ ],+ getCoreRowModel: getCoreRowModel(),+ getPaginationRowModel: getPaginationRowModel(),+ });++ return (+ <div>++ <Show when={query.data?.invitations.length === 0}>+ <EmptyState+ title={t('organizations.invitations.list.empty.title')}+ description={t('organizations.invitations.list.empty.description')}+ icon="i-tabler-mail"+ cta={(+ <Button as={A} href={`/organizations/${params.organizationId}/invite`} variant="outline">+ <div class="i-tabler-plus size-4 mr-2" />+ {t('organizations.invitations.list.cta')}+ </Button>+ )}+ />+ </Show>++ <Show when={query.data?.invitations.length}>+ <Table>+ <TableHeader>+ <For each={table.getHeaderGroups()}>+ {headerGroup => (+ <TableRow>+ <For each={headerGroup.headers}>{header => <TableHead>{flexRender(header.column.columnDef.header, header.getContext())}</TableHead>}</For>+ </TableRow>+ )}+ </For>+ </TableHeader>+ <TableBody>+ <For each={table.getRowModel().rows}>+ {row => <TableRow>{row.getVisibleCells().map(cell => <TableCell>{flexRender(cell.column.columnDef.cell, cell.getContext())}</TableCell>)}</TableRow>}+ </For>+ </TableBody>+ </Table>+ </Show>+ </div>+ );+};++export const InvitationsListPage: Component = () => {+ const { t } = useI18n();+ const params = useParams();+ const navigate = useNavigate();+ const { getIsAtLeastAdmin } = useCurrentUserRole({ organizationId: params.organizationId });++ onMount(() => {+ if (!getIsAtLeastAdmin()) {+ navigate(`/organizations/${params.organizationId}/members`);+ }+ });++ return (+ <div class="p-6 max-w-screen-md mx-auto mt-4 ">+ <div class="border-b mb-6 pb-4">++ <div>+ <Button as={A} href={`/organizations/${params.organizationId}/members`} variant="ghost" class="ml--4 text-muted-foreground">+ <div class="i-tabler-arrow-left size-4 mr-2" />+ {t('organizations.members.title')}+ </Button>+ </div>+ <h1 class="text-xl font-bold">+ {t('organizations.invitations.title')}+ </h1>+ <p class="text-sm text-muted-foreground">+ {t('organizations.invitations.description')}+ </p>+ </div>++ <InvitationsList />+ </div>+ );+};diff --git a/apps/papra-client/src/modules/organizations/pages/invite-member.page.tsx b/apps/papra-client/src/modules/organizations/pages/invite-member.page.tsxindex 1ed3f107..7ebe9aed 100644--- a/apps/papra-client/src/modules/organizations/pages/invite-member.page.tsx+++ b/apps/papra-client/src/modules/organizations/pages/invite-member.page.tsx@@ -57,7 +57,9 @@ export const InviteMemberPage: Component = () => {createToast({message: t('organizations.invite-member.success.message'),description: t('organizations.invite-member.success.description'),+ type: 'success',});+ navigate(`/organizations/${params.organizationId}/members`);},onError: (error) => {createToast({@@ -153,7 +155,7 @@ export const InviteMemberPage: Component = () => {)}</Field>- <Button type="submit" class="w-full mt-6">+ <Button type="submit" class="w-full mt-6" isLoading={inviteMemberMutation.isPending}>{t('organizations.invite-member.form.submit')}<div class="i-tabler-send size-4 ml-1" /></Button>diff --git a/apps/papra-client/src/modules/organizations/pages/members.page.tsx b/apps/papra-client/src/modules/organizations/pages/members.page.tsxindex a401934f..8183deda 100644--- a/apps/papra-client/src/modules/organizations/pages/members.page.tsx+++ b/apps/papra-client/src/modules/organizations/pages/members.page.tsx@@ -192,10 +192,18 @@ export const MembersPage: Component = () => {</Tooltip>)}>- <Button as={A} href={`/organizations/${params.organizationId}/invite`}>- <div class="i-tabler-plus size-4 mr-2" />- {t('organizations.members.invite-member')}- </Button>+ <div class="flex items-center gap-2">+ <Button as={A} href={`/organizations/${params.organizationId}/invitations`} variant="outline">+ <div class="i-tabler-mail size-4 mr-2" />+ {t('organizations.invitations.title')}+ </Button>++ <Button as={A} href={`/organizations/${params.organizationId}/invite`}>+ <div class="i-tabler-plus size-4 mr-2" />+ {t('organizations.members.invite-member')}+ </Button>++ </div></Show></div>diff --git a/apps/papra-client/src/routes.tsx b/apps/papra-client/src/routes.tsxindex 23dd652f..34f69d32 100644--- a/apps/papra-client/src/routes.tsx+++ b/apps/papra-client/src/routes.tsx@@ -18,6 +18,7 @@ import { InvitationsPage } from './modules/invitations/pages/invitations.page';import { fetchOrganizations } from './modules/organizations/organizations.services';import { CreateFirstOrganizationPage } from './modules/organizations/pages/create-first-organization.page';import { CreateOrganizationPage } from './modules/organizations/pages/create-organization.page';+import { InvitationsListPage } from './modules/organizations/pages/invitations-list.page';import { InviteMemberPage } from './modules/organizations/pages/invite-member.page';import { MembersPage } from './modules/organizations/pages/members.page';import { OrganizationPage } from './modules/organizations/pages/organization.page';@@ -139,6 +140,10 @@ export const routes: RouteDefinition[] = [path: '/invite',component: InviteMemberPage,},+ {+ path: '/invitations',+ component: InvitationsListPage,+ },],},diff --git a/apps/papra-server/src/modules/app/database/database.test-utils.ts b/apps/papra-server/src/modules/app/database/database.test-utils.tsindex f7594576..3577aa42 100644--- a/apps/papra-server/src/modules/app/database/database.test-utils.ts+++ b/apps/papra-server/src/modules/app/database/database.test-utils.ts@@ -2,7 +2,7 @@ import type { Database } from './database.types';import { apiKeyOrganizationsTable, apiKeysTable } from '../../api-keys/api-keys.tables';import { documentsTable } from '../../documents/documents.table';import { intakeEmailsTable } from '../../intake-emails/intake-emails.tables';-import { organizationMembersTable, organizationsTable } from '../../organizations/organizations.table';+import { organizationInvitationsTable, organizationMembersTable, organizationsTable } from '../../organizations/organizations.table';import { organizationSubscriptionsTable } from '../../subscriptions/subscriptions.tables';import { taggingRuleActionsTable, taggingRuleConditionsTable, taggingRulesTable } from '../../tagging-rules/tagging-rules.tables';import { documentsTagsTable, tagsTable } from '../../tags/tags.table';@@ -42,6 +42,7 @@ const seedTables = {webhooks: webhooksTable,webhookEvents: webhookEventsTable,webhookDeliveries: webhookDeliveriesTable,+ organizationInvitations: organizationInvitationsTable,} as const;type SeedTablesRows = {diff --git a/apps/papra-server/src/modules/invitations/invitations.routes.ts b/apps/papra-server/src/modules/invitations/invitations.routes.tsindex 718d1ca7..18a8da34 100644--- a/apps/papra-server/src/modules/invitations/invitations.routes.ts+++ b/apps/papra-server/src/modules/invitations/invitations.routes.ts@@ -4,6 +4,7 @@ import { requireAuthentication } from '../app/auth/auth.middleware';import { getUser } from '../app/auth/auth.models';import { ORGANIZATION_INVITATION_STATUS, ORGANIZATION_ROLES } from '../organizations/organizations.constants';import { createOrganizationsRepository } from '../organizations/organizations.repository';+import { resendOrganizationInvitation } from '../organizations/organizations.usecases';import { createError } from '../shared/errors/errors';import { createLogger } from '../shared/logger/logger';import { createUsersRepository } from '../users/users.repository';@@ -16,6 +17,7 @@ export function registerInvitationsRoutes(context: RouteDefinitionContext) {setupRejectInvitationRoute(context);setupCancelInvitationRoute(context);setupGetPendingInvitationsCountRoute(context);+ setupResendInvitationRoute(context);}function setupGetInvitationsRoute({ app, db }: RouteDefinitionContext) {@@ -172,3 +174,26 @@ function setupCancelInvitationRoute({ app, db }: RouteDefinitionContext) {},);}++function setupResendInvitationRoute({ app, db, config, emailsServices }: RouteDefinitionContext) {+ app.post(+ '/api/invitations/:invitationId/resend',+ requireAuthentication(),+ async (context) => {+ const { invitationId } = context.req.param();+ const { userId } = getUser({ context });++ const organizationsRepository = createOrganizationsRepository({ db });++ await resendOrganizationInvitation({+ invitationId,+ userId,+ organizationsRepository,+ emailsServices,+ config,+ });++ return context.body(null, 204);+ },+ );+}diff --git a/apps/papra-server/src/modules/invitations/invtations.specs.md b/apps/papra-server/src/modules/invitations/invtations.specs.mdnew file mode 100644index 00000000..ade4c8af--- /dev/null+++ b/apps/papra-server/src/modules/invitations/invtations.specs.md@@ -0,0 +1,31 @@+# Organization invitations specs++Privileged members of an organization (owner or admin) can invite other users to join the organization.++- Invitations are valid for 7 days (configurable)+- Invitations can be cancelled by a privileged member of the organization.+- Invitations can be rejected by the recipient.+- Invitations can be accepted by the recipient.+- Invitations that are expired, cancelled or rejected can be resend by a privileged member of the organization.++## Invitation statuses++- `pending`: The invitation has been sent but not yet accepted or rejected.+- `accepted`: The invitation has been accepted by the recipient.+- `rejected`: The invitation has been rejected by the recipient.+- `expired`: The invitation has expired.+- `cancelled`: The invitation has been cancelled by a privileged member of the organization.++State machine:+```mermaid+stateDiagram-v2+ [*] --> pending+ pending --> accepted+ pending --> rejected+ pending --> expired: 7 days+ pending --> cancelled+ expired --> pending: resend+ cancelled --> pending: resend+ rejected --> pending: resend+ accepted --> [*]+```diff --git a/apps/papra-server/src/modules/organizations/organizations.repository.models.test.ts b/apps/papra-server/src/modules/organizations/organizations.repository.models.test.tsnew file mode 100644index 00000000..18792f32--- /dev/null+++ b/apps/papra-server/src/modules/organizations/organizations.repository.models.test.ts@@ -0,0 +1,80 @@+import type { OrganizationInvitation } from './organizations.types';+import { describe, expect, test } from 'vitest';+import { ORGANIZATION_INVITATION_STATUS } from './organizations.constants';+import { ensureInvitationStatus } from './organizations.repository.models';++describe('organizations repository models', () => {+ describe('ensureInvitationStatus', () => {+ test('when retrieving a pending invitation from the db, it may be just expired', () => {+ expect(+ ensureInvitationStatus({+ invitation: {+ id: '1',+ status: ORGANIZATION_INVITATION_STATUS.PENDING,+ expiresAt: new Date('2025-05-12'),+ } as OrganizationInvitation,+ now: new Date('2025-05-13'),+ }),+ ).to.eql({+ id: '1',+ status: ORGANIZATION_INVITATION_STATUS.EXPIRED,+ expiresAt: new Date('2025-05-12'),+ });++ // non expired invitation+ expect(+ ensureInvitationStatus({+ invitation: {+ id: '1',+ status: ORGANIZATION_INVITATION_STATUS.PENDING,+ expiresAt: new Date('2025-05-14'),+ } as OrganizationInvitation,+ now: new Date('2025-05-13'),+ }),+ ).to.eql({+ id: '1',+ status: ORGANIZATION_INVITATION_STATUS.PENDING,+ expiresAt: new Date('2025-05-14'),+ });++ // Non pending invitation+ expect(+ ensureInvitationStatus({+ invitation: {+ id: '1',+ status: ORGANIZATION_INVITATION_STATUS.EXPIRED,+ expiresAt: new Date('2025-05-12'),+ } as OrganizationInvitation,+ now: new Date('2025-05-13'),+ }),+ ).to.eql({+ id: '1',+ status: ORGANIZATION_INVITATION_STATUS.EXPIRED,+ expiresAt: new Date('2025-05-12'),+ });++ expect(+ ensureInvitationStatus({+ invitation: {+ id: '1',+ status: ORGANIZATION_INVITATION_STATUS.CANCELLED,+ expiresAt: new Date('2025-05-12'),+ } as OrganizationInvitation,+ now: new Date('2025-05-13'),+ }),+ ).to.eql({+ id: '1',+ status: ORGANIZATION_INVITATION_STATUS.CANCELLED,+ expiresAt: new Date('2025-05-12'),+ });+ });++ test('nullish invitation stay nullish', () => {+ expect(+ ensureInvitationStatus({+ invitation: null,+ }),+ ).to.eql(null);+ });+ });+});diff --git a/apps/papra-server/src/modules/organizations/organizations.repository.models.ts b/apps/papra-server/src/modules/organizations/organizations.repository.models.tsnew file mode 100644index 00000000..633d0f1e--- /dev/null+++ b/apps/papra-server/src/modules/organizations/organizations.repository.models.ts@@ -0,0 +1,19 @@+import type { OrganizationInvitation } from './organizations.types';+import { isAfter } from 'date-fns';+import { ORGANIZATION_INVITATION_STATUS } from './organizations.constants';++export function ensureInvitationStatus({ invitation, now = new Date() }: { invitation?: OrganizationInvitation | null | undefined; now?: Date }) {+ if (!invitation) {+ return null;+ }++ if (invitation.status !== ORGANIZATION_INVITATION_STATUS.PENDING) {+ return invitation;+ }++ if (invitation.expiresAt && isAfter(invitation.expiresAt, now)) {+ return invitation;+ }++ return { ...invitation, status: ORGANIZATION_INVITATION_STATUS.EXPIRED };+}diff --git a/apps/papra-server/src/modules/organizations/organizations.repository.test.ts b/apps/papra-server/src/modules/organizations/organizations.repository.test.tsnew file mode 100644index 00000000..29f2877d--- /dev/null+++ b/apps/papra-server/src/modules/organizations/organizations.repository.test.ts@@ -0,0 +1,76 @@+import { describe, expect, test } from 'vitest';+import { createInMemoryDatabase } from '../app/database/database.test-utils';+import { createOrganizationsRepository } from './organizations.repository';+import { organizationInvitationsTable } from './organizations.table';++describe('organizations repository', () => {+ describe('updateExpiredPendingInvitationsStatus', () => {+ test('the pending invitations that are expired (expiredAt < now) are updated to expired', async () => {+ const commonInvitation = {+ organizationId: 'org_1',+ role: 'member',+ inviterId: 'user_1',+ createdAt: new Date('2025-05-05'),+ updatedAt: new Date('2025-05-05'),+ } as const;++ const { db } = await createInMemoryDatabase({+ users: [{ id: 'user_1', email: '[email protected]' }],+ organizations: [{ id: 'org_1', name: 'Test Organization' }],+ organizationInvitations: [+ {+ id: 'invitation_1',+ expiresAt: new Date('2025-05-12'),+ status: 'pending',+ email: '[email protected]',+ ...commonInvitation,+ },+ {+ id: 'invitation_2',+ expiresAt: new Date('2025-05-14'),+ status: 'pending',+ email: '[email protected]',+ ...commonInvitation,+ },+ {+ id: 'invitation_3',+ expiresAt: new Date('2025-05-05'),+ status: 'accepted',+ email: '[email protected]',+ ...commonInvitation,+ },+ ],+ });++ const organizationsRepository = createOrganizationsRepository({ db });++ await organizationsRepository.updateExpiredPendingInvitationsStatus({ now: new Date('2025-05-13') });++ const invitations = await db.select().from(organizationInvitationsTable).orderBy(organizationInvitationsTable.id);++ expect(invitations).to.eql([+ {+ id: 'invitation_1',+ status: 'expired',+ expiresAt: new Date('2025-05-12'),+ email: '[email protected]',+ ...commonInvitation,+ },+ {+ id: 'invitation_2',+ status: 'pending',+ expiresAt: new Date('2025-05-14'),+ email: '[email protected]',+ ...commonInvitation,+ },+ {+ id: 'invitation_3',+ status: 'accepted',+ expiresAt: new Date('2025-05-05'),+ email: '[email protected]',+ ...commonInvitation,+ },+ ]);+ });+ });+});diff --git a/apps/papra-server/src/modules/organizations/organizations.repository.ts b/apps/papra-server/src/modules/organizations/organizations.repository.tsindex 720316c0..f0d9ffb1 100644--- a/apps/papra-server/src/modules/organizations/organizations.repository.ts+++ b/apps/papra-server/src/modules/organizations/organizations.repository.ts@@ -2,11 +2,12 @@ import type { Database } from '../app/database/database.types';import type { DbInsertableOrganization, OrganizationInvitationStatus, OrganizationRole } from './organizations.types';import { injectArguments } from '@corentinth/chisels';import { addDays, startOfDay } from 'date-fns';-import { and, count, eq, getTableColumns, gte } from 'drizzle-orm';+import { and, count, eq, getTableColumns, gte, lte } from 'drizzle-orm';import { omit } from 'lodash-es';import { omitUndefined } from '../shared/utils';import { usersTable } from '../users/users.table';import { ORGANIZATION_INVITATION_STATUS, ORGANIZATION_ROLES } from './organizations.constants';+import { ensureInvitationStatus } from './organizations.repository.models';import { organizationInvitationsTable, organizationMembersTable, organizationsTable } from './organizations.table';export type OrganizationsRepository = ReturnType<typeof createOrganizationsRepository>;@@ -38,6 +39,8 @@ export function createOrganizationsRepository({ db }: { db: Database }) {getPendingInvitationsCount,getInvitationForEmailAndOrganization,getOrganizationMemberByEmail,+ getOrganizationInvitations,+ updateExpiredPendingInvitationsStatus,},{ db },);@@ -282,16 +285,17 @@ async function getTodayUserInvitationCount({ userId, db, now = new Date() }: { u};}-async function getPendingOrganizationInvitationsForEmail({ email, db }: { email: string; db: Database }) {+async function getPendingOrganizationInvitationsForEmail({ email, db, now = new Date() }: { email: string; db: Database; now?: Date }) {const rawInvitations = await db.select().from(organizationInvitationsTable).leftJoin(organizationsTable, eq(organizationInvitationsTable.organizationId, organizationsTable.id)).where(and(-eq(organizationInvitationsTable.email, email),eq(organizationInvitationsTable.status, ORGANIZATION_INVITATION_STATUS.PENDING),+ // To ensure we don't count just expired invitations that haven't been marked as expired yet+ gte(organizationInvitationsTable.expiresAt, now),),);@@ -305,7 +309,7 @@ async function getPendingOrganizationInvitationsForEmail({ email, db }: { email:};}-async function getOrganizationInvitationById({ invitationId, db }: { invitationId: string; db: Database }) {+async function getOrganizationInvitationById({ invitationId, db, now = new Date() }: { invitationId: string; db: Database; now?: Date }) {const [invitation] = await db.select().from(organizationInvitationsTable)@@ -314,15 +318,23 @@ async function getOrganizationInvitationById({ invitationId, db }: { invitationI);return {- invitation,+ invitation: ensureInvitationStatus({ invitation, now }),};}-async function updateOrganizationInvitation({ invitationId, status, db }: { invitationId: string; status: OrganizationInvitationStatus; db: Database }) {- await db.update(organizationInvitationsTable).set({ status }).where(eq(organizationInvitationsTable.id, invitationId));+async function updateOrganizationInvitation({ invitationId, status, expiresAt, db }: { invitationId: string; status: OrganizationInvitationStatus; expiresAt?: Date; db: Database }) {+ await db+ .update(organizationInvitationsTable)+ .set(omitUndefined({+ status,+ expiresAt,+ }))+ .where(+ eq(organizationInvitationsTable.id, invitationId),+ );}-async function getPendingInvitationsCount({ email, db }: { email: string; db: Database }) {+async function getPendingInvitationsCount({ email, db, now = new Date() }: { email: string; db: Database; now?: Date }) {const [{ pendingInvitationsCount }] = await db.select({pendingInvitationsCount: count(organizationInvitationsTable.id),@@ -332,6 +344,8 @@ async function getPendingInvitationsCount({ email, db }: { email: string; db: Daand(eq(organizationInvitationsTable.email, email),eq(organizationInvitationsTable.status, ORGANIZATION_INVITATION_STATUS.PENDING),+ // To ensure we don't count just expired invitations that haven't been marked as expired yet+ gte(organizationInvitationsTable.expiresAt, now),),);@@ -340,7 +354,7 @@ async function getPendingInvitationsCount({ email, db }: { email: string; db: Da};}-async function getInvitationForEmailAndOrganization({ email, organizationId, db }: { email: string; organizationId: string; db: Database }) {+async function getInvitationForEmailAndOrganization({ email, organizationId, db, now = new Date() }: { email: string; organizationId: string; db: Database; now?: Date }) {const [invitation] = await db.select().from(organizationInvitationsTable)@@ -352,7 +366,7 @@ async function getInvitationForEmailAndOrganization({ email, organizationId, db);return {- invitation,+ invitation: ensureInvitationStatus({ invitation, now }),};}@@ -372,3 +386,24 @@ async function getOrganizationMemberByEmail({ email, organizationId, db }: { emamember: rawMember ? rawMember.organization_members : null,};}++async function getOrganizationInvitations({ organizationId, db, now = new Date() }: { organizationId: string; db: Database; now?: Date }) {+ const invitations = await db+ .select()+ .from(organizationInvitationsTable)+ .where(eq(organizationInvitationsTable.organizationId, organizationId));++ return { invitations: invitations.map(invitation => ensureInvitationStatus({ invitation, now })) };+}++async function updateExpiredPendingInvitationsStatus({ db, now = new Date() }: { db: Database; now?: Date }) {+ await db+ .update(organizationInvitationsTable)+ .set({ status: ORGANIZATION_INVITATION_STATUS.EXPIRED })+ .where(+ and(+ lte(organizationInvitationsTable.expiresAt, now),+ eq(organizationInvitationsTable.status, ORGANIZATION_INVITATION_STATUS.PENDING),+ ),+ );+}diff --git a/apps/papra-server/src/modules/organizations/organizations.routes.ts b/apps/papra-server/src/modules/organizations/organizations.routes.tsindex b90c7e3a..e09ad639 100644--- a/apps/papra-server/src/modules/organizations/organizations.routes.ts+++ b/apps/papra-server/src/modules/organizations/organizations.routes.ts@@ -21,6 +21,7 @@ export async function registerOrganizationsRoutes(context: RouteDefinitionContexsetupUpdateOrganizationMemberRoute(context);setupInviteOrganizationMemberRoute(context);setupGetMembershipRoute(context);+ setupGetOrganizationInvitationsRoute(context);}function setupGetOrganizationsRoute({ app, db }: RouteDefinitionContext) {@@ -270,3 +271,29 @@ function setupInviteOrganizationMemberRoute({ app, db, config, emailsServices }:},);}++function setupGetOrganizationInvitationsRoute({ app, db }: RouteDefinitionContext) {+ app.get(+ '/api/organizations/:organizationId/members/invitations',+ requireAuthentication(),+ validateParams(z.object({+ organizationId: organizationIdSchema,+ })),+ async (context) => {+ const { userId } = getUser({ context });+ const { organizationId } = context.req.valid('param');++ const organizationsRepository = createOrganizationsRepository({ db });++ const { member } = await organizationsRepository.getOrganizationMemberByUserId({ organizationId, userId });++ if (!member || ![ORGANIZATION_ROLES.ADMIN, ORGANIZATION_ROLES.OWNER].includes(member.role)) {+ throw createForbiddenError();+ }++ const { invitations } = await organizationsRepository.getOrganizationInvitations({ organizationId });++ return context.json({ invitations });+ },+ );+}diff --git a/apps/papra-server/src/modules/organizations/organizations.types.ts b/apps/papra-server/src/modules/organizations/organizations.types.tsindex 26666ba0..b7717b6e 100644--- a/apps/papra-server/src/modules/organizations/organizations.types.ts+++ b/apps/papra-server/src/modules/organizations/organizations.types.ts@@ -1,9 +1,11 @@import type { Expand } from '@corentinth/chisels';import type { ORGANIZATION_INVITATION_STATUS_LIST, ORGANIZATION_ROLES_LIST } from './organizations.constants';-import type { organizationsTable } from './organizations.table';+import type { organizationInvitationsTable, organizationsTable } from './organizations.table';export type DbInsertableOrganization = Expand<typeof organizationsTable.$inferInsert>;export type OrganizationRole = typeof ORGANIZATION_ROLES_LIST[number];export type OrganizationInvitationStatus = typeof ORGANIZATION_INVITATION_STATUS_LIST[number];++export type OrganizationInvitation = Expand<typeof organizationInvitationsTable.$inferSelect>;diff --git a/apps/papra-server/src/modules/organizations/organizations.usecases.ts b/apps/papra-server/src/modules/organizations/organizations.usecases.tsindex 3b54aeff..407d8fef 100644--- a/apps/papra-server/src/modules/organizations/organizations.usecases.ts+++ b/apps/papra-server/src/modules/organizations/organizations.usecases.ts@@ -9,12 +9,22 @@ import type { UsersRepository } from '../users/users.repository';import type { OrganizationsRepository } from './organizations.repository';import type { OrganizationRole } from './organizations.types';import { buildUrl } from '@corentinth/chisels';+import { addDays } from 'date-fns';import { createForbiddenError } from '../app/auth/auth.errors';import { getOrganizationPlan } from '../plans/plans.usecases';import { sanitize } from '../shared/html/html';import { createLogger } from '../shared/logger/logger';-import { ORGANIZATION_ROLES } from './organizations.constants';-import { createOrganizationDocumentStorageLimitReachedError, createOrganizationInvitationAlreadyExistsError, createOrganizationNotFoundError, createUserAlreadyInOrganizationError, createUserMaxOrganizationCountReachedError, createUserNotInOrganizationError, createUserNotOrganizationOwnerError, createUserOrganizationInvitationLimitReachedError } from './organizations.errors';+import { ORGANIZATION_INVITATION_STATUS, ORGANIZATION_ROLES } from './organizations.constants';+import {+ createOrganizationDocumentStorageLimitReachedError,+ createOrganizationInvitationAlreadyExistsError,+ createOrganizationNotFoundError,+ createUserAlreadyInOrganizationError,+ createUserMaxOrganizationCountReachedError,+ createUserNotInOrganizationError,+ createUserNotOrganizationOwnerError,+ createUserOrganizationInvitationLimitReachedError,+} from './organizations.errors';import { canUserRemoveMemberFromOrganization } from './organizations.models';export async function createOrganization({ name, userId, organizationsRepository }: { name: string; userId: string; organizationsRepository: OrganizationsRepository }) {@@ -352,3 +362,64 @@ export async function updateOrganizationMemberRole({return { member: updatedMember };}++export async function resendOrganizationInvitation({+ invitationId,+ userId,+ organizationsRepository,+ emailsServices,+ config,+ logger = createLogger({ namespace: 'organizations.resend-invitation' }),+ now = new Date(),+}: {+ invitationId: string;+ userId: string;+ organizationsRepository: OrganizationsRepository;+ emailsServices: EmailsServices;+ config: Config;+ logger?: Logger;+ now?: Date;+}) {+ const { invitation } = await organizationsRepository.getOrganizationInvitationById({ invitationId });++ if (!invitation) {+ logger.error({ invitationId }, 'Invitation not found');+ throw createForbiddenError();+ }++ if (![ORGANIZATION_INVITATION_STATUS.EXPIRED, ORGANIZATION_INVITATION_STATUS.CANCELLED, ORGANIZATION_INVITATION_STATUS.REJECTED].includes(invitation.status)) {+ logger.error({ invitationId, invitationStatus: invitation.status }, 'Cannot resend invitation that is neither expired, cancelled nor rejected');+ throw createForbiddenError();+ }++ const { member: inviterMember } = await organizationsRepository.getOrganizationMemberByUserId({ userId, organizationId: invitation.organizationId });++ if (!inviterMember) {+ logger.error({ invitationId, userId }, 'Inviter not found in organization');+ throw createForbiddenError();+ }++ if (![ORGANIZATION_ROLES.OWNER, ORGANIZATION_ROLES.ADMIN].includes(inviterMember.role)) {+ logger.error({+ invitationId,+ userId,+ memberId: inviterMember.id,+ memberRole: inviterMember.role,+ }, 'Inviter does not have permission to resend invitation');+ throw createForbiddenError();+ }++ await organizationsRepository.updateOrganizationInvitation({+ invitationId,+ status: ORGANIZATION_INVITATION_STATUS.PENDING,+ expiresAt: addDays(now, config.organizations.invitationExpirationDelayDays),+ });++ await sendOrganizationInvitationEmail({+ email: invitation.email,+ organizationId: invitation.organizationId,+ organizationsRepository,+ emailsServices,+ config,+ });+}diff --git a/apps/papra-server/src/modules/organizations/tasks/expire-invitations.task.ts b/apps/papra-server/src/modules/organizations/tasks/expire-invitations.task.tsnew file mode 100644index 00000000..84ded6c9--- /dev/null+++ b/apps/papra-server/src/modules/organizations/tasks/expire-invitations.task.ts@@ -0,0 +1,14 @@+import { defineTask } from '../../tasks/tasks.models';+import { createOrganizationsRepository } from '../organizations.repository';++export const expireInvitationsTaskDefinition = defineTask({+ name: 'expire-invitations',+ isEnabled: ({ config }) => config.tasks.expireInvitations.enabled,+ cronSchedule: ({ config }) => config.tasks.expireInvitations.cron,+ runOnStartup: ({ config }) => config.tasks.expireInvitations.runOnStartup,+ handler: async ({ db, now }) => {+ const organizationsRepository = createOrganizationsRepository({ db });++ await organizationsRepository.updateExpiredPendingInvitationsStatus({ now });+ },+});diff --git a/apps/papra-server/src/modules/tasks/task-scheduler.ts b/apps/papra-server/src/modules/tasks/task-scheduler.tsindex e0f22de7..0963d789 100644--- a/apps/papra-server/src/modules/tasks/task-scheduler.ts+++ b/apps/papra-server/src/modules/tasks/task-scheduler.ts@@ -42,8 +42,6 @@ function createTaskScheduler({},);- logger.info({ taskName: taskDefinition.taskName, cronSchedule }, 'Task registered');-return { job: task, taskName: taskDefinition.taskName };}).filter(Boolean);@@ -53,14 +51,14 @@ function createTaskScheduler({start() {scheduledTasks.forEach(({ taskName, job }) => {job.start();- logger.info({ taskName }, 'Task scheduled');+ logger.debug({ taskName }, 'Task scheduled');});},stop() {scheduledTasks.forEach(({ taskName, job }) => {job.stop();- logger.info({ taskName }, 'Task unscheduled');+ logger.debug({ taskName }, 'Task unscheduled');});},},diff --git a/apps/papra-server/src/modules/tasks/tasks.config.ts b/apps/papra-server/src/modules/tasks/tasks.config.tsindex baddf12f..8ee5f7d2 100644--- a/apps/papra-server/src/modules/tasks/tasks.config.ts+++ b/apps/papra-server/src/modules/tasks/tasks.config.ts@@ -23,4 +23,24 @@ export const tasksConfig = {env: 'DOCUMENTS_HARD_DELETE_EXPIRED_DOCUMENTS_RUN_ON_STARTUP',},},+ expireInvitations: {+ enabled: {+ doc: 'Whether the task to expire invitations is enabled',+ schema: booleanishSchema,+ default: true,+ env: 'ORGANIZATIONS_EXPIRE_INVITATIONS_ENABLED',+ },+ cron: {+ doc: 'The cron schedule for the task to expire invitations',+ schema: z.string(),+ default: '0 0 * * *',+ env: 'ORGANIZATIONS_EXPIRE_INVITATIONS_CRON',+ },+ runOnStartup: {+ doc: 'Whether the task to expire invitations should run on startup',+ schema: booleanishSchema,+ default: true,+ env: 'ORGANIZATIONS_EXPIRE_INVITATIONS_RUN_ON_STARTUP',+ },+ },} as const satisfies ConfigDefinition;diff --git a/apps/papra-server/src/modules/tasks/tasks.defiitions.ts b/apps/papra-server/src/modules/tasks/tasks.defiitions.tsindex 4759b011..a68609b1 100644--- a/apps/papra-server/src/modules/tasks/tasks.defiitions.ts+++ b/apps/papra-server/src/modules/tasks/tasks.defiitions.ts@@ -1,5 +1,7 @@import { hardDeleteExpiredDocumentsTaskDefinition } from '../documents/tasks/hard-delete-expired-documents.task';+import { expireInvitationsTaskDefinition } from '../organizations/tasks/expire-invitations.task';export const taskDefinitions = [hardDeleteExpiredDocumentsTaskDefinition,+ expireInvitationsTaskDefinition,];diff --git a/apps/papra-server/src/modules/tasks/tasks.models.ts b/apps/papra-server/src/modules/tasks/tasks.models.tsindex 1c74f91c..9ca1035c 100644--- a/apps/papra-server/src/modules/tasks/tasks.models.ts+++ b/apps/papra-server/src/modules/tasks/tasks.models.ts@@ -36,7 +36,7 @@ function defineTask({const startedAt = getNow();try {- logger.info({ taskName, startedAt }, 'Task started');+ logger.debug({ taskName, startedAt }, 'Task started');await handler({ ...handlerArgs, logger, now: getNow() });