Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(dav): remove sharing attributes from default dav fetch and change duplicate registration from error to warn #902

Merged
merged 1 commit into from
Mar 5, 2024
Merged

fix(dav): remove sharing attributes from default dav fetch and change duplicate registration from error to warn #902

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 10 additions & 10 deletions __tests__/dav/davProperties.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ describe('DAV Properties', () => {
beforeEach(() => {
delete window._nc_dav_properties
delete window._nc_dav_namespaces

logger.error = vi.fn()
logger.warn = vi.fn()
})

test('getDavNameSpaces fall back to defaults', () => {
Expand Down Expand Up @@ -51,54 +54,51 @@ describe('DAV Properties', () => {
})

test('registerDavProperty registers successfully', () => {
logger.error = vi.fn()

expect(window._nc_dav_namespaces).toBeUndefined()
expect(window._nc_dav_properties).toBeUndefined()

expect(registerDavProperty('my:prop', { my: 'https://example.com/ns' })).toBe(true)
expect(logger.warn).not.toBeCalled()
expect(logger.error).not.toBeCalled()
expect(getDavProperties().includes('my:prop')).toBe(true)
expect(getDavNameSpaces().includes('xmlns:my="https://example.com/ns"')).toBe(true)
})

test('registerDavProperty fails when registered multipletimes', () => {
logger.error = vi.fn()

test('registerDavProperty fails when registered multiple times', () => {
expect(window._nc_dav_namespaces).toBeUndefined()
expect(window._nc_dav_properties).toBeUndefined()

expect(registerDavProperty('my:prop', { my: 'https://example.com/ns' })).toBe(true)
expect(registerDavProperty('my:prop')).toBe(false)
expect(logger.error).toBeCalled()
expect(logger.warn).toBeCalled()
expect(logger.error).not.toBeCalled()
// but still included
expect(getDavProperties().includes('my:prop')).toBe(true)
expect(getDavNameSpaces().includes('xmlns:my="https://example.com/ns"')).toBe(true)
})

test('registerDavProperty fails with invalid props', () => {
logger.error = vi.fn()

expect(window._nc_dav_namespaces).toBeUndefined()
expect(window._nc_dav_properties).toBeUndefined()

expect(registerDavProperty('my:prop:invalid', { my: 'https://example.com/ns' })).toBe(false)
expect(logger.error).toBeCalled()
expect(logger.warn).not.toBeCalled()
expect(getDavProperties().includes('my:prop')).toBe(false)

expect(registerDavProperty('<my:prop />', { my: 'https://example.com/ns' })).toBe(false)
expect(logger.error).toBeCalled()
expect(logger.warn).not.toBeCalled()
expect(getDavProperties().includes('my:prop')).toBe(false)
})

test('registerDavProperty fails with missing namespace', () => {
logger.error = vi.fn()

expect(window._nc_dav_namespaces).toBeUndefined()
expect(window._nc_dav_properties).toBeUndefined()

expect(registerDavProperty('my:prop', { other: 'https://example.com/ns' })).toBe(false)
expect(logger.error).toBeCalled()
expect(logger.warn).not.toBeCalled()
expect(getDavProperties().includes('my:prop')).toBe(false)
})
})
5 changes: 1 addition & 4 deletions lib/dav/davProperties.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,16 +35,13 @@ export const defaultDavProperties = [
'nc:has-preview',
'nc:is-encrypted',
'nc:mount-type',
'nc:share-attributes',
'oc:comments-unread',
'oc:favorite',
'oc:fileid',
'oc:owner-display-name',
'oc:owner-id',
'oc:permissions',
'oc:share-types',
'oc:size',
'ocs:share-permissions',
]

export const defaultDavNamespaces = {
Expand Down Expand Up @@ -72,7 +69,7 @@ export const registerDavProperty = function(prop: string, namespace: DavProperty

// Check duplicates
if (window._nc_dav_properties.find((search) => search === prop)) {
logger.error(`${prop} already registered`, { prop })
logger.warn(`${prop} already registered`, { prop })
return false
}

Expand Down