cozy-sharing 28.5.0 → 28.7.0

package/dist/SharingProvider.spec.js

@@ -1,4 +1,10 @@
+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';
@@ -308,6 +314,152 @@ describe('updateDocumentPermissions', function () {
       }
     }, _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/Recipient/LinkRecipient.js

@@ -1,21 +1,23 @@
 import _extends from "@babel/runtime/helpers/extends";
+import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import PropTypes from 'prop-types';
-import React from 'react';
+import React, { useState } from 'react';
 import { useI18n } from 'twake-i18n';
 import Avatar from 'cozy-ui/transpiled/react/Avatar';
+import DropdownButton from 'cozy-ui/transpiled/react/DropdownButton';
 import Fade from 'cozy-ui/transpiled/react/Fade';
 import Icon from 'cozy-ui/transpiled/react/Icon';
 import LinkIcon from 'cozy-ui/transpiled/react/Icons/Link';
 import ListItem from 'cozy-ui/transpiled/react/ListItem';
 import ListItemIcon from 'cozy-ui/transpiled/react/ListItemIcon';
 import ListItemText from 'cozy-ui/transpiled/react/ListItemText';
-import Typography from 'cozy-ui/transpiled/react/Typography';
 import useBreakpoints from 'cozy-ui/transpiled/react/providers/Breakpoints';
 import LinkRecipientPermissions from './LinkRecipientPermissions';
 import RecipientConfirm from './RecipientConfirm';
 import { checkIsPermissionHasPassword, getPermissionExpiresDate } from '../../helpers/permissions';
 import { FADE_IN_DURATION } from '../../helpers/recipients';
 import { useSharingContext } from '../../hooks/useSharingContext';
+import { ShareRestrictionModal } from '../ShareRestrictionModal/ShareRestrictionModal';
 
 var LinkRecipient = function LinkRecipient(props) {
   var _useI18n = useI18n(),
@@ -31,9 +33,14 @@ var LinkRecipient = function LinkRecipient(props) {
 
   var recipientConfirmationData = props.recipientConfirmationData,
       verifyRecipient = props.verifyRecipient,
-      link = props.link,
       fadeIn = props.fadeIn,
       document = props.document;
+
+  var _useState = useState(false),
+      _useState2 = _slicedToArray(_useState, 2),
+      openShareRestrictionModal = _useState2[0],
+      setOpenShareRestrictionModal = _useState2[1];
+
   var permissions = getDocumentPermissions(document === null || document === void 0 ? void 0 : document._id);
   var hasPassword = checkIsPermissionHasPassword(permissions);
   var expiresDate = getPermissionExpiresDate(permissions);
@@ -41,7 +48,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
@@ -62,14 +69,26 @@ var LinkRecipient = function LinkRecipient(props) {
   }, /*#__PURE__*/React.createElement(Icon, {
     icon: LinkIcon
   }))), /*#__PURE__*/React.createElement(ListItemText, {
-    primary: /*#__PURE__*/React.createElement(Typography, {
-      variant: "body1"
+    primary: /*#__PURE__*/React.createElement(DropdownButton, {
+      textVariant: "body1",
+      onClick: function onClick() {
+        return setOpenShareRestrictionModal(true);
+      }
     }, textPrimary),
     secondary: textSecondary
-  }), RightPart));
+  }), RightPart, openShareRestrictionModal && /*#__PURE__*/React.createElement(ShareRestrictionModal, {
+    file: document,
+    onClose: function onClose() {
+      return setOpenShareRestrictionModal(false);
+    }
+  })));
 };
 
 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/LinkRecipientPermissions.js

@@ -2,14 +2,20 @@ import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import PropTypes from 'prop-types';
 import React, { useState, useRef } from 'react';
 import { useI18n } from 'twake-i18n';
+import ActionsMenu from 'cozy-ui/transpiled/react/ActionsMenu';
+import { makeActions, divider } from 'cozy-ui/transpiled/react/ActionsMenu/Actions';
 import DropdownButton from 'cozy-ui/transpiled/react/DropdownButton';
+import { revokeLink } from './actions/revokeLink';
+import { setReadOnlySharedPermission } from './actions/setReadOnlySharedPermission';
+import { setReadWriteSharedPermission } from './actions/setReadWriteSharedPermission';
+import { isOnlyReadOnlyLinkAllowed } from '../../helpers/link';
 import { checkIsReadOnlyPermissions } from '../../helpers/permissions';
