cozy-sharing 30.1.1 → 30.2.1

package/dist/components/ShareRestrictionModal/ShareRestrictionModal.js

@@ -91,96 +91,83 @@ export var ShareRestrictionModal = function ShareRestrictionModal(_ref) {
 
   var handleClick = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-      var ttl, _yield$createPermissi2, perms, url, _yield$updatePermissi3, _yield$updatePermissi4, _perms, _url;
-
+      var permsPromise, urlPromise;
       return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            setLoading(true); // If the file is not shared, we create a new sharing link
-
-            if (hasSharingLink) {
-              _context.next = 13;
-              break;
-            }
+            setLoading(true); // The clipboard write must be initiated synchronously within the click
+            // handler for Safari to honor the user gesture; we pass a pending blob
+            // whose content resolves after the permission round-trip.
 
-            ttl = makeTTL(dateToggle && selectedDate);
-            _context.next = 5;
-            return createPermissions({
+            permsPromise = hasSharingLink ? updatePermissions({
               file: file,
               t: t,
-              ttl: ttl,
+              dateToggle: dateToggle,
+              selectedDate: selectedDate,
+              passwordToggle: passwordToggle,
               password: password,
               editingRights: editingRights,
               documentType: documentType,
-              shareByLink: shareByLink,
-              showAlert: showAlert
-            });
-
-          case 5:
-            _yield$createPermissi2 = _context.sent;
-            perms = _yield$createPermissi2.data;
-            url = generateWebLink({
-              cozyUrl: client.getStackClient().uri,
-              searchParams: [['sharecode', perms.attributes.shortcodes.code]],
-              pathname: '/public',
-              slug: getAppSlugFromDocumentType({
-                documentType: documentType
-              }),
-              subDomainType: client.capabilities.flat_subdomains ? 'flat' : 'nested'
-            });
-            _context.next = 10;
-            return copyToClipboard(url, {
-              t: t,
+              updateDocumentPermissions: updateDocumentPermissions,
               showAlert: showAlert
-            });
-
-          case 10:
-            onClose();
-            _context.next = 22;
-            break;
+            }).then(function (_ref3) {
+              var _ref4 = _slicedToArray(_ref3, 1),
+                  perms = _ref4[0].data;
 
-          case 13:
-            _context.next = 15;
-            return updatePermissions({
+              return perms;
+            }) : createPermissions({
               file: file,
               t: t,
-              dateToggle: dateToggle,
-              selectedDate: selectedDate,
-              passwordToggle: passwordToggle,
+              ttl: makeTTL(dateToggle && selectedDate),
               password: password,
               editingRights: editingRights,
               documentType: documentType,
-              updateDocumentPermissions: updateDocumentPermissions,
+              shareByLink: shareByLink,
               showAlert: showAlert
+            }).then(function (_ref5) {
+              var perms = _ref5.data;
+              return perms;
             });
-
-          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: getAppSlugFromDocumentType({
-                documentType: documentType
-              }),
-              subDomainType: client.capabilities.flat_subdomains ? 'flat' : 'nested'
+            urlPromise = permsPromise.then(function (perms) {
+              return generateWebLink({
+                cozyUrl: client.getStackClient().uri,
+                searchParams: [['sharecode', perms.attributes.shortcodes.code]],
+                pathname: '/public',
+                slug: getAppSlugFromDocumentType({
+                  documentType: documentType
+                }),
+                subDomainType: client.capabilities.flat_subdomains ? 'flat' : 'nested'
+              });
             });
-            _context.next = 21;
-            return copyToClipboard(_url, {
+            _context.next = 5;
+            return copyToClipboard(urlPromise, {
               t: t,
               showAlert: showAlert
             });
 
-          case 21:
+          case 5:
+            _context.prev = 5;
+            _context.next = 8;
+            return permsPromise;
+
+          case 8:
+            _context.next = 14;
+            break;
+
+          case 10:
+            _context.prev = 10;
+            _context.t0 = _context["catch"](5);
+            setLoading(false);
+            return _context.abrupt("return");
+
+          case 14:
             onClose();
 
-          case 22:
+          case 15:
           case "end":
             return _context.stop();
         }
-      }, _callee);
+      }, _callee, null, [[5, 10]]);
     }));
 
     return function handleClick() {
@@ -189,7 +176,7 @@ export var ShareRestrictionModal = function ShareRestrictionModal(_ref) {
   }();
 
   var handleRevokeLink = /*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
+    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
       return _regeneratorRuntime.wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
@@ -214,7 +201,7 @@ export var ShareRestrictionModal = function ShareRestrictionModal(_ref) {
     }));
 
     return function handleRevokeLink() {
-      return _ref3.apply(this, arguments);
+      return _ref6.apply(this, arguments);
     };
   }();
 

package/dist/components/ShareRestrictionModal/helpers.js

@@ -115,11 +115,19 @@ export var generateShareLinkFromFile = function generateShareLinkFromFile(_ref3)
   });
 };
 /**
- * Copy a string to the clipboard
+ * Copy a value to the clipboard.
  *
- * @param {string} value - The string saved to the clipboard
+ * Accepts a resolved string or a `Promise<string>`. The promise form is
+ * required when the value depends on a prior async step (e.g. creating a
+ * sharing link) from within a click handler: Safari drops the user-gesture
+ * context across any `await`, so `navigator.clipboard.writeText` called after
+ * an awaited call throws `NotAllowedError`. Passing a pending blob to
+ * `ClipboardItem` lets the clipboard API be invoked synchronously while the
+ * content is resolved later.
+ *
+ * @param {string | Promise<string>} value - Value to copy
  * @param {object} [options]
- * @param {number} options.t - Translation function
+ * @param {Function} options.t - Translation function
  * @param {Function} options.showAlert - Function to display an alert
  */
 
@@ -128,6 +136,7 @@ export var copyToClipboard = /*#__PURE__*/function () {
     var _ref5,
         t,
         showAlert,
+        blobPromise,
         _args2 = arguments;
 
     return _regeneratorRuntime.wrap(function _callee2$(_context2) {
@@ -144,33 +153,73 @@ export var copyToClipboard = /*#__PURE__*/function () {
 
         case 3:
           _context2.prev = 3;
-          _context2.next = 6;
+
+          if (!(typeof value === 'string')) {
+            _context2.next = 9;
+            break;
+          }
+
+          _context2.next = 7;
           return navigator.clipboard.writeText(value);
 
-        case 6:
+        case 7:
+          _context2.next = 21;
+          break;
+
+        case 9:
+          if (!(typeof ClipboardItem !== 'undefined')) {
+            _context2.next = 15;
+            break;
+          }
+
+          blobPromise = Promise.resolve(value).then(function (text) {
+            return new Blob([text], {
+              type: 'text/plain'
+            });
+          });
+          _context2.next = 13;
+          return navigator.clipboard.write([new ClipboardItem({
+            'text/plain': blobPromise
+          })]);
+
+        case 13:
+          _context2.next = 21;
+          break;
+
+        case 15:
+          _context2.t0 = navigator.clipboard;
+          _context2.next = 18;
+          return value;
+
+        case 18:
+          _context2.t1 = _context2.sent;
+          _context2.next = 21;
+          return _context2.t0.writeText.call(_context2.t0, _context2.t1);
+
+        case 21:
           showAlert({
             message: t('copyReminderContent.success'),
             severity: 'success',
             variant: 'filled'
           });
-          _context2.next = 13;
+          _context2.next = 28;
           break;
 
-        case 9:
-          _context2.prev = 9;
-          _context2.t0 = _context2["catch"](3);
+        case 24:
+          _context2.prev = 24;
+          _context2.t2 = _context2["catch"](3);
           showAlert({
             message: t('copyReminderContent.error'),
             severity: 'error',
             variant: 'filled'
           });
-          log.error("Error in 'copyToClipboard' function when trying to copy to clipboard", _context2.t0);
+          log.error("Error in 'copyToClipboard' function when trying to copy to clipboard", _context2.t2);
 
-        case 13:
+        case 28:
         case "end":
           return _context2.stop();
       }
-    }, _callee2, null, [[3, 9]]);
+    }, _callee2, null, [[3, 24]]);
   }));
 
   return function copyToClipboard(_x2) {

package/dist/components/SharedDrive/DumbSharedDriveModal.js

@@ -20,7 +20,9 @@ export var DumbSharedDriveModal = withLocales(function (_ref) {
       onRename = _ref.onRename,
       _ref$showNameField = _ref.showNameField,
       showNameField = _ref$showNameField === void 0 ? true : _ref$showNameField,
-      sharingLink = _ref.sharingLink;
+      sharingLink = _ref.sharingLink,
+      autoOpenShareRestriction = _ref.autoOpenShareRestriction,
+      showGenerateLinkButton = _ref.showGenerateLinkButton;
 
   var _useI18n = useI18n(),
       t = _useI18n.t;
@@ -48,7 +50,9 @@ export var DumbSharedDriveModal = withLocales(function (_ref) {
     cancelLabel: t('SharedDrive.sharedDriveModal.cancel'),
     createLabel: t('SharedDrive.sharedDriveModal.create'),
     shareLabel: t('FederatedFolder.share'),
-    saveLabel: t('SharedDrive.sharedDriveModal.save')
+    saveLabel: t('SharedDrive.sharedDriveModal.save'),
+    autoOpenShareRestriction: autoOpenShareRestriction,
+    showGenerateLinkButton: showGenerateLinkButton
   });
 });
 DumbSharedDriveModal.propTypes = {
@@ -67,6 +71,8 @@ DumbSharedDriveModal.propTypes = {
   onShare: PropTypes.func.isRequired,
   onRename: PropTypes.func,
   showNameField: PropTypes.bool,
-  sharingLink: PropTypes.string
+  sharingLink: PropTypes.string,
+  autoOpenShareRestriction: PropTypes.bool,
+  showGenerateLinkButton: PropTypes.bool
 };
 export default DumbSharedDriveModal;

package/dist/components/SharedDrive/SharedDriveEditModal.js

@@ -16,7 +16,9 @@ export var SharedDriveEditModal = withLocales(function (_ref) {
       recipients = _ref.recipients,
       onShare = _ref.onShare,
       onRevoke = _ref.onRevoke,
-      onClose = _ref.onClose;
+      onClose = _ref.onClose,
+      autoOpenShareRestriction = _ref.autoOpenShareRestriction,
+      showGenerateLinkButton = _ref.showGenerateLinkButton;
   var client = useClient();
 
   var _useI18n = useI18n(),
@@ -91,9 +93,18 @@ export var SharedDriveEditModal = withLocales(function (_ref) {
     onShare: onShare,
     sharedDriveName: name,
     handleSharedDriveNameChange: handleNameChange,
-    onRename: onRename
+    onRename: onRename,
+    autoOpenShareRestriction: autoOpenShareRestriction,
+    showGenerateLinkButton: showGenerateLinkButton
   });
 });
 SharedDriveEditModal.propTypes = {
-  onClose: PropTypes.func.isRequired
+  document: PropTypes.object,
+  sharing: PropTypes.object,
+  recipients: PropTypes.array,
+  onShare: PropTypes.func.isRequired,
+  onRevoke: PropTypes.func.isRequired,
+  onClose: PropTypes.func.isRequired,
+  autoOpenShareRestriction: PropTypes.bool,
+  showGenerateLinkButton: PropTypes.bool
 };

package/dist/components/SharedFolder/DumbBatchSharedFolderModal.js

@@ -36,7 +36,9 @@ export var DumbBatchSharedFolderModal = withLocales(function (_ref) {
       saveLabel = _ref.saveLabel,
       sharingDesc = _ref.sharingDesc,
       _ref$showShareByEmail = _ref.showShareByEmail,
-      showShareByEmail = _ref$showShareByEmail === void 0 ? true : _ref$showShareByEmail;
+      showShareByEmail = _ref$showShareByEmail === void 0 ? true : _ref$showShareByEmail,
+      autoOpenShareRestriction = _ref.autoOpenShareRestriction,
+      showGenerateLinkButton = _ref.showGenerateLinkButton;
   var hasRecipients = Boolean(recipients === null || recipients === void 0 ? void 0 : recipients.length); // Determine action buttons based on modal mode
 
   var actionButtons = function () {
@@ -56,7 +58,9 @@ export var DumbBatchSharedFolderModal = withLocales(function (_ref) {
       return /*#__PURE__*/React.createElement(ShareByLink, {
         link: sharingLink,
         document: document,
-        documentType: "Files"
+        documentType: "Files",
+        showGenerateLinkButton: showGenerateLinkButton,
+        autoOpenShareRestriction: autoOpenShareRestriction
       });
     }
 
@@ -64,7 +68,9 @@ export var DumbBatchSharedFolderModal = withLocales(function (_ref) {
       return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ShareByLink, {
         link: sharingLink,
         document: document,
-        documentType: "Files"
+        documentType: "Files",
+        showGenerateLinkButton: showGenerateLinkButton,
+        autoOpenShareRestriction: autoOpenShareRestriction
       }), /*#__PURE__*/React.createElement(Button, {
         variant: "primary",
         label: shareLabel,
@@ -165,7 +171,9 @@ DumbBatchSharedFolderModal.propTypes = {
   shareLabel: PropTypes.string,
   saveLabel: PropTypes.string,
   sharingDesc: PropTypes.string,
-  showShareByEmail: PropTypes.bool
+  showShareByEmail: PropTypes.bool,
+  autoOpenShareRestriction: PropTypes.bool,
+  showGenerateLinkButton: PropTypes.bool
 };
 DumbBatchSharedFolderModal.defaultProps = {
   sharingDesc: ''

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-sharing",
-  "version": "30.1.1",
+  "version": "30.2.1",
   "description": "Provides sharing login for React applications.",
   "main": "dist/index.js",
   "author": "Cozy",
@@ -84,5 +84,5 @@
   "sideEffects": [
     "*.css"
   ],
-  "gitHead": "f19da18da889a4164b25cfa3479f597bfe7e6047"
+  "gitHead": "4658ed10da57999de9a4cbef4887582ac10019db"
 }

package/src/components/FederatedFolder/DumbFederatedFolderModal.jsx

@@ -20,7 +20,9 @@ export const DumbFederatedFolderModal = withLocales(
     onClose,
     onShare,
     sharingLink,
-    showShareByEmail
+    showShareByEmail,
+    autoOpenShareRestriction,
+    showGenerateLinkButton
   }) => {
     const { t } = useI18n()
     return (
@@ -42,6 +44,8 @@ export const DumbFederatedFolderModal = withLocales(
         addButtonLabel={t('FederatedFolder.add')}
         shareLabel={t('FederatedFolder.share')}
         showShareByEmail={showShareByEmail}
+        autoOpenShareRestriction={autoOpenShareRestriction}
+        showGenerateLinkButton={showGenerateLinkButton}
       />
     )
   }
@@ -60,7 +64,9 @@ DumbFederatedFolderModal.propTypes = {
   onClose: PropTypes.func.isRequired,
   onShare: PropTypes.func.isRequired,
   sharingLink: PropTypes.string,
-  showShareByEmail: PropTypes.bool
+  showShareByEmail: PropTypes.bool,
+  autoOpenShareRestriction: PropTypes.bool,
+  showGenerateLinkButton: PropTypes.bool
 }
 
 export default DumbFederatedFolderModal

package/src/components/FederatedFolder/FederatedFolderModal.jsx

@@ -17,7 +17,12 @@ import {
 } from '../SharedDrive/helpers'
 
 export const FederatedFolderModal = withLocales(
-  ({ onClose, document: existingDocument }) => {
+  ({
+    onClose,
+    document: existingDocument,
+    autoOpenShareRestriction,
+    showGenerateLinkButton
+  }) => {
     const client = useClient()
     const { t } = useI18n()
     const {
@@ -159,6 +164,8 @@ export const FederatedFolderModal = withLocales(
         onShare={onShare}
         sharingLink={sharingLink}
         showShareByEmail={!isSharedDrive}
+        autoOpenShareRestriction={autoOpenShareRestriction}
+        showGenerateLinkButton={showGenerateLinkButton}
       />
     )
   }
@@ -166,7 +173,9 @@ export const FederatedFolderModal = withLocales(
 
 FederatedFolderModal.propTypes = {
   onClose: PropTypes.func.isRequired,
-  document: PropTypes.object.isRequired
+  document: PropTypes.object.isRequired,
+  autoOpenShareRestriction: PropTypes.bool,
+  showGenerateLinkButton: PropTypes.bool
 }
 
 export default FederatedFolderModal

package/src/components/ShareByLink.jsx

@@ -18,7 +18,13 @@ import {
 } from './ShareRestrictionModal/helpers'
 import { useSharingContext } from '../hooks/useSharingContext'
 
-const ShareByLink = ({ link, document, documentType }) => {
+const ShareByLink = ({
+  link,
+  document,
+  documentType,
+  showGenerateLinkButton = false,
+  autoOpenShareRestriction = false
+}) => {
   const { t } = useI18n()
   const { isMobile } = useBreakpoints()
   const { showAlert } = useAlert()
@@ -27,8 +33,9 @@ const ShareByLink = ({ link, document, documentType }) => {
   const [isGenerating, setIsGenerating] = useState(false)
 
   const canShare = typeof navigator?.share === 'function'
-  const showCopyAndSendButtons = isMobile && canShare
-  const showOnlyCopyButton = !isMobile || !canShare
+  const showGenerateButton = showGenerateLinkButton && !link
+  const showCopyAndSendButtons = !showGenerateButton && isMobile && canShare
+  const showOnlyCopyButton = !showGenerateButton && (!isMobile || !canShare)
   const isFederated = flag('drive.federated-shared-folder.enabled')
 
   const [isEditDialogOpen, toggleEditDialogOpen] = useReducer(
@@ -36,6 +43,14 @@ const ShareByLink = ({ link, document, documentType }) => {
     false
   )
 
+  const showGenericError = () => {
+    showAlert({
+      message: t(`${documentType}.share.error.generic`),
+      severity: 'error',
+      variant: 'filled'
+    })
+  }
+
   const handleGenerateLink = async () => {
     setIsGenerating(true)
     try {
@@ -60,18 +75,40 @@ const ShareByLink = ({ link, document, documentType }) => {
   }
 
   const generateLinkAndCopyLinkToClipboard = async () => {
-    let linkToCopy = link
-    if (!linkToCopy) {
-      linkToCopy = await handleGenerateLink()
+    if (link) {
+      await copyToClipboard(link, { t, showAlert })
+      return
     }
-    if (linkToCopy) {
-      await copyToClipboard(linkToCopy, { t, showAlert })
-    } else {
-      showAlert({
-        message: t(`${documentType}.share.error.generic`),
-        severity: 'error',
-        variant: 'filled'
-      })
+    // Safari: the clipboard API must be invoked synchronously within the
+    // click handler, so we pass the pending link to `copyToClipboard`.
+    // The resolved URL is captured here so we can branch on success after
+    // the copy has completed, without re-awaiting the promise.
+    let generatedLink = null
+    await copyToClipboard(
+      handleGenerateLink().then(generated => {
+        generatedLink = generated
+        if (!generated) throw new Error('link-generation-failed')
+        return generated
+      }),
+      { t, showAlert }
+    )
+    if (!generatedLink) {
+      showGenericError()
+      return
+    }
+    if (autoOpenShareRestriction) {
+      toggleEditDialogOpen()
+    }
+  }
+
+  const generateLinkSilently = async () => {
+    const generated = await handleGenerateLink()
+    if (!generated) {
+      showGenericError()
+      return
+    }
+    if (autoOpenShareRestriction) {
+      toggleEditDialogOpen()
     }
   }
 
@@ -81,11 +118,7 @@ const ShareByLink = ({ link, document, documentType }) => {
       linkToShare = await handleGenerateLink()
     }
     if (!linkToShare) {
-      showAlert({
-        message: t(`${documentType}.share.error.generic`),
-        severity: 'error',
-        variant: 'filled'
-      })
+      showGenericError()
       return
     }
 
@@ -100,11 +133,7 @@ const ShareByLink = ({ link, document, documentType }) => {
     } catch (error) {
       // Don't show error when user cancels the share dialog
       if (error.name !== 'AbortError') {
-        showAlert({
-          message: t(`${documentType}.share.error.generic`),
-          severity: 'error',
-          variant: 'filled'
-        })
+        showGenericError()
       }
     }
   }
@@ -144,6 +173,16 @@ const ShareByLink = ({ link, document, documentType }) => {
           busy={isGenerating}
         />
       )}
+      {showGenerateButton && (
+        <Button
+          label={t(`${documentType}.share.shareByLink.create`)}
+          variant="secondary"
+          size="medium"
+          startIcon={<Icon icon={LinkIcon} />}
+          onClick={generateLinkSilently}
+          busy={isGenerating}
+        />
+      )}
       {isEditDialogOpen && (
         <ShareRestrictionModal file={document} onClose={toggleEditDialogOpen} />
       )}
@@ -154,7 +193,9 @@ const ShareByLink = ({ link, document, documentType }) => {
 ShareByLink.propTypes = {
   link: PropTypes.string,
   document: PropTypes.object.isRequired,
-  documentType: PropTypes.string.isRequired
+  documentType: PropTypes.string.isRequired,
+  showGenerateLinkButton: PropTypes.bool,
+  autoOpenShareRestriction: PropTypes.bool
 }
 
 export default ShareByLink

package/src/components/ShareDialogCozyToCozy.jsx

@@ -1,5 +1,5 @@
 import cx from 'classnames'
-import React from 'react'
+import React, { useMemo } from 'react'
 
 import Typography from 'cozy-ui/transpiled/react/Typography'
 import useBreakpoints from 'cozy-ui/transpiled/react/providers/Breakpoints'
@@ -111,17 +111,32 @@ const SharingTitleFunction = ({ documentType, document }) =>
  */
 const ShareDialogCozyToCozy = ({
   showShareByLink,
+  showGenerateLinkButton,
+  autoOpenShareRestriction,
   documentType,
   document,
   ...props
 }) => {
+  const dialogActionsOnShare = useMemo(() => {
+    if (!showShareByLink) return null
+    const BoundShareByLink = dialogActionProps => (
+      <DumbShareByLink
+        {...dialogActionProps}
+        showGenerateLinkButton={showGenerateLinkButton}
+        autoOpenShareRestriction={autoOpenShareRestriction}
+      />
+    )
+    BoundShareByLink.displayName = 'BoundShareByLink'
+    return BoundShareByLink
+  }, [showShareByLink, showGenerateLinkButton, autoOpenShareRestriction])
+
   return (
     <ShareDialogTwoStepsConfirmationContainer
       {...props}
       documentType={documentType}
       document={document}
       dialogContentOnShare={SharingContent}
-      dialogActionsOnShare={showShareByLink ? DumbShareByLink : null}
+      dialogActionsOnShare={dialogActionsOnShare}
       dialogTitleOnShare={SharingTitleFunction({ documentType, document })}
       disableGutters
     />

package/src/components/ShareDialogOnlyByLink.jsx

@@ -19,7 +19,9 @@ const ShareDialogOnlyByLink = ({
   documentType,
   link,
   onClose,
-  permissions
+  permissions,
+  showGenerateLinkButton,
+  autoOpenShareRestriction
 }) => {
   const { t } = useI18n()
   const { isMobile } = useBreakpoints()
@@ -62,6 +64,8 @@ const ShareDialogOnlyByLink = ({
               link={link}
               document={document}
               documentType={documentType}
+              showGenerateLinkButton={showGenerateLinkButton}
+              autoOpenShareRestriction={autoOpenShareRestriction}
             />
           </div>
         </>