cozy-sharing 28.4.4 → 28.6.0

package/dist/SharingProvider.spec.js

@@ -1,11 +1,17 @@
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { act, render, screen } from '@testing-library/react';
 import React from 'react';
 import { createMockClient } from 'cozy-client';
 import { SharingProvider } from './SharingProvider';
-import SharingContext from './context'; // import { receiveSharings } from './state'
-
+import SharingContext from './context';
+import reducer, { addSharingLink, getDocumentPermissions } from './state';
 import AppLike from '../test/AppLike';
 
 var AppWrapper = function AppWrapper(_ref) {
@@ -130,6 +136,330 @@ describe('SharingProvider', function () {
     expect(client.collection().findLinksByDoctype).not.toHaveBeenCalled();
     expect(client.collection().findApps).not.toHaveBeenCalled();
   });
+});
+describe('shareByLink', function () {
+  var PERM_DRIVE_FILE = {
+    type: 'io.cozy.permissions',
+    id: 'perm_drive_file',
+    attributes: {
+      type: 'share',
+      permissions: {
+        rule0: {
+          type: 'io.cozy.files',
+          verbs: ['GET'],
+          values: ['file_in_drive']
+        }
+      },
+      shortcodes: {
+        code: 'shortcode123'
+      }
+    }
+  };
+  var driveFile = {
+    _id: 'file_in_drive',
+    id: 'file_in_drive',
+    driveId: 'drive_123'
+  };
+  it('dispatches addSharingLink exactly once for a shared drive file', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
+    var mockCreateSharingLink, mockClient, provider, permissions;
+    return _regeneratorRuntime.wrap(function _callee3$(_context3) {
+      while (1) switch (_context3.prev = _context3.next) {
+        case 0:
+          mockCreateSharingLink = jest.fn().mockResolvedValue({
+            data: PERM_DRIVE_FILE
+          });
+          mockClient = createMockClient({});
+          mockClient.collection = jest.fn().mockReturnValue({
+            createSharingLink: mockCreateSharingLink
+          });
+          provider = new SharingProvider({
+            client: mockClient
+          });
+          provider.state = reducer();
+          provider.dispatch = jest.fn(function (action) {
+            provider.state = reducer(provider.state, action);
+          });
+          _context3.next = 8;
+          return provider.shareByLink(driveFile, {
+            verbs: ['GET']
+          });
+
+        case 8:
+          expect(provider.dispatch).toHaveBeenCalledTimes(1);
+          permissions = getDocumentPermissions(provider.state, driveFile._id);
+          expect(permissions).toHaveLength(1);
+          expect(permissions[0].id).toBe(PERM_DRIVE_FILE.id);
+
+        case 12:
+        case "end":
+          return _context3.stop();
+      }
+    }, _callee3);
+  })));
+  it('dispatches addSharingLink once for a regular file (non shared drive)', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4() {
+    var PERM_REGULAR_FILE, regularFile, mockCreateSharingLink, mockClient, provider, permissions;
+    return _regeneratorRuntime.wrap(function _callee4$(_context4) {
+      while (1) switch (_context4.prev = _context4.next) {
+        case 0:
+          PERM_REGULAR_FILE = {
+            type: 'io.cozy.permissions',
+            id: 'perm_regular_file',
+            attributes: {
+              type: 'share',
+              permissions: {
+                rule0: {
+                  type: 'io.cozy.files',
+                  verbs: ['GET'],
+                  values: ['regular_file_id']
+                }
+              },
+              shortcodes: {
+                code: 'shortcode456'
+              }
+            }
+          };
+          regularFile = {
+            _id: 'regular_file_id',
+            id: 'regular_file_id'
+          };
+          mockCreateSharingLink = jest.fn().mockResolvedValue({
+            data: PERM_REGULAR_FILE
+          });
+          mockClient = createMockClient({});
+          mockClient.collection = jest.fn().mockReturnValue({
+            createSharingLink: mockCreateSharingLink
+          });
+          provider = new SharingProvider({
+            client: mockClient
+          });
+          provider.state = reducer();
+          provider.permissionCol = {
+            createSharingLink: mockCreateSharingLink
+          };
+          provider.dispatch = jest.fn(function (action) {
+            provider.state = reducer(provider.state, action);
+          });
+          _context4.next = 11;
+          return provider.shareByLink(regularFile, {
+            verbs: ['GET']
+          });
+
+        case 11:
+          expect(provider.dispatch).toHaveBeenCalledTimes(1);
+          permissions = getDocumentPermissions(provider.state, regularFile._id);
+          expect(permissions).toHaveLength(1);
+          expect(permissions[0].id).toBe(PERM_REGULAR_FILE.id);
+
+        case 15:
+        case "end":
+          return _context4.stop();
+      }
+    }, _callee4);
+  })));
+});
+describe('updateDocumentPermissions', function () {
+  var PERM_DRIVE_FILE = {
+    type: 'io.cozy.permissions',
+    id: 'perm_drive_file',
+    attributes: {
+      type: 'share',
+      permissions: {
+        rule0: {
+          type: 'io.cozy.files',
+          verbs: ['GET'],
+          values: ['file_in_drive']
+        }
+      },
+      shortcodes: {
+        code: 'shortcode123'
+      }
+    }
+  };
+  it('sends only one PATCH request for a shared drive file', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5() {
+    var driveFile, mockAdd, mockClient, provider;
+    return _regeneratorRuntime.wrap(function _callee5$(_context5) {
+      while (1) switch (_context5.prev = _context5.next) {
+        case 0:
+          driveFile = {
+            _id: 'file_in_drive',
+            id: 'file_in_drive',
+            driveId: 'drive_123'
+          };
+          mockAdd = jest.fn().mockResolvedValue({
+            data: PERM_DRIVE_FILE
+          });
+          mockClient = createMockClient({});
+          mockClient.collection = jest.fn().mockReturnValue({
+            add: mockAdd
+          });
+          provider = new SharingProvider({
+            client: mockClient
+          }); // Seed the state with exactly one permission (as it would be after a correct shareByLink)
+
+          provider.state = reducer(undefined, addSharingLink(PERM_DRIVE_FILE));
+          provider.dispatch = jest.fn();
+          _context5.next = 9;
+          return provider.updateDocumentPermissions(driveFile, {
+            verbs: ['GET'],
+            expiresAt: '',
+            password: ''
+          });
+
+        case 9:
+          expect(mockAdd).toHaveBeenCalledTimes(1);
+
+        case 10:
+        case "end":
+          return _context5.stop();
+      }
+    }, _callee5);
+  })));
+});
+describe('updateSharingMemberType', function () {
+  var mockContact = {
+    _id: 'contact-1',
+    email: [{
+      address: 'bob@bob.cozy'
+    }]
+  };
+  var mockSharing = {
+    id: 'sharing-123',
+    type: 'io.cozy.sharings',
+    attributes: {
+      members: [{
+        status: 'owner',
+        email: 'owner@cozy.local'
+      }, {
+        status: 'ready',
+        email: 'bob@bob.cozy'
+      }]
+    }
+  };
+  var instance;
+  var mockContactsCollection;
+  beforeEach(function () {
+    mockContactsCollection = {
+      find: jest.fn().mockResolvedValue({
+        data: [mockContact]
+      })
+    };
+    var mockClient = {
+      getStackClient: function getStackClient() {
+        return {
+          uri: 'http://cozy.local'
+        };
+      },
+      collection: jest.fn().mockReturnValue(mockContactsCollection)
+    };
+    instance = new SharingProvider({
+      client: mockClient
+    });
+    instance.state = _objectSpread(_objectSpread({}, instance.state), {}, {
+      sharings: [mockSharing]
+    });
+    instance.sharingCol = {
+      revokeRecipient: jest.fn().mockResolvedValue({})
+    };
+    jest.spyOn(instance, 'addRecipients').mockResolvedValue({});
+  });
+  it('should throw when sharing is not found', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6() {
+    return _regeneratorRuntime.wrap(function _callee6$(_context6) {
+      while (1) switch (_context6.prev = _context6.next) {
+        case 0:
+          _context6.next = 2;
+          return expect(instance.updateSharingMemberType('unknown-id', 1, 'one-way')).rejects.toThrow('Sharing not found');
+
+        case 2:
+        case "end":
+          return _context6.stop();
+      }
+    }, _callee6);
+  })));
+  it('should throw when member is not found', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7() {
+    return _regeneratorRuntime.wrap(function _callee7$(_context7) {
+      while (1) switch (_context7.prev = _context7.next) {
+        case 0:
+          _context7.next = 2;
+          return expect(instance.updateSharingMemberType('sharing-123', 99, 'one-way')).rejects.toThrow('Member not found');
+
+        case 2:
+        case "end":
+          return _context7.stop();
+      }
+    }, _callee7);
+  })));
+  it('should throw when contact is not found', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee8() {
+    return _regeneratorRuntime.wrap(function _callee8$(_context8) {
+      while (1) switch (_context8.prev = _context8.next) {
+        case 0:
+          mockContactsCollection.find.mockResolvedValue({
+            data: []
+          });
+          _context8.next = 3;
+          return expect(instance.updateSharingMemberType('sharing-123', 1, 'one-way')).rejects.toThrow('Contact not found');
+
+        case 3:
+        case "end":
+          return _context8.stop();
+      }
+    }, _callee8);
+  })));
+  it('should revoke and re-add with readOnly when switching to one-way', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee9() {
+    return _regeneratorRuntime.wrap(function _callee9$(_context9) {
+      while (1) switch (_context9.prev = _context9.next) {
+        case 0:
+          _context9.next = 2;
+          return instance.updateSharingMemberType('sharing-123', 1, 'one-way');
+
+        case 2:
+          expect(instance.sharingCol.revokeRecipient).toHaveBeenCalledWith(mockSharing, 1);
+          expect(instance.addRecipients).toHaveBeenCalledWith({
+            document: mockSharing,
+            recipients: [],
+            readOnlyRecipients: [mockContact]
+          });
+
+        case 4:
+        case "end":
+          return _context9.stop();
+      }
+    }, _callee9);
+  })));
+  it('should revoke and re-add as read-write when switching to two-way', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee10() {
+    return _regeneratorRuntime.wrap(function _callee10$(_context10) {
+      while (1) switch (_context10.prev = _context10.next) {
+        case 0:
+          _context10.next = 2;
+          return instance.updateSharingMemberType('sharing-123', 1, 'two-way');
+
+        case 2:
+          expect(instance.sharingCol.revokeRecipient).toHaveBeenCalledWith(mockSharing, 1);
+          expect(instance.addRecipients).toHaveBeenCalledWith({
+            document: mockSharing,
+            recipients: [mockContact],
+            readOnlyRecipients: []
+          });
+
+        case 4:
+        case "end":
+          return _context10.stop();
+      }
+    }, _callee10);
+  })));
+  it('should rethrow error if addRecipients fails after revocation', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee11() {
+    return _regeneratorRuntime.wrap(function _callee11$(_context11) {
+      while (1) switch (_context11.prev = _context11.next) {
+        case 0:
+          instance.addRecipients.mockRejectedValue(new Error('Network error'));
+          _context11.next = 3;
+          return expect(instance.updateSharingMemberType('sharing-123', 1, 'one-way')).rejects.toThrow('Network error');
+
+        case 3:
+        case "end":
+          return _context11.stop();
+      }
+    }, _callee11);
+  })));
 }); // TODO Convert with react-testing-library
 // describe('hasWriteAccess', () => {
 //   it('tells if a doc is writtable', () => {

