Merge pull request #6339 from nextcloud/fix/detect_public

fix(public): Use `@nextcloud/sharing` to detect public shares

cypress/e2e/nodes/CodeBlock.spec.js

@@ -77,7 +77,7 @@ describe('Front matter support', function() {
 				cy.getContent().find('code').eq(1).find('.hljs-keyword').eq(1).contains('function')
 
 				// Mermaid diagram
-				cy.get('#app-content').scrollTo('bottom')
+				cy.getEditor().scrollTo('bottom')
 				cy.getContent().find('.split-view__preview').eq(2).should('be.visible')
 				cy.get('.code-block').eq(2).find('code').should('not.be.visible')
 				cy.get('.split-view__preview').find('svg .entityTitleText')

cypress/e2e/share.spec.js

@@ -95,7 +95,7 @@ describe('Open test.md in viewer', function() {
 				return cy.visit(`/s/${token}`)
 			})
 			.then(() => {
-				cy.openFileInShare('test.md')
+				cy.openFile('test.md')
 				cy.getModal().getContent().should('be.visible')
 				cy.getModal().getContent().should('contain', 'Hello world')
 				cy.getModal().getContent().find('h2').should('contain', 'Hello world')
@@ -105,8 +105,8 @@ describe('Open test.md in viewer', function() {
 			})
 	})
 
-	it('Opens the editor as guest', function() {
-		cy.shareFile('/test3.md')
+	it('Opens the editor as guest and set a session username', function() {
+		cy.shareFile('/test3.md', { edit: true })
 			.then((token) => {
 				cy.logout()
 				cy.visit(`/s/${token}`)

cypress/support/commands.js

@@ -272,12 +272,6 @@ Cypress.Commands.add('openFile', (fileName, params = {}) => {
 	cy.get(`[data-cy-files-list] tr[data-cy-files-list-row-name="${fileName}"] [data-cy-files-list-row-name-link]`).click(params)
 })
 
-Cypress.Commands.add('openFileInShare', fileName => {
-	cy.get(`.files-fileList tr[data-file="${CSS.escape(fileName)}"] a.name`).click()
-	// eslint-disable-next-line
-	cy.wait(250)
-})
-
 Cypress.Commands.add('closeFile', (params = {}) => {
 	cy.intercept({ method: 'POST', url: '**/apps/text/session/*/close' })
 		.as('close')

package.json

@@ -47,6 +47,7 @@
     "@nextcloud/moment": "^1.3.1",
     "@nextcloud/notify_push": "^1.3.0",
     "@nextcloud/router": "^3.0.1",
+    "@nextcloud/sharing": "^0.2.3",
     "@nextcloud/vue": "^8.17.1",
     "@quartzy/markdown-it-mentions": "^0.2.0",
     "@tiptap/core": "^2.6.6",

src/components/Editor.vue

@@ -73,6 +73,7 @@
 import Vue, { ref, set, watch } from 'vue'
 import { getCurrentUser } from '@nextcloud/auth'
 import { loadState } from '@nextcloud/initial-state'
+import { isPublicShare } from '@nextcloud/sharing/public'
 import { emit, subscribe, unsubscribe } from '@nextcloud/event-bus'
 import { Collaboration } from '@tiptap/extension-collaboration'
 import Autofocus from '../extensions/Autofocus.js'
@@ -269,7 +270,7 @@ export default {
 			return this.fileId || this.shareToken || this.initialSession
 		},
 		isPublic() {
-			return this.isDirectEditing || (document.getElementById('isPublic') && document.getElementById('isPublic').value === '1')
+			return this.isDirectEditing || isPublicShare()
 		},
 		isRichEditor() {
 			return loadState('text', 'rich_editing_enabled', true) && this.mime === 'text/markdown'

src/components/ViewerComponent.vue

@@ -34,13 +34,13 @@
 <script>
 import Vue from 'vue'
 import axios from '@nextcloud/axios'
+import { getSharingToken } from '@nextcloud/sharing/public'
 import PencilIcon from 'vue-material-design-icons/Pencil.vue'
 import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
 import PlainTextReader from './PlainTextReader.vue'
 import MarkdownContentEditor from './Editor/MarkdownContentEditor.vue'
 import { translate, translatePlural } from '@nextcloud/l10n'
 
-import { getSharingToken } from '../helpers/token.js'
 import getEditorInstance from './Editor.singleton.js'
 
 Vue.prototype.t = translate

src/helpers/files.js

@@ -5,13 +5,13 @@
 
 import { getCurrentUser } from '@nextcloud/auth'
 import { showSuccess, showError } from '@nextcloud/dialogs'
+import { getSharingToken } from '@nextcloud/sharing/public'
 import { emit } from '@nextcloud/event-bus'
 import { Header, addNewFileMenuEntry, Permission, File, NewMenuEntryCategory } from '@nextcloud/files'
 import { loadState } from '@nextcloud/initial-state'
 import { imagePath } from '@nextcloud/router'
 import { dirname } from 'path'
 
-import { getSharingToken } from './token.js'
 import { openMimetypes } from './mime.js'
 import store from '../store/index.js'
 import axios from '@nextcloud/axios'

src/public.js

@@ -4,6 +4,7 @@
  */
 
 import { loadState } from '@nextcloud/initial-state'
+import { getSharingToken } from '@nextcloud/sharing/public'
 // eslint-disable-next-line import/no-unresolved, n/no-missing-import
 import 'vite/modulepreload-polyfill'
 
@@ -134,7 +135,7 @@ const loadEditor = ({ sharingToken, mimetype, fileId, $el }) => {
 }
 
 documentReady(() => {
-	const sharingToken = document.getElementById('sharingToken') ? document.getElementById('sharingToken').value : null
+	const sharingToken = getSharingToken()
 
 	if (!sharingToken) {
 		return

src/views/RichWorkspace.vue

@@ -29,10 +29,11 @@
 import axios from '@nextcloud/axios'
 import { generateOcsUrl } from '@nextcloud/router'
 import { subscribe, unsubscribe } from '@nextcloud/event-bus'
+import { getSharingToken, isPublicShare } from '@nextcloud/sharing/public'
 import getEditorInstance from '../components/Editor.singleton.js'
 import RichTextReader from '../components/RichTextReader.vue'
 
-const IS_PUBLIC = !!(document.getElementById('isPublic'))
+const IS_PUBLIC = isPublicShare()
 const WORKSPACE_URL = generateOcsUrl('apps/text' + (IS_PUBLIC ? '/public' : '') + '/workspace', 2)
 const SUPPORTED_STATIC_FILENAMES = ['Readme.md', 'README.md', 'readme.md']
 
@@ -77,7 +78,7 @@ export default {
 	},
 	computed: {
 		shareToken() {
-			return document.getElementById('sharingToken')?.value
+			return getSharingToken()
 		},
 	},
 	watch: {