Merge pull request #11068 from owncloud/fix/editor-save-after-token-r…

…enewal fix: editor save after token renewal
owncloud · Jun 19, 2024 · b4f4dba · b4f4dba
2 parents 3eefbd8 + bb57361
commit b4f4dba
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/changelog/unreleased/bugfix-editor-save-after-token-renewal b/changelog/unreleased/bugfix-editor-save-after-token-renewal
@@ -0,0 +1,6 @@
+Bugfix: Editor save after token renewal
+
+We've fixed a bug where saving changes in an editor would not work after the access token has been renewed.
+
+https://github.com/owncloud/web/pull/11068
+https://github.com/owncloud/web/issues/11062
diff --git a/packages/web-pkg/src/composables/appDefaults/useAppFileHandling.ts b/packages/web-pkg/src/composables/appDefaults/useAppFileHandling.ts
@@ -36,9 +36,9 @@ export interface AppFileHandlingResult {
 }
 
 export function useAppFileHandling({
-  clientService: { webdav }
+  clientService
 }: AppFileHandlingOptions): AppFileHandlingResult {
-  const clientService = useClientService()
+  clientService = clientService || useClientService()
   const capabilityStore = useCapabilityStore()
   const userStore = useUserStore()
 
@@ -63,7 +63,7 @@ export function useAppFileHandling({
     fileContext: MaybeRef<FileContext>,
     options: { responseType?: 'arraybuffer' | 'blob' | 'text' } & Record<string, any>
   ) => {
-    return webdav.getFileContents(
+    return clientService.webdav.getFileContents(
       unref(unref(fileContext).space),
       {
         path: unref(unref(fileContext).item)
@@ -78,7 +78,7 @@ export function useAppFileHandling({
     fileContext: MaybeRef<FileContext>,
     options: ListFilesOptions = {}
   ): Promise<Resource> => {
-    return webdav.getFileInfo(
+    return clientService.webdav.getFileInfo(
       unref(unref(fileContext).space),
       {
         path: unref(unref(fileContext).item),
@@ -92,7 +92,7 @@ export function useAppFileHandling({
     fileContext: MaybeRef<FileContext>,
     options: { content?: string } & Record<string, any>
   ) => {
-    return webdav.putFileContents(unref(unref(fileContext).space), {
+    return clientService.webdav.putFileContents(unref(unref(fileContext).space), {
       path: unref(unref(fileContext).item),
       ...options
     })