refactor(files): migrate to @nextcloud/sharing

Signed-off-by: Grigorii K. Shartsev <[email protected]>
nextcloud · Oct 17, 2024 · 9779bd6 · 9779bd6
1 parent 60cf5a2
commit 9779bd6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 21 deletions.
diff --git a/apps/files/src/components/TemplatePreview.vue b/apps/files/src/components/TemplatePreview.vue
@@ -33,7 +33,7 @@
 <script>
 import { encodePath } from '@nextcloud/paths'
 import { generateUrl } from '@nextcloud/router'
-import { getToken, isPublic } from '../utils/davUtils.ts'
+import { isPublicShare, getSharingToken } from '@nextcloud/sharing/public'
 
 // preview width generation
 const previewWidth = 256
@@ -107,8 +107,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=${encodePath(this.filename)}&x=${previewWidth}&y=${previewWidth}&a=1`)
+			if (isPublicShare()) {
+				return generateUrl(`/apps/files_sharing/publicpreview/${getSharingToken()}?fileId=${this.fileid}&file=${encodePath(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
@@ -3,27 +3,9 @@
  * 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