cozy-sharing 33.5.1 → 33.6.1

package/src/SharingProvider.spec.jsx

@@ -5,7 +5,12 @@ import { createMockClient } from 'cozy-client'
 
 import { SharingProvider } from './SharingProvider'
 import SharingContext from './context'
-import reducer, { addSharingLink, getDocumentPermissions } from './state'
+import reducer, {
+  addSharingLink,
+  getDocumentPermissions,
+  getDocumentSharing,
+  receiveSharings
+} from './state'
 import AppLike from '../test/AppLike'
 
 const AppWrapper = ({ children, client, isPublic }) => {
@@ -291,6 +296,115 @@ describe('updateDocumentPermissions', () => {
   })
 })
 
+describe('shared drive recipient revocation', () => {
+  const SHARED_DRIVE = {
+    _id: 'sharing_123',
+    id: 'sharing_123',
+    type: 'io.cozy.sharings',
+    attributes: {
+      drive: true,
+      owner: true,
+      description: 'Shared folder',
+      rules: [
+        {
+          title: 'Shared folder',
+          doctype: 'io.cozy.files',
+          values: ['folder_123'],
+          add: 'none',
+          update: 'none',
+          remove: 'none'
+        }
+      ],
+      members: [
+        {
+          status: 'owner',
+          email: 'owner@cozy.local',
+          instance: 'http://cozy.local'
+        },
+        {
+          status: 'pending',
+          email: 'recipient@cozy.local',
+          instance: 'http://recipient.cozy.local'
+        }
+      ]
+    }
+  }
+  const NEW_SHARING = {
+    ...SHARED_DRIVE,
+    _id: 'sharing_456',
+    id: 'sharing_456'
+  }
+  const document = {
+    _id: 'folder_123',
+    id: 'folder_123',
+    path: '/Shared folder'
+  }
+  const recipient = {
+    _id: 'contact_123',
+    id: 'contact_123',
+    _type: 'io.cozy.contacts',
+    email: 'recipient@cozy.local'
+  }
+
+  let provider
+  let sharingCol
+
+  beforeEach(() => {
+    const mockClient = createMockClient({})
+    mockClient.getStackClient = () => ({ uri: 'http://cozy.local' })
+    mockClient.collection = jest.fn().mockReturnValue({})
+
+    provider = new SharingProvider({ client: mockClient })
+    provider.state = {
+      ...provider.state,
+      ...reducer(undefined, receiveSharings({ sharings: [SHARED_DRIVE] }))
+    }
+    provider.dispatch = jest.fn(action => {
+      provider.state = {
+        ...provider.state,
+        ...reducer(provider.state, action)
+      }
+    })
+    sharingCol = {
+      addRecipients: jest.fn(),
+      create: jest.fn().mockResolvedValue({ data: NEW_SHARING }),
+      revokeRecipient: jest.fn().mockResolvedValue({})
+    }
+    provider.sharingCol = sharingCol
+  })
+
+  it('forgets the shared drive when revoking its last recipient', async () => {
+    await provider.revoke(document, SHARED_DRIVE.id, 1)
+
+    expect(sharingCol.revokeRecipient).toHaveBeenCalledWith(SHARED_DRIVE, 1)
+    expect(getDocumentSharing(provider.state, document.id)).toBeNull()
+  })
+
+  it('creates a new sharing when re-adding after the last recipient was revoked', async () => {
+    await provider.revoke(document, SHARED_DRIVE.id, 1)
+
+    await provider.share({
+      document,
+      recipients: [recipient],
+      readOnlyRecipients: [],
+      description: 'Shared folder',
+      openSharing: true,
+      sharedDrive: true
+    })
+
+    expect(sharingCol.addRecipients).not.toHaveBeenCalled()
+    expect(sharingCol.create).toHaveBeenCalledWith({
+      document,
+      recipients: [recipient],
+      readOnlyRecipients: [],
+      description: 'Shared folder',
+      previewPath: '/preview',
+      openSharing: true,
+      sharedDrive: true
+    })
+  })
+})
+
 describe('fetchSharedDriveSharingLinks', () => {
   const PERM_DRIVE_FILE = {
     type: 'io.cozy.permissions',

package/src/components/Recipient/LinkRecipient.jsx

@@ -24,16 +24,51 @@ import { FADE_IN_DURATION } from '../../helpers/recipients'
 import { useSharingContext } from '../../hooks/useSharingContext'
 import { ShareRestrictionModal } from '../ShareRestrictionModal/ShareRestrictionModal'
 
+const LinkRecipientTextReadOnly = ({ textPrimary, textSecondary }) => {
+  return (
+    <ListItemText
+      primary={
+        <div className="u-flex u-flex-items-center">
+          <Typography>{textPrimary}</Typography>
+        </div>
+      }
+      secondary={textSecondary}
+    />
+  )
+}
+
+const LinkRecipientText = ({ onClick, textPrimary, textSecondary }) => {
+  return (
+    <ListItemText
+      onClick={onClick}
+      primary={
+        <div className="u-flex u-flex-items-center">
+          <Typography className="u-c-pointer ">{textPrimary}</Typography>
+          <IconButton size="small" className="u-ml-half">
+            <Icon icon={Gear} />
+          </IconButton>
+        </div>
+      }
+      secondary={textSecondary}
+    />
+  )
+}
+
 const LinkRecipient = props => {
   const { t, f, lang } = useI18n()
   const { isMobile } = useBreakpoints()
   const { getDocumentPermissions } = useSharingContext()
 
-  const { recipientConfirmationData, verifyRecipient, fadeIn, document } = props
+  const {
+    recipientConfirmationData,
+    verifyRecipient,
+    fadeIn,
+    document,
+    isReadOnly
+  } = props
 
   const [openShareRestrictionModal, setOpenShareRestrictionModal] =
     useState(false)
-
   const permissions = getDocumentPermissions(document?._id)
   const hasPassword = checkIsPermissionHasPassword(permissions)
   const expiresDate = getPermissionExpiresDate(permissions)
@@ -57,7 +92,7 @@ const LinkRecipient = props => {
       verifyRecipient={verifyRecipient}
     />
   ) : (
-    <LinkRecipientPermissions {...props} className="u-flex-shrink-0" />
+    <LinkRecipientPermissions {...props} />
   )
 
   return (
@@ -68,18 +103,18 @@ const LinkRecipient = props => {
             <Icon icon={LinkIcon} />
           </Avatar>
         </ListItemIcon>
-        <ListItemText
-          onClick={() => setOpenShareRestrictionModal(true)}
-          primary={
-            <div className="u-flex u-flex-items-center">
-              <Typography className="u-c-pointer ">{textPrimary}</Typography>
-              <IconButton size="small" className="u-ml-half">
-                <Icon icon={Gear} />
-              </IconButton>
-            </div>
-          }
-          secondary={textSecondary}
-        />
+        {isReadOnly ? (
+          <LinkRecipientTextReadOnly
+            textPrimary={textPrimary}
+            textSecondary={textSecondary}
+          />
+        ) : (
+          <LinkRecipientText
+            onClick={() => setOpenShareRestrictionModal(true)}
+            textPrimary={textPrimary}
+            textSecondary={textSecondary}
+          />
+        )}
         {RightPart}
         {openShareRestrictionModal && (
           <ShareRestrictionModal

package/src/components/Recipient/LinkRecipientPermissions.jsx

@@ -7,6 +7,7 @@ import {
   divider
 } from 'cozy-ui/transpiled/react/ActionsMenu/Actions'
 import DropdownButton from 'cozy-ui/transpiled/react/DropdownButton'
+import Typography from 'cozy-ui/transpiled/react/Typography'
 import { useI18n } from 'twake-i18n'
 
 import { revokeLink } from './actions/revokeLink'
@@ -17,7 +18,7 @@ import { checkIsReadOnlyPermissions } from '../../helpers/permissions'
 import { useSharingContext } from '../../hooks/useSharingContext'
 import { WRITE_PERMS, READ_ONLY_PERMS } from '../ShareRestrictionModal/helpers'
 
-const LinkRecipientPermissions = ({ className, document }) => {
+const LinkRecipientPermissions = ({ document, isReadOnly }) => {
   const { t } = useI18n()
   const buttonRef = useRef()
   const [isMenuDisplayed, setMenuDisplayed] = useState(false)
@@ -56,30 +57,36 @@ const LinkRecipientPermissions = ({ className, document }) => {
     handleRevocation
   })
 
+  const shouldShowMenu = !isReadOnly
+
   return (
-    <div className={className}>
-      <>
-        <DropdownButton
-          ref={buttonRef}
-          textVariant="body2"
-          onClick={toggleMenu}
-        >
-          {t(`Share.type.${type}`)}
-        </DropdownButton>
-        <ActionsMenu
-          ref={buttonRef}
-          open={isMenuDisplayed}
-          actions={actions}
-          autoClose
-          onClose={hideMenu}
-        />
-      </>
-    </div>
+    <>
+      {!shouldShowMenu && (
+        <Typography variant="body2">{t(`Share.type.${type}`)}</Typography>
+      )}
+      {shouldShowMenu && (
+        <>
+          <DropdownButton
+            ref={buttonRef}
+            textVariant="body2"
+            onClick={toggleMenu}
+          >
+            {t(`Share.type.${type}`)}
+          </DropdownButton>
+          <ActionsMenu
+            ref={buttonRef}
+            open={isMenuDisplayed}
+            actions={actions}
+            autoClose
+            onClose={hideMenu}
+          />
+        </>
+      )}
+    </>
   )
 }
 
 LinkRecipientPermissions.propTypes = {
-  className: PropTypes.string,
   document: PropTypes.object.isRequired
 }
 

package/src/components/Recipient/MemberRecipient.jsx

@@ -46,7 +46,7 @@ const MemberRecipient = props => {
       verifyRecipient={verifyRecipient}
     />
   ) : (
-    <MemberRecipientPermissions {...props} className="u-flex-shrink-0" />
+    <MemberRecipientPermissions {...props} />
   )
 
   return (

package/src/components/Recipient/MemberRecipientPermissions.jsx

@@ -21,11 +21,11 @@ const log = minilog('MemberRecipientPermissions')
 
 const MemberRecipientPermissions = ({
   isOwner,
+  isReadOnly,
   status,
   instance,
   type,
   document,
-  className,
   onRevoke,
   onRevokeSelf,
   sharingId,
@@ -44,6 +44,7 @@ const MemberRecipientPermissions = ({
     instance !== undefined && instance === client.options.uri
   const contactIsOwner = status === 'owner'
   const shouldShowMenu =
+    !isReadOnly &&
     !revoking &&
     !contactIsOwner &&
     ((instanceMatchesClient && !isOwner) || isOwner)
@@ -107,10 +108,14 @@ const MemberRecipientPermissions = ({
   )
 
   return (
-    <div className={className}>
+    <>
       {revoking && <Spinner />}
-      {!shouldShowMenu && !revoking && (
-        <Typography variant="body2">{t(`Share.status.${status}`)}</Typography>
+      {!shouldShowMenu && (
+        <Typography variant="body2">
+          {contactIsOwner
+            ? t(`Share.status.${status}`)
+            : t(`Share.type.${type}`)}
+        </Typography>
       )}
       {shouldShowMenu && (
         <>
@@ -140,7 +145,7 @@ const MemberRecipientPermissions = ({
           </IconButton>
         </>
       )}
-    </div>
+    </>
   )
 }
 

package/src/components/Recipient/RecipientList.jsx

@@ -10,6 +10,7 @@ const RecipientList = ({
   recipientsToBeConfirmed,
   isOwner,
   isSharedDrive,
+  isReadOnly,
   document,
   documentType,
   onRevoke,
@@ -49,6 +50,7 @@ const RecipientList = ({
         key={recipient.index}
         isOwner={isOwner}
         isSharedDrive={isSharedDrive}
+        isReadOnly={isReadOnly}
         document={document}
         documentType={documentType}
         onRevoke={onRevoke}

package/src/components/ShareModal/ShareModal.jsx

@@ -22,8 +22,6 @@ export const ShareModal = withLocales(props => {
     isOwner,
     canReshare,
     documentType,
-    getOwner,
-    getSharingType,
     getRecipients,
     revokeSelf,
     allLoaded
@@ -48,11 +46,9 @@ export const ShareModal = withLocales(props => {
 
   return (
     <SharingDetailsModal
+      recipients={getRecipients(document.id)}
       document={document}
       documentType={documentType}
-      owner={getOwner(document.id)}
-      sharingType={getSharingType(document.id)}
-      recipients={getRecipients(document.id)}
       onRevoke={revokeSelf}
       onRevokeSelf={handleRevokeSelf}
       {...rest}

package/src/components/ShareModal/SharingDetailsModal.jsx

@@ -1,29 +1,21 @@
-import cx from 'classnames'
 import PropTypes from 'prop-types'
 import React from 'react'
 
 import { Dialog } from 'cozy-ui/transpiled/react/CozyDialogs'
-import Divider from 'cozy-ui/transpiled/react/Divider'
-import useBreakpoints from 'cozy-ui/transpiled/react/providers/Breakpoints'
 import { useI18n } from 'twake-i18n'
 
-import { getDisplayName } from '../../models'
 import styles from '../../styles/share.styl'
-import OwnerIdentity from '../Identity/OwnerIdentity'
 import WhoHasAccess from '../WhoHasAccess'
 
 export const SharingDetailsModal = ({
   onClose,
-  sharingType,
-  owner,
   recipients,
   document,
   documentType = 'Document',
   onRevoke,
   onRevokeSelf
 }) => {
-  const { t, f } = useI18n()
-  const { isMobile } = useBreakpoints()
+  const { t } = useI18n()
 
   return (
     <Dialog
@@ -34,50 +26,14 @@ export const SharingDetailsModal = ({
       title={t(`${documentType}.share.details.title`)}
       content={
         <div className={styles['share-modal-content']}>
-          <div
-            className={cx(
-              styles['share-details'],
-              isMobile ? 'u-ph-1 u-pt-1-half' : 'u-ph-2 u-pt-1'
-            )}
-          >
-            {owner ? (
-              <OwnerIdentity
-                name={t(`${documentType}.share.sharedBy`, {
-                  name: getDisplayName(owner)
-                })}
-                url={owner.instance}
-              />
-            ) : null}
-            <div className={styles['share-details-created']}>
-              {t(`${documentType}.share.details.createdAt`, {
-                date: f(document.created_at || null, 'do LLLL yyyy')
-              })}
-            </div>
-            <div className={styles['share-details-perm']}>
-              {t(
-                `${documentType}.share.details.${
-                  sharingType === 'one-way' ? 'ro' : 'rw'
-                }`
-              )}
-            </div>
-            <div className={styles['share-details-perm-desc']}>
-              {t(
-                `${documentType}.share.details.desc.${
-                  sharingType === 'one-way' ? 'ro' : 'rw'
-                }`
-              )}
-            </div>
-          </div>
-          <Divider className="u-mv-1" />
           <WhoHasAccess
-            title={t('Share.recipients.accessCount', {
-              count: recipients.length
-            })}
+            isReadOnly
             recipients={recipients}
             document={document}
             documentType={documentType}
             onRevoke={onRevoke}
             onRevokeSelf={onRevokeSelf}
+            link="ok"
           />
         </div>
       }

package/src/components/WhoHasAccess.jsx

@@ -29,6 +29,7 @@ const RecipientWaitingForConfirmationAlert = ({ recipientsToBeConfirmed }) => {
 const WhoHasAccess = ({
   isOwner = false,
   isSharedDrive = false,
+  isReadOnly = false,
   showOwner = true,
   recipients,
   recipientsToBeConfirmed = [],
@@ -53,6 +54,7 @@ const WhoHasAccess = ({
       <List>
         {link && (
           <LinkRecipient
+            isReadOnly={isReadOnly}
             document={document}
             documentType={documentType}
             onRevoke={onRevoke}
@@ -69,6 +71,7 @@ const WhoHasAccess = ({
           recipientsToBeConfirmed={recipientsToBeConfirmed}
           isOwner={isOwner}
           isSharedDrive={isSharedDrive}
+          isReadOnly={isReadOnly}
           document={document}
           documentType={documentType}
           onRevoke={onRevoke}

package/src/state.js

@@ -184,10 +184,7 @@ const byDocId = (state = {}, action) => {
     case REVOKE_GROUP:
     case REVOKE_RECIPIENT:
     case UPDATE_SHARING:
-      if (
-        !isSharingADrive(action.sharing) &&
-        areAllRecipientsRevoked(action.sharing)
-      ) {
+      if (areAllRecipientsRevoked(action.sharing)) {
         return forgetSharing(state, action.sharing)
       }
       return state
@@ -258,10 +255,7 @@ const sharings = (state = [], action) => {
     case UPDATE_SHARING:
     case REVOKE_GROUP:
     case REVOKE_RECIPIENT:
-      if (
-        !isSharingADrive(action.sharing) &&
-        areAllRecipientsRevoked(action.sharing)
-      ) {
+      if (areAllRecipientsRevoked(action.sharing)) {
         return state.filter(s => s.id !== action.sharing.id)
       }
       return state.map(s => {
@@ -287,10 +281,8 @@ const sharedPaths = (state = [], action) => {
       return newState
     case REVOKE_GROUP:
     case REVOKE_RECIPIENT:
-      if (
-        !isSharingADrive(action.sharing) &&
-        areAllRecipientsRevoked(action.sharing)
-      ) {
+    case UPDATE_SHARING:
+      if (areAllRecipientsRevoked(action.sharing)) {
         return state.filter(p => p !== action.path)
       }
       return state
@@ -351,7 +343,7 @@ export const canReshare = (state, docId, instanceUri) => {
   const sharing = getDocumentSharing(state, docId)
   const me = sharing.attributes.members.find(matchingInstanceName(instanceUri))
   if (sharing.drive) {
-    return me && !me.read_only
+    return !sharing.org_drive && me && !me.read_only
   } else {
     return sharing.attributes.open_sharing === true && me && !me.read_only
   }

package/src/state.spec.js

@@ -6,6 +6,7 @@ import reducer, {
   revokeSharingLink,
   getRecipients,
   getRecipientsFromSharing,
+  revokeGroup,
   revokeRecipient,
   revokeSelf,
   updateSharing,
@@ -143,7 +144,7 @@ describe('Sharing state', () => {
     expect(state.sharings).toEqual([SHARING_1, SHARED_DRIVE_WITHOUT_RECIPIENTS])
   })
 
-  it('should not forget shared drives without recipients when updating', () => {
+  it('should forget shared drives without recipients when updating', () => {
     const SHARED_DRIVE_WITHOUT_RECIPIENTS = {
       ...SHARING_1,
       id: 'shared_drive_no_recipients',
@@ -184,16 +185,65 @@ describe('Sharing state', () => {
       }
     }
     const state = reducer(initialState, updateSharing(updatedSharing))
-    expect(state.byDocId).toEqual({
-      shared_drive_folder: {
-        sharings: [SHARED_DRIVE_WITHOUT_RECIPIENTS.id],
-        permissions: []
+
+    expect(state.byDocId).toEqual({})
+    expect(state.sharings).toEqual([])
+  })
+
+  it('should forget a shared drive when revoking its last group', () => {
+    const SHARED_DRIVE_WITH_GROUP = {
+      ...SHARING_1,
+      id: 'shared_drive_group',
+      attributes: {
+        ...SHARING_1.attributes,
+        drive: true,
+        members: [
+          {
+            status: 'owner',
+            name: 'Jane Doe',
+            email: 'jane@doe.com',
+            instance: 'http://cozy.tools:8080'
+          }
+        ],
+        groups: [
+          {
+            name: 'Last group',
+            addedBy: 0
+          }
+        ],
+        rules: [
+          {
+            title: 'My Shared Drive',
+            doctype: 'io.cozy.files',
+            values: ['shared_drive_group_folder'],
+            add: 'sync',
+            update: 'sync',
+            remove: 'sync'
+          }
+        ]
       }
-    })
-    expect(state.sharings).toEqual([updatedSharing])
+    }
+    const sharedDrivePath = '/shared_drive_group_folder'
+    const initialState = reducer(
+      reducer(
+        undefined,
+        receiveSharings({
+          sharings: [SHARED_DRIVE_WITH_GROUP]
+        })
+      ),
+      addSharing(SHARED_DRIVE_WITH_GROUP, sharedDrivePath)
+    )
+    const state = reducer(
+      initialState,
+      revokeGroup(SHARED_DRIVE_WITH_GROUP, 0, sharedDrivePath)
+    )
+
+    expect(state.byDocId).toEqual({})
+    expect(state.sharings).toEqual([])
+    expect(state.sharedPaths).toEqual([])
   })
 
-  it('should not remove shared drive path when revoking last recipient', () => {
+  it('should forget a shared drive when revoking last recipient', () => {
     const SHARED_DRIVE_WITH_ONE_RECIPIENT = {
       ...SHARING_1,
       id: 'shared_drive_one_recipient',
@@ -236,30 +286,14 @@ describe('Sharing state', () => {
       ),
       addSharing(SHARED_DRIVE_WITH_ONE_RECIPIENT, sharedDrivePath)
     )
-    const sharingAfterRevoke = {
-      ...SHARED_DRIVE_WITH_ONE_RECIPIENT,
-      attributes: {
-        ...SHARED_DRIVE_WITH_ONE_RECIPIENT.attributes,
-        members: [
-          SHARED_DRIVE_WITH_ONE_RECIPIENT.attributes.members[0],
-          {
-            ...SHARED_DRIVE_WITH_ONE_RECIPIENT.attributes.members[1],
-            status: 'revoked'
-          }
-        ]
-      }
-    }
     const state = reducer(
       initialState,
-      revokeRecipient(sharingAfterRevoke, 1, sharedDrivePath)
+      revokeRecipient(SHARED_DRIVE_WITH_ONE_RECIPIENT, 1, sharedDrivePath)
     )
-    expect(state.sharedPaths).toContain(sharedDrivePath)
-    expect(state.byDocId).toEqual({
-      shared_drive_folder: {
-        sharings: [SHARED_DRIVE_WITH_ONE_RECIPIENT.id],
-        permissions: []
-      }
-    })
+
+    expect(state.byDocId).toEqual({})
+    expect(state.sharings).toEqual([])
+    expect(state.sharedPaths).toEqual([])
   })
 
   it('should index received permissions', () => {