-import { ShareRestrictionModal } from '../ShareRestrictionModal/ShareRestrictionModal';
+import { useSharingContext } from '../../hooks/useSharingContext';
+import { WRITE_PERMS, READ_ONLY_PERMS } from '../ShareRestrictionModal/helpers';
 
 var LinkRecipientPermissions = function LinkRecipientPermissions(_ref) {
   var className = _ref.className,
-      document = _ref.document,
-      permissions = _ref.permissions;
+      document = _ref.document;
 
   var _useI18n = useI18n(),
       t = _useI18n.t;
@@ -18,29 +24,70 @@ var LinkRecipientPermissions = function LinkRecipientPermissions(_ref) {
 
   var _useState = useState(false),
       _useState2 = _slicedToArray(_useState, 2),
-      openShareRestrictionModal = _useState2[0],
-      setOpenShareRestrictionModal = _useState2[1];
+      isMenuDisplayed = _useState2[0],
+      setMenuDisplayed = _useState2[1];
 
+  var _useSharingContext = useSharingContext(),
+      updateDocumentPermissions = _useSharingContext.updateDocumentPermissions,
+      revokeSharingLink = _useSharingContext.revokeSharingLink,
+      documentType = _useSharingContext.documentType,
+      getDocumentPermissions = _useSharingContext.getDocumentPermissions;
+
+  var permissions = getDocumentPermissions(document._id);
   var isReadOnlyPermissions = checkIsReadOnlyPermissions(permissions);
+  var type = isReadOnlyPermissions ? 'one-way' : 'two-way';
+
+  var toggleMenu = function toggleMenu() {
+    return setMenuDisplayed(!isMenuDisplayed);
+  };
+
+  var hideMenu = function hideMenu() {
+    return setMenuDisplayed(false);
+  };
+
+  var handleSetType = function handleSetType(newType) {
+    var verbs = newType === 'one-way' ? READ_ONLY_PERMS : WRITE_PERMS;
+    updateDocumentPermissions(document, {
+      verbs: verbs
+    });
+  };
+
+  var handleRevocation = function handleRevocation() {
+    return revokeSharingLink(document);
+  };
+
+  var actionsToShow = [setReadOnlySharedPermission];
+
+  if (!isOnlyReadOnlyLinkAllowed({
+    documentType: documentType
+  })) {
+    actionsToShow.push(setReadWriteSharedPermission);
+  }
+
+  actionsToShow.push(divider, revokeLink);
+  var actions = makeActions(actionsToShow, {
+    t: t,
+    type: type,
+    setType: handleSetType,
+    handleRevocation: handleRevocation
+  });
   return /*#__PURE__*/React.createElement("div", {
     className: className
   }, /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(DropdownButton, {
     ref: buttonRef,
     textVariant: "body2",
-    onClick: function onClick() {
-      return setOpenShareRestrictionModal(true);
-    }
-  }, t("Share.type.".concat(isReadOnlyPermissions ? 'one-way' : 'two-way')).toLowerCase()), openShareRestrictionModal && /*#__PURE__*/React.createElement(ShareRestrictionModal, {
-    file: document,
-    onClose: function onClose() {
-      return setOpenShareRestrictionModal(false);
-    }
+    onClick: toggleMenu
+  }, t("Share.type.".concat(type)).toLowerCase()), /*#__PURE__*/React.createElement(ActionsMenu, {
+    ref: buttonRef,
+    open: isMenuDisplayed,
+    actions: actions,
+    autoClose: true,
+    onClose: hideMenu
   })));
 };
 
 LinkRecipientPermissions.propTypes = {
   className: PropTypes.string,
-  document: PropTypes.object.isRequired,
-  permissions: PropTypes.arrayOf(PropTypes.object).isRequired
+  document: PropTypes.object.isRequired
 };
 export default LinkRecipientPermissions;

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 = {

package/dist/components/Recipient/MemberRecipientPermissions.js

@@ -4,13 +4,18 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 import React, { useState, useRef, useCallback } from 'react';
 import { useI18n } from 'twake-i18n';
 import { useClient } from 'cozy-client';
+import minilog from 'cozy-minilog';
 import ActionsMenu from 'cozy-ui/transpiled/react/ActionsMenu';
 import { makeActions, divider } from 'cozy-ui/transpiled/react/ActionsMenu/Actions';
 import DropdownButton from 'cozy-ui/transpiled/react/DropdownButton';
 import Spinner from 'cozy-ui/transpiled/react/Spinner';
 import Typography from 'cozy-ui/transpiled/react/Typography';
-import { permission } from './actions/permission';
+import { useAlert } from 'cozy-ui/transpiled/react/providers/Alert';
 import { revokeMember } from './actions/revokeMember';
+import { setReadOnlySharedPermission } from './actions/setReadOnlySharedPermission';
+import { setReadWriteSharedPermission } from './actions/setReadWriteSharedPermission';
+import { useSharingContext } from '../../hooks/useSharingContext';
+var log = minilog('MemberRecipientPermissions');
 
 var MemberRecipientPermissions = function MemberRecipientPermissions(_ref) {
   var isOwner = _ref.isOwner,
@@ -31,6 +36,12 @@ var MemberRecipientPermissions = function MemberRecipientPermissions(_ref) {
   var buttonRef = useRef();
   var client = useClient();
 
+  var _useSharingContext = useSharingContext(),
+      updateSharingMemberType = _useSharingContext.updateSharingMemberType;
+
+  var _useAlert = useAlert(),
+      showAlert = _useAlert.showAlert;
+
   var _useState = useState(false),
       _useState2 = _slicedToArray(_useState, 2),
       revoking = _useState2[0],
@@ -44,52 +55,101 @@ var MemberRecipientPermissions = function MemberRecipientPermissions(_ref) {
   var instanceMatchesClient = instance !== undefined && instance === client.options.uri;
   var contactIsOwner = status === 'owner';
   var shouldShowMenu = !revoking && !contactIsOwner && (instanceMatchesClient && !isOwner || isOwner);
-
-  var toggleMenu = function toggleMenu() {
-    return setMenuDisplayed(!isMenuDisplayed);
-  };
-
-  var hideMenu = function hideMenu() {
-    return setMenuDisplayed(false);
-  };
-
+  var toggleMenu = useCallback(function () {
+    setMenuDisplayed(function (displayed) {
+      return !displayed;
+    });
+  }, []);
+  var hideMenu = useCallback(function () {
+    setMenuDisplayed(false);
+  }, []);
   var handleRevocation = useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
     return _regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
           setRevoking(true);
+          _context.prev = 1;
 
           if (!isOwner) {
-            _context.next = 6;
+            _context.next = 7;
             break;
           }
 
-          _context.next = 4;
+          _context.next = 5;
           return onRevoke(document, sharingId, memberIndex);
 
-        case 4:
-          _context.next = 8;
+        case 5:
+          _context.next = 9;
           break;
 
-        case 6:
-          _context.next = 8;
+        case 7:
+          _context.next = 9;
           return onRevokeSelf(document);
 
-        case 8:
+        case 9:
+          _context.prev = 9;
           setRevoking(false);
+          return _context.finish(9);
 
-        case 9:
+        case 12:
         case "end":
           return _context.stop();
       }
-    }, _callee);
+    }, _callee, null, [[1,, 9, 12]]);
   })), [isOwner, onRevoke, onRevokeSelf, document, sharingId, memberIndex]);
