upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-28 04:32:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 25

fix(files_sharing): use webroot for public links

Browse source 
Regression of https://github.com/nextcloud/server/pull/55750

Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
This commit is contained in:
Ferdinand Thiessen 2025-11-12 22:10:04 +01:00
parent e7d02a6e5f
commit 85b6a0628d
No known key found for this signature in database
GPG key ID: 45FAE7268762B400
2 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
apps/files_sharing/src/utils/generateUrl.spec.ts
View file

@ -3,13 +3,25 @@
* SPDX-License-Identifier: AGPL-3.0-or-later
*/
import { describe, expect, it, vi } from 'vitest'
import { beforeEach, describe, expect, it, vi } from 'vitest'
import { generateFileUrl } from './generateUrl.ts'
const getCapabilities = vi.hoisted(() => vi.fn())
vi.mock('@nextcloud/capabilities', () => ({ getCapabilities }))
describe('generateFileUrl', () => {
beforeEach(() => window._oc_webroot = '')
/**
* Regression test of https://github.com/nextcloud/server/issues/56374
*/
it('should work without globalscale and webroot', () => {
window._oc_webroot = '/nextcloud'
getCapabilities.mockReturnValue({ globalscale: null })
const url = generateFileUrl(12345)
expect(url).toBe('http://nextcloud.local/nextcloud/index.php/f/12345')
})
it('should work without globalscale', () => {
getCapabilities.mockReturnValue({ globalscale: null })
const url = generateFileUrl(12345)

4
apps/files_sharing/src/utils/generateUrl.ts
View file

@ -4,7 +4,7 @@
*/
import { getCapabilities } from '@nextcloud/capabilities'
import { generateUrl } from '@nextcloud/router'
import { generateUrl, getBaseUrl } from '@nextcloud/router'
interface IGlobalScaleCapabilities {
token?: string
@ -14,7 +14,7 @@ interface IGlobalScaleCapabilities {
* @param fileid - The file ID to generate the direct file link for
*/
export function generateFileUrl(fileid: number): string {
const baseURL = window.location.protocol + '//' + window.location.host
const baseURL = getBaseUrl()
const { globalscale } = getCapabilities() as { globalscale?: IGlobalScaleCapabilities }
if (globalscale?.token) {