summaryrefslogtreecommitdiffstats
path: root/js/dav
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2016-02-18 17:07:34 +0100
committerThomas Müller <thomas.mueller@tmit.eu>2016-02-19 14:36:58 +0100
commitaeed15e614e5c53bd7353990d1a3b00c26fd5ef7 (patch)
treee9a8fc51f4228d6f3b8235d418e54949aeda94e9 /js/dav
parent216ab7af68df45b6a5092d032de1a8ddbf10a888 (diff)
Don't use wellknown if not needed - fixes #41
Diffstat (limited to 'js/dav')
-rw-r--r--js/dav/dav.js2
-rw-r--r--js/dav/lib/accounts.js2
2 files changed, 2 insertions, 2 deletions
diff --git a/js/dav/dav.js b/js/dav/dav.js
index 628d0bc6..9e944519 100644
--- a/js/dav/dav.js
+++ b/js/dav/dav.js
@@ -683,7 +683,7 @@ var serviceDiscovery = _co2['default'].wrap(regeneratorRuntime.mark(function cal
uri = _url2['default'].format({
protocol: endpoint.protocol,
host: endpoint.host,
- pathname: '/.well-known/' + options.accountType
+ pathname: !options.useProvidedPath ? '/.well-known/' + options.accountType : endpoint.pathname
});
req = request.basic({ method: 'GET' });
context$1$0.prev = 5;
diff --git a/js/dav/lib/accounts.js b/js/dav/lib/accounts.js
index dbeb6745..f471c5b6 100644
--- a/js/dav/lib/accounts.js
+++ b/js/dav/lib/accounts.js
@@ -30,7 +30,7 @@ let serviceDiscovery = co.wrap(function *(account, options) {
let uri = url.format({
protocol: endpoint.protocol,
host: endpoint.host,
- pathname: `/.well-known/${options.accountType}`
+ pathname: (!options.useProvidedPath ? '/.well-known/' + options.accountType : endpoint.pathname)
});
let req = request.basic({ method: 'GET' });