nextcloud
/
contacts
mirror of https://github.com/nextcloud/contacts
0
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #2765 from nextcloud/bug/2366/add-encoding-for-header 

Encode group names for x-property-replace header
This commit is contained in:
Anna 2022-07-19 10:22:55 +02:00 committed by GitHub
parent c4ebd81a8f bf43de1223
commit d59d6f4eab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/Dav/PatchPlugin.php
View File

@ -28,8 +28,6 @@ namespace OCA\Contacts\Dav;
use Sabre\CardDAV\Card;
use Sabre\DAV;
use Sabre\DAV\INode;
use Sabre\DAV\PropPatch;
use Sabre\DAV\Server;
use Sabre\DAV\ServerPlugin;
use Sabre\HTTP\RequestInterface;
@ -85,9 +83,13 @@ class PatchPlugin extends ServerPlugin {
/**
* Adds all CardDAV-specific properties
*
* @param PropPatch $propPatch
* @param INode $node
* @param RequestInterface $request
* @param ResponseInterface $response
* @return bool
* @throws DAV\Exception\BadRequest
* @throws DAV\Exception\NotAuthenticated
* @throws DAV\Exception\NotFound
* @throws \Sabre\DAVACL\Exception\NeedPrivileges
*/
public function httpPatch(RequestInterface $request, ResponseInterface $response): bool {
$path = $request->getPath();
@ -119,6 +121,8 @@ class PatchPlugin extends ServerPlugin {
}
}
$propertyData = rawurldecode($propertyData);
// Init contact
$vCard = Reader::read($node->get());
$properties = $vCard->select($propertyName);

2
src/services/appendContactToGroup.js
View File

@ -34,7 +34,7 @@ const appendContactToGroup = async function(contact, groupName) {
return axios.patch(contact.url, {}, {
headers: {
'X-PROPERTY': 'CATEGORIES',
'X-PROPERTY-REPLACE': groups.join(','),
'X-PROPERTY-REPLACE': groups.map(groupName => encodeURIComponent(groupName)).join(','),
},
})
}