cozy-sharing 33.2.0 → 33.2.2

package/dist/components/ShareDialogOnlyByLink.spec.js

@@ -0,0 +1,75 @@
+import { render, screen } from '@testing-library/react';
+import React from 'react';
+import ShareDialogOnlyByLink from './ShareDialogOnlyByLink';
+import AppLike from '../../test/AppLike';
+var mockSharingLink = null;
+jest.mock('./ShareByLink', function () {
+  return function () {
+    return /*#__PURE__*/React.createElement("button", null, "Copy link");
+  };
+});
+jest.mock('../hooks/useSharingContext', function () {
+  return {
+    useSharingContext: function useSharingContext() {
+      return {
+        documentType: 'Files',
+        getDocumentPermissions: function getDocumentPermissions() {
+          return [];
+        },
+        getSharingLink: function getSharingLink() {
+          return mockSharingLink;
+        },
+        revokeSharingLink: jest.fn(),
+        updateDocumentPermissions: jest.fn()
+      };
+    }
+  };
+});
+describe('ShareDialogOnlyByLink', function () {
+  beforeEach(function () {
+    mockSharingLink = null;
+  });
+
+  var renderModal = function renderModal() {
+    return /*#__PURE__*/React.createElement(AppLike, null, /*#__PURE__*/React.createElement(ShareDialogOnlyByLink, {
+      document: {
+        _id: 'file-id',
+        attributes: {
+          name: 'file.txt'
+        }
+      },
+      documentType: "Files",
+      isOwner: true,
+      onClose: jest.fn(),
+      onRevoke: jest.fn(),
+      onRevokeSelf: jest.fn(),
+      permissions: [],
+      recipients: []
+    }));
+  };
+
+  var setup = function setup() {
+    return render(renderModal());
+  };
+
+  it('shows link access as soon as a link is generated', function () {
+    var _setup = setup(),
+        rerender = _setup.rerender;
+
+    expect(screen.queryByText('Anyone with the link')).toBe(null);
+    mockSharingLink = 'https://example.com/public';
+    rerender(renderModal());
+    expect(screen.queryByText('Anyone with the link')).toBeInTheDocument();
+  });
+  it('hides link access as soon as a link is revoked', function () {
+    mockSharingLink = 'https://example.com/public';
+
+    var _setup2 = setup(),
+        rerender = _setup2.rerender;
+
+    expect(screen.queryByText('Anyone with the link')).toBeInTheDocument();
+    mockSharingLink = null;
+    rerender(renderModal());
+    expect(screen.queryByText('Anyone with the link')).toBe(null);
+  });
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-sharing",
-  "version": "33.2.0",
+  "version": "33.2.2",
   "description": "Provides sharing login for React applications.",
   "main": "dist/index.js",
   "author": "Cozy",
@@ -83,5 +83,5 @@
   "sideEffects": [
     "*.css"
   ],
-  "gitHead": "aeaf0cb5bb862ce8908d78862ca79e8e749982f2"
+  "gitHead": "d4513639ed420da6b9edfef7cb3230d90d0cf537"
 }

package/src/components/FederatedFolder/FederatedFolderModal.jsx

@@ -1,5 +1,5 @@
 import PropTypes from 'prop-types'
-import React, { useCallback, useEffect, useMemo, useState } from 'react'
+import React, { useCallback, useState } from 'react'
 
 import { useClient } from 'cozy-client'
 import Button from 'cozy-ui/transpiled/react/Buttons'
@@ -31,11 +31,9 @@ const FederatedFolderModalContent = ({
   const { t } = useI18n()
   const {
     share,
+    getSharingById,
     getSharingLink,
     getFederatedShareLink,
-    getDocumentPermissions,
-    getOwner,
-    getSharingById,
     getRecipients,
     hasSharedChild,
     hasSharedParent,
@@ -44,7 +42,6 @@ const FederatedFolderModalContent = ({
   const { showAlert } = useAlert()
   const { showConfirmDialog, closeConfirmDialog } = useConfirmDialog()
 
-  const [sharingLink, setSharingLink] = useState(null)
   const {
     pendingRecipients,
     setPendingRecipients,
@@ -98,39 +95,29 @@ const FederatedFolderModalContent = ({
     t
   ])
 
-  const documentPermissions = useMemo(
-    () =>
-      existingDocument ? getDocumentPermissions(existingDocument._id) : [],
-    [existingDocument, getDocumentPermissions]
-  )
-
-  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
-  ])
-
   const folderName = existingDocument?.name || ''
   const documentPath = existingDocument?.path
-  const hasParentRestriction = Boolean(
-    existingDocument?.driveId || (documentPath && hasSharedParent(documentPath))
+  const sharedDriveSharing = existingDocument?.driveId
+    ? getSharingById(existingDocument.driveId)
+    : null
+  const sharedDriveRootIds =
+    sharedDriveSharing?.attributes?.rules?.reduce(
+      (ids, rule) => ids.concat(rule.values || []),
+      []
+    ) || []
+  const isSharedDriveRoot = Boolean(
+    existingDocument?.driveId &&
+    sharedDriveRootIds.some(
+      id => id === existingDocument?._id || id === existingDocument?.id
+    )
+  )
+  const isInsideSharedDrive = Boolean(
+    existingDocument?.driveId && !isSharedDriveRoot
+  )
+  const hasSharedParentByPath = Boolean(
+    documentPath && hasSharedParent(documentPath)
   )
+  const hasParentRestriction = isInsideSharedDrive || hasSharedParentByPath
   const hasChildRestriction = Boolean(
     documentPath && hasSharedChild(documentPath)
   )
@@ -185,6 +172,9 @@ const FederatedFolderModalContent = ({
   const existingRecipients = existingDocument
     ? getRecipients(existingDocument._id)
     : []
+  const displayedLink = existingDocument?.driveId
+    ? getFederatedShareLink(existingDocument)
+    : getSharingLink(existingDocument?._id)
 
   const modalTitle = t('FederatedFolder.shareTitle', { name: folderName })
 
@@ -252,14 +242,14 @@ const FederatedFolderModalContent = ({
             documentType="Files"
             className="u-w-100"
             onRevoke={revoke}
-            link={sharingLink}
+            link={displayedLink}
           />
         </div>
       }
       actions={
         <>
           <ShareByLink
-            link={sharingLink}
+            link={displayedLink}
             document={isSending ? frozenDoc : existingDocument}
             documentType="Files"
             showGenerateLinkButton={showGenerateLinkButton}

package/src/components/FederatedFolder/FederatedFolderModal.spec.jsx

@@ -9,10 +9,12 @@ import { usePendingRecipients } from '../../hooks/usePendingRecipients'
 import AppLike from '../SharingBanner/test/AppLike'
 
 const mockShare = jest.fn()
+const mockShareByLink = jest.fn()
 const mockRevoke = jest.fn()
 const mockGetSharingLink = jest.fn()
 const mockGetFederatedShareLink = jest.fn()
 const mockGetRecipients = jest.fn().mockReturnValue([])
+const mockGetSharingById = jest.fn()
 const mockHasSharedChild = jest.fn()
 const mockHasSharedParent = jest.fn()
 const mockShowAlert = jest.fn()
@@ -21,11 +23,14 @@ const mockOnClose = jest.fn()
 jest.mock('../../hooks/useSharingContext', () => ({
   useSharingContext: () => ({
     share: mockShare,
+    shareByLink: mockShareByLink,
     revoke: mockRevoke,
     getSharingLink: mockGetSharingLink,
     getFederatedShareLink: mockGetFederatedShareLink,
     getDocumentPermissions: jest.fn().mockReturnValue([]),
+    getOwner: jest.fn(),
     getRecipients: mockGetRecipients,
+    getSharingById: mockGetSharingById,
     hasSharedChild: mockHasSharedChild,
     hasSharedParent: mockHasSharedParent
   })
@@ -47,6 +52,8 @@ jest.mock('../../hooks/usePendingRecipients', () => ({
   usePendingRecipients: jest.fn()
 }))
 
+jest.mock('../ShareByLink', () => () => <button>Copy link</button>)
+
 const mockDocument = {
   _id: 'folder-123',
   name: 'My Test Folder',
@@ -90,12 +97,26 @@ describe('FederatedFolderModal', () => {
   beforeEach(() => {
     jest.clearAllMocks()
     mockGetSharingLink.mockReturnValue('https://example.com/share/abc123')
-    mockGetFederatedShareLink.mockResolvedValue(
+    mockGetFederatedShareLink.mockReturnValue(
       'https://example.com/share/federated-abc123'
     )
     mockGetRecipients.mockReturnValue([])
+    mockGetSharingById.mockReturnValue(null)
     mockHasSharedChild.mockReturnValue(false)
     mockHasSharedParent.mockReturnValue(false)
+    mockShareByLink.mockResolvedValue({
+      data: {
+        _id: 'permission-id',
+        attributes: {
+          shortcodes: { code: 'abc123' }
+        }
+      }
+    })
+    Object.assign(navigator, {
+      clipboard: {
+        writeText: jest.fn()
+      }
+    })
     client = createTestClient()
     sharingContextValue = createSharingContextValue()
     usePendingRecipients.mockReturnValue({
@@ -139,6 +160,22 @@ describe('FederatedFolderModal', () => {
       await findByText('Copy link')
     })
 
+    it('should show link access as soon as a link is generated', async () => {
+      mockGetSharingLink.mockReturnValue(null)
+      const { findByText, queryByText, rerender } = setup()
+
+      expect(queryByText('Anyone with the link')).toBe(null)
+
+      mockGetSharingLink.mockReturnValue('https://example.com/share/abc123')
+      rerender(
+        <AppLike client={client} sharingContextValue={sharingContextValue}>
+          <FederatedFolderModal document={mockDocument} onClose={mockOnClose} />
+        </AppLike>
+      )
+
+      await findByText('Anyone with the link')
+    })
+
     it('should hide share by email when document is in federated shared folder received by current user', async () => {
       const { findByText, queryByText } = setup({
         document: { ...mockDocument, driveId: 'federated-folder-id' }
@@ -162,6 +199,32 @@ describe('FederatedFolderModal', () => {
       await findByText('This folder can only be shared by link, because')
       await findByText('it has a shared parent')
     })
+
+    it('should allow share by email when document is the federated shared folder root', async () => {
+      mockGetSharingById.mockReturnValue({
+        attributes: {
+          rules: [
+            { values: ['another-folder-id'] },
+            { values: ['yet-another-folder-id', mockDocument._id] }
+          ]
+        }
+      })
+
+      const { findByText, queryByText } = setup({
+        document: {
+          ...mockDocument,
+          driveId: 'federated-folder-id',
+          type: 'directory'
+        }
+      })
+
+      await findByText('Add users')
+
+      expect(
+        queryByText('This folder can only be shared by link, because')
+      ).toBe(null)
+      expect(queryByText('it has a shared parent')).toBe(null)
+    })
   })
 
   describe('onSend callback', () => {

package/src/components/ShareDialogCozyToCozy.jsx

@@ -19,6 +19,7 @@ import { getOrCreateFromArray } from '../helpers/contacts'
 import { hasReachRecipientsLimit } from '../helpers/recipients'
 import { getErrorMessage, getSuccessMessage } from '../helpers/share'
 import { usePendingRecipients } from '../hooks/usePendingRecipients'
+import { useSharingContext } from '../hooks/useSharingContext'
 import styles from '../styles/share.styl'
 
 const SharingContent = ({
@@ -126,6 +127,7 @@ const ShareDialogCozyToCozy = ({
   const { t } = useI18n()
   const client = useClient()
   const { showAlert } = useAlert()
+  const { getSharingLink } = useSharingContext()
 
   const {
     pendingRecipients,
@@ -136,6 +138,7 @@ const ShareDialogCozyToCozy = ({
 
   const [submitting, setSubmitting] = useState(false)
   const [showRecipientsLimit, setShowRecipientsLimit] = useState(false)
+  const displayedLink = getSharingLink(document._id || document.id)
 
   const handleShare = useCallback(async () => {
     if (pendingRecipients.length === 0) {
@@ -238,6 +241,7 @@ const ShareDialogCozyToCozy = ({
     <>
       <ShareDialogTwoStepsConfirmationContainer
         {...props}
+        link={displayedLink}
         documentType={documentType}
         document={document}
         recipients={recipients}

package/src/components/ShareDialogCozyToCozy.spec.jsx

@@ -16,6 +16,7 @@ jest.mock('cozy-client', () => ({
 
 jest.mock('../hooks/useSharingContext', () => ({
   useSharingContext: () => ({
+    getSharingLink: jest.fn(() => null),
     updateSharingMemberType: jest.fn()
   })
 }))

package/src/components/ShareDialogOnlyByLink.jsx

@@ -9,6 +9,7 @@ import { useI18n } from 'twake-i18n'
 import AntivirusAlert from './AntivirusAlert'
 import { default as DumbShareByLink } from './ShareByLink'
 import WhoHasAccess from './WhoHasAccess'
+import { useSharingContext } from '../hooks/useSharingContext'
 
 const ShareDialogOnlyByLink = ({
   isOwner,
@@ -17,7 +18,6 @@ const ShareDialogOnlyByLink = ({
   recipients,
   document,
   documentType,
-  link,
   onClose,
   permissions,
   showGenerateLinkButton,
@@ -25,6 +25,8 @@ const ShareDialogOnlyByLink = ({
 }) => {
   const { t } = useI18n()
   const { isMobile } = useBreakpoints()
+  const { getSharingLink } = useSharingContext()
+  const displayedLink = getSharingLink(document._id || document.id)
 
   return (
     <Dialog
@@ -51,7 +53,7 @@ const ShareDialogOnlyByLink = ({
             onRevoke={onRevoke}
             onRevokeSelf={onRevokeSelf}
             recipients={recipients}
-            link={link}
+            link={displayedLink}
             permissions={permissions}
           />
           <div
@@ -61,7 +63,7 @@ const ShareDialogOnlyByLink = ({
             )}
           >
             <DumbShareByLink
-              link={link}
+              link={displayedLink}
               document={document}
               documentType={documentType}
               showGenerateLinkButton={showGenerateLinkButton}

package/src/components/ShareDialogOnlyByLink.spec.jsx

@@ -0,0 +1,65 @@
+import { render, screen } from '@testing-library/react'
+import React from 'react'
+
+import ShareDialogOnlyByLink from './ShareDialogOnlyByLink'
+import AppLike from '../../test/AppLike'
+
+let mockSharingLink = null
+
+jest.mock('./ShareByLink', () => () => <button>Copy link</button>)
+
+jest.mock('../hooks/useSharingContext', () => ({
+  useSharingContext: () => ({
+    documentType: 'Files',
+    getDocumentPermissions: () => [],
+    getSharingLink: () => mockSharingLink,
+    revokeSharingLink: jest.fn(),
+    updateDocumentPermissions: jest.fn()
+  })
+}))
+
+describe('ShareDialogOnlyByLink', () => {
+  beforeEach(() => {
+    mockSharingLink = null
+  })
+
+  const renderModal = () => (
+    <AppLike>
+      <ShareDialogOnlyByLink
+        document={{ _id: 'file-id', attributes: { name: 'file.txt' } }}
+        documentType="Files"
+        isOwner
+        onClose={jest.fn()}
+        onRevoke={jest.fn()}
+        onRevokeSelf={jest.fn()}
+        permissions={[]}
+        recipients={[]}
+      />
+    </AppLike>
+  )
+
+  const setup = () => render(renderModal())
+
+  it('shows link access as soon as a link is generated', () => {
+    const { rerender } = setup()
+
+    expect(screen.queryByText('Anyone with the link')).toBe(null)
+
+    mockSharingLink = 'https://example.com/public'
+    rerender(renderModal())
+
+    expect(screen.queryByText('Anyone with the link')).toBeInTheDocument()
+  })
+
+  it('hides link access as soon as a link is revoked', () => {
+    mockSharingLink = 'https://example.com/public'
+    const { rerender } = setup()
+
+    expect(screen.queryByText('Anyone with the link')).toBeInTheDocument()
+
+    mockSharingLink = null
+    rerender(renderModal())
+
+    expect(screen.queryByText('Anyone with the link')).toBe(null)
+  })
+})