cozy-sharing 28.4.4 → 28.5.0

package/src/SharingProvider.jsx

@@ -3,6 +3,7 @@ import React, { Component } from 'react'
 import { withClient } from 'cozy-client'
 import minilog from 'cozy-minilog'
 
+import { generateShareLinkFromFile } from './components/ShareRestrictionModal/helpers'
 import SharingContext from './context'
 import { fetchNextPermissions } from './fetchNextPermissions'
 import { fetchFilesPaths } from './helpers/files'
@@ -11,6 +12,7 @@ import {
   createSharingInStore,
   updateSharingInStore
 } from './helpers/sharings'
+import { getShortcode } from './helpers/shortcodes'
 import { SynchronousJobQueue } from './helpers/synchronousJobQueue'
 import { fetchApps } from './queries/queries'
 import reducer, {
@@ -67,6 +69,7 @@ export class SharingProvider extends Component {
       canReshare: docId => canReshare(this.state, docId, instanceUri),
       getOwner: docId => getOwner(this.state, docId),
       getSharingType: docId => getSharingType(this.state, docId, instanceUri),
+      getSharingById: docId => getSharingById(this.state, docId),
       getSharingForSelf: docId => getSharingForSelf(this.state, docId),
       getRecipients: docId => getRecipients(this.state, docId),
       getSharedParentPath: documentPath =>
@@ -83,6 +86,7 @@ export class SharingProvider extends Component {
       revokeGroup: this.revokeGroup,
       revokeSelf: this.revokeSelf,
       shareByLink: this.shareByLink,
+      getFederatedShareLink: this.getFederatedShareLink,
       updateDocumentPermissions: this.updateDocumentPermissions,
       revokeSharingLink: this.revokeSharingLink,
       hasLoadedAtLeastOnePage: false,
@@ -336,11 +340,66 @@ export class SharingProvider extends Component {
   }
 
   shareByLink = async (document, options) => {
-    const resp = await this.permissionCol.createSharingLink(document, options)
+    const resp = document.driveId
+      ? await this.createSharedDriveSharingLink(document, options)
+      : await this.permissionCol.createSharingLink(document, options)
     this.dispatch(addSharingLink(resp.data))
     return resp
   }
 
+  getFederatedShareLink = document => {
+    if (!document.driveId) return null
+
+    const permissions = getDocumentPermissions(this.state, document._id)
+    const perm = permissions.find(p => getShortcode(p))
+    if (!perm) return null
+
+    const code = getShortcode(perm)
+    if (!code) return null
+
+    const { client } = this.props
+    return generateShareLinkFromFile({
+      client,
+      file: document,
+      sharecode: code,
+      getOwner: this.state.getOwner,
+      getSharingById: this.state.getSharingById,
+      documentType: this.state.documentType
+    })
+  }
+
+  createSharedDriveSharingLink = async (document, options) => {
+    const { client } = this.props
+    const drivePermissionCollection = client.collection('io.cozy.permissions', {
+      driveId: document.driveId
+    })
+    const resp = await drivePermissionCollection.createSharingLink(
+      document,
+      options
+    )
+    return resp
+  }
+
+  updateSharedDrivePermissions = async (
+    document,
+    permissionDocument,
+    updatedPermissions,
+    options
+  ) => {
+    const { client } = this.props
+    const { expiresAt, password } = options
+    const drivePermissionCollection = client.collection('io.cozy.permissions', {
+      driveId: document.driveId
+    })
+    const resp = await drivePermissionCollection.add(
+      permissionDocument,
+      updatedPermissions,
+      { expiresAt, password }
+    )
+    this.dispatch(updateSharingLink(resp.data))
+    return resp
+  }
+
   /**
    * updateDocumentPermissions - Description
    *
@@ -356,19 +415,29 @@ export class SharingProvider extends Component {
     const { verbs, expiresAt, password } = options
     const permissions = getDocumentPermissions(this.state, document.id)
 
+    if (!permissions || permissions.length === 0) {
+      return []
+    }
+
     const responses = await Promise.all(
       permissions.map(async permissionDocument => {
         const updatedPermissions = permissionDocument.attributes.permissions
-        Object.keys(updatedPermissions).map(permType => {
+        Object.keys(updatedPermissions).forEach(permType => {
           updatedPermissions[permType].verbs = verbs
         })
 
-        const resp = await this.permissionCol.add(
-          permissionDocument,
-          updatedPermissions,
-          { expiresAt, password }
-        )
-        this.dispatch(updateSharingLink(resp.data))
+        const resp = document.driveId
+          ? await this.updateSharedDrivePermissions(
+              document,
+              permissionDocument,
+              updatedPermissions,
+              options
+            )
+          : await this.permissionCol.add(
+              permissionDocument,
+              updatedPermissions,
+              { expiresAt, password }
+            )
         return resp
       })
     )

package/src/SharingProvider.spec.jsx

@@ -5,7 +5,7 @@ import { createMockClient } from 'cozy-client'
 
 import { SharingProvider } from './SharingProvider'
 import SharingContext from './context'
-// import { receiveSharings } from './state'
+import reducer, { addSharingLink, getDocumentPermissions } from './state'
 import AppLike from '../test/AppLike'
 
 const AppWrapper = ({ children, client, isPublic }) => {
@@ -105,6 +105,135 @@ describe('SharingProvider', () => {
   })
 })
 
+describe('shareByLink', () => {
+  const 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' }
+    }
+  }
+
+  const driveFile = {
+    _id: 'file_in_drive',
+    id: 'file_in_drive',
+    driveId: 'drive_123'
+  }
+
+  it('dispatches addSharingLink exactly once for a shared drive file', async () => {
+    const mockCreateSharingLink = jest
+      .fn()
+      .mockResolvedValue({ data: PERM_DRIVE_FILE })
+    const mockClient = createMockClient({})
+    mockClient.collection = jest.fn().mockReturnValue({
+      createSharingLink: mockCreateSharingLink
+    })
+
+    const provider = new SharingProvider({ client: mockClient })
+    provider.state = reducer()
+    provider.dispatch = jest.fn(action => {
+      provider.state = reducer(provider.state, action)
+    })
+
+    await provider.shareByLink(driveFile, { verbs: ['GET'] })
+
+    expect(provider.dispatch).toHaveBeenCalledTimes(1)
+    const permissions = getDocumentPermissions(provider.state, driveFile._id)
+    expect(permissions).toHaveLength(1)
+    expect(permissions[0].id).toBe(PERM_DRIVE_FILE.id)
+  })
+
+  it('dispatches addSharingLink once for a regular file (non shared drive)', async () => {
+    const 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' }
+      }
+    }
+    const regularFile = { _id: 'regular_file_id', id: 'regular_file_id' }
+    const mockCreateSharingLink = jest
+      .fn()
+      .mockResolvedValue({ data: PERM_REGULAR_FILE })
+    const mockClient = createMockClient({})
+    mockClient.collection = jest.fn().mockReturnValue({
+      createSharingLink: mockCreateSharingLink
+    })
+
+    const provider = new SharingProvider({ client: mockClient })
+    provider.state = reducer()
+    provider.permissionCol = { createSharingLink: mockCreateSharingLink }
+    provider.dispatch = jest.fn(action => {
+      provider.state = reducer(provider.state, action)
+    })
+
+    await provider.shareByLink(regularFile, { verbs: ['GET'] })
+
+    expect(provider.dispatch).toHaveBeenCalledTimes(1)
+    const permissions = getDocumentPermissions(provider.state, regularFile._id)
+    expect(permissions).toHaveLength(1)
+    expect(permissions[0].id).toBe(PERM_REGULAR_FILE.id)
+  })
+})
+
+describe('updateDocumentPermissions', () => {
+  const 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', async () => {
+    const driveFile = {
+      _id: 'file_in_drive',
+      id: 'file_in_drive',
+      driveId: 'drive_123'
+    }
+    const mockAdd = jest.fn().mockResolvedValue({ data: PERM_DRIVE_FILE })
+    const mockClient = createMockClient({})
+    mockClient.collection = jest.fn().mockReturnValue({ add: mockAdd })
+
+    const 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()
+
+    await provider.updateDocumentPermissions(driveFile, {
+      verbs: ['GET'],
+      expiresAt: '',
+      password: ''
+    })
+
+    expect(mockAdd).toHaveBeenCalledTimes(1)
+  })
+})
+
 // TODO Convert with react-testing-library
 // describe('hasWriteAccess', () => {
 //   it('tells if a doc is writtable', () => {

package/src/components/FederatedFolder/DumbFederatedFolderModal.jsx

@@ -3,7 +3,7 @@ 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 const DumbFederatedFolderModal = withLocales(
   ({
@@ -18,7 +18,8 @@ export const DumbFederatedFolderModal = withLocales(
     onSend,
     onClose,
     onShare,
-    sharingLink
+    sharingLink,
+    showShareByEmail
   }) => {
     const { t } = useI18n()
     return (
@@ -39,6 +40,7 @@ export const DumbFederatedFolderModal = withLocales(
         addPeopleLabel={t('FederatedFolder.addPeople')}
         addButtonLabel={t('FederatedFolder.add')}
         shareLabel={t('FederatedFolder.share')}
+        showShareByEmail={showShareByEmail}
       />
     )
   }
@@ -56,7 +58,8 @@ 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/src/components/FederatedFolder/FederatedFolderModal.jsx

@@ -1,5 +1,5 @@
 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'
@@ -19,13 +19,43 @@ export const FederatedFolderModal = withLocales(
   ({ onClose, document: existingDocument }) => {
     const client = useClient()
     const { t } = useI18n()
-    const { share, getSharingLink } = useSharingContext()
+    const {
+      share,
+      getSharingLink,
+      getFederatedShareLink,
+      getDocumentPermissions,
+      getOwner,
+      getSharingById
+    } = useSharingContext()
     const { showAlert } = useAlert()
 
-    // Get sharing link
-    const sharingLink = existingDocument
-      ? getSharingLink(existingDocument._id)
-      : null
+    const [sharingLink, setSharingLink] = useState(null)
+
+    const documentPermissions = existingDocument
+      ? getDocumentPermissions(existingDocument._id)
+      : []
+
+    useEffect(() => {
+      const fetchSharingLink = async () => {
+        if (!existingDocument) return
+
+        if (existingDocument.driveId) {
+          const link = await getFederatedShareLink(existingDocument)
+          setSharingLink(link)
+        } else {
+          setSharingLink(getSharingLink(existingDocument._id))
+        }
+      }
+
+      fetchSharingLink()
+    }, [
+      existingDocument,
+      documentPermissions,
+      getFederatedShareLink,
+      getSharingLink,
+      getOwner,
+      getSharingById
+    ]) // eslint-disable-line react-hooks/exhaustive-deps
 
     const [federatedRecipients, setFederatedRecipients] = useState({
       recipients: [],
@@ -92,6 +122,8 @@ export const FederatedFolderModal = withLocales(
 
     const modalTitle = t('FederatedFolder.shareTitle', { name: folderName })
 
+    const isSharedDrive = Boolean(existingDocument?.driveId)
+
     return (
       <DumbFederatedFolderModal
         title={modalTitle}
@@ -106,6 +138,7 @@ export const FederatedFolderModal = withLocales(
         onClose={onClose}
         onShare={onShare}
         sharingLink={sharingLink}
+        showShareByEmail={!isSharedDrive}
       />
     )
   }

package/src/components/ShareByLink.jsx

@@ -23,7 +23,7 @@ const ShareByLink = ({ link, document, documentType }) => {
   const { isMobile } = useBreakpoints()
   const { showAlert } = useAlert()
   const client = useClient()
-  const { shareByLink } = useSharingContext()
+  const { shareByLink, getOwner, getSharingById } = useSharingContext()
   const [isGenerating, setIsGenerating] = useState(false)
 
   const canShare = typeof navigator?.share === 'function'
@@ -44,6 +44,8 @@ const ShareByLink = ({ link, document, documentType }) => {
         file: document,
         documentType,
         shareByLink,
+        getOwner,
+        getSharingById,
         t,
         showAlert,
         password: '',

package/src/components/ShareRestrictionModal/helpers.js

@@ -2,6 +2,7 @@ import { generateWebLink } from 'cozy-client'
 import minilog from 'cozy-minilog'
 
 import { getAppSlugFromDocumentType } from '../../helpers/link'
+import { getShortcode } from '../../helpers/shortcodes'
 
 const log = minilog('ShareRestrictionModal/helpers')
 
@@ -28,6 +29,8 @@ export const createSharingLink = async ({
   file,
   documentType,
   shareByLink,
+  getOwner,
+  getSharingById,
   t,
   ttl,
   editingRights = 'readOnly',
@@ -44,13 +47,48 @@ export const createSharingLink = async ({
     shareByLink,
     showAlert
   })
-  if (!permsResult?.data?.attributes?.shortcodes?.code) {
+  const code = getShortcode(permsResult?.data)
+  if (!code) {
     return null
   }
-  const { data: perms } = permsResult
+  return generateShareLinkFromFile({
+    client,
+    file,
+    sharecode: code,
+    getOwner,
+    getSharingById,
+    documentType
+  })
+}
+
+/**
+ * Generate a sharing link from a file and sharecode
+ * @param {object} options
+ * @param {object} options.client - CozyClient instance
+ * @param {object} options.file - File to share
+ * @param {string} options.sharecode - Share code
+ * @param {Function} options.getOwner - Function to get the owner of a sharing
+ * @param {Function} options.getSharingById - Function to get a sharing by ID
+ * @param {string} options.documentType - Type of the document
+ * @returns {string} - The generated web link
+ */
+export const generateShareLinkFromFile = ({
+  client,
+  file,
+  sharecode,
+  getOwner,
+  getSharingById,
+  documentType
+}) => {
+  let cozyUrl = client.getStackClient().uri
+  if (file.driveId) {
+    const sharing = getSharingById(file.driveId)
+    const owner = getOwner(sharing?.rules?.[0]?.values?.[0])
+    cozyUrl = owner?.instance || client.getStackClient().uri
+  }
   return generateWebLink({
-    cozyUrl: client.getStackClient().uri,
-    searchParams: [['sharecode', perms.attributes.shortcodes.code]],
+    cozyUrl,
+    searchParams: [['sharecode', sharecode]],
     pathname: '/public',
     slug: getAppSlugFromDocumentType({ documentType }),
     subDomainType: client.capabilities.flat_subdomains ? 'flat' : 'nested'

package/src/components/SharedDrive/DumbSharedDriveModal.jsx

@@ -3,7 +3,7 @@ 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 const DumbSharedDriveModal = withLocales(
   ({

package/src/components/SharedFolder/DumbBatchSharedFolderModal.jsx

@@ -37,7 +37,8 @@ export const DumbBatchSharedFolderModal = withLocales(
     createLabel,
     shareLabel,
     saveLabel,
-    sharingDesc
+    sharingDesc,
+    showShareByEmail = true
   }) => {
     const hasRecipients = Boolean(recipients?.length)
 
@@ -52,6 +53,16 @@ export const DumbBatchSharedFolderModal = withLocales(
         )
       }
 
+      if (!showShareByEmail) {
+        return (
+          <ShareByLink
+            link={sharingLink}
+            document={document}
+            documentType="Files"
+          />
+        )
+      }
+
       if (!showNameField) {
         return (
           <>
@@ -111,19 +122,21 @@ export const DumbBatchSharedFolderModal = withLocales(
               <Typography variant="h6" className="u-mt-1-half u-mb-half">
                 {addPeopleLabel}
               </Typography>
-              <DumbShareByEmail
-                createContact={createContact}
-                currentRecipients={currentRecipients}
-                document={document}
-                documentType="Files"
-                sharedDrive
-                sharingDesc={sharingDesc}
-                onShare={params => {
-                  onShare(params)
-                }}
-                submitLabel={addButtonLabel}
-                showNotifications={false}
-              />
+              {showShareByEmail && (
+                <DumbShareByEmail
+                  createContact={createContact}
+                  currentRecipients={currentRecipients}
+                  document={document}
+                  documentType="Files"
+                  sharedDrive
+                  sharingDesc={sharingDesc}
+                  onShare={params => {
+                    onShare(params)
+                  }}
+                  submitLabel={addButtonLabel}
+                  showNotifications={false}
+                />
+              )}
             </div>
             <WhoHasAccess
               isOwner
@@ -168,7 +181,10 @@ DumbBatchSharedFolderModal.propTypes = {
   createLabel: PropTypes.string,
   shareLabel: PropTypes.string,
   saveLabel: PropTypes.string,
-  sharingDesc: PropTypes.string.isRequired
+  sharingDesc: PropTypes.string,
+  showShareByEmail: PropTypes.bool
 }
 
-export default DumbBatchSharedFolderModal
+DumbBatchSharedFolderModal.defaultProps = {
+  sharingDesc: ''
+}

package/src/helpers/shortcodes.js

@@ -0,0 +1,28 @@
+/**
+ * Get the shortcode from a permission object
+ * The shortcode can be in different places depending on how the sharing was created:
+ * - attributes.shortcodes.email
+ * - attributes.shortcodes.code
+ * - attributes.codes.email
+ * - attributes.codes.code
+ *
+ * We used to use `email` as `codes` attribute for a sharingByLink.
+ * But when we use cozy-client to create a Permission, by default
+ * the codes attribute is set to `code`. MesPapiers app is using this
+ * default behavior... So the sharing by link created by mes papiers
+ * didn't appear correctly in cozy-sharing.
+ * This is a bit ugly, we should have a better way to know if this is
+ * a sharing by link or not.
+ *
+ * @param {object} permission - The permission object
+ * @returns {string|null} The shortcode or null if not found
+ */
+export const getShortcode = permission => {
+  return (
+    permission?.attributes?.shortcodes?.email ||
+    permission?.attributes?.shortcodes?.code ||
+    permission?.attributes?.codes?.email ||
+    permission?.attributes?.codes?.code ||
+    null
+  )
+}

package/src/state.js

@@ -1,7 +1,7 @@
-import get from 'lodash/get'
-
 import flag from 'cozy-flags'
 
+import { getShortcode } from './helpers/shortcodes'
+
 const RECEIVE_SHARINGS = 'RECEIVE_SHARINGS'
 const ADD_SHARING = 'ADD_SHARING'
 const UPDATE_SHARING = 'UPDATE_SHARING'
@@ -423,18 +423,7 @@ export const getSharingLink = (state, docId, documentType) => {
   const perms = getDocumentPermissions(state, docId)
   if (perms.length === 0) return null
   const perm = perms[0]
-  // We used to use `email` as `codes` attribute for a sharingByLink.
-  // But when we use cozy-client to create a Permission, by default
-  // the codes attribute is set to `code`. MesPapiers app is using this
-  // default behavior... So the sharing by link created by mes papiers
-  // didn't appear correctly in cozy-sharing.
-  // This is a bit ugly, we should have a better way to know if this is
-  // a sharing by link or not.
-  const code =
-    get(perm, 'attributes.shortcodes.email') ||
-    get(perm, 'attributes.shortcodes.code') ||
-    get(perm, 'attributes.codes.email') ||
-    get(perm, 'attributes.codes.code')
+  const code = getShortcode(perm)
   if (code) {
     return buildSharingLink(state, documentType, code)
   } else {