package/dist/components/FederatedFolder/DumbFederatedFolderModal.js

@@ -2,7 +2,7 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import { useI18n } from 'twake-i18n';
 import withLocales from '../../hoc/withLocales';
-import DumbBatchSharedFolderModal from '../SharedFolder/DumbBatchSharedFolderModal';
+import { DumbBatchSharedFolderModal } from '../SharedFolder/DumbBatchSharedFolderModal';
 export var DumbFederatedFolderModal = withLocales(function (_ref) {
   var title = _ref.title,
       document = _ref.document,
@@ -15,7 +15,8 @@ export var DumbFederatedFolderModal = withLocales(function (_ref) {
       onSend = _ref.onSend,
       onClose = _ref.onClose,
       onShare = _ref.onShare,
-      sharingLink = _ref.sharingLink;
+      sharingLink = _ref.sharingLink,
+      showShareByEmail = _ref.showShareByEmail;
 
   var _useI18n = useI18n(),
       t = _useI18n.t;
@@ -36,7 +37,8 @@ export var DumbFederatedFolderModal = withLocales(function (_ref) {
     showNameField: false,
     addPeopleLabel: t('FederatedFolder.addPeople'),
     addButtonLabel: t('FederatedFolder.add'),
-    shareLabel: t('FederatedFolder.share')
+    shareLabel: t('FederatedFolder.share'),
+    showShareByEmail: showShareByEmail
   });
 });
 DumbFederatedFolderModal.propTypes = {
@@ -51,6 +53,7 @@ DumbFederatedFolderModal.propTypes = {
   onSend: PropTypes.func.isRequired,
   onClose: PropTypes.func.isRequired,
   onShare: PropTypes.func.isRequired,
-  sharingLink: PropTypes.string
+  sharingLink: PropTypes.string,
+  showShareByEmail: PropTypes.bool
 };
 export default DumbFederatedFolderModal;

package/dist/components/FederatedFolder/FederatedFolderModal.js

@@ -2,7 +2,7 @@ import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import PropTypes from 'prop-types';
-import React, { useState } from 'react';
+import React, { useState, useEffect } from 'react';
 import { useI18n } from 'twake-i18n';
 import { useClient } from 'cozy-client';
 import { useAlert } from 'cozy-ui/transpiled/react/providers/Alert';
@@ -20,25 +20,79 @@ export var FederatedFolderModal = withLocales(function (_ref) {
 
   var _useSharingContext = useSharingContext(),
       share = _useSharingContext.share,
-      getSharingLink = _useSharingContext.getSharingLink;
+      getSharingLink = _useSharingContext.getSharingLink,
+      getFederatedShareLink = _useSharingContext.getFederatedShareLink,
+      getDocumentPermissions = _useSharingContext.getDocumentPermissions,
+      getOwner = _useSharingContext.getOwner,
+      getSharingById = _useSharingContext.getSharingById;
 
   var _useAlert = useAlert(),
-      showAlert = _useAlert.showAlert; // Get sharing link
+      showAlert = _useAlert.showAlert;
 
+  var _useState = useState(null),
+      _useState2 = _slicedToArray(_useState, 2),
+      sharingLink = _useState2[0],
+      setSharingLink = _useState2[1];
+
+  var documentPermissions = existingDocument ? getDocumentPermissions(existingDocument._id) : [];
+  useEffect(function () {
+    var fetchSharingLink = /*#__PURE__*/function () {
+      var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+        var link;
+        return _regeneratorRuntime.wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              if (existingDocument) {
+                _context.next = 2;
+                break;
+              }
+
+              return _context.abrupt("return");
+
+            case 2:
+              if (!existingDocument.driveId) {
+                _context.next = 9;
+                break;
+              }
+
+              _context.next = 5;
+              return getFederatedShareLink(existingDocument);
+
+            case 5:
+              link = _context.sent;
+              setSharingLink(link);
+              _context.next = 10;
+              break;
+
+            case 9:
+              setSharingLink(getSharingLink(existingDocument._id));
+
+            case 10:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee);
+      }));
+
+      return function fetchSharingLink() {
+        return _ref2.apply(this, arguments);
+      };
+    }();
 
-  var sharingLink = existingDocument ? getSharingLink(existingDocument._id) : null;
+    fetchSharingLink();
+  }, [existingDocument, documentPermissions, getFederatedShareLink, getSharingLink, getOwner, getSharingById]); // eslint-disable-line react-hooks/exhaustive-deps
 
-  var _useState = useState({
+  var _useState3 = useState({
     recipients: [],
     readOnlyRecipients: []
   }),
-      _useState2 = _slicedToArray(_useState, 2),
-      federatedRecipients = _useState2[0],
-      setFederatedRecipients = _useState2[1];
+      _useState4 = _slicedToArray(_useState3, 2),
+      federatedRecipients = _useState4[0],
+      setFederatedRecipients = _useState4[1];
 
-  var _useState3 = useState((existingDocument === null || existingDocument === void 0 ? void 0 : existingDocument.name) || ''),
-      _useState4 = _slicedToArray(_useState3, 1),
-      folderName = _useState4[0];
+  var _useState5 = useState((existingDocument === null || existingDocument === void 0 ? void 0 : existingDocument.name) || ''),
+      _useState6 = _slicedToArray(_useState5, 1),
+      folderName = _useState6[0];
 
   var onShare = function onShare(params) {
     setFederatedRecipients({
@@ -48,12 +102,12 @@ export var FederatedFolderModal = withLocales(function (_ref) {
   };
 
   var onSend = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-      return _regeneratorRuntime.wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
+      return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
           case 0:
-            _context.prev = 0;
-            _context.next = 3;
+            _context2.prev = 0;
+            _context2.next = 3;
             return share({
               description: folderName,
               document: existingDocument,
@@ -70,12 +124,12 @@ export var FederatedFolderModal = withLocales(function (_ref) {
               variant: 'filled'
             });
             onClose();
-            _context.next = 10;
+            _context2.next = 10;
             break;
 
           case 7:
-            _context.prev = 7;
-            _context.t0 = _context["catch"](0);
+            _context2.prev = 7;
+            _context2.t0 = _context2["catch"](0);
             showAlert({
               message: t('FederatedFolder.errorNotification'),
               severity: 'error',
@@ -84,13 +138,13 @@ export var FederatedFolderModal = withLocales(function (_ref) {
 
           case 10:
           case "end":
-            return _context.stop();
+            return _context2.stop();
         }
-      }, _callee, null, [[0, 7]]);
+      }, _callee2, null, [[0, 7]]);
     }));
 
     return function onSend() {
-      return _ref2.apply(this, arguments);
+      return _ref3.apply(this, arguments);
     };
   }();
 
@@ -126,6 +180,7 @@ export var FederatedFolderModal = withLocales(function (_ref) {
   var modalTitle = t('FederatedFolder.shareTitle', {
     name: folderName
   });
+  var isSharedDrive = Boolean(existingDocument === null || existingDocument === void 0 ? void 0 : existingDocument.driveId);
   return /*#__PURE__*/React.createElement(DumbFederatedFolderModal, {
     title: modalTitle,
     document: existingDocument,
@@ -140,7 +195,8 @@ export var FederatedFolderModal = withLocales(function (_ref) {
     onSend: onSend,
     onClose: onClose,
     onShare: onShare,
-    sharingLink: sharingLink
+    sharingLink: sharingLink,
+    showShareByEmail: !isSharedDrive
   });
 });
 FederatedFolderModal.propTypes = {

package/dist/components/Recipient/LinkRecipient.js

@@ -31,7 +31,6 @@ var LinkRecipient = function LinkRecipient(props) {
 
   var recipientConfirmationData = props.recipientConfirmationData,
       verifyRecipient = props.verifyRecipient,
-      link = props.link,
       fadeIn = props.fadeIn,
       document = props.document;
   var permissions = getDocumentPermissions(document === null || document === void 0 ? void 0 : document._id);
@@ -41,7 +40,7 @@ var LinkRecipient = function LinkRecipient(props) {
   var textPrimary = hasPassword ? t('Share.recipients.linkWithPassword') : t('Share.recipients.anyoneWithTheLink');
   var textSecondary = expiresDate ? t('Share.recipients.expires', {
     date: dateFormatted
-  }) : link;
+  }) : '';
   var RightPart = recipientConfirmationData ? /*#__PURE__*/React.createElement(RecipientConfirm, {
     recipientConfirmationData: recipientConfirmationData,
     verifyRecipient: verifyRecipient
@@ -70,6 +69,10 @@ var LinkRecipient = function LinkRecipient(props) {
 };
 
 LinkRecipient.propTypes = {
-  link: PropTypes.string.isRequired
+  recipientConfirmationData: PropTypes.oneOfType([PropTypes.bool, PropTypes.object]),
+  verifyRecipient: PropTypes.func,
+  fadeIn: PropTypes.bool,
+  document: PropTypes.object,
+  permissions: PropTypes.arrayOf(PropTypes.object)
 };
 export default LinkRecipient;

package/dist/components/Recipient/LinkRecipient.stories.js

@@ -6,7 +6,6 @@ var meta = {
     verifyRecipient: function verifyRecipient() {
       return true;
     },
-    link: 'test',
     fadeIn: false
   }
 };

package/dist/components/Recipient/MemberRecipient.spec.js

@@ -5,6 +5,19 @@ import React from 'react';
 import { createMockClient } from 'cozy-client';
 import MemberRecipient from './MemberRecipient';
 import AppLike from '../../../test/AppLike';
+var mockUpdateDocumentPermissions = jest.fn();
+var mockUpdateSharingMemberType = jest.fn();
+jest.mock('../../hooks/useSharingContext', function () {
+  return {
+    // eslint-disable-next-line react/display-name
+    useSharingContext: function useSharingContext() {
+      return {
+        updateDocumentPermissions: mockUpdateDocumentPermissions,
+        updateSharingMemberType: mockUpdateSharingMemberType
+      };
+    }
+  };
+});
 describe('MemberRecipient component', function () {
   var client = createMockClient({});
   client.options = {