Bug 1693669 - Use correct namespace for getetag elements in CardDAV requests. r=mkmelin

Depends on D105693

Differential Revision: https://phabricator.services.mozilla.com/D105694

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Geoff Lankow 2021-02-19 09:48:07 +00:00
Родитель 331d6adaf8
Коммит 22502e5e6e
2 изменённых файлов: 6 добавлений и 6 удалений

Просмотреть файл

@ -236,7 +236,7 @@ class CardDAVDirectory extends AddrBookDirectory {
);
let data = `<card:addressbook-multiget ${NAMESPACE_STRING}>
<d:prop>
<cs:getetag/>
<d:getetag/>
<card:address-data/>
</d:prop>
${hrefsToFetch.join("\n")}
@ -450,7 +450,7 @@ class CardDAVDirectory extends AddrBookDirectory {
let data = `<propfind xmlns="${PREFIX_BINDINGS.d}" ${NAMESPACE_STRING}>
<prop>
<resourcetype/>
<cs:getetag/>
<getetag/>
<cs:getctag/>
</prop>
</propfind>`;
@ -543,7 +543,7 @@ class CardDAVDirectory extends AddrBookDirectory {
let data = `<propfind xmlns="${PREFIX_BINDINGS.d}" ${NAMESPACE_STRING}>
<prop>
<resourcetype/>
<cs:getetag/>
<getetag/>
<cs:getctag/>
</prop>
</propfind>`;
@ -676,7 +676,7 @@ class CardDAVDirectory extends AddrBookDirectory {
<sync-token>${xmlEncode(syncToken)}</sync-token>
<sync-level>1</sync-level>
<prop>
<cs:getetag/>
<getetag/>
<card:address-data/>
</prop>
</sync-collection>`;

Просмотреть файл

@ -378,7 +378,7 @@ var CardDAVServer = {
_cardResponse(href, card, propNames, includeAddressData = true) {
let propValues = {
"cs:getetag": card.etag,
"d:getetag": card.etag,
"d:resourcetype": null,
};
@ -405,11 +405,11 @@ var CardDAVServer = {
propNames.push(`card:${p.localName}`);
break;
case "getctag":
case "getetag":
Assert.equal(p.namespaceURI, PREFIX_BINDINGS.cs);
propNames.push(`cs:${p.localName}`);
break;
case "displayname":
case "getetag":
case "resourcetype":
case "sync-token":
Assert.equal(p.namespaceURI, PREFIX_BINDINGS.d);