cozy-sharing 40.1.6 → 40.1.7

package/src/components/ShareDialogCozyToCozy.jsx

@@ -1,7 +1,6 @@
 import PropTypes from 'prop-types'
 import React, { useCallback, useMemo, useState } from 'react'
 
-import { useClient } from 'cozy-client'
 import Button from 'cozy-ui/transpiled/react/Buttons'
 import { useAlert } from 'cozy-ui/transpiled/react/providers/Alert'
 import { useI18n } from 'twake-i18n'
@@ -10,10 +9,10 @@ import { default as DumbShareByLink } from './ShareByLink'
 import ShareDialogTwoStepsConfirmationContainer from './ShareDialogTwoStepsConfirmationContainer'
 import { ShareRecipientsLimitModal } from './ShareRecipientsLimitModal'
 import SharingContent from './SharingContent'
-import { getOrCreateFromArray } from '../helpers/contacts'
 import { hasReachRecipientsLimit } from '../helpers/recipients'
 import { getErrorMessage, getSuccessMessage } from '../helpers/share'
 import { usePendingRecipients } from '../hooks/usePendingRecipients'
+import { useResolveRecipients } from '../hooks/useResolveRecipients'
 import { useSharingContext } from '../hooks/useSharingContext'
 
 const SharingTitleFunction = ({ documentType, document }) =>
