Merge pull request #44 from owncloud/fix-welknown-issue-41

Don't use wellknown if not needed
owncloud · Feb 19, 2016 · c206420 · c206420
2 parents 216ab7a + aeed15e
commit c206420
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 28 deletions.
diff --git 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
@@ -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' });

diff --git a/js/public/script.js b/js/public/script.js
@@ -67,30 +67,6 @@ app.directive('addressbooklist', function() {
 	};
 });
 
-app.controller('contactCtrl', ['$route', '$routeParams', function($route, $routeParams) {
-	var ctrl = this;
-
-	ctrl.openContact = function() {
-		$route.updateParams({
-			gid: $routeParams.gid,
-			uid: ctrl.contact.uid()});
-	};
-
-	console.log("Contact: ",ctrl.contact);
-
-}]);
-
-app.directive('contact', function() {
-	return {
-		scope: {},
-		controller: 'contactCtrl',
-		controllerAs: 'ctrl',
-		bindToController: {
-			contact: '=data'
-		},
-		templateUrl: OC.linkTo('contactsrework', 'templates/contact.html')
-	};
-});
 app.controller('contactdetailsCtrl', ['ContactService', '$routeParams', '$scope', function(ContactService, $routeParams, $scope) {
 	var ctrl = this;
 
@@ -131,6 +107,30 @@ app.directive('contactdetails', function() {
 	};
 });
 
+app.controller('contactCtrl', ['$route', '$routeParams', function($route, $routeParams) {
+	var ctrl = this;
+
+	ctrl.openContact = function() {
+		$route.updateParams({
+			gid: $routeParams.gid,
+			uid: ctrl.contact.uid()});
+	};
+
+	console.log("Contact: ",ctrl.contact);
+
+}]);
+
+app.directive('contact', function() {
+	return {
+		scope: {},
+		controller: 'contactCtrl',
+		controllerAs: 'ctrl',
+		bindToController: {
+			contact: '=data'
+		},
+		templateUrl: OC.linkTo('contactsrework', 'templates/contact.html')
+	};
+});
 app.controller('contactlistCtrl', ['$scope', 'ContactService', '$routeParams', function($scope, ContactService, $routeParams) {
 	var ctrl = this;
 
@@ -579,7 +579,8 @@ app.service('DavClient', function() {
 app.service('DavService', ['DavClient', function(client) {
 	return client.createAccount({
 		server: OC.linkToRemoteBase('dav/addressbooks'),
-		accountType: 'carddav'
+		accountType: 'carddav',
+		useProvidedPath: true
 	});
 }]);
 

diff --git a/js/services/dav_service.js b/js/services/dav_service.js
@@ -1,6 +1,7 @@
 app.service('DavService', ['DavClient', function(client) {
 	return client.createAccount({
 		server: OC.linkToRemoteBase('dav/addressbooks'),
-		accountType: 'carddav'
+		accountType: 'carddav',
+		useProvidedPath: true
 	});
 }]);