From a2988e5614c54873c6ba581553e0c87b2552f4c0 Mon Sep 17 00:00:00 2001
From: Julius Knorr <jus@bitgrid.net>
Date: Tue, 17 Feb 2026 15:23:15 +0100
Subject: [PATCH 1/3] fix: Check file existencen before using save as

Signed-off-by: Julius Knorr <jus@bitgrid.net>
---
 src/components/Modal/SaveAs.vue | 47 ++++++++++++++++++++++++++++++---
 1 file changed, 43 insertions(+), 4 deletions(-)

diff --git a/src/components/Modal/SaveAs.vue b/src/components/Modal/SaveAs.vue
index d033f5216b..091bb246b2 100644
--- a/src/components/Modal/SaveAs.vue
+++ b/src/components/Modal/SaveAs.vue
@@ -19,8 +19,9 @@
 					{{ t('richdocuments', 'Cancel') }}
 				</NcButton>
 				<NcButton type="primary"
+					:disabled="isChecking"
 					@click="close">
-					{{ t('richdocuments', 'Save') }}
+					{{ isChecking ? t('richdocuments', 'Checking…') : t('richdocuments', 'Save') }}
 				</NcButton>
 			</div>
 		</div>
@@ -29,6 +30,9 @@
 
 <script>
 import { translate as t } from '@nextcloud/l10n'
+import { showError } from '@nextcloud/dialogs'
+import { getClient, getDefaultPropfind, resultToNode, defaultRootPath } from '@nextcloud/files/dav'
+import { emit } from '@nextcloud/event-bus'
 
 import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
 import NcModal from '@nextcloud/vue/dist/Components/NcModal.js'
