The minimalistic document archiving platform.
feat(organizations): added member role update functionality (#299)
Corentin Thomasset557cde940c07
diff --git a/apps/papra-client/src/locales/en.yml b/apps/papra-client/src/locales/en.ymlindex b82d9300..1628c1a5 100644--- a/apps/papra-client/src/locales/en.yml+++ b/apps/papra-client/src/locales/en.yml@@ -254,6 +254,7 @@ organizations.members.description: Manage your organization membersorganizations.members.invite-member: Invite memberorganizations.members.invite-member-disabled-tooltip: Only admins or owners can invite members to the organizationorganizations.members.remove-from-organization: Remove from organization+organizations.members.role: Roleorganizations.members.roles.owner: Ownerorganizations.members.roles.admin: Adminorganizations.members.roles.member: Member@@ -262,6 +263,7 @@ organizations.members.delete.confirm.message: Are you sure you want to remove thorganizations.members.delete.confirm.confirm-button: Removeorganizations.members.delete.confirm.cancel-button: Cancelorganizations.members.delete.success: Member removed from organization+organizations.members.update-role.success: Member role updatedorganizations.invite-member.title: Invite memberorganizations.invite-member.description: Invite a member to your organizationdiff --git a/apps/papra-client/src/modules/i18n/locales.types.ts b/apps/papra-client/src/modules/i18n/locales.types.tsindex dcf926c5..c9671e84 100644--- a/apps/papra-client/src/modules/i18n/locales.types.ts+++ b/apps/papra-client/src/modules/i18n/locales.types.ts@@ -243,6 +243,7 @@ export type LocaleKeys =| 'organizations.members.invite-member'| 'organizations.members.invite-member-disabled-tooltip'| 'organizations.members.remove-from-organization'+ | 'organizations.members.role'| 'organizations.members.roles.owner'| 'organizations.members.roles.admin'| 'organizations.members.roles.member'@@ -251,6 +252,7 @@ export type LocaleKeys =| 'organizations.members.delete.confirm.confirm-button'| 'organizations.members.delete.confirm.cancel-button'| 'organizations.members.delete.success'+ | 'organizations.members.update-role.success'| 'organizations.invite-member.title'| 'organizations.invite-member.description'| 'organizations.invite-member.form.email.label'diff --git a/apps/papra-client/src/modules/organizations/organizations.models.ts b/apps/papra-client/src/modules/organizations/organizations.models.tsnew file mode 100644index 00000000..e7d34bf1--- /dev/null+++ b/apps/papra-client/src/modules/organizations/organizations.models.ts@@ -0,0 +1,26 @@+import type { OrganizationMemberRole } from './organizations.types';+import { ORGANIZATION_ROLES } from './organizations.constants';++export function getIsMemberRoleDisabled({+ currentUserRole,+ memberRole,+ targetRole,+}: {+ currentUserRole?: OrganizationMemberRole;+ memberRole: OrganizationMemberRole;+ targetRole: OrganizationMemberRole;+}) {+ if (currentUserRole === ORGANIZATION_ROLES.MEMBER) {+ return true;+ }++ if (memberRole === ORGANIZATION_ROLES.OWNER) {+ return true;+ }++ if (targetRole === ORGANIZATION_ROLES.OWNER) {+ return true;+ }++ return false;+}diff --git a/apps/papra-client/src/modules/organizations/organizations.services.ts b/apps/papra-client/src/modules/organizations/organizations.services.tsindex f697ea32..013b54e8 100644--- a/apps/papra-client/src/modules/organizations/organizations.services.ts+++ b/apps/papra-client/src/modules/organizations/organizations.services.ts@@ -92,3 +92,15 @@ export async function getMembership({ organizationId }: { organizationId: stringmember: coerceDates(member),};}++export async function updateOrganizationMemberRole({ organizationId, memberId, role }: { organizationId: string; memberId: string; role: OrganizationMemberRole }) {+ const { member } = await apiClient<{ member: AsDto<OrganizationMember> }>({+ path: `/api/organizations/${organizationId}/members/${memberId}`,+ method: 'PATCH',+ body: { role },+ });++ return {+ member: coerceDates(member),+ };+}diff --git a/apps/papra-client/src/modules/organizations/pages/members.page.tsx b/apps/papra-client/src/modules/organizations/pages/members.page.tsxindex e9c14090..2f13b369 100644--- a/apps/papra-client/src/modules/organizations/pages/members.page.tsx+++ b/apps/papra-client/src/modules/organizations/pages/members.page.tsx@@ -6,15 +6,17 @@ import { createSolidTable, flexRender, getCoreRowModel, getPaginationRowModel }import { For, Show } from 'solid-js';import { useI18n } from '@/modules/i18n/i18n.provider';import { useConfirmModal } from '@/modules/shared/confirm';+import { useI18nApiErrors } from '@/modules/shared/http/composables/i18n-api-errors';import { queryClient } from '@/modules/shared/query/query-client';import { Button } from '@/modules/ui/components/button';-import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuTrigger } from '@/modules/ui/components/dropdown-menu';+import { DropdownMenu, DropdownMenuContent, DropdownMenuGroup, DropdownMenuGroupLabel, DropdownMenuItem, DropdownMenuRadioGroup, DropdownMenuRadioItem, DropdownMenuSeparator, DropdownMenuTrigger } from '@/modules/ui/components/dropdown-menu';import { createToast } from '@/modules/ui/components/sonner';import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from '@/modules/ui/components/table';import { Tooltip, TooltipContent, TooltipTrigger } from '@/modules/ui/components/tooltip';import { useCurrentUserRole } from '../organizations.composables';import { ORGANIZATION_ROLES } from '../organizations.constants';-import { fetchOrganizationMembers, removeOrganizationMember } from '../organizations.services';+import { getIsMemberRoleDisabled } from '../organizations.models';+import { fetchOrganizationMembers, removeOrganizationMember, updateOrganizationMemberRole } from '../organizations.services';const MemberList: Component = () => {const params = useParams();@@ -24,8 +26,9 @@ const MemberList: Component = () => {queryKey: ['organizations', params.organizationId, 'members'],queryFn: () => fetchOrganizationMembers({ organizationId: params.organizationId }),}));+ const { getErrorMessage } = useI18nApiErrors({ t });- const { getIsAtLeastAdmin } = useCurrentUserRole({ organizationId: params.organizationId });+ const { getIsAtLeastAdmin, getRole } = useCurrentUserRole({ organizationId: params.organizationId });const removeMemberMutation = createMutation(() => ({mutationFn: ({ memberId }: { memberId: string }) => removeOrganizationMember({ organizationId: params.organizationId, memberId }),@@ -38,6 +41,23 @@ const MemberList: Component = () => {},}));+ const updateMemberRoleMutation = createMutation(() => ({+ mutationFn: ({ memberId, role }: { memberId: string; role: OrganizationMemberRole }) => updateOrganizationMemberRole({ organizationId: params.organizationId, memberId, role }),+ onSuccess: async () => {+ await queryClient.invalidateQueries({ queryKey: ['organizations', params.organizationId, 'members'] });++ createToast({+ message: t('organizations.members.update-role.success'),+ });+ },+ onError: (error) => {+ createToast({+ message: getErrorMessage({ error }),+ type: 'error',+ });+ },+ }));+const handleDelete = async ({ memberId }: { memberId: string }) => {const confirmed = await confirm({title: t('organizations.members.delete.confirm.title'),@@ -58,6 +78,10 @@ const MemberList: Component = () => {removeMemberMutation.mutate({ memberId });};+ const handleUpdateMemberRole = async ({ memberId, role }: { memberId: string; role: OrganizationMemberRole }) => {+ await updateMemberRoleMutation.mutateAsync({ memberId, role });+ };+const table = createSolidTable({get data() {return query.data?.members ?? [];@@ -80,6 +104,32 @@ const MemberList: Component = () => {<div class="i-tabler-user-x size-4 mr-2" />{t('organizations.members.remove-from-organization')}</DropdownMenuItem>+ <DropdownMenuSeparator />++ <DropdownMenuGroup>+ <DropdownMenuGroupLabel class="font-normal">{t('organizations.members.role')}</DropdownMenuGroupLabel>+ <DropdownMenuRadioGroup value={data.row.original.role} onChange={role => handleUpdateMemberRole({ memberId: data.row.original.id, role: role as OrganizationMemberRole })}>+ <DropdownMenuRadioItem+ value={ORGANIZATION_ROLES.OWNER}+ disabled={getIsMemberRoleDisabled({ currentUserRole: getRole(), memberRole: data.row.original.role, targetRole: ORGANIZATION_ROLES.OWNER })}+ >+ {t(`organizations.members.roles.owner`)}+ </DropdownMenuRadioItem>+ <DropdownMenuRadioItem+ value={ORGANIZATION_ROLES.ADMIN}+ disabled={getIsMemberRoleDisabled({ currentUserRole: getRole(), memberRole: data.row.original.role, targetRole: ORGANIZATION_ROLES.ADMIN })}+ >+ {t(`organizations.members.roles.admin`)}+ </DropdownMenuRadioItem>+ <DropdownMenuRadioItem+ value={ORGANIZATION_ROLES.MEMBER}+ disabled={getIsMemberRoleDisabled({ currentUserRole: getRole(), memberRole: data.row.original.role, targetRole: ORGANIZATION_ROLES.MEMBER })}+ >+ {t(`organizations.members.roles.member`)}+ </DropdownMenuRadioItem>+ </DropdownMenuRadioGroup>+ </DropdownMenuGroup>+</DropdownMenuContent></DropdownMenu></div>diff --git a/apps/papra-server/src/modules/organizations/organizations.repository.ts b/apps/papra-server/src/modules/organizations/organizations.repository.tsindex e3d5fa67..720316c0 100644--- a/apps/papra-server/src/modules/organizations/organizations.repository.ts+++ b/apps/papra-server/src/modules/organizations/organizations.repository.ts@@ -192,16 +192,16 @@ async function removeUserFromOrganization({ userId, organizationId, db }: { user);}-async function updateOrganizationMemberRole({ userId, organizationId, role, db }: { userId: string; organizationId: string; role: OrganizationRole; db: Database }) {- await db+async function updateOrganizationMemberRole({ memberId, role, db }: { memberId: string; role: OrganizationRole; db: Database }) {+ const [updatedMember] = await db.update(organizationMembersTable).set({ role }).where(- and(- eq(organizationMembersTable.userId, userId),- eq(organizationMembersTable.organizationId, organizationId),- ),- );+ eq(organizationMembersTable.id, memberId),+ )+ .returning();++ return { member: updatedMember };}async function getOrganizationMemberByUserId({ userId, organizationId, db }: { userId: string; organizationId: string; db: Database }) {diff --git a/apps/papra-server/src/modules/organizations/organizations.routes.ts b/apps/papra-server/src/modules/organizations/organizations.routes.tsindex 70aa262f..b90c7e3a 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 } from './organizations.usecases';+import { checkIfUserCanCreateNewOrganization, createOrganization, ensureUserIsInOrganization, inviteMemberToOrganization, removeMemberFromOrganization, updateOrganizationMemberRole } from './organizations.usecases';export async function registerOrganizationsRoutes(context: RouteDefinitionContext) {setupGetOrganizationsRoute(context);@@ -18,6 +18,7 @@ export async function registerOrganizationsRoutes(context: RouteDefinitionContexsetupDeleteOrganizationRoute(context);setupGetOrganizationMembersRoute(context);setupRemoveOrganizationMemberRoute(context);+ setupUpdateOrganizationMemberRoute(context);setupInviteOrganizationMemberRoute(context);setupGetMembershipRoute(context);}@@ -182,6 +183,33 @@ function setupRemoveOrganizationMemberRoute({ app, db }: RouteDefinitionContext));}+function setupUpdateOrganizationMemberRoute({ app, db }: RouteDefinitionContext) {+ app.patch(+ '/api/organizations/:organizationId/members/:memberId',+ requireAuthentication(),+ validateParams(z.object({+ organizationId: organizationIdSchema,+ memberId: memberIdSchema,+ })),+ validateJsonBody(z.object({+ role: z.enum([ORGANIZATION_ROLES.ADMIN, ORGANIZATION_ROLES.MEMBER]),+ })),+ async (context) => {+ const { userId } = getUser({ context });+ const { organizationId, memberId } = context.req.valid('param');+ const { role } = context.req.valid('json');++ const organizationsRepository = createOrganizationsRepository({ db });++ await ensureUserIsInOrganization({ userId, organizationId, organizationsRepository });++ const { member } = await updateOrganizationMemberRole({ memberId, organizationsRepository, userId, organizationId, role });++ return context.json({ member });+ },+ );+}+function setupGetMembershipRoute({ app, db }: RouteDefinitionContext) {app.get('/api/organizations/:organizationId/members/me',diff --git a/apps/papra-server/src/modules/organizations/organizations.usecases.ts b/apps/papra-server/src/modules/organizations/organizations.usecases.tsindex 36a75a64..3b54aeff 100644--- a/apps/papra-server/src/modules/organizations/organizations.usecases.ts+++ b/apps/papra-server/src/modules/organizations/organizations.usecases.ts@@ -314,3 +314,41 @@ export async function sendOrganizationInvitationEmail({`,});}++export async function updateOrganizationMemberRole({+ memberId,+ userId,+ organizationId,+ organizationsRepository,+ role,+}: {+ memberId: string;+ userId: string;+ organizationId: string;+ organizationsRepository: OrganizationsRepository;+ role: 'admin' | 'member';+}) {+ const { member } = await organizationsRepository.getOrganizationMemberByMemberId({ memberId, organizationId });++ if (!member) {+ throw createForbiddenError();+ }++ if (member.role === ORGANIZATION_ROLES.OWNER) {+ throw createForbiddenError();+ }++ const { member: currentUser } = await organizationsRepository.getOrganizationMemberByUserId({ userId, organizationId });++ if (!currentUser) {+ throw createUserNotInOrganizationError();+ }++ if (![ORGANIZATION_ROLES.OWNER, ORGANIZATION_ROLES.ADMIN].includes(currentUser.role)) {+ throw createForbiddenError();+ }++ const { member: updatedMember } = await organizationsRepository.updateOrganizationMemberRole({ memberId, role });++ return { member: updatedMember };+}