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

Get relevant fields for listing and searching 

This requires an updated SabreDav in core. The contents of address-data
are ignored before https://github.com/fruux/sabre-dav/issues/889

Signed-off-by: Daniel Landau <daniel@landau.fi>
This commit is contained in:
Daniel Landau 2017-01-02 20:22:32 +02:00
parent 0575638e44
commit 1df38ad9ab
4 changed files with 52 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
js/dav/dav.js
View File

@ -1749,22 +1749,29 @@ function createCard(addressBook, options) {
* (dav.Sandbox) sandbox - optional request sandbox.
*/
var listVCards = _co2['default'].wrap(regeneratorRuntime.mark(function callee$0$0(addressBook, options) {
var req, responses;
var vCardListFields, req, responses;
return regeneratorRuntime.wrap(function callee$0$0$(context$1$0) {
while (1) switch (context$1$0.prev = context$1$0.next) {
case 0:
debug('Doing REPORT on address book ' + addressBook.url + ' which belongs to\n ' + addressBook.account.credentials.username);
vCardListFields = ['EMAIL', 'UID', 'CATEGORIES', 'FN', 'TEL'].map(function (value) {
return {
name: 'prop',
namespace: ns.CARDDAV,
attrs: [{ name: 'name', value: value }]
};
});
req = request.addressBookQuery({
depth: 1,
props: [{ name: 'getetag', namespace: ns.DAV }, { name: 'address-data', namespace: ns.CARDDAV }]
props: [{ name: 'getetag', namespace: ns.DAV }, { name: 'address-data', namespace: ns.CARDDAV, children: vCardListFields }]
});
context$1$0.next = 4;
context$1$0.next = 5;
return options.xhr.send(req, addressBook.url, {
sandbox: options.sandbox
});
case 4:
case 5:
responses = context$1$0.sent;
return context$1$0.abrupt('return', responses.map(function (res) {
debug('Found vcard with url ' + res.href);
@ -1777,7 +1784,7 @@ var listVCards = _co2['default'].wrap(regeneratorRuntime.mark(function callee$0$
});
}));
case 6:
case 7:
case 'end':
return context$1$0.stop();
}
@ -2818,24 +2825,24 @@ function createSandbox() {
return new Sandbox();
}
},{"./debug":6}],14:[function(require,module,exports){
'use strict';
"use strict";
Object.defineProperty(exports, '__esModule', {
Object.defineProperty(exports, "__esModule", {
value: true
});
exports['default'] = addressBookQuery;
exports["default"] = addressBookQuery;
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
var _prop = require('./prop');
var _prop2 = _interopRequireDefault(_prop);
function addressBookQuery(object) {
return '<card:addressbook-query xmlns:card="urn:ietf:params:xml:ns:carddav"\n xmlns:d="DAV:">\n <d:prop>\n ' + object.props.map(_prop2['default']) + '\n </d:prop>\n <card:limit><card:nresults>10</card:nresults></card:limit>\n <!-- According to http://stackoverflow.com/questions/23742568/google-carddav-api-addressbook-multiget-returns-400-bad-request,\n Google\'s CardDAV server requires a filter element. I don\'t think all addressbook-query calls need a filter in the spec though? -->\n </card:addressbook-query>';
return "<card:addressbook-query xmlns:card=\"urn:ietf:params:xml:ns:carddav\"\n xmlns:d=\"DAV:\">\n <d:prop>\n " + object.props.map(_prop2["default"]).join("") + "\n </d:prop>\n <!-- According to http://stackoverflow.com/questions/23742568/google-carddav-api-addressbook-multiget-returns-400-bad-request,\n Google's CardDAV server requires a filter element. I don't think all addressbook-query calls need a filter in the spec though? -->\n </card:addressbook-query>";
}
module.exports = exports['default'];
module.exports = exports["default"];
},{"./prop":19}],15:[function(require,module,exports){
'use strict';
@ -2965,15 +2972,23 @@ var ns = _interopRequireWildcard(_namespace);
*/
function prop(item) {
var tagName = xmlnsPrefix(item.namespace) + ':' + item.name;
var attrs = (item.attrs || []).map(makeAttr).join(' ');
if (!item.children || !item.children.length) {
if (typeof item.value === "undefined") {
return '<' + xmlnsPrefix(item.namespace) + ':' + item.name + ' />';
return '<' + tagName + ' ' + attrs + '/>';
}
return '<' + xmlnsPrefix(item.namespace) + ':' + item.name + '>' + item.value + '</' + xmlnsPrefix(item.namespace) + ':' + item.name + '>';
return '<' + tagName + ' ' + attrs + '>' + item.value + '</' + tagName + '>';
}
var children = item.children.map(prop);
return '<' + xmlnsPrefix(item.namespace) + ':' + item.name + '>\n ' + children + '\n </' + xmlnsPrefix(item.namespace) + ':' + item.name + '>';
return '<' + tagName + ' ' + attrs + '>\n ' + children.join('') + '\n </' + tagName + '>';
}
function makeAttr(attr) {
if (!attr.name) return '';
if (!attr.value) return attr.name;
return attr.name + '="' + attr.value + '"';
}
function xmlnsPrefix(namespace) {

10
js/dav/lib/contacts.js
View File

@ -152,11 +152,19 @@ export let listVCards = co.wrap(function *(addressBook, options) {
debug(`Doing REPORT on address book ${addressBook.url} which belongs to
${addressBook.account.credentials.username}`);
var vCardListFields = [ 'EMAIL', 'UID', 'CATEGORIES', 'FN', 'TEL', 'NICKNAME' ]
.map(function (value) {
return {
name: 'prop',
namespace: ns.CARDDAV,
attrs: [ { name: 'name', value: value } ]
};
});
var req = request.addressBookQuery({
depth: 1,
props: [
{ name: 'getetag', namespace: ns.DAV },
{ name: 'address-data', namespace: ns.CARDDAV }
{ name: 'address-data', namespace: ns.CARDDAV, children: vCardListFields }
]
});

2
js/dav/lib/template/address_book_query.js
View File

@ -4,7 +4,7 @@ export default function addressBookQuery(object) {
return `<card:addressbook-query xmlns:card="urn:ietf:params:xml:ns:carddav"
xmlns:d="DAV:">
<d:prop>
${object.props.map(prop)}
${object.props.map(prop).join("")}
</d:prop>
<!-- According to http://stackoverflow.com/questions/23742568/google-carddav-api-addressbook-multiget-returns-400-bad-request,
Google's CardDAV server requires a filter element. I don't think all addressbook-query calls need a filter in the spec though? -->

18
js/dav/lib/template/prop.js
View File

@ -36,17 +36,25 @@ import * as ns from '../namespace';
* }
*/
export default function prop(item) {
var tagName = `${xmlnsPrefix(item.namespace)}:${item.name}`;
var attrs = (item.attrs || []).map(makeAttr).join(' ');
if (!item.children || !item.children.length) {
if (typeof item.value === "undefined") {
return `<${xmlnsPrefix(item.namespace)}:${item.name} />`;
return `<${tagName} ${attrs}/>`;
}
return `<${xmlnsPrefix(item.namespace)}:${item.name}>${item.value}</${xmlnsPrefix(item.namespace)}:${item.name}>`;
return `<${tagName} ${attrs}>${item.value}</${tagName}>`;
}
let children = item.children.map(prop);
return `<${xmlnsPrefix(item.namespace)}:${item.name}>
${children}
</${xmlnsPrefix(item.namespace)}:${item.name}>`;
return `<${tagName} ${attrs}>
${children.join('')}
</${tagName}>`;
}
function makeAttr(attr) {
if (!attr.name) return '';
if (!attr.value) return attr.name;
return `${attr.name}="${attr.value}"`;
}
function xmlnsPrefix(namespace) {