@@ -67,6 +71,7 @@ export default {
 	data() {
 		return {
 			selectedPath: '',
+			isChecking: false,
 		}
 	},
 	computed: {
@@ -86,7 +91,6 @@ export default {
 		},
 	},
 	mounted() {
-		// prepare filename for having a separate picker for the path (.split('/').pop())
 		const filename = this.path
 		const extension = filename.split('.').pop()
 		const filenameWithoutExtension = filename.substring(0, filename.length - extension.length - 1)
@@ -98,8 +102,43 @@ export default {
 	},
 	methods: {
 		t,
-		close() {
-			this.$emit('close', this.newFileName)
+		async close() {
+			if (this.isChecking) {
+				return
+			}
+
+			this.isChecking = true
+
+			try {
+				const client = getClient()
+				const filename = this.newFileName
+
+				try {
+					const result = await client.stat(`${defaultRootPath}${filename}`, {
+						details: true,
+						data: getDefaultPropfind(),
+					})
+
+					if (result) {
+						showError(t('richdocuments', 'A file with that name already exists.'))
+						const node = resultToNode(result.data)
+						emit('files:node:updated', node)
+						this.isChecking = false
+						return
+					}
+				} catch (error) {
+					if (error.response?.status !== 404) {
+						console.error('Error checking file existence:', error)
+						showError(t('richdocuments', 'Error checking if file exists.'))
+						this.isChecking = false
+						return
+					}
+				}
+
+				this.$emit('close', this.newFileName)
+			} finally {
+				this.isChecking = false
+			}
 		},
 		cancel() {
 			this.$emit('close', null)

From 1985835789582f7b4575af0bdcc3da7113ca2278 Mon Sep 17 00:00:00 2001
From: James Manuel <moodyjmz@users.noreply.github.com>
Date: Mon, 23 Feb 2026 13:29:17 +0100
Subject: [PATCH 2/3] fix: :bug: Add userId to DirectViewController

Signed-off-by: James Manuel <moodyjmz@users.noreply.github.com>
---
 lib/Controller/DirectViewController.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/Controller/DirectViewController.php b/lib/Controller/DirectViewController.php
index 725a2dd2c0..bd47da46f0 100644
--- a/lib/Controller/DirectViewController.php
+++ b/lib/Controller/DirectViewController.php
@@ -124,6 +124,7 @@ public function show($token) {
 				'urlsrc' => $urlSrc,
 				'path' => $relativePath,
 				'direct' => true,
+				'userId' => $direct->getUid(),
 			];
 
 			return $this->documentTemplateResponse($wopi, $params);

From c0df7e5a5a20d51eb34fe21b16b7c81e7685839a Mon Sep 17 00:00:00 2001
From: James Manuel <moodyjmz@users.noreply.github.com>
Date: Mon, 23 Feb 2026 13:31:02 +0100
Subject: [PATCH 3/3] fix: :bug: Update SaveAs component to use Config service
 for saveAs checking

Signed-off-by: James Manuel <moodyjmz@users.noreply.github.com>
---
 src/components/Modal/SaveAs.vue | 54 +++++++++++++++++++++------------
 1 file changed, 34 insertions(+), 20 deletions(-)

diff --git a/src/components/Modal/SaveAs.vue b/src/components/Modal/SaveAs.vue
index 091bb246b2..957536c201 100644
--- a/src/components/Modal/SaveAs.vue
+++ b/src/components/Modal/SaveAs.vue
@@ -31,13 +31,15 @@
 <script>
 import { translate as t } from '@nextcloud/l10n'
 import { showError } from '@nextcloud/dialogs'
-import { getClient, getDefaultPropfind, resultToNode, defaultRootPath } from '@nextcloud/files/dav'
+import { getCurrentUser } from '@nextcloud/auth'
+import { getClient, getDefaultPropfind, resultToNode } from '@nextcloud/files/dav'
 import { emit } from '@nextcloud/event-bus'
+import { isPublicShare, getSharingToken } from '@nextcloud/sharing/public'
 
 import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
 import NcModal from '@nextcloud/vue/dist/Components/NcModal.js'
 import NcTextField from '@nextcloud/vue/dist/Components/NcTextField.js'
-
+import Config from '../../services/config.tsx'
 export default {
 	name: 'SaveAs',
 	components: {
@@ -75,6 +77,12 @@ export default {
 		}
 	},
 	computed: {
+		rootPath() {
+			if (isPublicShare()) {
+				return `/files/${getSharingToken()}`
+			}
+			return `/files/${getCurrentUser()?.uid ?? Config.get('userId')}`
+		},
 		newFileName: {
 			get() {
 				if (this.selectedPath !== '') {
@@ -113,25 +121,31 @@ export default {
 				const client = getClient()
 				const filename = this.newFileName
 
-				try {
-					const result = await client.stat(`${defaultRootPath}${filename}`, {
-						details: true,
-						data: getDefaultPropfind(),
-					})
+				// In direct editing sessions there is no authenticated DAV session
+				// so we skip the existence check and let the backend handle conflicts.
+				// A future improvement could use a dedicated API endpoint that validates
+				// the WOPI token and checks file existence on behalf of the user.
+				if (!Config.get('direct')) {
+					try {
+						const result = await client.stat(`${this.rootPath}/${filename}`, {
+							details: true,
+							data: getDefaultPropfind(),
+						})
 
-					if (result) {
-						showError(t('richdocuments', 'A file with that name already exists.'))
-						const node = resultToNode(result.data)
-						emit('files:node:updated', node)
-						this.isChecking = false
-						return
-					}
-				} catch (error) {
-					if (error.response?.status !== 404) {
-						console.error('Error checking file existence:', error)
-						showError(t('richdocuments', 'Error checking if file exists.'))
-						this.isChecking = false
-						return
+						if (result) {
+							showError(t('richdocuments', 'A file with that name already exists.'))
+							const node = resultToNode(result.data)
+							emit('files:node:updated', node)
+							this.isChecking = false
+							return
+						}
+					} catch (error) {
+						if (error.response?.status !== 404) {
+							console.error('Error checking file existence:', error)
+							showError(t('richdocuments', 'Error checking if file exists.'))
+							this.isChecking = false
+							return
+						}
 					}
 				}