Merge pull request #2431 from nextcloud/fix/nextcloud/webdav-namespaces

Author: provokateurin

packages/nextcloud/lib/src/api/webdav/models/webdav.dart

@@ -248,7 +248,7 @@ class WebDavOcChecksums with _$WebDavOcChecksumsXmlSerializableMixin {
 
   factory WebDavOcChecksums.fromXmlElement(XmlElement element) => _$WebDavOcChecksumsFromXmlElement(element);
 
-  @annotation.XmlElement(name: 'checksum', namespace: namespaceNextcloud)
+  @annotation.XmlElement(name: 'checksum', namespace: namespaceOwncloud)
   final List<String>? checksums;
 }
 
@@ -262,7 +262,7 @@ class WebDavOcShareTypes with _$WebDavOcShareTypesXmlSerializableMixin {
 
   factory WebDavOcShareTypes.fromXmlElement(XmlElement element) => _$WebDavOcShareTypesFromXmlElement(element);
 
-  @annotation.XmlElement(name: 'share-type', namespace: namespaceNextcloud)
+  @annotation.XmlElement(name: 'share-type', namespace: namespaceOwncloud)
   final List<int>? shareTypes;
 }
 
@@ -276,6 +276,6 @@ class WebDavOcTags with _$WebDavOcTagsXmlSerializableMixin {
 
   factory WebDavOcTags.fromXmlElement(XmlElement element) => _$WebDavOcTagsFromXmlElement(element);
 
-  @annotation.XmlElement(name: 'tag', namespace: namespaceNextcloud)
+  @annotation.XmlElement(name: 'tag', namespace: namespaceOwncloud)
   final List<String>? tags;
 }

packages/nextcloud/lib/src/api/webdav/models/webdav.g.dart

@@ -3,6 +3,8 @@ import 'dart:math';
 import 'dart:typed_data';
 
 import 'package:mocktail/mocktail.dart';
+import 'package:nextcloud/core.dart' as core;
+import 'package:nextcloud/files_sharing.dart' as files_sharing;
 import 'package:nextcloud/nextcloud.dart';
 import 'package:nextcloud/src/utils/date_time.dart';
 import 'package:nextcloud/webdav.dart';
@@ -281,6 +283,35 @@ void main() {
       expect(response.props.ocSize, data.lengthInBytes);
     });
 
+    test('Create share', () async {
+      final file = File('test/files/test.png');
+      await tester.client.webdav.putFile(file, file.statSync(), PathUri.parse('test/share.png'));
+
+      await tester.client.filesSharing.shareapi.createShare(
+        $body: files_sharing.ShareapiCreateShareRequestApplicationJson(
+          (b) => b
+            ..path = '/test/share.png'
+            ..shareType = core.ShareType.user.index
+            ..shareWith = 'user2',
+        ),
+      );
+
+      final response = await tester.client.webdav.propfind(
+        PathUri.parse('test/share.png'),
+        prop: const WebDavPropWithoutValues.fromBools(
+          ncShareAttributes: true,
+          ncSharees: true,
+          ocShareTypes: true,
+        ),
+      );
+      final props = response.responses.single.propstats.first.prop;
+      expect(json.decode(props.ncShareAttributes!), <String>[]);
+      expect(props.ncSharees!.sharees!.single.id, 'user2');
+      expect(props.ncSharees!.sharees!.single.displayName, 'User Two');
+      expect(props.ncSharees!.sharees!.single.type, core.ShareType.user.index);
+      expect(props.ocShareTypes!.shareTypes!.single, core.ShareType.user.index);
+    });
+
     test('Filter files', () async {
       final response = await tester.client.webdav.put(utf8.encode('test'), PathUri.parse('test/filter.txt'));
       final id = response.headers['oc-fileid'];
@@ -396,6 +427,30 @@ void main() {
       expect(props.ocFavorite, false);
     });
 
+    test('Set and get tags', () async {
+      await tester.client.webdav.put(
+        utf8.encode('test'),
+        PathUri.parse('test/tags.txt'),
+      );
+
+      final updated = await tester.client.webdav.proppatch(
+        PathUri.parse('test/tags.txt'),
+        set: const WebDavProp(
+          ocTags: WebDavOcTags(tags: ['example']),
+        ),
+      );
+      expect(updated, isTrue);
+
+      final response = await tester.client.webdav.propfind(
+        PathUri.parse('test/tags.txt'),
+        prop: const WebDavPropWithoutValues.fromBools(
+          ocTags: true,
+        ),
+      );
+      final props = response.responses.single.propstats.first.prop;
+      expect(props.ocTags!.tags!.single, 'example');
+    });
+
     test('Upload and download file', () async {
       final destinationDir = Directory.systemTemp.createTempSync();
       final destination = File('${destinationDir.path}/test.png');

packages/nextcloud/test/api/webdav/webdav_test.dart

@@ -0,0 +1,19 @@
+PUT http://localhost/remote\.php/webdav/test/share\.png
+authorization: Bearer mock
+content-length: 8650
+content-type: application/xml
+ocs-apirequest: true
+requesttoken: token
+.+
+POST http://localhost/ocs/v2\.php/apps/files_sharing/api/v1/shares
+accept: application/json
+authorization: Bearer mock
+content-type: application/json; charset=utf-8
+ocs-apirequest: true
+\{"shareType":0,"publicUpload":"false","password":"","expireDate":"","note":"","label":"","path":"/test/share\.png","shareWith":"user2"\}
+PROPFIND http://localhost/remote\.php/webdav/test/share\.png
+authorization: Bearer mock
+content-type: application/xml
+ocs-apirequest: true
+requesttoken: token
+<d:propfind xmlns:d="DAV:" xmlns:oc="http://owncloud\.org/ns" xmlns:nc="http://nextcloud\.org/ns" xmlns:ocs="http://open-collaboration-services\.org/ns" xmlns:ocm="http://open-cloud-mesh\.org/ns"><d:prop><nc:share-attributes/><nc:sharees/><oc:share-types/></d:prop></d:propfind>

packages/nextcloud/test/fixtures/webdav/create_share.regexp

@@ -0,0 +1,19 @@
+PUT http://localhost/remote\.php/webdav/test/tags\.txt
+authorization: Bearer mock
+content-length: 4
+content-type: application/xml
+ocs-apirequest: true
+requesttoken: token
+test
+PROPPATCH http://localhost/remote\.php/webdav/test/tags\.txt
+authorization: Bearer mock
+content-type: application/xml
+ocs-apirequest: true
+requesttoken: token
+<d:propertyupdate xmlns:d="DAV:" xmlns:oc="http://owncloud\.org/ns" xmlns:nc="http://nextcloud\.org/ns" xmlns:ocs="http://open-collaboration-services\.org/ns" xmlns:ocm="http://open-cloud-mesh\.org/ns"><d:set><d:prop><oc:tags><oc:tag>example</oc:tag></oc:tags></d:prop></d:set></d:propertyupdate>
+PROPFIND http://localhost/remote\.php/webdav/test/tags\.txt
+authorization: Bearer mock
+content-type: application/xml
+ocs-apirequest: true
+requesttoken: token
+<d:propfind xmlns:d="DAV:" xmlns:oc="http://owncloud\.org/ns" xmlns:nc="http://nextcloud\.org/ns" xmlns:ocs="http://open-collaboration-services\.org/ns" xmlns:ocm="http://open-cloud-mesh\.org/ns"><d:prop><oc:tags/></d:prop></d:propfind>