diff options
| author | Grigorii K. Shartsev <me@shgk.me> | 2024-10-17 15:17:43 +0200 |
|---|---|---|
| committer | Grigorii K. Shartsev <me@shgk.me> | 2024-10-28 13:19:20 +0100 |
| commit | e10a2b1a1ac5514d924935c2b10ee6e4537d2f5f (patch) | |
| tree | 07c26fbfbd5d5f18c59590b673c6b1611704b7fa | |
| parent | 5bb1211caef8f47387d17a2f4ab5ac7ae87dc408 (diff) | |
| download | nextcloud-server-e10a2b1a1ac5514d924935c2b10ee6e4537d2f5f.tar.gz nextcloud-server-e10a2b1a1ac5514d924935c2b10ee6e4537d2f5f.zip | |
refactor(files): migrate to @nextcloud/sharing
Signed-off-by: Grigorii K. Shartsev <me@shgk.me>
| -rw-r--r-- | apps/files/src/components/TemplatePreview.vue | 6 | ||||
| -rw-r--r-- | apps/files/src/utils/davUtils.ts | 18 |
2 files changed, 3 insertions, 21 deletions
diff --git a/apps/files/src/components/TemplatePreview.vue b/apps/files/src/components/TemplatePreview.vue index 53195d028c6..943ed2906f2 100644 --- a/apps/files/src/components/TemplatePreview.vue +++ b/apps/files/src/components/TemplatePreview.vue @@ -48,8 +48,8 @@ <script> import { generateUrl } from '@nextcloud/router' +import { isPublicShare, getSharingToken } from '@nextcloud/sharing/public' import { encodeFilePath } from '../utils/fileUtils.ts' -import { getToken, isPublic } from '../utils/davUtils.js' // preview width generation const previewWidth = 256 @@ -123,8 +123,8 @@ export default { return this.previewUrl } // TODO: find a nicer standard way of doing this? - if (isPublic()) { - return generateUrl(`/apps/files_sharing/publicpreview/${getToken()}?fileId=${this.fileid}&file=${encodeFilePath(this.filename)}&x=${previewWidth}&y=${previewWidth}&a=1`) + if (isPublicShare()) { + return generateUrl(`/apps/files_sharing/publicpreview/${getSharingToken()}?fileId=${this.fileid}&file=${encodeFilePath(this.filename)}&x=${previewWidth}&y=${previewWidth}&a=1`) } return generateUrl(`/core/preview?fileId=${this.fileid}&x=${previewWidth}&y=${previewWidth}&a=1`) }, diff --git a/apps/files/src/utils/davUtils.ts b/apps/files/src/utils/davUtils.ts index cf49df5b278..d8dc12d069d 100644 --- a/apps/files/src/utils/davUtils.ts +++ b/apps/files/src/utils/davUtils.ts @@ -3,28 +3,10 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ -import { getCurrentUser } from '@nextcloud/auth' import { t } from '@nextcloud/l10n' import type { WebDAVClientError } from 'webdav' /** - * Check whether this is a public share - * @return {boolean} Whether this is a public share - */ -export function isPublic() { - return !getCurrentUser() -} - -/** - * Get the sharing token - * @return {string|null} The sharing token - */ -export function getToken() { - const tokenElement = document.getElementById('sharingToken') as (HTMLInputElement | null) - return tokenElement?.value -} - -/** * Whether error is a WebDAVClientError * @param error - Any exception * @return {boolean} - Whether error is a WebDAVClientError |