upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-08 16:26:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Merge pull request #22445 from owncloud/files-client-sendpropfindheaders

Browse source 
Files DAV client send propfind headers
This commit is contained in:
Thomas Müller 2016-02-17 11:32:16 +01:00
commit 7b0f83b616
2 changed files with 14 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
core/js/files/client.js
View file

@ -394,7 +394,6 @@
properties = options.properties;
}
// TODO: headers
this._client.propFind(
this._buildUrl(path),
properties,
@ -441,7 +440,6 @@
throw 'Missing filter argument';
}
var headers = _.extend({}, this._defaultHeaders);
// root element with namespaces
var body = '<oc:filter-files ';
var namespace;
@ -472,7 +470,7 @@
this._client.request(
'REPORT',
this._buildUrl(),
headers,
{},
body
).then(function(result) {
if (self._isSuccessStatus(result.status)) {
@ -542,8 +540,7 @@
this._client.request(
'GET',
this._buildUrl(path),
this._defaultHeaders
this._buildUrl(path)
).then(
function(result) {
if (self._isSuccessStatus(result.status)) {
@ -575,7 +572,7 @@
var deferred = $.Deferred();
var promise = deferred.promise();
options = options || {};
var headers = _.extend({}, this._defaultHeaders);
var headers = {};
var contentType = 'text/plain;charset=utf-8';
if (options.contentType) {
contentType = options.contentType;
@ -616,8 +613,7 @@
this._client.request(
method,
this._buildUrl(path),
this._defaultHeaders
this._buildUrl(path)
).then(
function(result) {
if (self._isSuccessStatus(result.status)) {
@ -673,10 +669,9 @@
var self = this;
var deferred = $.Deferred();
var promise = deferred.promise();
var headers =
_.extend({
'Destination' : this._buildUrl(destinationPath)
}, this._defaultHeaders);
var headers = {
'Destination' : this._buildUrl(destinationPath)
};
if (!allowOverwrite) {
headers['Overwrite'] = 'F';

12
core/vendor/davclient.js/lib/client.js vendored
View file

@ -40,18 +40,19 @@ dav.Client.prototype = {
*
* @param {string} url Url to do the propfind request on
* @param {Array} properties List of properties to retrieve.
* @param {Object} [headers] headers
* @return {Promise}
*/
propFind : function(url, properties, depth) {
propFind : function(url, properties, depth, headers) {
if(typeof depth == "undefined") {
depth = 0;
}
var headers = {
Depth : depth,
'Content-Type' : 'application/xml; charset=utf-8'
};
headers = headers || {};
headers['Depth'] = depth;
headers['Content-Type'] = 'application/xml; charset=utf-8';
var body =
'<?xml version="1.0"?>\n' +
@ -103,6 +104,7 @@ dav.Client.prototype = {
*
* @param {string} url Url to do the proppatch request on
* @param {Array} properties List of properties to store.
* @param {Object} [headers] headers
* @return {Promise}
*/
propPatch : function(url, properties, headers) {