fix(dialog): match the merged per-recipient permission API

nextcloud/server#63854 landed per-recipient permissions with a different shape
than assumed, so align with it:

- SharingRecipient exposes `permissions` only; there is no per-recipient preset
  field, so the selected preset is derived from the enabled permissions.
- updateShareRecipientPermission sends recipientClass / recipientValue /
  recipientInstance / permissionClass / enabled.
- There is no per-recipient preset endpoint: drop it, and apply a preset by
  toggling each permission to match it (skipping any beyond the share maximum).

Assisted-by: ClaudeCode:claude-opus-4-8
Signed-off-by: skjnldsv <skjnldsv@protonmail.com>

Author: skjnldsv

lib/dialog/api/share.spec.ts

@@ -23,7 +23,6 @@ vi.mock('./sharing.ts', () => ({
 	updateSharePermission: vi.fn(),
 	selectSharePermissionPreset: vi.fn(),
 	updateShareRecipientPermission: vi.fn(),
-	selectShareRecipientPermissionPreset: vi.fn(),
 	updateShareState: vi.fn(),
 	searchRecipients: vi.fn(),
 	deleteShare: vi.fn(),
@@ -128,13 +127,6 @@ describe('Share', () => {
 		expect(mocked.updateShareRecipientPermission).toHaveBeenCalledWith('abc', 'R', 'bob', 'C', true, 'inst')
 	})
 
-	it('selectRecipientPreset forwards recipient identity and preset', async () => {
-		const instance = await makeShare()
-		mocked.selectShareRecipientPermissionPreset.mockResolvedValue(share())
-		await instance.selectRecipientPreset('R', 'bob', 'PresetX')
-		expect(mocked.selectShareRecipientPermissionPreset).toHaveBeenCalledWith('abc', 'R', 'bob', 'PresetX', undefined)
-	})
-
 	it('addSource forwards the class and value', async () => {
 		const instance = await makeShare()
 		mocked.addShareSource.mockResolvedValue(share())

lib/dialog/api/share.ts

@@ -197,18 +197,6 @@ class Share {
 		return this.#sync(await client.updateShareRecipientPermission(this.id, recipientClass, recipientValue, permissionClass, enabled, instance))
 	}
 
-	/**
-	 * Apply a permission preset to one recipient.
-	 *
-	 * @param recipientClass The recipient type class
-	 * @param recipientValue The recipient value
-	 * @param presetClass The preset class to apply
-	 * @param instance The recipient's instance (federated shares)
-	 */
-	async selectRecipientPreset(recipientClass: string, recipientValue: string, presetClass: string, instance?: string): Promise<this> {
-		return this.#sync(await client.selectShareRecipientPermissionPreset(this.id, recipientClass, recipientValue, presetClass, instance))
-	}
-
 	/**
 	 * Set the share state (draft → active → deleted).
 	 *

lib/dialog/api/sharing.ts

@@ -188,34 +188,15 @@ export async function selectSharePermissionPreset(shareId: string, presetClass:
  */
 export async function updateShareRecipientPermission(shareId: string, recipientClass: string, recipientValue: string, permissionClass: string, enabled: boolean, instance?: string): Promise<SharingShare> {
 	const response = await axios.put(sharingUrl(`/share/${shareId}/recipient/permission`), {
-		class: recipientClass,
-		value: recipientValue,
-		instance: instance ?? null,
+		recipientClass,
+		recipientValue,
+		recipientInstance: instance ?? null,
 		permissionClass,
 		enabled,
 	})
 	return unwrapOcs<SharingShare>(response)
 }
 
-/**
- * Apply a permission preset to one recipient of a share.
- *
- * @param shareId
- * @param recipientClass
- * @param recipientValue
- * @param presetClass
- * @param instance
- */
-export async function selectShareRecipientPermissionPreset(shareId: string, recipientClass: string, recipientValue: string, presetClass: string, instance?: string): Promise<SharingShare> {
-	const response = await axios.put(sharingUrl(`/share/${shareId}/recipient/permission/preset`), {
-		class: recipientClass,
-		value: recipientValue,
-		instance: instance ?? null,
-		permissionPresetClass: presetClass,
-	})
-	return unwrapOcs<SharingShare>(response)
-}
-
 /**
  * Update the state of a share (draft → active → deleted).
  *

lib/dialog/components/SharePanel.spec.ts

@@ -79,7 +79,6 @@ function schema(overrides: Partial<SharingShare> = {}): SharingShare {
 			{ class: PERM_READ, source_class: null, display_name: 'Read', hint: null, priority: 10, presets: [PRESET_VIEW, PRESET_EDIT], enabled: true },
 			{ class: PERM_WRITE, source_class: null, display_name: 'Write', hint: null, priority: 20, presets: [PRESET_EDIT], enabled: false },
 		],
-		permission_preset: null,
 		...overrides,
 	}
 }
@@ -178,7 +177,6 @@ describe('SharePanel tab bar', () => {
 		icon: null,
 		secret: { updatable: false },
 		initiator: null,
-		permission_preset: null,
 		permissions: [],
 	}
 

lib/dialog/composables/useRecipientPermissions.spec.ts

@@ -40,7 +40,6 @@ function recipient(overrides: Partial<SharingRecipient> = {}): SharingRecipient
 		icon: null,
 		secret: { updatable: false },
 		initiator: null,
-		permission_preset: null,
 		permissions: [],
 		...overrides,
 	}
@@ -51,7 +50,6 @@ function fakeShare(permissions: SharingPermission[], preset: string | null = nul
 		permissions,
 		permissionPreset: preset,
 		data: { owner },
-		selectRecipientPreset: vi.fn().mockResolvedValue(undefined),
 		setRecipientPermission: vi.fn().mockResolvedValue(undefined),
 	} as unknown as Share
 }
@@ -78,9 +76,14 @@ describe('permissions', () => {
 })
 
 describe('selectedPreset', () => {
-	test('falls back to custom when the recipient preset is not offered', () => {
-		const { selectedPreset } = useRecipientPermissions(cappedShare(), () => recipient({ permission_preset: 'Edit' }))
-		expect(selectedPreset.value.value).toBe(CUSTOM_VALUE)
+	test('derives the preset from the enabled permissions', () => {
+		const r = recipient({ permissions: [permission('read', true, ['View', 'Edit'])] })
+		expect(useRecipientPermissions(cappedShare(), () => r).selectedPreset.value.value).toBe('View')
+	})
+
+	test('falls back to custom when no preset matches the enabled permissions', () => {
+		const r = recipient({ permissions: [permission('read', false, ['View', 'Edit'])] })
+		expect(useRecipientPermissions(cappedShare(), () => r).selectedPreset.value.value).toBe(CUSTOM_VALUE)
 	})
 })
 
@@ -111,12 +114,17 @@ describe('mutations', () => {
 		share = cappedShare()
 	})
 
-	test('onPresetChange forwards to the share, skipping custom', async () => {
-		const { onPresetChange } = useRecipientPermissions(share, () => recipient())
+	test('onPresetChange applies the preset by toggling permissions', async () => {
+		const r = recipient({ permissions: [permission('read', false, ['View', 'Edit']), permission('write', false, ['Edit'])] })
+		const { onPresetChange } = useRecipientPermissions(share, () => r)
+
 		await onPresetChange({ value: CUSTOM_VALUE, label: 'Can…' })
-		expect(share.selectRecipientPreset).not.toHaveBeenCalled()
+		expect(share.setRecipientPermission).not.toHaveBeenCalled()
+
 		await onPresetChange({ value: 'View', label: 'Can view' })
-		expect(share.selectRecipientPreset).toHaveBeenCalledWith('UserRecipient', 'carol', 'View', undefined)
+		// read belongs to the preset and is within the share max; write is over it.
+		expect(share.setRecipientPermission).toHaveBeenCalledWith('UserRecipient', 'carol', 'read', true, undefined)
+		expect(share.setRecipientPermission).toHaveBeenCalledTimes(1)
 	})
 
 	test('onPermissionToggle forwards to the share', async () => {

lib/dialog/composables/useRecipientPermissions.ts

@@ -61,19 +61,34 @@ export function useRecipientPermissions(share: Share, getRecipient: () => Sharin
 		]
 	})
 
-	const selectedPreset = computed<PresetOption>(() => presetOptions.value.find((option) => option.value === recipient.value.permission_preset) ?? customOption)
-
-	const showPermissions = computed(() => selectedPreset.value.value === CUSTOM_VALUE)
-
 	const permissions = computed<RecipientPermission[]>(() => {
 		const max = shareMax.value
-		// The backend may not (yet) return per-recipient permissions.
 		return (recipient.value.permissions ?? []).map((permission) => ({
 			...permission,
 			available: max.has(permission.class),
 		}))
 	})
 
+	/**
+	 * Recipients carry permissions but no preset field, so the preset is the one
+	 * whose member permissions are exactly the enabled ones (custom otherwise).
+	 */
+	const selectedPreset = computed<PresetOption>(() => {
+		const enabled = new Set(permissions.value.filter((permission) => permission.enabled).map((permission) => permission.class))
+		for (const option of presetOptions.value) {
+			if (option.value === CUSTOM_VALUE) {
+				continue
+			}
+			const members = permissions.value.filter((permission) => permission.presets.includes(option.value))
+			if (members.length > 0 && members.length === enabled.size && members.every((permission) => enabled.has(permission.class))) {
+				return option
+			}
+		}
+		return customOption
+	})
+
+	const showPermissions = computed(() => selectedPreset.value.value === CUSTOM_VALUE)
+
 	/** Whether any permission is beyond the share max (drives the cap notice). */
 	const hasCap = computed(() => permissions.value.some((permission) => !permission.available))
 
@@ -113,11 +128,22 @@ export function useRecipientPermissions(share: Share, getRecipient: () => Sharin
 		}
 		presetError.value = null
 		const r = recipient.value
-		try {
-			await share.selectRecipientPreset(r.class, r.value, option.value, r.instance ?? undefined)
-		} catch (e) {
-			logger.error('Failed to select recipient permission preset', { error: e, recipient: r.value, preset: option.value })
-			presetError.value = getOcsErrorMessage(e)
+		// There is no per-recipient preset endpoint: apply the preset by toggling
+		// each permission to match it, skipping any beyond the share maximum.
+		const target = new Set(permissions.value.filter((permission) => permission.presets.includes(option.value)).map((permission) => permission.class))
+		const snapshot = permissions.value.map(({ class: permissionClass, enabled, available }) => ({ permissionClass, enabled, available }))
+		for (const { permissionClass, enabled, available } of snapshot) {
+			const shouldEnable = target.has(permissionClass)
+			if (!available || enabled === shouldEnable) {
+				continue
+			}
+			try {
+				await share.setRecipientPermission(r.class, r.value, permissionClass, shouldEnable, r.instance ?? undefined)
+			} catch (e) {
+				logger.error('Failed to apply recipient permission preset', { error: e, recipient: r.value, permission: permissionClass })
+				presetError.value = getOcsErrorMessage(e)
+				return
+			}
 		}
 	}
 

lib/dialog/composables/useRecipientSearch.spec.ts

@@ -21,7 +21,6 @@ const bob: SharingRecipient = {
 	icon: null,
 	secret: { updatable: false },
 	initiator: null,
-	permission_preset: null,
 	permissions: [],
 }
 

lib/dialog/types/api.ts

@@ -51,9 +51,10 @@ export interface SharingRecipient {
 	icon: SharingIcon | null
 	secret: SharingRecipientSecret
 	initiator: SharingOwner | null
-	/** Class of the preset matching this recipient's enabled permissions, null when custom */
-	permission_preset: string | null
-	/** Per-recipient permissions, capped at the share-level (maximum) permissions */
+	/**
+	 * Per-recipient permissions, capped at the share-level (maximum) permissions.
+	 * There is no preset field: the preset is derived from the enabled ones.
+	 */
 	permissions: SharingPermission[]
 }
 

tests/ct/fixtures/RecipientListFixture.vue

@@ -23,7 +23,6 @@ function recipient(cls: string, value: string, displayName: string): SharingReci
 		icon: null,
 		secret: { updatable: false },
 		initiator: null,
-		permission_preset: null,
 		permissions: [],
 	}
 }

tests/ct/fixtures/RecipientRowFixture.vue

@@ -28,7 +28,6 @@ const recipient: SharingRecipient = {
 	icon: null,
 	secret: { updatable: false },
 	initiator: null,
-	permission_preset: null,
 	permissions: [],
 }