The Open Source DocuSign Alternative.
TypeScript digital-signaturedocument-signingdocusign-alternativee-signatureesignesignaturenext-authnextjsopen-sourcepades-standardpdfpdf-signpdf-signaturepostgresqlprismaself-hostedsigningtypescript
feat: admin member role updates (#2093)
Ephraim Duncan353bdce86b9c
diff --git a/apps/remix/app/components/dialogs/admin-organisation-member-update-dialog.tsx b/apps/remix/app/components/dialogs/admin-organisation-member-update-dialog.tsxnew file mode 100644index 000000000..1e6be1e3f--- /dev/null+++ b/apps/remix/app/components/dialogs/admin-organisation-member-update-dialog.tsx@@ -0,0 +1,218 @@+import { useEffect, useState } from 'react';++import { zodResolver } from '@hookform/resolvers/zod';+import { useLingui } from '@lingui/react/macro';+import { Trans } from '@lingui/react/macro';+import { OrganisationMemberRole } from '@prisma/client';+import type * as DialogPrimitive from '@radix-ui/react-dialog';+import { useForm } from 'react-hook-form';+import { useNavigate } from 'react-router';+import { match } from 'ts-pattern';+import { z } from 'zod';++import { getHighestOrganisationRoleInGroup } from '@documenso/lib/utils/organisations';+import { trpc } from '@documenso/trpc/react';+import type { TGetAdminOrganisationResponse } from '@documenso/trpc/server/admin-router/get-admin-organisation.types';+import { Button } from '@documenso/ui/primitives/button';+import {+ Dialog,+ DialogContent,+ DialogDescription,+ DialogFooter,+ DialogHeader,+ DialogTitle,+ DialogTrigger,+} from '@documenso/ui/primitives/dialog';+import {+ Form,+ FormControl,+ FormField,+ FormItem,+ FormLabel,+ FormMessage,+} from '@documenso/ui/primitives/form/form';+import {+ Select,+ SelectContent,+ SelectItem,+ SelectTrigger,+ SelectValue,+} from '@documenso/ui/primitives/select';+import { useToast } from '@documenso/ui/primitives/use-toast';++export type AdminOrganisationMemberUpdateDialogProps = {+ trigger?: React.ReactNode;+ organisationId: string;+ organisationMember: TGetAdminOrganisationResponse['members'][number];+ isOwner: boolean;+} & Omit<DialogPrimitive.DialogProps, 'children'>;++const ZUpdateOrganisationMemberFormSchema = z.object({+ role: z.enum(['OWNER', 'ADMIN', 'MANAGER', 'MEMBER']),+});++type ZUpdateOrganisationMemberSchema = z.infer<typeof ZUpdateOrganisationMemberFormSchema>;++export const AdminOrganisationMemberUpdateDialog = ({+ trigger,+ organisationId,+ organisationMember,+ isOwner,+ ...props+}: AdminOrganisationMemberUpdateDialogProps) => {+ const [open, setOpen] = useState(false);++ const { t } = useLingui();+ const { toast } = useToast();+ const navigate = useNavigate();++ // Determine the current role value for the form+ const currentRoleValue = isOwner+ ? 'OWNER'+ : getHighestOrganisationRoleInGroup(+ organisationMember.organisationGroupMembers.map((ogm) => ogm.group),+ );+ const organisationMemberName = organisationMember.user.name ?? organisationMember.user.email;++ const form = useForm<ZUpdateOrganisationMemberSchema>({+ resolver: zodResolver(ZUpdateOrganisationMemberFormSchema),+ defaultValues: {+ role: currentRoleValue,+ },+ });++ const { mutateAsync: updateOrganisationMemberRole } =+ trpc.admin.organisationMember.updateRole.useMutation();++ const onFormSubmit = async ({ role }: ZUpdateOrganisationMemberSchema) => {+ try {+ await updateOrganisationMemberRole({+ organisationId,+ userId: organisationMember.userId,+ role,+ });++ const roleLabel = match(role)+ .with('OWNER', () => t`Owner`)+ .with(OrganisationMemberRole.ADMIN, () => t`Admin`)+ .with(OrganisationMemberRole.MANAGER, () => t`Manager`)+ .with(OrganisationMemberRole.MEMBER, () => t`Member`)+ .exhaustive();++ toast({+ title: t`Success`,+ description:+ role === 'OWNER'+ ? t`Ownership transferred to ${organisationMemberName}.`+ : t`Updated ${organisationMemberName} to ${roleLabel}.`,+ duration: 5000,+ });++ setOpen(false);++ // Refresh the page to show updated data+ await navigate(0);+ } catch (err) {+ console.error(err);++ toast({+ title: t`An unknown error occurred`,+ description: t`We encountered an unknown error while attempting to update this organisation member. Please try again later.`,+ variant: 'destructive',+ });+ }+ };++ useEffect(() => {+ if (!open) {+ return;+ }++ form.reset({+ role: currentRoleValue,+ });+ // eslint-disable-next-line react-hooks/exhaustive-deps+ }, [open, currentRoleValue, form]);++ return (+ <Dialog+ {...props}+ open={open}+ onOpenChange={(value) => !form.formState.isSubmitting && setOpen(value)}+ >+ <DialogTrigger onClick={(e) => e.stopPropagation()} asChild>+ {trigger ?? (+ <Button variant="secondary">+ <Trans>Update role</Trans>+ </Button>+ )}+ </DialogTrigger>++ <DialogContent position="center">+ <DialogHeader>+ <DialogTitle>+ <Trans>Update organisation member</Trans>+ </DialogTitle>++ <DialogDescription className="mt-4">+ <Trans>+ You are currently updating{' '}+ <span className="font-bold">{organisationMemberName}.</span>+ </Trans>+ </DialogDescription>+ </DialogHeader>++ <Form {...form}>+ <form onSubmit={form.handleSubmit(onFormSubmit)}>+ <fieldset className="flex h-full flex-col" disabled={form.formState.isSubmitting}>+ <FormField+ control={form.control}+ name="role"+ render={({ field }) => (+ <FormItem className="w-full">+ <FormLabel required>+ <Trans>Role</Trans>+ </FormLabel>+ <FormControl>+ <Select {...field} onValueChange={field.onChange}>+ <SelectTrigger className="text-muted-foreground">+ <SelectValue />+ </SelectTrigger>++ <SelectContent className="w-full" position="popper">+ <SelectItem value="OWNER">+ <Trans>Owner</Trans>+ </SelectItem>+ <SelectItem value={OrganisationMemberRole.ADMIN}>+ <Trans>Admin</Trans>+ </SelectItem>+ <SelectItem value={OrganisationMemberRole.MANAGER}>+ <Trans>Manager</Trans>+ </SelectItem>+ <SelectItem value={OrganisationMemberRole.MEMBER}>+ <Trans>Member</Trans>+ </SelectItem>+ </SelectContent>+ </Select>+ </FormControl>+ <FormMessage />+ </FormItem>+ )}+ />++ <DialogFooter className="mt-4">+ <Button type="button" variant="secondary" onClick={() => setOpen(false)}>+ <Trans>Cancel</Trans>+ </Button>++ <Button type="submit" loading={form.formState.isSubmitting}>+ <Trans>Update</Trans>+ </Button>+ </DialogFooter>+ </fieldset>+ </form>+ </Form>+ </DialogContent>+ </Dialog>+ );+};diff --git a/apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx b/apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsxindex 799c54a3f..cd5c939a2 100644--- a/apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx+++ b/apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx@@ -34,6 +34,7 @@ import { Input } from '@documenso/ui/primitives/input';import { Tooltip, TooltipContent, TooltipTrigger } from '@documenso/ui/primitives/tooltip';import { useToast } from '@documenso/ui/primitives/use-toast';+import { AdminOrganisationMemberUpdateDialog } from '~/components/dialogs/admin-organisation-member-update-dialog';import { GenericErrorLayout } from '~/components/general/generic-error-layout';import { SettingsHeader } from '~/components/general/settings-header';@@ -71,23 +72,6 @@ export default function OrganisationGroupSettingsPage({ params }: Route.Componen},});- const { mutateAsync: promoteToOwner, isPending: isPromotingToOwner } =- trpc.admin.organisationMember.promoteToOwner.useMutation({- onSuccess: () => {- toast({- title: t`Success`,- description: t`Member promoted to owner successfully`,- });- },- onError: () => {- toast({- title: t`Error`,- description: t`We couldn't promote the member to owner. Please try again.`,- variant: 'destructive',- });- },- });-const teamsColumns = useMemo(() => {return [{@@ -120,23 +104,24 @@ export default function OrganisationGroupSettingsPage({ params }: Route.Componen},{header: t`Actions`,- cell: ({ row }) => (- <div className="flex justify-end space-x-2">- <Button- variant="outline"- disabled={row.original.userId === organisation?.ownerUserId}- loading={isPromotingToOwner}- onClick={async () =>- promoteToOwner({- organisationId,- userId: row.original.userId,- })- }- >- <Trans>Promote to owner</Trans>- </Button>- </div>- ),+ cell: ({ row }) => {+ const isOwner = row.original.userId === organisation?.ownerUserId;++ return (+ <div className="flex justify-end space-x-2">+ <AdminOrganisationMemberUpdateDialog+ trigger={+ <Button variant="outline">+ <Trans>Update role</Trans>+ </Button>+ }+ organisationId={organisationId}+ organisationMember={row.original}+ isOwner={isOwner}+ />+ </div>+ );+ },},] satisfies DataTableColumnDef<TGetAdminOrganisationResponse['members'][number]>[];}, [organisation]);diff --git a/packages/app-tests/e2e/admin/organisations/promote-member-to-owner.spec.ts b/packages/app-tests/e2e/admin/organisations/update-organisation-member-role.spec.tssimilarity index 64%rename from packages/app-tests/e2e/admin/organisations/promote-member-to-owner.spec.tsrename to packages/app-tests/e2e/admin/organisations/update-organisation-member-role.spec.tsindex 86edeac2b..7cc3f7c03 100644--- a/packages/app-tests/e2e/admin/organisations/promote-member-to-owner.spec.ts+++ b/packages/app-tests/e2e/admin/organisations/update-organisation-member-role.spec.ts@@ -68,15 +68,29 @@ test('[ADMIN]: promote member to owner', async ({ page }) => {// Test promoting a MEMBER to ownerconst memberRow = page.getByRole('row', { name: memberUser.email });- // Find and click the "Promote to owner" button for the member- const promoteButton = memberRow.getByRole('button', { name: 'Promote to owner' });- await expect(promoteButton).toBeVisible();- await expect(promoteButton).not.toBeDisabled();+ // Find and click the "Update role" button for the member+ const updateRoleButton = memberRow.getByRole('button', {+ name: 'Update role',+ });+ await expect(updateRoleButton).toBeVisible();+ await expect(updateRoleButton).not.toBeDisabled();++ await updateRoleButton.click();++ // Wait for dialog to open and select Owner role+ await expect(page.getByRole('dialog')).toBeVisible();- await promoteButton.click();+ // Find and click the select trigger - it's a button with role="combobox"+ await page.getByRole('dialog').locator('button[role="combobox"]').click();- // Verify success toast appears- await expect(page.getByText('Member promoted to owner successfully').first()).toBeVisible();+ // Select "Owner" from the dropdown options+ await page.getByRole('option', { name: 'Owner' }).click();++ // Click Update button+ await page.getByRole('dialog').getByRole('button', { name: 'Update' }).click();++ // Wait for dialog to close (indicates success)+ await expect(page.getByRole('dialog')).not.toBeVisible({ timeout: 10_000 });// Reload the page to see the changesawait page.reload();@@ -89,12 +103,18 @@ test('[ADMIN]: promote member to owner', async ({ page }) => {const previousOwnerRow = page.getByRole('row', { name: ownerUser.email });await expect(previousOwnerRow.getByRole('status').filter({ hasText: 'Owner' })).not.toBeVisible();- // Verify that the promote button is now disabled for the new owner- const newOwnerPromoteButton = newOwnerRow.getByRole('button', { name: 'Promote to owner' });- await expect(newOwnerPromoteButton).toBeDisabled();+ // Verify that the Update role button exists for the new owner and shows Owner as current role+ const newOwnerUpdateButton = newOwnerRow.getByRole('button', {+ name: 'Update role',+ });+ await expect(newOwnerUpdateButton).toBeVisible();++ // Verify clicking it shows the dialog with Owner already selected+ await newOwnerUpdateButton.click();+ await expect(page.getByRole('dialog')).toBeVisible();- // Test that we can't promote the current owner (button should be disabled)- await expect(newOwnerPromoteButton).toHaveAttribute('disabled');+ // Close the dialog without making changes+ await page.getByRole('button', { name: 'Cancel' }).click();});test('[ADMIN]: promote manager to owner', async ({ page }) => {@@ -130,10 +150,26 @@ test('[ADMIN]: promote manager to owner', async ({ page }) => {// Promote the manager to ownerconst managerRow = page.getByRole('row', { name: managerUser.email });- const promoteButton = managerRow.getByRole('button', { name: 'Promote to owner' });+ const updateRoleButton = managerRow.getByRole('button', {+ name: 'Update role',+ });++ await updateRoleButton.click();++ // Wait for dialog to open and select Owner role+ await expect(page.getByRole('dialog')).toBeVisible();++ // Find and click the select trigger - it's a button with role="combobox"+ await page.getByRole('dialog').locator('button[role="combobox"]').click();++ // Select "Owner" from the dropdown options+ await page.getByRole('option', { name: 'Owner' }).click();- await promoteButton.click();- await expect(page.getByText('Member promoted to owner successfully').first()).toBeVisible();+ // Click Update button+ await page.getByRole('dialog').getByRole('button', { name: 'Update' }).click();++ // Wait for dialog to close (indicates success)+ await expect(page.getByRole('dialog')).not.toBeVisible({ timeout: 10_000 });// Reload and verify the changeawait page.reload();@@ -173,13 +209,26 @@ test('[ADMIN]: promote admin member to owner', async ({ page }) => {// Promote the admin member to ownerconst adminMemberRow = page.getByRole('row', { name: adminMemberUser.email });- const promoteButton = adminMemberRow.getByRole('button', { name: 'Promote to owner' });+ const updateRoleButton = adminMemberRow.getByRole('button', {+ name: 'Update role',+ });- await promoteButton.click();+ await updateRoleButton.click();- await expect(page.getByText('Member promoted to owner successfully').first()).toBeVisible({- timeout: 10_000,- });+ // Wait for dialog to open and select Owner role+ await expect(page.getByRole('dialog')).toBeVisible();++ // Find and click the select trigger - it's a button with role="combobox"+ await page.getByRole('dialog').locator('button[role="combobox"]').click();++ // Select "Owner" from the dropdown options+ await page.getByRole('option', { name: 'Owner' }).click();++ // Click Update button+ await page.getByRole('dialog').getByRole('button', { name: 'Update' }).click();++ // Wait for dialog to close (indicates success)+ await expect(page.getByRole('dialog')).not.toBeVisible({ timeout: 10_000 });// Reload and verify the changeawait page.reload();@@ -249,11 +298,25 @@ test('[ADMIN]: verify role hierarchy after promotion', async ({ page }) => {await expect(memberRow.getByRole('status').filter({ hasText: 'Owner' })).not.toBeVisible();// Promote member to owner- const promoteButton = memberRow.getByRole('button', { name: 'Promote to owner' });- await promoteButton.click();- await expect(page.getByText('Member promoted to owner successfully').first()).toBeVisible({- timeout: 10_000,+ const updateRoleButton = memberRow.getByRole('button', {+ name: 'Update role',});+ await updateRoleButton.click();++ // Wait for dialog to open and select Owner role+ await expect(page.getByRole('dialog')).toBeVisible();++ // Find and click the select trigger - it's a button with role="combobox"+ await page.getByRole('dialog').locator('button[role="combobox"]').click();++ // Select "Owner" from the dropdown options+ await page.getByRole('option', { name: 'Owner' }).click();++ // Click Update button+ await page.getByRole('dialog').getByRole('button', { name: 'Update' }).click();++ // Wait for dialog to close (indicates success)+ await expect(page.getByRole('dialog')).not.toBeVisible({ timeout: 10_000 });// Reload page to see updated stateawait page.reload();@@ -262,9 +325,11 @@ test('[ADMIN]: verify role hierarchy after promotion', async ({ page }) => {memberRow = page.getByRole('row', { name: memberUser.email });await expect(memberRow.getByRole('status').filter({ hasText: 'Owner' })).toBeVisible();- // Verify the promote button is now disabled for the new owner- const newOwnerPromoteButton = memberRow.getByRole('button', { name: 'Promote to owner' });- await expect(newOwnerPromoteButton).toBeDisabled();+ // Verify the Update role button exists and shows Owner as current role+ const newOwnerUpdateButton = memberRow.getByRole('button', {+ name: 'Update role',+ });+ await expect(newOwnerUpdateButton).toBeVisible();// Sign in as the newly promoted user to verify they have owner permissionsawait apiSignin({@@ -336,28 +401,56 @@ test('[ADMIN]: multiple promotions in sequence', async ({ page }) => {// First promotion: Member 1 becomes ownerlet member1Row = page.getByRole('row', { name: member1User.email });- let promoteButton1 = member1Row.getByRole('button', { name: 'Promote to owner' });- await promoteButton1.click();- await expect(page.getByText('Member promoted to owner successfully').first()).toBeVisible({- timeout: 10_000,+ let updateRoleButton1 = member1Row.getByRole('button', {+ name: 'Update role',});+ await updateRoleButton1.click();++ // Wait for dialog to open and select Owner role+ await expect(page.getByRole('dialog')).toBeVisible();++ // Find and click the select trigger - it's a button with role="combobox"+ await page.getByRole('dialog').locator('button[role="combobox"]').click();++ // Select "Owner" from the dropdown options+ await page.getByRole('option', { name: 'Owner' }).click();++ // Click Update button+ await page.getByRole('dialog').getByRole('button', { name: 'Update' }).click();++ // Wait for dialog to close (indicates success)+ await expect(page.getByRole('dialog')).not.toBeVisible({ timeout: 10_000 });await page.reload();- // Verify Member 1 is now owner and button is disabled+ // Verify Member 1 is now ownermember1Row = page.getByRole('row', { name: member1User.email });await expect(member1Row.getByRole('status').filter({ hasText: 'Owner' })).toBeVisible();- promoteButton1 = member1Row.getByRole('button', { name: 'Promote to owner' });- await expect(promoteButton1).toBeDisabled();+ updateRoleButton1 = member1Row.getByRole('button', { name: 'Update role' });+ await expect(updateRoleButton1).toBeVisible();// Second promotion: Member 2 becomes the new ownerconst member2Row = page.getByRole('row', { name: member2User.email });- const promoteButton2 = member2Row.getByRole('button', { name: 'Promote to owner' });- await expect(promoteButton2).not.toBeDisabled();- await promoteButton2.click();- await expect(page.getByText('Member promoted to owner successfully').first()).toBeVisible({- timeout: 10_000,+ const updateRoleButton2 = member2Row.getByRole('button', {+ name: 'Update role',});+ await expect(updateRoleButton2).toBeVisible();+ await updateRoleButton2.click();++ // Wait for dialog to open and select Owner role+ await expect(page.getByRole('dialog')).toBeVisible();++ // Find and click the select trigger - it's a button with role="combobox"+ await page.getByRole('dialog').locator('button[role="combobox"]').click();++ // Select "Owner" from the dropdown options+ await page.getByRole('option', { name: 'Owner' }).click();++ // Click Update button+ await page.getByRole('dialog').getByRole('button', { name: 'Update' }).click();++ // Wait for dialog to close (indicates success)+ await expect(page.getByRole('dialog')).not.toBeVisible({ timeout: 10_000 });await page.reload();@@ -365,9 +458,11 @@ test('[ADMIN]: multiple promotions in sequence', async ({ page }) => {await expect(member2Row.getByRole('status').filter({ hasText: 'Owner' })).toBeVisible();await expect(member1Row.getByRole('status').filter({ hasText: 'Owner' })).not.toBeVisible();- // Verify Member 1's promote button is now enabled again- const newPromoteButton1 = member1Row.getByRole('button', { name: 'Promote to owner' });- await expect(newPromoteButton1).not.toBeDisabled();+ // Verify Member 1's Update role button is still visible+ const newUpdateButton1 = member1Row.getByRole('button', {+ name: 'Update role',+ });+ await expect(newUpdateButton1).toBeVisible();});test('[ADMIN]: verify organisation access after ownership change', async ({ page }) => {@@ -402,11 +497,25 @@ test('[ADMIN]: verify organisation access after ownership change', async ({ page});const memberRow = page.getByRole('row', { name: memberUser.email });- const promoteButton = memberRow.getByRole('button', { name: 'Promote to owner' });- await promoteButton.click();- await expect(page.getByText('Member promoted to owner successfully').first()).toBeVisible({- timeout: 10_000,+ const updateRoleButton = memberRow.getByRole('button', {+ name: 'Update role',});+ await updateRoleButton.click();++ // Wait for dialog to open and select Owner role+ await expect(page.getByRole('dialog')).toBeVisible();++ // Find and click the select trigger - it's a button with role="combobox"+ await page.getByRole('dialog').locator('button[role="combobox"]').click();++ // Select "Owner" from the dropdown options+ await page.getByRole('option', { name: 'Owner' }).click();++ // Click Update button+ await page.getByRole('dialog').getByRole('button', { name: 'Update' }).click();++ // Wait for dialog to close (indicates success)+ await expect(page.getByRole('dialog')).not.toBeVisible({ timeout: 10_000 });// Test that the new owner can access organisation settingsawait apiSignin({diff --git a/packages/trpc/server/admin-router/get-admin-organisation.ts b/packages/trpc/server/admin-router/get-admin-organisation.tsindex 8990e0521..31fc09022 100644--- a/packages/trpc/server/admin-router/get-admin-organisation.ts+++ b/packages/trpc/server/admin-router/get-admin-organisation.ts@@ -39,6 +39,11 @@ export const getAdminOrganisation = async ({ organisationId }: GetOrganisationOpteams: true,members: {include: {+ organisationGroupMembers: {+ include: {+ group: true,+ },+ },user: {select: {id: true,diff --git a/packages/trpc/server/admin-router/get-admin-organisation.types.ts b/packages/trpc/server/admin-router/get-admin-organisation.types.tsindex 8491003f9..442999c83 100644--- a/packages/trpc/server/admin-router/get-admin-organisation.types.ts+++ b/packages/trpc/server/admin-router/get-admin-organisation.types.ts@@ -3,6 +3,8 @@ import { z } from 'zod';import { ZOrganisationSchema } from '@documenso/lib/types/organisation';import OrganisationClaimSchema from '@documenso/prisma/generated/zod/modelSchema/OrganisationClaimSchema';import OrganisationGlobalSettingsSchema from '@documenso/prisma/generated/zod/modelSchema/OrganisationGlobalSettingsSchema';+import OrganisationGroupMemberSchema from '@documenso/prisma/generated/zod/modelSchema/OrganisationGroupMemberSchema';+import OrganisationGroupSchema from '@documenso/prisma/generated/zod/modelSchema/OrganisationGroupSchema';import OrganisationMemberSchema from '@documenso/prisma/generated/zod/modelSchema/OrganisationMemberSchema';import SubscriptionSchema from '@documenso/prisma/generated/zod/modelSchema/SubscriptionSchema';import TeamSchema from '@documenso/prisma/generated/zod/modelSchema/TeamSchema';@@ -30,6 +32,18 @@ export const ZGetAdminOrganisationResponseSchema = ZOrganisationSchema.extend({email: true,name: true,}),+ organisationGroupMembers: z.array(+ OrganisationGroupMemberSchema.pick({+ id: true,+ groupId: true,+ }).extend({+ group: OrganisationGroupSchema.pick({+ id: true,+ type: true,+ organisationRole: true,+ }),+ }),+ ),}).array(),subscription: SubscriptionSchema.nullable(),organisationClaim: OrganisationClaimSchema,diff --git a/packages/trpc/server/admin-router/router.ts b/packages/trpc/server/admin-router/router.tsindex c3d2c9b81..526f04980 100644--- a/packages/trpc/server/admin-router/router.ts+++ b/packages/trpc/server/admin-router/router.ts@@ -17,6 +17,7 @@ import { promoteMemberToOwnerRoute } from './promote-member-to-owner';import { resealDocumentRoute } from './reseal-document';import { resetTwoFactorRoute } from './reset-two-factor-authentication';import { updateAdminOrganisationRoute } from './update-admin-organisation';+import { updateOrganisationMemberRoleRoute } from './update-organisation-member-role';import { updateRecipientRoute } from './update-recipient';import { updateSiteSettingRoute } from './update-site-setting';import { updateSubscriptionClaimRoute } from './update-subscription-claim';@@ -31,6 +32,7 @@ export const adminRouter = router({},organisationMember: {promoteToOwner: promoteMemberToOwnerRoute,+ updateRole: updateOrganisationMemberRoleRoute,},claims: {find: findSubscriptionClaimsRoute,diff --git a/packages/trpc/server/admin-router/update-organisation-member-role.ts b/packages/trpc/server/admin-router/update-organisation-member-role.tsnew file mode 100644index 000000000..bfb12256b--- /dev/null+++ b/packages/trpc/server/admin-router/update-organisation-member-role.ts@@ -0,0 +1,220 @@+import { OrganisationGroupType, OrganisationMemberRole } from '@prisma/client';++import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';+import { generateDatabaseId } from '@documenso/lib/universal/id';+import { getHighestOrganisationRoleInGroup } from '@documenso/lib/utils/organisations';+import { prisma } from '@documenso/prisma';++import { adminProcedure } from '../trpc';+import {+ ZUpdateOrganisationMemberRoleRequestSchema,+ ZUpdateOrganisationMemberRoleResponseSchema,+} from './update-organisation-member-role.types';++/**+ * Admin mutation to update organisation member role or transfer ownership.+ *+ * This mutation handles two scenarios:+ * 1. When role='OWNER': Transfers organisation ownership and promotes to ADMIN+ * 2. When role=ADMIN/MANAGER/MEMBER: Updates group membership+ *+ * Admin privileges bypass normal hierarchy restrictions.+ */+export const updateOrganisationMemberRoleRoute = adminProcedure+ .input(ZUpdateOrganisationMemberRoleRequestSchema)+ .output(ZUpdateOrganisationMemberRoleResponseSchema)+ .mutation(async ({ input, ctx }) => {+ const { organisationId, userId, role } = input;++ ctx.logger.info({+ input: {+ organisationId,+ userId,+ role,+ },+ });++ const organisation = await prisma.organisation.findUnique({+ where: {+ id: organisationId,+ },+ include: {+ groups: {+ where: {+ type: OrganisationGroupType.INTERNAL_ORGANISATION,+ },+ },+ members: {+ where: {+ userId,+ },+ include: {+ organisationGroupMembers: {+ include: {+ group: true,+ },+ },+ },+ },+ },+ });++ if (!organisation) {+ throw new AppError(AppErrorCode.NOT_FOUND, {+ message: 'Organisation not found',+ });+ }++ const [member] = organisation.members;++ if (!member) {+ throw new AppError(AppErrorCode.NOT_FOUND, {+ message: 'User is not a member of this organisation',+ });+ }++ const currentOrganisationRole = getHighestOrganisationRoleInGroup(+ member.organisationGroupMembers.flatMap((member) => member.group),+ );++ if (role === 'OWNER') {+ if (organisation.ownerUserId === userId) {+ throw new AppError(AppErrorCode.INVALID_REQUEST, {+ message: 'User is already the owner of this organisation',+ });+ }++ const currentMemberGroup = organisation.groups.find(+ (group) => group.organisationRole === currentOrganisationRole,+ );++ const adminGroup = organisation.groups.find(+ (group) => group.organisationRole === OrganisationMemberRole.ADMIN,+ );++ if (!currentMemberGroup) {+ ctx.logger.error({+ message: '[CRITICAL]: Missing internal group',+ organisationId,+ userId,+ role: currentOrganisationRole,+ });++ throw new AppError(AppErrorCode.UNKNOWN_ERROR, {+ message: 'Current member group not found',+ });+ }++ if (!adminGroup) {+ ctx.logger.error({+ message: '[CRITICAL]: Missing internal group',+ organisationId,+ userId,+ targetRole: 'ADMIN',+ });++ throw new AppError(AppErrorCode.UNKNOWN_ERROR, {+ message: 'Admin group not found',+ });+ }++ await prisma.$transaction(async (tx) => {+ await tx.organisation.update({+ where: {+ id: organisationId,+ },+ data: {+ ownerUserId: userId,+ },+ });++ if (currentOrganisationRole !== OrganisationMemberRole.ADMIN) {+ await tx.organisationGroupMember.delete({+ where: {+ organisationMemberId_groupId: {+ organisationMemberId: member.id,+ groupId: currentMemberGroup.id,+ },+ },+ });++ await tx.organisationGroupMember.create({+ data: {+ id: generateDatabaseId('group_member'),+ organisationMemberId: member.id,+ groupId: adminGroup.id,+ },+ });+ }+ });++ return;+ }++ const targetRole = role as OrganisationMemberRole;++ if (currentOrganisationRole === targetRole) {+ throw new AppError(AppErrorCode.INVALID_REQUEST, {+ message: 'User already has this role',+ });+ }++ if (userId === organisation.ownerUserId && targetRole !== OrganisationMemberRole.ADMIN) {+ throw new AppError(AppErrorCode.INVALID_REQUEST, {+ message: 'Organisation owner must be an admin. Transfer ownership first.',+ });+ }++ const currentMemberGroup = organisation.groups.find(+ (group) => group.organisationRole === currentOrganisationRole,+ );++ const newMemberGroup = organisation.groups.find(+ (group) => group.organisationRole === targetRole,+ );++ if (!currentMemberGroup) {+ ctx.logger.error({+ message: '[CRITICAL]: Missing internal group',+ organisationId,+ userId,+ role: currentOrganisationRole,+ });++ throw new AppError(AppErrorCode.UNKNOWN_ERROR, {+ message: 'Current member group not found',+ });+ }++ if (!newMemberGroup) {+ ctx.logger.error({+ message: '[CRITICAL]: Missing internal group',+ organisationId,+ userId,+ targetRole,+ });++ throw new AppError(AppErrorCode.UNKNOWN_ERROR, {+ message: 'New member group not found',+ });+ }++ await prisma.$transaction(async (tx) => {+ await tx.organisationGroupMember.delete({+ where: {+ organisationMemberId_groupId: {+ organisationMemberId: member.id,+ groupId: currentMemberGroup.id,+ },+ },+ });++ await tx.organisationGroupMember.create({+ data: {+ id: generateDatabaseId('group_member'),+ organisationMemberId: member.id,+ groupId: newMemberGroup.id,+ },+ });+ });+ });diff --git a/packages/trpc/server/admin-router/update-organisation-member-role.types.ts b/packages/trpc/server/admin-router/update-organisation-member-role.types.tsnew file mode 100644index 000000000..9e8adf7db--- /dev/null+++ b/packages/trpc/server/admin-router/update-organisation-member-role.types.ts@@ -0,0 +1,30 @@+import { OrganisationMemberRole } from '@prisma/client';+import { z } from 'zod';++/**+ * Admin-only role selection that includes OWNER as a special case.+ * OWNER is not a database role but triggers ownership transfer.+ */+export const ZAdminRoleSelection = z.enum([+ 'OWNER',+ OrganisationMemberRole.ADMIN,+ OrganisationMemberRole.MANAGER,+ OrganisationMemberRole.MEMBER,+]);++export type TAdminRoleSelection = z.infer<typeof ZAdminRoleSelection>;++export const ZUpdateOrganisationMemberRoleRequestSchema = z.object({+ organisationId: z.string().min(1),+ userId: z.number().min(1),+ role: ZAdminRoleSelection,+});++export const ZUpdateOrganisationMemberRoleResponseSchema = z.void();++export type TUpdateOrganisationMemberRoleRequest = z.infer<+ typeof ZUpdateOrganisationMemberRoleRequestSchema+>;+export type TUpdateOrganisationMemberRoleResponse = z.infer<+ typeof ZUpdateOrganisationMemberRoleResponseSchema+>;