Merge pull request #5087 from nextcloud/backport/5042/stable27

[stable27] Refactor attachment loading
nextcloud · Dec 6, 2023 · 00698a7 · 00698a7
2 parents c6557e6 + 8b67f07
commit 00698a7
Show file tree

Hide file tree

Showing 41 changed files with 1,110 additions and 956 deletions.
diff --git a/appinfo/routes.php b/appinfo/routes.php
@@ -29,6 +29,8 @@
 
 return [
 	'routes' => [
+		/** @see Controller\AttachmentController::getAttachmentFile() */
+		['name' => 'Attachment#getAttachmentList', 'url' => '/attachments', 'verb' => 'POST'],
 		/** @see Controller\AttachmentController::insertAttachmentFile() */
 		['name' => 'Attachment#insertAttachmentFile', 'url' => '/attachment/filepath', 'verb' => 'POST'],
 		/** @see Controller\AttachmentController::uploadAttachment() */
@@ -39,8 +41,6 @@
 		['name' => 'Attachment#getMediaFile', 'url' => '/media', 'verb' => 'GET'],
 		/** @see Controller\AttachmentController::getMediaFilePreview() */
 		['name' => 'Attachment#getMediaFilePreview', 'url' => '/mediaPreview', 'verb' => 'GET'],
-		/** @see Controller\AttachmentController::getMediaFileMetadata() */
-		['name' => 'Attachment#getMediaFileMetadata', 'url' => '/mediaMetadata', 'verb' => 'GET'],
 
 		/** @see Controller\SessionController::create() */
 		['name' => 'Session#create', 'url' => '/session/create', 'verb' => 'PUT'],

diff --git a/composer/composer/autoload_classmap.php b/composer/composer/autoload_classmap.php
@@ -45,6 +45,7 @@
     'OCA\\Text\\Listeners\\NodeCopiedListener' => $baseDir . '/../lib/Listeners/NodeCopiedListener.php',
     'OCA\\Text\\Listeners\\RegisterDirectEditorEventListener' => $baseDir . '/../lib/Listeners/RegisterDirectEditorEventListener.php',
     'OCA\\Text\\Middleware\\Attribute\\RequireDocumentSession' => $baseDir . '/../lib/Middleware/Attribute/RequireDocumentSession.php',
+    'OCA\\Text\\Middleware\\Attribute\\RequireDocumentSessionOrUserOrShareToken' => $baseDir . '/../lib/Middleware/Attribute/RequireDocumentSessionOrUserOrShareToken.php',
     'OCA\\Text\\Middleware\\SessionMiddleware' => $baseDir . '/../lib/Middleware/SessionMiddleware.php',
     'OCA\\Text\\Migration\\ResetSessionsBeforeYjs' => $baseDir . '/../lib/Migration/ResetSessionsBeforeYjs.php',
     'OCA\\Text\\Migration\\Version010000Date20190617184535' => $baseDir . '/../lib/Migration/Version010000Date20190617184535.php',

diff --git a/composer/composer/autoload_static.php b/composer/composer/autoload_static.php
@@ -60,6 +60,7 @@ class ComposerStaticInitText
         'OCA\\Text\\Listeners\\NodeCopiedListener' => __DIR__ . '/..' . '/../lib/Listeners/NodeCopiedListener.php',
         'OCA\\Text\\Listeners\\RegisterDirectEditorEventListener' => __DIR__ . '/..' . '/../lib/Listeners/RegisterDirectEditorEventListener.php',
         'OCA\\Text\\Middleware\\Attribute\\RequireDocumentSession' => __DIR__ . '/..' . '/../lib/Middleware/Attribute/RequireDocumentSession.php',
+        'OCA\\Text\\Middleware\\Attribute\\RequireDocumentSessionOrUserOrShareToken' => __DIR__ . '/..' . '/../lib/Middleware/Attribute/RequireDocumentSessionOrUserOrShareToken.php',
         'OCA\\Text\\Middleware\\SessionMiddleware' => __DIR__ . '/..' . '/../lib/Middleware/SessionMiddleware.php',
         'OCA\\Text\\Migration\\ResetSessionsBeforeYjs' => __DIR__ . '/..' . '/../lib/Migration/ResetSessionsBeforeYjs.php',
         'OCA\\Text\\Migration\\Version010000Date20190617184535' => __DIR__ . '/..' . '/../lib/Migration/Version010000Date20190617184535.php',

diff --git a/cypress/e2e/attachments.spec.js b/cypress/e2e/attachments.spec.js
@@ -108,7 +108,7 @@ const checkAttachment = (documentId, fileName, fileId, index, isImage = true) =>
 				.find('img')
 				.should('have.attr', 'src')
 				.should('contain', 'apps/text/' + srcPathEnd + '?documentId=' + documentId)
-				.should('contain', srcFileNameParam + '=' + encodeURIComponent(fileName))
+				.should('contain', srcFileNameParam + '=' + fixedEncodeURIComponent(fileName))
 
 			return isImage
 				? cy.wrap($el)

diff --git a/cypress/e2e/nodes/ImageView.spec.js b/cypress/e2e/nodes/ImageView.spec.js
@@ -83,23 +83,6 @@ describe('Image View', () => {
 				.should('have.attr', 'src')
 				.should('contain', `/dav/files/${user.userId}/github.png`)
 		})
-
-		it('with preview', () => {
-			cy.get('.files-fileList tr[data-file="github.png"]')
-				.should('have.attr', 'data-id')
-				.then(imageId => {
-					const fileName = `${Cypress.currentTest.title}.md`
-
-					createMarkdown(fileName, `# from image id\n\n ![${imageId}](github.png?fileId=${imageId}&hasPreview=true)`)
-
-					cy.openFile(fileName, { force: true })
-
-					cy.getContent()
-						.find('[data-component="image-view"] img')
-						.should('have.attr', 'src')
-						.should('contains', `core/preview?fileId=${imageId}&file=${encodeURIComponent('/github.png')}`, { timeout: 5000 })
-				})
-		})
 	})
 
 	describe('fail to load', () => {
@@ -127,4 +110,46 @@ describe('Image View', () => {
 				.should('have.value', 'yaha')
 		})
 	})