@@ -39,7 +38,7 @@ const ShareDialogCozyToCozy = ({
   ...props
 }) => {
   const { t } = useI18n()
-  const client = useClient()
+  const resolveRecipients = useResolveRecipients()
   const { showAlert } = useAlert()
   const { getSharingLink } = useSharingContext()
 
@@ -67,13 +66,13 @@ const ShareDialogCozyToCozy = ({
 
     setSubmitting(true)
     try {
-      const contacts = await getOrCreateFromArray(
-        client,
-        pendingRecipients,
-        createContact
-      )
-      const readWriteRecipients = selectedOption === 'readOnly' ? [] : contacts
-      const readOnlyRecipients = selectedOption === 'readOnly' ? contacts : []
+      const { recipients: readWriteRecipients, readOnlyRecipients } =
+        await resolveRecipients(
+          pendingRecipients,
+          selectedOption,
+          createContact
+        )
+      const contacts = [...readWriteRecipients, ...readOnlyRecipients]
 
       await onShare({
         document,
@@ -109,7 +108,7 @@ const ShareDialogCozyToCozy = ({
   }, [
     pendingRecipients,
     selectedOption,
-    client,
+    resolveRecipients,
     showAlert,
     t,
     recipients,

package/src/components/ShareDialogCozyToCozy.spec.jsx

@@ -17,6 +17,7 @@ jest.mock('cozy-client', () => ({
 jest.mock('../hooks/useSharingContext', () => ({
   useSharingContext: () => ({
     getSharingLink: jest.fn(() => null),
+    getDocumentPermissions: jest.fn(() => []),
     updateSharingMemberType: jest.fn(),
     isOrgSharedDrive: jest.fn(() => false)
   })

package/src/components/ShareDialogOnlyByLink.jsx

@@ -8,7 +8,7 @@ import { useI18n } from 'twake-i18n'
 
 import AntivirusAlert from './AntivirusAlert'
 import { default as DumbShareByLink } from './ShareByLink'
-import WhoHasAccess from './WhoHasAccess'
+import WhoHasAccessWrapper from './WhoHasAccessWrapper'
 import { useSharingContext } from '../hooks/useSharingContext'
 
 const ShareDialogOnlyByLink = ({
@@ -19,7 +19,6 @@ const ShareDialogOnlyByLink = ({
   document,
   documentType,
   onClose,
-  permissions,
   showGenerateLinkButton,
   autoOpenShareRestriction
 }) => {
@@ -46,7 +45,7 @@ const ShareDialogOnlyByLink = ({
           >
             {t('Share.contacts.whoHasAccess')}
           </Typography>
-          <WhoHasAccess
+          <WhoHasAccessWrapper
             document={document}
             documentType={documentType}
             isOwner={isOwner}
@@ -54,7 +53,6 @@ const ShareDialogOnlyByLink = ({
             onRevokeSelf={onRevokeSelf}
             recipients={recipients}
             link={displayedLink}
-            permissions={permissions}
           />
           <div
             className={cx(

package/src/components/ShareDialogOnlyByLink.spec.jsx

@@ -33,7 +33,6 @@ describe('ShareDialogOnlyByLink', () => {
         onClose={jest.fn()}
         onRevoke={jest.fn()}
         onRevokeSelf={jest.fn()}
-        permissions={[]}
         recipients={[]}
       />
     </AppLike>

package/src/components/ShareModal/SharingDetailsModal.jsx

@@ -7,7 +7,7 @@ import { useI18n } from 'twake-i18n'
 import { useSharingContext } from '../../hooks/useSharingContext'
 import styles from '../../styles/share.styl'
 import ShareByLink from '../ShareByLink'
-import WhoHasAccess from '../WhoHasAccess'
+import WhoHasAccessWrapper from '../WhoHasAccessWrapper'
 
 export const SharingDetailsModal = ({
   recipients,
@@ -34,7 +34,7 @@ export const SharingDetailsModal = ({
       title={t(`${documentType}.share.details.title`)}
       content={
         <div className={styles['share-modal-content']}>
-          <WhoHasAccess
+          <WhoHasAccessWrapper
             canManageMembers={false}
             canManageLink={isSharedDrive}
             isSharedDrive={isSharedDrive}

package/src/components/SharedDrive/EditSharedDriveModal.jsx

@@ -10,13 +10,13 @@ import { useSubmitWithLoader } from 'cozy-ui/transpiled/react/hooks/useSubmitWit
 import { useI18n } from 'twake-i18n'
 
 import SharedDriveHeader from './SharedDriveHeader'
-import { getOrCreateFromArray } from '../../helpers/contacts'
 import withLocales from '../../hoc/withLocales'
 import { usePendingRecipients } from '../../hooks/usePendingRecipients'
+import { useResolveRecipients } from '../../hooks/useResolveRecipients'
 import { useSharingContext } from '../../hooks/useSharingContext'
 import styles from '../../styles/share.styl'
 import { default as DumbShareByEmail } from '../ShareByEmail'
-import WhoHasAccess from '../WhoHasAccess'
+import WhoHasAccessWrapper from '../WhoHasAccessWrapper'
 
 export const EditSharedDriveModal = withLocales(({ onClose, document }) => {
   const client = useClient()
@@ -29,18 +29,13 @@ export const EditSharedDriveModal = withLocales(({ onClose, document }) => {
     setSelectedOption
   } = usePendingRecipients()
   const { onSubmit, isLoading } = useSubmitWithLoader()
+  const resolveRecipients = useResolveRecipients()
 
   const [driveName, setDriveName] = useState(document.name)
 
   const onSave = async () => {
-    // We add contacts
-    const contacts = await getOrCreateFromArray(
-      client,
-      pendingRecipients,
-      contact => client.create('io.cozy.contacts', contact)
-    )
-    const readWriteRecipients = selectedOption === 'readOnly' ? [] : contacts
-    const readOnlyRecipients = selectedOption === 'readOnly' ? contacts : []
+    const { recipients: readWriteRecipients, readOnlyRecipients } =
+      await resolveRecipients(pendingRecipients, selectedOption)
 
     await share({
       document: document,
@@ -100,7 +95,7 @@ export const EditSharedDriveModal = withLocales(({ onClose, document }) => {
               onSelectedOptionChange={setSelectedOption}
             />
           </div>
-          <WhoHasAccess
+          <WhoHasAccessWrapper
             isOwner
             isSharedDrive
             showOwner={false}

package/src/components/SharedDrive/useSharedDrive.js

@@ -2,12 +2,12 @@ import { useState } from 'react'
 
 import { useClient } from 'cozy-client'
 
-import { getOrCreateFromArray } from '../../helpers/contacts'
 import { usePendingRecipients } from '../../hooks/usePendingRecipients'
-import { DOCTYPE_CONTACTS } from '../../models'
+import { useResolveRecipients } from '../../hooks/useResolveRecipients'
 
 export const useSharedDrive = () => {
   const client = useClient()
+  const resolveRecipients = useResolveRecipients()
 
   const [sharedDriveName, setSharedDriveName] = useState('')
   const {
@@ -21,16 +21,9 @@ export const useSharedDrive = () => {
     setSharedDriveName(event.target.value)
   }
 
-  const createContact = contact => client.create(DOCTYPE_CONTACTS, contact)
-
   const onCreate = async () => {
-    const contacts = await getOrCreateFromArray(
-      client,
-      pendingRecipients,
-      createContact
-    )
-    const readWriteRecipients = selectedOption === 'readOnly' ? [] : contacts
-    const readOnlyRecipients = selectedOption === 'readOnly' ? contacts : []
+    const { recipients: readWriteRecipients, readOnlyRecipients } =
+      await resolveRecipients(pendingRecipients, selectedOption)
 
     await client.collection('io.cozy.sharings').createSharedDrive({
       name: sharedDriveName,

package/src/components/SharingContent.jsx

@@ -7,7 +7,7 @@ import { useI18n } from 'twake-i18n'
 
 import AntivirusAlert from './AntivirusAlert'
 import { default as DumbShareByEmail } from './ShareByEmail'
-import WhoHasAccess from './WhoHasAccess'
+import WhoHasAccessWrapper from './WhoHasAccessWrapper'
 import styles from '../styles/share.styl'
 
 const SharingContent = ({
@@ -25,7 +25,6 @@ const SharingContent = ({
   recipientsToBeConfirmed,
   verifyRecipient,
   link,
-  permissions,
   pendingRecipients,
   onPendingRecipientsChange,
   selectedOption,
@@ -74,7 +73,7 @@ const SharingContent = ({
         )}
       </div>
       {showWhoHasAccess && (
-        <WhoHasAccess
+        <WhoHasAccessWrapper
           document={document}
           documentType={documentType}
           isOwner={isOwner}
@@ -84,7 +83,6 @@ const SharingContent = ({
           recipientsToBeConfirmed={recipientsToBeConfirmed}
           verifyRecipient={verifyRecipient}
           link={link}
-          permissions={permissions}
         />
       )}
     </div>

package/src/components/WhoHasAccess.jsx

@@ -8,7 +8,6 @@ import LinkRecipient from './Recipient/LinkRecipient'
 import OwnerRecipient from './Recipient/OwnerRecipient'
 import { RecipientList } from './Recipient/RecipientList'
 import { usePrevious } from '../helpers/hooks'
-import { useSharingContext } from '../hooks/useSharingContext'
 
 /**
  * Displays a warning if some contacts are waiting for confirmation of their sharing
@@ -35,6 +34,9 @@ const WhoHasAccess = ({
   canManageMembers = !isReadOnly,
   canManageLink = canManageMembers,
   showOwner = true,
+  owner,
+  isInsideSharedParent = false,
+  sharedParentName,
   recipients,
   recipientsToBeConfirmed = [],
   document,
@@ -42,15 +44,17 @@ const WhoHasAccess = ({
   className,
   onRevoke,
   onRevokeSelf,
-  onSetType,
+  onRevokeGroup,
+  onLeaveGroup,
+  onSetMemberType,
+  onUpdateLinkPermissions,
+  onRevokeLink,
   verifyRecipient,
   link,
   permissions
 }) => {
   const previousLink = usePrevious(link)
   const linkHasBeenJustCreated = link && previousLink === null
-  const { isOrgSharedDrive } = useSharingContext()
-  const isOrgDrive = isOrgSharedDrive(document?._id)
 
   return (
     <div className={className}>
@@ -66,16 +70,13 @@ const WhoHasAccess = ({
             onRevoke={onRevoke}
             onRevokeSelf={onRevokeSelf}
             permissions={permissions}
+            onUpdateLinkPermissions={onUpdateLinkPermissions}
+            onRevokeLink={onRevokeLink}
             fadeIn={linkHasBeenJustCreated}
           />
         )}
 
-        {showOwner && (
-          <OwnerRecipient
-            recipients={recipients}
-            isOrgSharedDrive={isOrgDrive}
-          />
-        )}
+        {showOwner && <OwnerRecipient owner={owner} />}
 
         <RecipientList
           recipients={recipients}
@@ -86,9 +87,13 @@ const WhoHasAccess = ({
           isSharedDrive={isSharedDrive}
           document={document}
           documentType={documentType}
+          isInsideSharedParent={isInsideSharedParent}
+          sharedParentName={sharedParentName}
           onRevoke={onRevoke}
           onRevokeSelf={onRevokeSelf}
-          onSetType={onSetType}
+          onRevokeGroup={onRevokeGroup}
+          onLeaveGroup={onLeaveGroup}
+          onSetMemberType={onSetMemberType}
           verifyRecipient={verifyRecipient}
         />
       </List>
@@ -102,6 +107,9 @@ WhoHasAccess.propTypes = {
   canManageMembers: PropTypes.bool,
   canManageLink: PropTypes.bool,
   showOwner: PropTypes.bool,
+  owner: PropTypes.object,
+  isInsideSharedParent: PropTypes.bool,
+  sharedParentName: PropTypes.string,
   recipients: PropTypes.array.isRequired,
   recipientsToBeConfirmed: PropTypes.arrayOf(
     PropTypes.shape({
@@ -112,6 +120,12 @@ WhoHasAccess.propTypes = {
   documentType: PropTypes.string.isRequired,
   onRevoke: PropTypes.func.isRequired,
   onRevokeSelf: PropTypes.func,
-  verifyRecipient: PropTypes.func
+  onRevokeGroup: PropTypes.func.isRequired,
+  onLeaveGroup: PropTypes.func.isRequired,
+  onSetMemberType: PropTypes.func.isRequired,
+  onUpdateLinkPermissions: PropTypes.func.isRequired,
+  onRevokeLink: PropTypes.func.isRequired,
+  verifyRecipient: PropTypes.func,
+  permissions: PropTypes.arrayOf(PropTypes.object)
 }
 export default WhoHasAccess

package/src/components/WhoHasAccessWrapper.jsx

@@ -0,0 +1,117 @@
+import React from 'react'
+
+import { useClient, useQuery, hasQueryBeenLoaded } from 'cozy-client'
+
+import WhoHasAccess from './WhoHasAccess'
+import { hasMemberActions, markCurrentUser } from '../helpers/recipients'
+import { useMemberPermissionType } from '../hooks/useMemberPermissionType'
+import { useSharingContext } from '../hooks/useSharingContext'
+import { buildInstanceSettingsQuery } from '../queries/queries'
+
+// When the owner is not part of a sharing's members (eg. the folder only has
+// a link), there is no per-sharing avatar to reference. The instance's public
+// avatar still holds the owner's picture. fallback=initials makes the stack
+// serve a generated initials avatar (instead of the app icon) when no picture
+// has been uploaded, matching how avatars are rendered everywhere else.
+const OWNER_PUBLIC_AVATAR_PATH = '/public/avatar?fallback=initials'
+
+const WhoHasAccessWrapper = ({
+  isOwner = false,
+  canManageSharing = isOwner,
+  isSharedDrive,
+  isReadOnly,
+  canManageMembers = !isReadOnly,
+  canManageLink,
+  showOwner = true,
+  recipients,
+  recipientsToBeConfirmed = [],
+  document,
+  documentType,
+  className,
+  onRevoke,
+  onRevokeSelf,
+  verifyRecipient,
+  link
+}) => {
+  const client = useClient()
+  const {
+    isOrgSharedDrive,
+    getDocumentPermissions,
+    updateDocumentPermissions,
+    revokeSharingLink,
+    revokeGroup,
+    revokeSelf
+  } = useSharingContext()
+
+  const instanceUri = client.options.uri
+  const markedRecipients = markCurrentUser(recipients, instanceUri)
+  const hasMemberMenus = markedRecipients.some(
+    recipient =>
+      !recipient.members &&
+      !recipientsToBeConfirmed.some(user => user.email === recipient.email) &&
+      hasMemberActions({
+        status: recipient.status,
+        isCurrentUser: recipient.isCurrentUser,
+        isOwner,
+        canManageSharing,
+        canManageMembers
+      })
+  )
+  const { isInsideSharedParent, sharedParentName, setMemberType } =
+    useMemberPermissionType(document, { shouldFetchPath: hasMemberMenus })
+  const ownerRecipient = markedRecipients.find(
+    recipient => recipient.status === 'owner'
+  )
+
+  const instanceSettingsQuery = buildInstanceSettingsQuery()
+  const instanceSettingsResult = useQuery(instanceSettingsQuery.definition, {
+    ...instanceSettingsQuery.options,
+    enabled: showOwner && !ownerRecipient
+  })
+
+  const defaultOwner = hasQueryBeenLoaded(instanceSettingsResult)
+    ? {
+        isOwner: true,
+        status: 'owner',
+        instance: instanceUri,
+        avatarPath: OWNER_PUBLIC_AVATAR_PATH,
+        public_name: instanceSettingsResult.data?.attributes?.public_name
+      }
+    : null
+
+  const owner = ownerRecipient
+    ? { ...ownerRecipient, isOrgSharedDrive: isOrgSharedDrive(document?._id) }
+    : defaultOwner
+
+  return (
+    <WhoHasAccess
+      isOwner={isOwner}
+      canManageSharing={canManageSharing}
+      isSharedDrive={isSharedDrive}
+      isReadOnly={isReadOnly}
+      canManageMembers={canManageMembers}
+      canManageLink={canManageLink}
+      showOwner={showOwner}
+      owner={owner}
+      isInsideSharedParent={isInsideSharedParent}
+      sharedParentName={sharedParentName}
+      recipients={markedRecipients}
+      recipientsToBeConfirmed={recipientsToBeConfirmed}
+      document={document}
+      documentType={documentType}
+      className={className}
+      onRevoke={onRevoke}
+      onRevokeSelf={onRevokeSelf}
+      onRevokeGroup={revokeGroup}
+      onLeaveGroup={revokeSelf}
+      onSetMemberType={setMemberType}
+      onUpdateLinkPermissions={updateDocumentPermissions}
+      onRevokeLink={revokeSharingLink}
+      verifyRecipient={verifyRecipient}
+      link={link}
+      permissions={getDocumentPermissions(document?._id)}
+    />
+  )
+}
+
+export default WhoHasAccessWrapper

package/src/helpers/recipients.js

@@ -99,3 +99,47 @@ export const getGroupRecipientSecondaryText = ({
     (isUserInsideMembers ? ` (${t('GroupRecipient.secondary_you')})` : '')
   )
 }
+
+const isInstance = (recipient, instanceUri) =>
+  recipient.instance !== undefined && recipient.instance === instanceUri
+
+/**
+ * Flags with `isCurrentUser` the recipients, and the members of group
+ * recipients, whose instance is the current user's one
+ *
+ * @param {object[]} recipients - Recipients of a sharing
+ * @param {string} instanceUri - URI of the current user's instance
+ * @returns {object[]} The recipients with their `isCurrentUser` flag
+ */
+export const markCurrentUser = (recipients, instanceUri) =>
+  recipients.map(recipient => ({
+    ...recipient,
+    isCurrentUser: isInstance(recipient, instanceUri),
+    ...(recipient.members && {
+      members: recipient.members.map(member => ({
+        ...member,
+        isCurrentUser: isInstance(member, instanceUri)
+      }))
+    })
+  }))
+
+/**
+ * @param {object} params
+ * @param {string} params.status - Status of the member in the sharing
+ * @param {boolean} params.isCurrentUser - Whether the member is the current user
+ * @param {boolean} params.isOwner - Whether the current user owns the sharing
+ * @param {boolean} params.canManageSharing - Whether the current user can manage the sharing
+ * @param {boolean} params.canManageMembers - Whether the members can be managed
+ * @returns {boolean} Whether the current user can change the member's
+ * permission type or revoke them
+ */
+export const hasMemberActions = ({
+  status,
+  isCurrentUser,
+  isOwner,
+  canManageSharing,
+  canManageMembers
+}) =>
+  canManageMembers &&
+  status !== 'owner' &&
+  ((isCurrentUser && !isOwner) || canManageSharing)

package/src/helpers/recipients.spec.js

@@ -0,0 +1,82 @@
+import { hasMemberActions, markCurrentUser } from './recipients'
+
+const instanceUri = 'https://alice.cozy.cc'
+
+describe('markCurrentUser', () => {
+  it('flags the recipient whose instance is the current one', () => {
+    const recipients = [
+      { email: 'alice@cozy.cc', instance: instanceUri },
+      { email: 'bob@cozy.cc', instance: 'https://bob.cozy.cc' },
+      { email: 'carol@cozy.cc' }
+    ]
+
+    expect(
+      markCurrentUser(recipients, instanceUri).map(r => r.isCurrentUser)
+    ).toEqual([true, false, false])
+  })
+
+  it('does not flag a recipient without instance when the instance is unknown', () => {
+    expect(markCurrentUser([{ email: 'carol@cozy.cc' }], undefined)).toEqual([
+      { email: 'carol@cozy.cc', isCurrentUser: false }
+    ])
+  })
+
+  it('flags the members of group recipients', () => {
+    const recipients = [
+      {
+        name: 'Team',
+        members: [
+          { instance: 'https://bob.cozy.cc' },
+          { instance: instanceUri }
+        ]
+      }
+    ]
+
+    const [group] = markCurrentUser(recipients, instanceUri)
+
+    expect(group.isCurrentUser).toBe(false)
+    expect(group.members.map(m => m.isCurrentUser)).toEqual([false, true])
+  })
+})
+
+describe('hasMemberActions', () => {
+  const ownerRights = {
+    isOwner: true,
+    canManageSharing: true,
+    canManageMembers: true
+  }
+  const memberRights = {
+    isOwner: false,
+    canManageSharing: false,
+    canManageMembers: true
+  }
+
+  it('gives actions on the members to whom can manage the sharing', () => {
+    expect(hasMemberActions({ ...ownerRights, status: 'ready' })).toBe(true)
+  })
+
+  it('gives no action on the owner', () => {
+    expect(hasMemberActions({ ...ownerRights, status: 'owner' })).toBe(false)
+  })
+
+  it('gives no action when the members cannot be managed', () => {
+    expect(
+      hasMemberActions({
+        ...ownerRights,
+        canManageMembers: false,
+        status: 'ready'
+      })
+    ).toBe(false)
+  })
+
+  it('gives actions on themselves to a member who cannot manage the sharing', () => {
+    expect(
+      hasMemberActions({
+        ...memberRights,
+        status: 'ready',
+        isCurrentUser: true
+      })
+    ).toBe(true)
+    expect(hasMemberActions({ ...memberRights, status: 'ready' })).toBe(false)
+  })
+})