Skip to content

fix(files_sharing): respect openfile parameter for external file shares #65997

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

Open
sundeep8967 wants to merge 1 commit into
base: master
Choose a base branch
from
+13 −1
Open

fix(files_sharing): respect openfile parameter for external file shares #65997

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion apps/files_sharing/src/public/init.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,13 @@ if (fileId !== null) {
// The router lands its first navigation, to the URL the page was opened
// with, asynchronously: a push made before it finishes is overwritten by it,
// and the shared file is never opened
const currentOpenFile = window.OCP.Files.Router.query.openfile
const openfile = currentOpenFile !== undefined && currentOpenFile.toLowerCase() === 'false' ? 'false' : 'true'
router.isReady()
.then(() => window.OCP.Files.Router.goToRoute(
'filelist',
{ ...window.OCP.Files.Router.params, token, fileid: String(fileId) },
{ ...window.OCP.Files.Router.query, openfile: 'true' },
{ ...window.OCP.Files.Router.query, openfile },
))
.catch((error) => logger.error('Could not open the shared file', { error }))
}
Expand Down
10 changes: 10 additions & 0 deletions tests/playwright/e2e/files_sharing/public-share/download.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,16 @@ test.describe('files_sharing: Public share - downloading a shared file', () => {
expect(download.suggestedFilename()).toBe('file.txt')
expect(await readDownloadText(download)).toBe('<content>foo</content>')
})

test('respects openfile=false parameter for shared file without opening viewer', async ({ page, user, ownerRequest, publicShare, filesListPage }) => {
const fileId = await uploadContent(ownerRequest, user, '<content>foo</content>', 'text/plain', '/file.txt')
const share = await createLinkShare(ownerRequest, '/file.txt')
await publicShare.open(`${share.url}?openfile=false`)

const row = filesListPage.getRowForFileId(Number(fileId))
await expect(row).toBeVisible()
await expect(page.getByRole('dialog', { name: 'file.txt' })).toHaveCount(0)
})
})

test.describe('files_sharing: Public share - downloading from a shared folder', () => {
Expand Down