refactor(neon_framework): migrate Requestmanager.wrapWebDav to use ht…

…tp.Request Signed-off-by: Nikolas Rimikis <[email protected]>
nextcloud · Apr 3, 2024 · fd5ab56 · fd5ab56
1 parent 67a122a
commit fd5ab56
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/packages/neon/neon_files/lib/src/blocs/browser.dart b/packages/neon/neon_files/lib/src/blocs/browser.dart
@@ -95,7 +95,7 @@ class _FilesBrowserBloc extends InteractiveBloc implements FilesBrowserBloc {
       account: account,
       cacheKey: 'files-${uri.value.path}',
       subject: files,
-      request: () => account.client.webdav.propfind(
+      request: account.client.webdav.propfind_Request(
         uri.value,
         prop: const WebDavPropWithoutValues.fromBools(
           davGetcontenttype: true,

diff --git a/packages/neon_framework/lib/src/utils/request_manager.dart b/packages/neon_framework/lib/src/utils/request_manager.dart
@@ -105,15 +105,18 @@ class RequestManager {
     required Account account,
     required String cacheKey,
     required BehaviorSubject<Result<T>> subject,
-    required AsyncValueGetter<WebDavMultistatus> request,
+    required http.BaseRequest request,
     required UnwrapCallback<T, WebDavMultistatus> unwrap,
     bool disableTimeout = false,
-  }) async =>
+  }) =>
       wrap<T, WebDavMultistatus>(
         account: account,
         cacheKey: cacheKey,
         subject: subject,
-        request: request,
+        request: () async {
+          final response = await account.client.webdav.csrfClient.send(request);
+          return const WebDavResponseConverter().convert(response);
+        },
         unwrap: unwrap,
         serialize: (data) => data.toXmlElement(namespaces: namespaces).toXmlString(),
         deserialize: (data) => WebDavMultistatus.fromXmlElement(xml.XmlDocument.parse(data).rootElement),