Merge branch 'stable29' into automated/noid/stable29-fix-npm-audit

Author: elzody

cypress/e2e/open.spec.js

@@ -56,10 +56,8 @@ describe('Open existing office files', function() {
 			// Share action
 			cy.wait(2000)
 			cy.get('@loleafletframe').within(() => {
-				cy.get('#main-menu #menu-file > a').click()
-				cy.get('#main-menu #menu-shareas > a').should('be.visible').click()
+				cy.verifyOpen(filename)
 			})
-			cy.verifyOpen(filename)
 
 			// FIXME: wait for sidebar tab content
 			// FIXME: validate sharing tab
@@ -84,9 +82,8 @@ describe('Open existing office files', function() {
 
 			cy.screenshot('open-file_' + filename)
 			cy.get('@loleafletframe').within(() => {
-				cy.get('button.icon-nextcloud-sidebar').click()
+				cy.verifyOpen(filename)
 			})
-			cy.verifyOpen(filename)
 			// FIXME: wait for sidebar tab content
 			// FIXME: validate sharing tab
 			cy.screenshot('share-sidebar_' + filename)
@@ -148,9 +145,8 @@ describe('Open PDF with richdocuments', () => {
 
 		// Verify that the correct file is open
 		cy.get('@loleafletframe').within(() => {
-			cy.get('button.icon-nextcloud-sidebar').click()
+			cy.verifyOpen('document.pdf')
 		})
-		cy.verifyOpen('document.pdf')
 
 		// Make sure we can close the document
 		cy.closeDocument()

cypress/support/commands.js

@@ -307,11 +307,9 @@ Cypress.Commands.add('closeDocument', () => {
 })
 
 Cypress.Commands.add('verifyOpen', (filename) => {
-	cy.get('#app-sidebar-vue')
-		.should('be.visible')
-	cy.get('.app-sidebar-header__mainname')
-		.should('be.visible')
-		.should('contain.text', filename)
+	cy.get('input#document-name-input').should(($docName) => {
+		expect($docName.val()).to.equal(filename)
+	})
 })
 
 Cypress.Commands.add('uploadSystemTemplate', () => {

lib/Controller/WopiController.php

@@ -606,8 +606,7 @@ public function postFile(string $fileId, string $access_token): JSONResponse {
 				$suggested = $this->request->getHeader('X-WOPI-RequestedName');
 				$suggested = mb_convert_encoding($suggested, 'utf-8', 'utf-7') . '.' . $file->getExtension();
 
-				$parent = $isPublic ? dirname($file->getPath()) : $userFolder->getPath();
-				$path = $this->normalizePath($suggested, $parent);
+				$path = $this->normalizePath($suggested, dirname($file->getPath()));
 
 				if ($path === '') {
 					return new JSONResponse([

package-lock.json

@@ -51,7 +51,7 @@
     "@cypress/webpack-preprocessor": "^6.0.2",
     "@nextcloud/babel-config": "^1.0.0",
     "@nextcloud/browserslist-config": "^3.0.1",
-    "@nextcloud/cypress": "^1.0.0-beta.13",
+    "@nextcloud/cypress": "^1.0.0-beta.14",
     "@nextcloud/eslint-config": "^8.3.0",
     "@nextcloud/stylelint-config": "^2.4.0",
     "@nextcloud/webpack-vue-config": "^6.1.1",

package.json

@@ -232,4 +232,17 @@ public function updateTheGuestDisplayName($displayName) {
 			'guestName' => $displayName,
 		], [ 'auth' => null ]);
 	}
+
+	/**
+	 * @Given /^as "([^"]*)" rename "([^"]*)" to "([^"]*)"$/
+	 */
+	public function renameFileTo($user, $file, $newName) {
+		$this->serverContext->usingWebAsUser($user);
+		$davClient = $this->filesContext->getSabreClient($user);
+		$path = $this->filesContext->makeSabrePath($user, $file);
+		$result = $davClient->propFind($path, ['{http://owncloud.org/ns}fileid']);
+		$fileId = $result['{http://owncloud.org/ns}fileid'];
+
+		$this->wopiContext->collaboraRenamesTo($fileId, $newName);
+	}
 }

tests/features/bootstrap/RichDocumentsContext.php

@@ -316,4 +316,21 @@ public function collaboraSavesTheFileAs($source, $newName) {
 			$this->response = $e->getResponse();
 		}
 	}
+
+	public function collaboraRenamesTo($fileId, $newName) {
+		$client = new Client();
+		$options = [
+			'headers' => [
+				'X-LOOL-WOPI-Timestamp' => $this->checkFileInfoResult['LastModifiedTime'],
+				'X-WOPI-RequestedName' => $newName,
+				'X-WOPI-Override' => 'RENAME_FILE',
+			],
+		];
+
+		try {
+			$this->response = $client->post($this->getWopiEndpointBaseUrl() . 'index.php/apps/richdocuments/wopi/files/' . $fileId . '?access_token=' . $this->wopiToken, $options);
+		} catch (\GuzzleHttp\Exception\ClientException $e) {
+			$this->response = $e->getResponse();
+		}
+	}
 }

tests/features/bootstrap/WopiContext.php

@@ -358,3 +358,21 @@ Feature: WOPI
     And Collabora saves the content of "./../emptyTemplates/template.ods" as "/saved-as-guest-document.odt"
     And as "user1" the file "/SharedFolder/saved-as-guest-document.odt" exists
     And as "user1" the file "/saved-as-guest-document.odt" does not exist
+
+  Scenario: Rename file on share link
+    Given as user "user1"
+
+    And User "user1" creates a folder "/SharedFolder"
+    And User "user1" uploads file "./../emptyTemplates/template.odt" to "/SharedFolder/file.odt"
+    And as "user1" create a share with
+      | path        | /SharedFolder |
+      | shareType   | 3             |
+    And Updating last share with
+      | permissions | 31 |
+    And User "user1" opens the file "file.odt" of the shared link
+    And Collabora fetches checkFileInfo
+
+    And as "user1" rename "/SharedFolder/file.odt" to "renamed_file"
+    And as "user1" the file "/SharedFolder/renamed_file.odt" exists
+    And as "user1" the file "/SharedFolder/file.odt" does not exist
+    And as "user1" the file "/renamed_file.odt" does not exist