-  var actions = makeActions([permission, divider, revokeMember], {
+  var setType = useCallback( /*#__PURE__*/function () {
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(newType) {
+      return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            if (!(newType === type)) {
+              _context2.next = 3;
+              break;
+            }
+
+            hideMenu();
+            return _context2.abrupt("return");
+
+          case 3:
+            _context2.prev = 3;
+            _context2.next = 6;
+            return updateSharingMemberType(sharingId, memberIndex, newType);
+
+          case 6:
+            _context2.next = 12;
+            break;
+
+          case 8:
+            _context2.prev = 8;
+            _context2.t0 = _context2["catch"](3);
+            log.error('Failed to change member permission type', _context2.t0);
+            showAlert({
+              message: t('Share.members.error.changePermission'),
+              severity: 'error',
+              variant: 'filled'
+            });
+
+          case 12:
+            hideMenu();
+
+          case 13:
+          case "end":
+            return _context2.stop();
+        }
+      }, _callee2, null, [[3, 8]]);
+    }));
+
+    return function (_x) {
+      return _ref3.apply(this, arguments);
+    };
+  }(), [hideMenu, memberIndex, sharingId, showAlert, t, type, updateSharingMemberType]);
+  var actions = makeActions([setReadOnlySharedPermission, setReadWriteSharedPermission, divider, revokeMember], {
     client: client,
     t: t,
     type: type !== null && type !== void 0 ? type : 'one-way',
     isOwner: isOwner,
     isSharedDrive: isSharedDrive,
+    setType: setType,
     handleRevocation: handleRevocation
   });
   return /*#__PURE__*/React.createElement("div", {