cozy-sharing 19.0.0 → 20.0.0

package/CHANGELOG.md

@@ -3,6 +3,32 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [20.0.0](https://github.com/cozy/cozy-libs/compare/cozy-sharing@19.0.0...cozy-sharing@20.0.0) (2025-01-22)
+
+
+### Bug Fixes
+
+* **sharing:** Dispatch correct value ([4f2d17c](https://github.com/cozy/cozy-libs/commit/4f2d17cec7ce51fae97c825e3bb605c204dff330))
+
+
+### Features
+
+* **sharing:** Auto focus password input ([614da3c](https://github.com/cozy/cozy-libs/commit/614da3cceae6f207ced87ae0bc81886224c83a24))
+* **sharing:** Change ShareRestrictionModal validity ([00fb730](https://github.com/cozy/cozy-libs/commit/00fb730160e7f80ea57f6ebf7f47afadff9c0945))
+* **sharing:** Improve BoxPassword ([7e39d7f](https://github.com/cozy/cozy-libs/commit/7e39d7fe16c021c9902a905f7dbdba92b2787eaf))
+* **sharing:** Improve ShareDialogOnlyByLink UX ([4287e74](https://github.com/cozy/cozy-libs/commit/4287e74dc32aa7541e861939c4405a20426640e6))
+* **sharing:** Rework logic of ShareRestrictionModal ([e33df9f](https://github.com/cozy/cozy-libs/commit/e33df9f5bb737dab6db738b435d2d0492698c8e9))
+* **sharing:** Upgrade cozy-client to 53.0.0 ([fd6294f](https://github.com/cozy/cozy-libs/commit/fd6294f0870499a928795a73f099f3885e090a0a))
+
+
+### BREAKING CHANGES
+
+* **sharing:** You must have `cozy-client >= 53.0.0`
+
+
+
+
+
 # [19.0.0](https://github.com/cozy/cozy-libs/compare/cozy-sharing@18.0.0...cozy-sharing@19.0.0) (2025-01-08)
 
 

package/dist/SharingProvider.js

@@ -465,18 +465,22 @@ export var SharingProvider = /*#__PURE__*/function (_Component) {
      * updateDocumentPermissions - Description
      *
      * @param {Object} document A shared document
-     * @param {Array} newVerbs The new verbs to use for the permission, eg. ['GET']
+     * @param {object} options The new verbs to use for the permission, eg. ['GET']
+     * @param {string[]} options.verbs The new verbs to use for the permission, eg. ['GET']
+     * @param {string} [options.expiresAt] The new expiration date for the permission
+     * @param {string} [options.password] The new password for the permission
      *
      * @return {Array}
      */
     _defineProperty(_this2, "updateDocumentPermissions", /*#__PURE__*/function () {
-      var _ref12 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee11(document, newVerbs) {
-        var permissions, responses;
+      var _ref12 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee11(document, options) {
+        var verbs, expiresAt, password, permissions, responses;
         return _regeneratorRuntime.wrap(function _callee11$(_context11) {
           while (1) switch (_context11.prev = _context11.next) {
             case 0:
+              verbs = options.verbs, expiresAt = options.expiresAt, password = options.password;
               permissions = _getDocumentPermissions(_this2.state, document.id);
-              _context11.next = 3;
+              _context11.next = 4;
               return Promise.all(permissions.map( /*#__PURE__*/function () {
                 var _ref13 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee10(permissionDocument) {
                   var updatedPermissions, resp;
@@ -485,15 +489,18 @@ export var SharingProvider = /*#__PURE__*/function (_Component) {
                       case 0:
                         updatedPermissions = permissionDocument.attributes.permissions;
                         Object.keys(updatedPermissions).map(function (permType) {
-                          updatedPermissions[permType].verbs = newVerbs;
+                          updatedPermissions[permType].verbs = verbs;
                         });
                         _context10.next = 4;
-                        return _this2.permissionCol.add(permissionDocument, updatedPermissions);
+                        return _this2.permissionCol.add(permissionDocument, updatedPermissions, {
+                          expiresAt: expiresAt,
+                          password: password
+                        });
 
                       case 4:
                         resp = _context10.sent;
 
-                        _this2.dispatch(updateSharingLink(resp));
+                        _this2.dispatch(updateSharingLink(resp.data));
 
                         return _context10.abrupt("return", resp);
 
@@ -509,11 +516,11 @@ export var SharingProvider = /*#__PURE__*/function (_Component) {
                 };
               }()));
 
-            case 3:
+            case 4:
               responses = _context11.sent;
               return _context11.abrupt("return", responses);
 
-            case 5:
+            case 6:
             case "end":
               return _context11.stop();
           }

package/dist/components/Recipient/LinkRecipient.js

@@ -13,7 +13,9 @@ import useBreakpoints from 'cozy-ui/transpiled/react/providers/Breakpoints';
 import { useI18n } from 'cozy-ui/transpiled/react/providers/I18n';
 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';
 var styles = {
   "recipient": "recipient__recipient___2DmZI",
   "recipients-list-light": "recipient__recipients-list-light___Vq4op",
@@ -34,15 +36,29 @@ var styles = {
 
 var LinkRecipient = function LinkRecipient(props) {
   var _useI18n = useI18n(),
-      t = _useI18n.t;
+      t = _useI18n.t,
+      f = _useI18n.f,
+      lang = _useI18n.lang;
 
   var _useBreakpoints = useBreakpoints(),
       isMobile = _useBreakpoints.isMobile;
 
+  var _useSharingContext = useSharingContext(),
+      getDocumentPermissions = _useSharingContext.getDocumentPermissions;
+
   var recipientConfirmationData = props.recipientConfirmationData,
       verifyRecipient = props.verifyRecipient,
       link = props.link,
-      fadeIn = props.fadeIn;
+      fadeIn = props.fadeIn,
+      document = props.document;
+  var permissions = getDocumentPermissions(document._id);
+  var hasPassword = checkIsPermissionHasPassword(permissions);
+  var expiresDate = getPermissionExpiresDate(permissions);
+  var dateFormatted = expiresDate ? f(expiresDate, lang === 'fr' ? 'dd/LL/yyyy' : 'LL/dd/yyyy') : null;
+  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
@@ -64,8 +80,8 @@ var LinkRecipient = function LinkRecipient(props) {
     primary: /*#__PURE__*/React.createElement(Typography, {
       className: "u-ellipsis",
       variant: "body1"
-    }, t('Share.recipients.anyoneWithTheLink')),
-    secondary: link
+    }, textPrimary),
+    secondary: textSecondary
   }), RightPart));
 };
 

package/dist/components/ShareRestrictionModal/BoxPassword.js

@@ -1,3 +1,4 @@
+import _extends from "@babel/runtime/helpers/extends";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
@@ -16,8 +17,11 @@ import TextField from 'cozy-ui/transpiled/react/TextField';
 import { useAlert } from 'cozy-ui/transpiled/react/providers/Alert';
 import { useI18n } from 'cozy-ui/transpiled/react/providers/I18n';
 import { copyToClipboard } from './helpers';
+import { checkIsPermissionHasPassword } from '../../helpers/permissions';
+import { useSharingContext } from '../../hooks/useSharingContext';
 export var BoxPassword = function BoxPassword(_ref) {
-  var onChange = _ref.onChange,
+  var file = _ref.file,
+      onChange = _ref.onChange,
       password = _ref.password,
       onToggle = _ref.onToggle,
       toggle = _ref.toggle,
@@ -37,6 +41,12 @@ export var BoxPassword = function BoxPassword(_ref) {
 
   var inputRef = React.useRef();
 
+  var _useSharingContext = useSharingContext(),
+      getDocumentPermissions = _useSharingContext.getDocumentPermissions;
+
+  var permissions = getDocumentPermissions(file._id);
+  var hasPassword = checkIsPermissionHasPassword(permissions);
+
   var handlePasswordToggle = function handlePasswordToggle(val) {
     var _val$target$checked, _val$target;
 
@@ -106,9 +116,16 @@ export var BoxPassword = function BoxPassword(_ref) {
     onChange: handlePasswordToggle
   })))), toggle && /*#__PURE__*/React.createElement("div", {
     className: "u-pt-half u-ph-1 u-pb-1"
-  }, /*#__PURE__*/React.createElement(TextField, {
+  }, /*#__PURE__*/React.createElement(TextField, _extends({
     inputRef: inputRef,
-    label: t('BoxPassword.label'),
+    autoFocus: true,
+    label: t('BoxPassword.label')
+  }, hasPassword && {
+    placeholder: '****',
+    InputLabelProps: {
+      shrink: true
+    }
+  }, {
     value: password,
     error: displayHelper && !!helperText,
     helperText: displayHelper && helperText,
@@ -126,7 +143,7 @@ export var BoxPassword = function BoxPassword(_ref) {
       }))
     },
     inputProps: inputProps
-  })));
+  }))));
 };
 BoxPassword.propTypes = {
   onChange: PropTypes.func.isRequired,

package/dist/components/ShareRestrictionModal/ShareRestrictionContentModal.js

@@ -1,4 +1,4 @@
-import { addDays } from 'date-fns';
+import { addDays, isValid } from 'date-fns';
 import PropTypes from 'prop-types';
 import React from 'react';
 import Box from 'cozy-ui/transpiled/react/Box';
@@ -7,6 +7,8 @@ import { useI18n } from 'cozy-ui/transpiled/react/providers/I18n';
 import { BoxDate } from './BoxDate';
 import { BoxEditingRights } from './BoxEditingRights';
 import { BoxPassword } from './BoxPassword';
+import { checkIsPermissionHasPassword } from '../../helpers/permissions';
+import { useSharingContext } from '../../hooks/useSharingContext';
 var PASSWORD_MIN_LENGTH = 4;
 export var ShareRestrictionContentModal = function ShareRestrictionContentModal(_ref) {
   var file = _ref.file,
@@ -27,23 +29,44 @@ export var ShareRestrictionContentModal = function ShareRestrictionContentModal(
   var _useI18n = useI18n(),
       t = _useI18n.t;
 
+  var _useSharingContext = useSharingContext(),
+      getDocumentPermissions = _useSharingContext.getDocumentPermissions;
+
+  var permissions = getDocumentPermissions(file._id);
+  var hasPassword = checkIsPermissionHasPassword(permissions);
+
+  var handlePassword = function handlePassword(value) {
+    setPassword(value);
+    setIsValidPassword(hasPassword && value.trim().length === 0 || value.trim().length >= PASSWORD_MIN_LENGTH);
+  };
+
   var handlePasswordToggle = function handlePasswordToggle(val) {
     setPasswordToggle(val);
+    setPassword('');
+
+    if (val && !password) {
+      setIsValidPassword(hasPassword);
+    } else {
+      setIsValidPassword(true);
+    }
   };
 
-  var handlePassword = function handlePassword(value) {
-    setPassword(value);
-    setIsValidPassword(value.trim().length === 0 || value.trim().length >= PASSWORD_MIN_LENGTH);
+  var handleDate = function handleDate(date) {
+    setSelectedDate(date);
+    setIsValidDate(isValid(date));
   };
 
   var handleDateToggle = function handleDateToggle(val) {
+    setDateToggle(val);
+
     if (!val) {
+      setSelectedDate(null);
+      setIsValidDate(true);
+    } else {
+      var defaultValue = val ? addDays(new Date(), 30) : null;
+      setSelectedDate(defaultValue);
       setIsValidDate(true);
     }
-
-    var defaultValue = val ? addDays(new Date(), 30) : null;
-    setSelectedDate(defaultValue, true);
-    setDateToggle(val);
   };
 
   return /*#__PURE__*/React.createElement(Box, {
@@ -58,11 +81,12 @@ export var ShareRestrictionContentModal = function ShareRestrictionContentModal(
     editingRights: editingRights,
     setEditingRights: setEditingRights
   }), /*#__PURE__*/React.createElement(BoxDate, {
-    onChange: setSelectedDate,
+    onChange: handleDate,
     date: selectedDate,
     onToggle: handleDateToggle,
     toggle: dateToggle
   }), /*#__PURE__*/React.createElement(BoxPassword, {
+    file: file,
     onChange: handlePassword,
     password: password,
     onToggle: handlePasswordToggle,

package/dist/components/ShareRestrictionModal/ShareRestrictionModal.js

@@ -4,17 +4,15 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { addDays } from 'date-fns';
 import PropTypes from 'prop-types';
 import React, { useState } from 'react';
-import { useClient } from 'cozy-client';
-import { getSharingLink as makeSharingLink } from 'cozy-client/dist/models/sharing';
-import { isMobile } from 'cozy-device-helper';
+import { generateWebLink, useClient } from 'cozy-client';
 import Button from 'cozy-ui/transpiled/react/Buttons';
 import { ConfirmDialog } from 'cozy-ui/transpiled/react/CozyDialogs';
 import Icon from 'cozy-ui/transpiled/react/Icon';
 import { useAlert } from 'cozy-ui/transpiled/react/providers/Alert';
 import { useI18n } from 'cozy-ui/transpiled/react/providers/I18n';
 import { ShareRestrictionContentModal } from './ShareRestrictionContentModal';
-import { copyToClipboard, forwardFile, updatePermissions, makeTTL, READ_ONLY_PERMS, WRITE_PERMS, revokePermissions } from './helpers';
-import { checkIsReadOnlyPermissions } from '../../helpers/permissions';
+import { copyToClipboard, updatePermissions, makeTTL, revokePermissions, createPermissions } from './helpers';
+import { checkIsPermissionHasExpiresDate, checkIsPermissionHasPassword, checkIsReadOnlyPermissions, getPermissionExpiresDate } from '../../helpers/permissions';
 import { useSharingContext } from '../../hooks/useSharingContext';
 var PASSWORD_MIN_LENGTH = 4;
 export var ShareRestrictionModal = function ShareRestrictionModal(_ref) {
@@ -33,35 +31,20 @@ export var ShareRestrictionModal = function ShareRestrictionModal(_ref) {
       password = _useState2[0],
       setPassword = _useState2[1];
 
-  var _useState3 = useState(addDays(new Date(), 30)),
+  var _useState3 = useState(true),
       _useState4 = _slicedToArray(_useState3, 2),
-      selectedDate = _useState4[0],
-      setSelectedDate = _useState4[1];
+      isValidDate = _useState4[0],
+      setIsValidDate = _useState4[1];
 
   var _useState5 = useState(true),
       _useState6 = _slicedToArray(_useState5, 2),
-      isValidDate = _useState6[0],
-      setIsValidDate = _useState6[1];
+      isValidPassword = _useState6[0],
+      setIsValidPassword = _useState6[1];
 
-  var _useState7 = useState(true),
+  var _useState7 = useState(false),
       _useState8 = _slicedToArray(_useState7, 2),
-      isValidPassword = _useState8[0],
-      setIsValidPassword = _useState8[1];
-
-  var _useState9 = useState(true),
-      _useState10 = _slicedToArray(_useState9, 2),
-      dateToggle = _useState10[0],
-      setDateToggle = _useState10[1];
-
-  var _useState11 = useState(false),
-      _useState12 = _slicedToArray(_useState11, 2),
-      passwordToggle = _useState12[0],
-      setPasswordToggle = _useState12[1];
-
-  var _useState13 = useState(false),
-      _useState14 = _slicedToArray(_useState13, 2),
-      loading = _useState14[0],
-      setLoading = _useState14[1];
+      loading = _useState8[0],
+      setLoading = _useState8[1];
 
   var _useSharingContext = useSharingContext(),
       documentType = _useSharingContext.documentType,
@@ -74,25 +57,38 @@ export var ShareRestrictionModal = function ShareRestrictionModal(_ref) {
   var hasSharingLink = getSharingLink(file._id) !== null;
   var permissions = getDocumentPermissions(file._id);
   var isReadOnlyPermissions = checkIsReadOnlyPermissions(permissions);
+  var hasPassword = checkIsPermissionHasPassword(permissions);
+  var hasExpiresDate = checkIsPermissionHasExpiresDate(permissions);
+  var expiresDate = getPermissionExpiresDate(permissions);
+  var defaultDate = expiresDate ? new Date(expiresDate) : addDays(new Date(), 30);
+
+  var _useState9 = useState(defaultDate),
+      _useState10 = _slicedToArray(_useState9, 2),
+      selectedDate = _useState10[0],
+      setSelectedDate = _useState10[1];
+
+  var _useState11 = useState(permissions.length > 0 ? hasExpiresDate : true),
+      _useState12 = _slicedToArray(_useState11, 2),
+      dateToggle = _useState12[0],
+      setDateToggle = _useState12[1];
+
+  var _useState13 = useState(hasPassword),
+      _useState14 = _slicedToArray(_useState13, 2),
+      passwordToggle = _useState14[0],
+      setPasswordToggle = _useState14[1];
 
   var _useState15 = useState(isReadOnlyPermissions || permissions.length === 0 ? 'readOnly' : 'write'),
       _useState16 = _slicedToArray(_useState15, 2),
       editingRights = _useState16[0],
       setEditingRights = _useState16[1];
 
-  var isDesktopOrMobileWithoutShareAPI = isMobile() && !navigator.share || !isMobile();
   var helperTextPassword = !isValidPassword ? t('ShareRestrictionModal.invalidPasswordMessage', {
     smart_count: PASSWORD_MIN_LENGTH - password.length
   }) : null;
 
-  var handleDateChange = function handleDateChange(date, isValid) {
-    setSelectedDate(date);
-    setIsValidDate(isValid);
-  };
-
   var handleClick = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-      var verbs, url, ttl, _url;
+      var ttl, _yield$createPermissi2, perms, url, _yield$updatePermissi3, _yield$updatePermissi4, _perms, _url;
 
       return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -100,80 +96,80 @@ export var ShareRestrictionModal = function ShareRestrictionModal(_ref) {
             setLoading(true); // If the file is not shared, we create a new sharing link
 
             if (hasSharingLink) {
-              _context.next = 10;
+              _context.next = 13;
               break;
             }
 
-            verbs = editingRights === 'readOnly' ? READ_ONLY_PERMS : WRITE_PERMS;
+            ttl = makeTTL(dateToggle && selectedDate);
             _context.next = 5;
-            return shareByLink(file, {
-              verbs: verbs
+            return createPermissions({
+              file: file,
+              t: t,
+              ttl: ttl,
+              password: password,
+              editingRights: editingRights,
+              documentType: documentType,
+              shareByLink: shareByLink,
+              showAlert: showAlert
             });
 
           case 5:
-            url = getSharingLink(file._id);
-            _context.next = 8;
+            _yield$createPermissi2 = _context.sent;
+            perms = _yield$createPermissi2.data;
+            url = generateWebLink({
+              cozyUrl: client.getStackClient().uri,
+              searchParams: [['sharecode', perms.attributes.shortcodes.code]],
+              pathname: '/public',
+              slug: 'drive',
+              subDomainType: client.capabilities.flat_subdomains ? 'flat' : 'nested'
+            });
+            _context.next = 10;
             return copyToClipboard(url, {
               t: t,
               showAlert: showAlert
             });
 
-          case 8:
+          case 10:
             onClose();
-            return _context.abrupt("return");
+            _context.next = 22;
+            break;
 
-          case 10:
-            _context.next = 12;
+          case 13:
+            _context.next = 15;
             return updatePermissions({
               file: file,
               t: t,
+              dateToggle: dateToggle,
+              selectedDate: selectedDate,
+              passwordToggle: passwordToggle,
+              password: password,
               editingRights: editingRights,
               documentType: documentType,
               updateDocumentPermissions: updateDocumentPermissions,
               showAlert: showAlert
             });
 
-          case 12:
-            ttl = makeTTL(dateToggle && selectedDate);
-
-            if (!isDesktopOrMobileWithoutShareAPI) {
-              _context.next = 21;
-              break;
-            }
-
-            _context.next = 16;
-            return makeSharingLink(client, [file._id], {
-              ttl: ttl,
-              password: password
+          case 15:
+            _yield$updatePermissi3 = _context.sent;
+            _yield$updatePermissi4 = _slicedToArray(_yield$updatePermissi3, 1);
+            _perms = _yield$updatePermissi4[0].data;
+            _url = generateWebLink({
+              cozyUrl: client.getStackClient().uri,
+              searchParams: [['sharecode', _perms.attributes.shortcodes.code]],
+              pathname: '/public',
+              slug: 'drive',
+              subDomainType: client.capabilities.flat_subdomains ? 'flat' : 'nested'
             });
-
-          case 16:
-            _url = _context.sent;
-            _context.next = 19;
+            _context.next = 21;
             return copyToClipboard(_url, {
               t: t,
               showAlert: showAlert
             });
 
-          case 19:
-            _context.next = 23;
-            break;
-
           case 21:
-            _context.next = 23;
-            return forwardFile({
-              client: client,
-              file: file,
-              t: t,
-              ttl: ttl,
-              password: password,
-              showAlert: showAlert
-            });
-
-          case 23:
             onClose();
 
-          case 24:
+          case 22:
           case "end":
             return _context.stop();
         }
@@ -223,7 +219,7 @@ export var ShareRestrictionModal = function ShareRestrictionModal(_ref) {
       ,
       dateToggle: dateToggle,
       setDateToggle: setDateToggle,
-      setSelectedDate: handleDateChange,
+      setSelectedDate: setSelectedDate,
       selectedDate: selectedDate,
       setIsValidDate: setIsValidDate // Password
       ,