Merge pull request #172 from rezk2ll/direct-dav-connection

direct connection to DAV server

Author: alagane

src/app/app.js

@@ -6,8 +6,7 @@ angular.module('esnApp', [
   'esn.material',
   'linagora.esn.contact',
   'linagora.esn.contact.collect',
-  'linagora.esn.contact.import',
-  'linagora.esn.davproxy'
+  'linagora.esn.contact.import'
 ]);
 
 require('esn-frontend-common-libs/src/frontend/js/modules/session');
@@ -20,4 +19,3 @@ require('./app.run');
 require('../linagora.esn.contact/app/app.module.js');
 require('../linagora.esn.contact.collect/app/app.module.js');
 require('../linagora.esn.contact.import/js/app.module.js');
-require('../linagora.esn.davproxy/js/app.js');

src/esn.contact.libs/app/addressBook/addressbook-helper.service.js

@@ -0,0 +1,45 @@
+
+angular.module('esn.contact.libs')
+  .factory('contactAddressbookHelper', contactAddressbookHelper);
+
+function contactAddressbookHelper($q, contactAddressbookParser, contactDavClientService, CONTACT_ADDRESSBOOK_DAV_PROPERTIES, CONTACT_ACCEPT_HEADER) {
+  return {
+    populateSubscriptionSource,
+    formatAddressBookResponse
+  };
+
+  function populateSubscriptionSource(addressbook) {
+    if (!addressbook['openpaas:source']) {
+      return $q.when(addressbook);
+    }
+
+    const sourcePath = contactAddressbookParser.parseAddressbookPath(addressbook['openpaas:source']);
+    const url = `/addressbooks/${sourcePath.bookId}/${sourcePath.bookName}.json`;
+    const body = { properties: Object.keys(CONTACT_ADDRESSBOOK_DAV_PROPERTIES) };
+    const headers = { Accept: CONTACT_ACCEPT_HEADER };
+
+    return contactDavClientService('PROPFIND', url, headers, body)
+      .then(({ data }) => ({
+        ...addressbook,
+        'openpaas:source': formatAddressBookResponse(data, url)
+      }));
+  }
+
+  function formatAddressBookResponse(response, url) {
+    const formattedAddressBook = {};
+
+    if (url) {
+      formattedAddressBook._links = {
+        self: { href: url }
+      };
+    }
+
+    Object.entries(CONTACT_ADDRESSBOOK_DAV_PROPERTIES).forEach(([key, value]) => {
+      if (response[key]) {
+        formattedAddressBook[value] = response[key];
+      }
+    });
+
+    return { ...response, ...formattedAddressBook };
+  }
+}

src/esn.contact.libs/app/addressBook/addressbook.service.js

@@ -1,10 +1,9 @@
-const _ = require('lodash');
-
 require('./addressbook-parser.service');
 require('./contact-api-client.service.js');
 require('./addressbook-display.service.js');
 require('./virtual-addressbook.service.js');
 require('./constants.js');
+require('./contact-dav-url.service.js');
 
 (function(angular) {
   'use strict';
@@ -17,20 +16,19 @@ require('./constants.js');
     $window,
     $log,
     session,
-    esnUserConfigurationService,
+    contactDavUrlService,
     contactAddressbookParser,
     ContactAPIClient,
     contactAddressbookDisplayService,
     ContactVirtualAddressBookService,
-    davProxyPrincipalService,
+    FileSaver,
     CONTACT_ADDRESSBOOK_TYPES,
     CONTACT_ADDRESSBOOK_STATES,
     CONTACT_ADDRESSBOOK_MEMBERS_RIGHTS,
     CONTACT_SHARING_INVITE_STATUS,
-    CONTACT_SHARING_SUBSCRIPTION_TYPE
+    CONTACT_SHARING_SUBSCRIPTION_TYPE,
+    CONTACT_EXPORT_FILE_TYPE
   ) {
-    var DAVSERVER_CONFIGURATION = 'davserver';
-
     return {
       createAddressbook: createAddressbook,
       createGroupAddressbook: createGroupAddressbook,
@@ -46,7 +44,8 @@ require('./constants.js');
       subscribeAddressbooks: subscribeAddressbooks,
       shareAddressbook: shareAddressbook,
       updateAddressbookPublicRight: updateAddressbookPublicRight,
-      updateGroupAddressbookMembersRight: updateGroupAddressbookMembersRight
+      updateGroupAddressbookMembersRight: updateGroupAddressbookMembersRight,
+      exportAddressbook
     };
 
     function getAddressbookByBookName(bookName, bookId) {
@@ -94,7 +93,7 @@ require('./constants.js');
     }
 
     function _listGroupAddressbooks() {
-      return davProxyPrincipalService.getGroupMembership('/principals/users/' + session.user._id)
+      return ContactAPIClient.getGroupMembership('/principals/users/' + session.user._id)
         .then(function(groupPrincipals) {
           var promises = groupPrincipals.map(function(principal) {
             var parsedPrincipal = contactAddressbookParser.parsePrincipalPath(principal);
@@ -241,7 +240,7 @@ require('./constants.js');
     }
 
     function getAddressbookUrl(addressbook) {
-      return _getFrontendURL().then(function(url) {
+      return contactDavUrlService.getFrontendUrl().then(function(url) {
         return [url, _sanitizeAddressbookHref(addressbook)]
           .map(function(fragment) {
             return fragment.replace(/^\/|\/$/g, '');
@@ -250,39 +249,22 @@ require('./constants.js');
       });
     }
 
-    function _sanitizeAddressbookHref(addressbook) {
-      var parsedPath = contactAddressbookParser.parseAddressbookPath(addressbook.href);
-
-      return ['addressbooks', parsedPath.bookId, parsedPath.bookName].join('/');
-    }
-
-    function _getFrontendURL() {
-      return esnUserConfigurationService.get([DAVSERVER_CONFIGURATION], 'core')
-        .then(function(configurations) {
-          if (!configurations || !configurations.length) {
-            $log.debug('No valid configurations found for davserver');
-
-            return _getDefaultURL();
-          }
-
-          var davserver = _.find(configurations, { name: DAVSERVER_CONFIGURATION });
-
-          if (!davserver) {
-            $log.debug('davserver configuration is not set');
-
-            return _getDefaultURL();
-          }
-
-          return davserver.value && davserver.value.frontend && davserver.value.frontend.url ? davserver.value.frontend.url : _getDefaultURL();
-        }, function(err) {
-          $log.debug('Can not get davserver from configuration', err);
+    function exportAddressbook(addressbook) {
+      return ContactAPIClient
+        .addressbookHome(addressbook.bookId)
+        .addressbook(addressbook.bookName)
+        .exportAddressbook()
+        .then(({ data }) => {
+          const vcfBlob = new Blob([data], { type: CONTACT_EXPORT_FILE_TYPE });
 
-          return _getDefaultURL();
+          FileSaver.saveAs(vcfBlob, `${addressbook.bookName}.vcf`);
         });
     }
 
-    function _getDefaultURL() {
-      return $window.location.origin;
+    function _sanitizeAddressbookHref(addressbook) {
+      var parsedPath = contactAddressbookParser.parseAddressbookPath(addressbook.href);
+
+      return ['addressbooks', parsedPath.bookId, parsedPath.bookName].join('/');
     }
   }
 })(angular);