+
+	describe('native attachments', () => {
+		before(() => {
+			cy.login(user)
+			cy.visit('/apps/files')
+			const fileName = 'native attachments.md'
+			createMarkdown(fileName, '# open image in modal\n\n ![git](.attachments.123/github.png)\n\n ![file.txt.gz](.attachments.123/file.txt.gz)')
+
+			cy.getFileId(fileName).then((fileId) => {
+				const attachmentsFolder = `.attachments.${fileId}`
+				cy.createFolder(attachmentsFolder)
+				cy.uploadFile('github.png', 'image/png', `${attachmentsFolder}/github.png`)
+				cy.uploadFile('file.txt.gz', 'application/gzip', `${attachmentsFolder}/file.txt.gz`)
+			})
+		})
+
+		it('open image in modal', () => {
+			const fileName = 'native attachments.md'
+			cy.openFile(fileName)
+
+			cy.getContent()
+				.find('[data-component="image-view"][data-src=".attachments.123/github.png"] img')
+				.click()
+
+			cy.get('.modal__content img')
+				.should('have.attr', 'src')
+				.should('contain', 'imageFileName=github.png')
+		})
+
+		it('download non-image gzip attachment', () => {
+			const fileName = 'native attachments.md'
+			cy.openFile(fileName)
+
+			cy.getContent()
+				.find('[data-component="image-view"][data-src=".attachments.123/file.txt.gz"] img')
+				.click()
+
+			const downloadsFolder = Cypress.config('downloadsFolder')
+			cy.log(`downloadsFolder: ${downloadsFolder}`)
+			cy.readFile(`${downloadsFolder}/file.txt.gz`)
+		})
+	})
 })
diff --git a/cypress/support/commands.js b/cypress/support/commands.js
@@ -299,6 +299,11 @@ Cypress.Commands.add('openFolder', (name) => {
 	cy.wait(`@open-${name}`)
 })
 
+Cypress.Commands.add('getFileId', (fileName, params = {}) => {
+	return cy.get(`.files-fileList tr[data-file="${fileName}"]`)
+		.invoke('attr', 'data-id')
+})
+
 Cypress.Commands.add('openFile', (fileName, params = {}) => {
 	cy.get(`.files-fileList tr[data-file="${fileName}"] a.name`).click(params)
 })

diff --git a/js/editor.js b/js/editor.js
diff --git a/js/editor.js.map b/js/editor.js.map
diff --git a/js/text-editors.js b/js/text-editors.js
diff --git a/js/text-editors.js.LICENSE.txt b/js/text-editors.js.LICENSE.txt
@@ -19,6 +19,13 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+/*!
+ * The buffer module from node.js, for the browser.
+ *
+ * @author   Feross Aboukhadijeh <https://feross.org>
+ * @license  MIT
+ */
+
 /*!
  * Vue.js v2.7.15
  * (c) 2014-2023 Evan You
@@ -31,6 +38,8 @@
  * @license MIT
  */
 
+/*! ieee754. BSD-3-Clause License. Feross Aboukhadijeh <https://feross.org/opensource> */
+
 /**
  * @copyright Copyright (c) 2022 Vinicius Reis <[email protected]>
  *

diff --git a/js/text-editors.js.map b/js/text-editors.js.map
diff --git a/js/text-files.js b/js/text-files.js
diff --git a/js/text-files.js.map b/js/text-files.js.map
diff --git a/js/text-public.js b/js/text-public.js
diff --git a/js/text-public.js.map b/js/text-public.js.map
diff --git a/js/text-text.js b/js/text-text.js
diff --git a/js/text-text.js.LICENSE.txt b/js/text-text.js.LICENSE.txt
@@ -1,3 +1,10 @@
+/*!
+ * The buffer module from node.js, for the browser.
+ *
+ * @author   Feross Aboukhadijeh <https://feross.org>
+ * @license  MIT
+ */
+
 /*!
  * Vue.js v2.7.15
  * (c) 2014-2023 Evan You
@@ -10,6 +17,8 @@
  * @license MIT
  */
 
+/*! ieee754. BSD-3-Clause License. Feross Aboukhadijeh <https://feross.org/opensource> */
+
 /**
  * @copyright Copyright (c) 2022 Vinicius Reis <[email protected]>
  *

diff --git a/js/text-text.js.map b/js/text-text.js.map
diff --git a/js/text-viewer.js b/js/text-viewer.js
diff --git a/js/text-viewer.js.map b/js/text-viewer.js.map