cozy-sharing 30.1.1 → 30.2.1

package/src/components/ShareModal/ShareModal.jsx

@@ -36,7 +36,7 @@ export const ShareModal = withLocales(props => {
 
   const isFederatedMode = flag('drive.federated-shared-folder.enabled')
   if (isFederatedMode && allLoaded) {
-    return <FederatedFolderModal document={document} onClose={rest.onClose} />
+    return <FederatedFolderModal document={document} {...rest} />
   }
 
   const isEditable =
@@ -61,6 +61,8 @@ export const ShareModal = withLocales(props => {
 })
 
 ShareModal.propTypes = {
+  autoOpenShareRestriction: PropTypes.bool,
   document: PropTypes.object.isRequired,
-  onRevokeSuccess: PropTypes.func
+  onRevokeSuccess: PropTypes.func,
+  showGenerateLinkButton: PropTypes.bool
 }

package/src/components/ShareModal.jsx

@@ -8,6 +8,7 @@ import ShareDialogOnlyByLink from './ShareDialogOnlyByLink'
 import { SharedDriveEditModal } from './SharedDrive/SharedDriveEditModal'
 
 export const ShareModal = ({
+  autoOpenShareRestriction,
   createContact,
   document,
   documentType = 'Document',
@@ -24,6 +25,7 @@ export const ShareModal = ({
   recipients,
   sharing,
   sharingDesc,
+  showGenerateLinkButton,
   twoStepsConfirmationMethods
 }) => {
   if (isSharedDrive && !flag('drive.federated-shared-folder.enabled')) {
@@ -35,6 +37,8 @@ export const ShareModal = ({
         onShare={onShare}
         onRevoke={onRevoke}
         onClose={onClose}
+        autoOpenShareRestriction={autoOpenShareRestriction}
+        showGenerateLinkButton={showGenerateLinkButton}
       />
     )
   }
@@ -58,6 +62,8 @@ export const ShareModal = ({
       link={link}
       onClose={onClose}
       permissions={permissions}
+      showGenerateLinkButton={showGenerateLinkButton}
+      autoOpenShareRestriction={autoOpenShareRestriction}
     />
   ) : (
     <ShareDialogCozyToCozy
@@ -79,6 +85,8 @@ export const ShareModal = ({
       showShareByLink={showShareByLink}
       showShareOnlyByLink={showShareOnlyByLink}
       showWhoHasAccess={showWhoHasAccess}
+      showGenerateLinkButton={showGenerateLinkButton}
+      autoOpenShareRestriction={autoOpenShareRestriction}
       twoStepsConfirmationMethods={twoStepsConfirmationMethods}
     />
   )
@@ -87,6 +95,7 @@ export const ShareModal = ({
 export default ShareModal
 
 ShareModal.propTypes = {
+  autoOpenShareRestriction: PropTypes.bool,
   createContact: PropTypes.func.isRequired,
   document: PropTypes.object.isRequired,
   documentType: PropTypes.string,
@@ -100,6 +109,7 @@ ShareModal.propTypes = {
   permissions: PropTypes.array.isRequired,
   recipients: PropTypes.array.isRequired,
   sharingDesc: PropTypes.string,
+  showGenerateLinkButton: PropTypes.bool,
   twoStepsConfirmationMethods: PropTypes.shape({
     getRecipientsToBeConfirmed: PropTypes.func,
     confirmRecipient: PropTypes.func,

package/src/components/ShareModal.spec.js

@@ -6,8 +6,12 @@ import flag from 'cozy-flags'
 import { ShareModal } from './ShareModal'
 import AppLike from '../../test/AppLike'
 
-jest.mock('./ShareDialogCozyToCozy', () => () => <>ShareDialogCozyToCozy</>)
-jest.mock('./ShareDialogOnlyByLink', () => () => <>ShareDialogOnlyByLink</>)
+jest.mock('./ShareDialogCozyToCozy', () => () => (
+  <div>ShareDialogCozyToCozy</div>
+))
+jest.mock('./ShareDialogOnlyByLink', () => () => (
+  <div>ShareDialogOnlyByLink</div>
+))
 
 jest.mock('cozy-flags')
 
@@ -43,7 +47,7 @@ describe('ShareModal component', () => {
   })
 
   it('should render ShareDialogOnlyByLink if flag cozy.hide-sharing-cozy-to-cozy is true', () => {
-    flag.mockImplementation(() => true)
+    flag.mockImplementation(name => name === 'cozy.hide-sharing-cozy-to-cozy')
 
     const root = setup({ documentType: 'Document' })
 

package/src/components/ShareRestrictionModal/ShareRestrictionModal.jsx

@@ -77,51 +77,55 @@ export const ShareRestrictionModal = ({ file, onClose }) => {
 
   const handleClick = async () => {
     setLoading(true)
-    // If the file is not shared, we create a new sharing link
-    if (!hasSharingLink) {
-      const ttl = makeTTL(dateToggle && selectedDate)
-      const { data: perms } = await createPermissions({
-        file,
-        t,
-        ttl,
-        password,
-        editingRights,
-        documentType,
-        shareByLink,
-        showAlert
-      })
-      const url = generateWebLink({
-        cozyUrl: client.getStackClient().uri,
-        searchParams: [['sharecode', perms.attributes.shortcodes.code]],
-        pathname: '/public',
-        slug: getAppSlugFromDocumentType({ documentType }),
-        subDomainType: client.capabilities.flat_subdomains ? 'flat' : 'nested'
-      })
-      await copyToClipboard(url, { t, showAlert })
-      onClose()
-    } else {
-      const [{ data: perms }] = await updatePermissions({
-        file,
-        t,
-        dateToggle,
-        selectedDate,
-        passwordToggle,
-        password,
-        editingRights,
-        documentType,
-        updateDocumentPermissions,
-        showAlert
-      })
-      const url = generateWebLink({
+    // 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.
+    const permsPromise = hasSharingLink
+      ? updatePermissions({
+          file,
+          t,
+          dateToggle,
+          selectedDate,
+          passwordToggle,
+          password,
+          editingRights,
+          documentType,
+          updateDocumentPermissions,
+          showAlert
+        }).then(([{ data: perms }]) => perms)
+      : createPermissions({
+          file,
+          t,
+          ttl: makeTTL(dateToggle && selectedDate),
+          password,
+          editingRights,
+          documentType,
+          shareByLink,
+          showAlert
+        }).then(({ data: perms }) => perms)
+
+    const urlPromise = permsPromise.then(perms =>
+      generateWebLink({
         cozyUrl: client.getStackClient().uri,
         searchParams: [['sharecode', perms.attributes.shortcodes.code]],
         pathname: '/public',
         slug: getAppSlugFromDocumentType({ documentType }),
         subDomainType: client.capabilities.flat_subdomains ? 'flat' : 'nested'
       })
-      await copyToClipboard(url, { t, showAlert })
-      onClose()
+    )
+
+    await copyToClipboard(urlPromise, { t, showAlert })
+    try {
+      // Observe the permission result so we can keep the modal open (and
+      // preserve the user's date / password / editing-rights inputs) if
+      // the permission round-trip failed. copyToClipboard swallows its
+      // own errors so the await above always resolves.
+      await permsPromise
+    } catch {
+      setLoading(false)
+      return
     }
+    onClose()
   }
 
   const handleRevokeLink = async () => {

package/src/components/ShareRestrictionModal/helpers.js

@@ -96,17 +96,36 @@ export const generateShareLinkFromFile = ({
 }
 
 /**
- * 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
  */
 export const copyToClipboard = async (value, { t, showAlert } = {}) => {
   if (!value) return false
   try {
-    await navigator.clipboard.writeText(value)
+    if (typeof value === 'string') {
+      await navigator.clipboard.writeText(value)
+    } else if (typeof ClipboardItem !== 'undefined') {
+      const blobPromise = Promise.resolve(value).then(
+        text => new Blob([text], { type: 'text/plain' })
+      )
+      await navigator.clipboard.write([
+        new ClipboardItem({ 'text/plain': blobPromise })
+      ])
+    } else {
+      await navigator.clipboard.writeText(await value)
+    }
     showAlert({
       message: t('copyReminderContent.success'),
       severity: 'success',

package/src/components/SharedDrive/DumbSharedDriveModal.jsx

@@ -23,7 +23,9 @@ export const DumbSharedDriveModal = withLocales(
     onShare,
     onRename,
     showNameField = true,
-    sharingLink
+    sharingLink,
+    autoOpenShareRestriction,
+    showGenerateLinkButton
   }) => {
     const { t } = useI18n()
     return (
@@ -51,6 +53,8 @@ export const DumbSharedDriveModal = withLocales(
         createLabel={t('SharedDrive.sharedDriveModal.create')}
         shareLabel={t('FederatedFolder.share')}
         saveLabel={t('SharedDrive.sharedDriveModal.save')}
+        autoOpenShareRestriction={autoOpenShareRestriction}
+        showGenerateLinkButton={showGenerateLinkButton}
       />
     )
   }
@@ -72,7 +76,9 @@ 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/src/components/SharedDrive/SharedDriveEditModal.jsx

@@ -11,7 +11,16 @@ import { useSharingContext } from '../../hooks/useSharingContext'
 import { Contact } from '../../models'
 
 export const SharedDriveEditModal = withLocales(
-  ({ document, sharing, recipients, onShare, onRevoke, onClose }) => {
+  ({
+    document,
+    sharing,
+    recipients,
+    onShare,
+    onRevoke,
+    onClose,
+    autoOpenShareRestriction,
+    showGenerateLinkButton
+  }) => {
     const client = useClient()
     const { t } = useI18n()
     const { showAlert } = useAlert()
@@ -51,11 +60,20 @@ export const SharedDriveEditModal = withLocales(
         sharedDriveName={name}
         handleSharedDriveNameChange={handleNameChange}
         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/src/components/SharedFolder/DumbBatchSharedFolderModal.jsx

@@ -38,7 +38,9 @@ export const DumbBatchSharedFolderModal = withLocales(
     shareLabel,
     saveLabel,
     sharingDesc,
-    showShareByEmail = true
+    showShareByEmail = true,
+    autoOpenShareRestriction,
+    showGenerateLinkButton
   }) => {
     const hasRecipients = Boolean(recipients?.length)
 
@@ -59,6 +61,8 @@ export const DumbBatchSharedFolderModal = withLocales(
             link={sharingLink}
             document={document}
             documentType="Files"
+            showGenerateLinkButton={showGenerateLinkButton}
+            autoOpenShareRestriction={autoOpenShareRestriction}
           />
         )
       }
@@ -70,6 +74,8 @@ export const DumbBatchSharedFolderModal = withLocales(
               link={sharingLink}
               document={document}
               documentType="Files"
+              showGenerateLinkButton={showGenerateLinkButton}
+              autoOpenShareRestriction={autoOpenShareRestriction}
             />
             <Button
               variant="primary"
@@ -182,7 +188,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 = {