Merge pull request #1799 from nextcloud/artonge/backport/stable26/1797

[stable26] Send CSRF token in rawStat
nextcloud · Jul 11, 2023 · 571c11f · 571c11f
2 parents 883532f + 5ac07eb
commit 571c11f
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 12 deletions.
diff --git a/cypress/snapshots/base/visual-regression.cy.js/image.png b/cypress/snapshots/base/visual-regression.cy.js/image.png
diff --git a/cypress/snapshots/base/visual-regression.cy.js/image2.png b/cypress/snapshots/base/visual-regression.cy.js/image2.png
diff --git a/cypress/snapshots/base/visual-regression.cy.js/non-dav.png b/cypress/snapshots/base/visual-regression.cy.js/non-dav.png
diff --git a/cypress/snapshots/base/visual-regression.cy.js/video.png b/cypress/snapshots/base/visual-regression.cy.js/video.png
diff --git a/js/viewer-main.js b/js/viewer-main.js
diff --git a/js/viewer-main.js.map b/js/viewer-main.js.map
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -83,7 +83,7 @@
     "@vue/tsconfig": "^0.1.3",
     "babel-loader-exclude-node-modules-except": "^1.2.1",
     "cypress": "^11.2.0",
-    "cypress-visual-regression": "^2.1.1",
+    "cypress-visual-regression": "^3.0.0",
     "dockerode": "^3.3.5",
     "eslint-plugin-cypress": "^2.12.1",
     "jest": "^29.4.3",

diff --git a/src/services/FileInfo.js b/src/services/FileInfo.js
@@ -23,6 +23,7 @@
 import client from './DavClient.js'
 import { genFileInfo } from '../utils/fileUtils.js'
 import { createClient } from 'webdav'
+import { getRequestToken } from '@nextcloud/auth'
 
 const statData = `<?xml version="1.0"?>
 <d:propfind  xmlns:d="DAV:"
@@ -75,7 +76,7 @@ export default async function(path, options) {
  * @return {Promise<object>} the file list
  */
 export async function rawStat(origin, path, options) {
-	const response = await createClient(origin).stat(path, {
+	const response = await createClient(origin, { headers: { requesttoken: getRequestToken() || '' } }).stat(path, {
 		...options,
 		data: statData,
 		details: true,