diff --git a/apps/files_sharing/src/mixins/SharesMixin.js b/apps/files_sharing/src/mixins/SharesMixin.js index 6ed60b18673f8..af6c8ae3c6baf 100644 --- a/apps/files_sharing/src/mixins/SharesMixin.js +++ b/apps/files_sharing/src/mixins/SharesMixin.js @@ -10,7 +10,10 @@ import { ShareType } from '@nextcloud/sharing' import debounce from 'debounce' import PQueue from 'p-queue' import { markRaw } from 'vue' -import { getBundledPermissions } from '../lib/SharePermissionsToolBox.js' +import { + ATOMIC_PERMISSIONS, + getBundledPermissions, +} from '../lib/SharePermissionsToolBox.js' import Share from '../models/Share.ts' import Config from '../services/ConfigService.ts' import logger from '../services/logger.ts' @@ -143,7 +146,11 @@ export default { basePermissions.READ_ONLY, basePermissions.FILE_DROP, ] + // READ_ONLY and FILE_DROP never carry SHARE, so a link share created with it still matches. + const permissionsWithoutShare = this.share.permissions & ~ATOMIC_PERMISSIONS.SHARE return !bundledPermissions.includes(this.share.permissions) + && permissionsWithoutShare !== basePermissions.READ_ONLY + && permissionsWithoutShare !== basePermissions.FILE_DROP }, maxExpirationDateEnforced() { if (this.isExpiryDateEnforced) { diff --git a/apps/files_sharing/src/mixins/SharesMixin.spec.ts b/apps/files_sharing/src/mixins/SharesMixin.spec.ts index 861fdcaac082e..5039544151839 100644 --- a/apps/files_sharing/src/mixins/SharesMixin.spec.ts +++ b/apps/files_sharing/src/mixins/SharesMixin.spec.ts @@ -100,3 +100,24 @@ describe('SharesMixin.data', () => { await expect(state.updateQueue.add(async () => 'done')).resolves.toBe('done') }) }) + +describe('SharesMixin.hasCustomPermissions', () => { + function check(permissions: number) { + const ctx = { share: { permissions }, config: { excludeReshareFromEdit: false } } + return (SharesMixin.computed.hasCustomPermissions as () => boolean).call(ctx) + } + + it('treats a new link share (read and share) as view only', () => { + expect(check(17)).toBe(false) + }) + + it('treats read only and file drop as bundles', () => { + expect(check(1)).toBe(false) + expect(check(4)).toBe(false) + }) + + it('keeps other combinations custom', () => { + expect(check(3)).toBe(true) + expect(check(21)).toBe(true) + }) +}) diff --git a/apps/files_sharing/src/views/SharingDetailsTab.vue b/apps/files_sharing/src/views/SharingDetailsTab.vue index d0c1a6bf5f888..38330da8994f5 100644 --- a/apps/files_sharing/src/views/SharingDetailsTab.vue +++ b/apps/files_sharing/src/views/SharingDetailsTab.vue @@ -1133,7 +1133,10 @@ export default { this.advancedSectionAccordionExpanded = true this.setCustomPermissions = true } else if (this.share.permissions) { - this.sharingPermission = this.share.permissions.toString() + const permissionsWithoutShare = this.share.permissions & ~ATOMIC_PERMISSIONS.SHARE + const isViewOnlyOrDrop = permissionsWithoutShare === this.bundledPermissions.READ_ONLY + || permissionsWithoutShare === this.bundledPermissions.FILE_DROP + this.sharingPermission = (isViewOnlyOrDrop ? permissionsWithoutShare : this.share.permissions).toString() } },