cozy-sharing 33.3.3 → 33.4.0

package/src/SharingProvider.spec.jsx

@@ -291,6 +291,210 @@ describe('updateDocumentPermissions', () => {
   })
 })
 
+describe('fetchSharedDriveSharingLinks', () => {
+  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('fetches shared drive sharing links by file id', async () => {
+    const mockFindLinksByIds = jest
+      .fn()
+      .mockResolvedValue({ data: [PERM_DRIVE_FILE] })
+    const mockClient = createMockClient({})
+    mockClient.collection = jest.fn().mockReturnValue({
+      findLinksByIds: mockFindLinksByIds
+    })
+
+    const provider = new SharingProvider({ client: mockClient })
+    provider.state = reducer()
+    provider.dispatch = jest.fn(action => {
+      provider.state = reducer(provider.state, action)
+    })
+
+    const result = await provider.fetchSharedDriveSharingLinks(driveFile)
+
+    expect(mockClient.collection).toHaveBeenCalledWith('io.cozy.permissions', {
+      driveId: 'drive_123'
+    })
+    expect(mockFindLinksByIds).toHaveBeenCalledWith(['file_in_drive'])
+    expect(provider.dispatch).toHaveBeenCalled()
+    const permissions = getDocumentPermissions(provider.state, 'file_in_drive')
+    expect(permissions).toHaveLength(1)
+    expect(permissions[0].id).toBe(PERM_DRIVE_FILE.id)
+    expect(result).toEqual([PERM_DRIVE_FILE])
+  })
+
+  it('returns an empty array and skips the API call for non-shared-drive documents', async () => {
+    const mockClient = createMockClient({})
+    const findLinksByIds = jest.fn()
+    mockClient.collection = jest.fn().mockReturnValue({
+      findLinksByIds
+    })
+
+    const provider = new SharingProvider({ client: mockClient })
+    provider.dispatch = jest.fn()
+
+    const result = await provider.fetchSharedDriveSharingLinks({
+      _id: 'regular_file'
+    })
+
+    expect(result).toEqual([])
+    expect(findLinksByIds).not.toHaveBeenCalled()
+    expect(provider.dispatch).not.toHaveBeenCalled()
+  })
+
+  it('uses document.id as a fallback when _id is missing', async () => {
+    const mockFindLinksByIds = jest
+      .fn()
+      .mockResolvedValue({ data: [PERM_DRIVE_FILE] })
+    const mockClient = createMockClient({})
+    mockClient.collection = jest.fn().mockReturnValue({
+      findLinksByIds: mockFindLinksByIds
+    })
+
+    const provider = new SharingProvider({ client: mockClient })
+    provider.state = reducer()
+    provider.dispatch = jest.fn(action => {
+      provider.state = reducer(provider.state, action)
+    })
+
+    await provider.fetchSharedDriveSharingLinks({
+      id: 'file_in_drive',
+      driveId: 'drive_123'
+    })
+
+    expect(mockFindLinksByIds).toHaveBeenCalledWith(['file_in_drive'])
+  })
+
+  it('does not dispatch when the response has no data', async () => {
+    const mockFindLinksByIds = jest.fn().mockResolvedValue({ data: [] })
+    const mockClient = createMockClient({})
+    mockClient.collection = jest.fn().mockReturnValue({
+      findLinksByIds: mockFindLinksByIds
+    })
+
+    const provider = new SharingProvider({ client: mockClient })
+    provider.dispatch = jest.fn()
+
+    const result = await provider.fetchSharedDriveSharingLinks(driveFile)
+
+    expect(result).toEqual([])
+    expect(provider.dispatch).not.toHaveBeenCalled()
+  })
+})
+
+describe('shareByLink shared drive 409 recovery', () => {
+  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('falls back to fetching existing links when create returns 409', async () => {
+    const conflict = Object.assign(new Error('Conflict'), { status: 409 })
+    const mockCreateSharingLink = jest.fn().mockRejectedValue(conflict)
+    const mockFindLinksByIds = jest
+      .fn()
+      .mockResolvedValue({ data: [PERM_DRIVE_FILE] })
+    const mockClient = createMockClient({})
+    mockClient.collection = jest.fn().mockReturnValue({
+      createSharingLink: mockCreateSharingLink,
+      findLinksByIds: mockFindLinksByIds
+    })
+
+    const provider = new SharingProvider({ client: mockClient })
+    provider.state = reducer()
+    provider.dispatch = jest.fn(action => {
+      provider.state = reducer(provider.state, action)
+    })
+
+    const resp = await provider.shareByLink(driveFile, { verbs: ['GET'] })
+
+    expect(mockCreateSharingLink).toHaveBeenCalled()
+    expect(mockFindLinksByIds).toHaveBeenCalledWith(['file_in_drive'])
+    expect(resp.data.id).toBe(PERM_DRIVE_FILE.id)
+  })
+
+  it('does not duplicate existing links when 409 recovery refetches them', async () => {
+    const conflict = Object.assign(new Error('Conflict'), { status: 409 })
+    const mockCreateSharingLink = jest.fn().mockRejectedValue(conflict)
+    const mockFindLinksByIds = jest
+      .fn()
+      .mockResolvedValue({ data: [PERM_DRIVE_FILE] })
+    const mockClient = createMockClient({})
+    mockClient.collection = jest.fn().mockReturnValue({
+      createSharingLink: mockCreateSharingLink,
+      findLinksByIds: mockFindLinksByIds
+    })
+
+    const provider = new SharingProvider({ client: mockClient })
+    provider.state = reducer(undefined, addSharingLink(PERM_DRIVE_FILE))
+    provider.dispatch = jest.fn(action => {
+      provider.state = reducer(provider.state, action)
+    })
+
+    const resp = await provider.shareByLink(driveFile, { verbs: ['GET'] })
+
+    const permissions = getDocumentPermissions(provider.state, 'file_in_drive')
+    expect(resp.data.id).toBe(PERM_DRIVE_FILE.id)
+    expect(provider.dispatch).not.toHaveBeenCalled()
+    expect(permissions).toHaveLength(1)
+  })
+
+  it('rethrows the original error when 409 happens and no link is found', async () => {
+    const conflict = Object.assign(new Error('Conflict'), { status: 409 })
+    const mockCreateSharingLink = jest.fn().mockRejectedValue(conflict)
+    const mockFindLinksByIds = jest.fn().mockResolvedValue({ data: [] })
+    const mockClient = createMockClient({})
+    mockClient.collection = jest.fn().mockReturnValue({
+      createSharingLink: mockCreateSharingLink,
+      findLinksByIds: mockFindLinksByIds
+    })
+
+    const provider = new SharingProvider({ client: mockClient })
+    provider.state = reducer()
+    provider.dispatch = jest.fn()
+
+    await expect(
+      provider.shareByLink(driveFile, { verbs: ['GET'] })
+    ).rejects.toBe(conflict)
+  })
+})
+
 describe('updateSharingMemberType', () => {
   const mockSharing = {
     id: 'sharing-123',

package/src/components/FederatedFolder/FederatedFolderModal.jsx

@@ -1,7 +1,8 @@
 import PropTypes from 'prop-types'
-import React, { useCallback, useState } from 'react'
+import React, { useCallback, useEffect, useState } from 'react'
 
 import { useClient } from 'cozy-client'
+import minilog from 'cozy-minilog'
 import Button from 'cozy-ui/transpiled/react/Buttons'
 import { FixedDialog } from 'cozy-ui/transpiled/react/CozyDialogs'
 import Typography from 'cozy-ui/transpiled/react/Typography'
@@ -21,6 +22,8 @@ import { default as DumbShareByEmail } from '../ShareByEmail'
 import ShareByLink from '../ShareByLink'
 import WhoHasAccess from '../WhoHasAccess'
 
+const log = minilog('FederatedFolderModal')
+
 const FederatedFolderModalContent = ({
   onClose,
   document: existingDocument,
@@ -34,6 +37,8 @@ const FederatedFolderModalContent = ({
     getSharingById,
     getSharingLink,
     getFederatedShareLink,
+    getDocumentPermissions,
+    fetchSharedDriveSharingLinks,
     getRecipients,
     hasSharedChild,
     hasSharedParent,
@@ -56,6 +61,9 @@ const FederatedFolderModalContent = ({
   // in members before the modal closes. That's why when clicking on "Share"
   // we do not use the reactive existingDocument and existingRecipients.
   const [isSending, setIsSending] = useState(false)
+  const [isFetchingSharingLinks, setIsFetchingSharingLinks] = useState(false)
+  const [fetchedSharingLinksDocumentId, setFetchedSharingLinksDocumentId] =
+    useState(null)
   const [frozenDoc, setFrozenDoc] = useState(null)
   const [frozenRecipients, setFrozenRecipients] = useState(null)
 
@@ -169,13 +177,46 @@ const FederatedFolderModalContent = ({
     }
   }
 
-  const existingRecipients = existingDocument
-    ? getRecipients(existingDocument._id)
+  const documentId = existingDocument?._id || existingDocument?.id
+  const existingRecipients = documentId ? getRecipients(documentId) : []
+  const documentPermissions = documentId
+    ? getDocumentPermissions(documentId)
     : []
   const displayedLink = existingDocument?.driveId
     ? getFederatedShareLink(existingDocument)
     : getSharingLink(existingDocument?._id)
 
+  useEffect(() => {
+    if (!existingDocument?.driveId) return
+    if (!documentId) return
+    if (!fetchSharedDriveSharingLinks) return
+    if (documentPermissions.length > 0) return
+    if (isFetchingSharingLinks) return
+    if (fetchedSharingLinksDocumentId === documentId) return
+
+    const fetchSharingLinks = async () => {
+      setIsFetchingSharingLinks(true)
+
+      try {
+        await fetchSharedDriveSharingLinks(existingDocument)
+      } catch (error) {
+        log.error('Failed to fetch shared drive sharing links', error)
+      } finally {
+        setFetchedSharingLinksDocumentId(documentId)
+        setIsFetchingSharingLinks(false)
+      }
+    }
+
+    fetchSharingLinks()
+  }, [
+    documentId,
+    existingDocument,
+    documentPermissions.length,
+    fetchedSharingLinksDocumentId,
+    fetchSharedDriveSharingLinks,
+    isFetchingSharingLinks
+  ])
+
   const modalTitle = t('FederatedFolder.shareTitle', { name: folderName })
 
   return (

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

@@ -17,6 +17,8 @@ const mockGetRecipients = jest.fn().mockReturnValue([])
 const mockGetSharingById = jest.fn()
 const mockHasSharedChild = jest.fn()
 const mockHasSharedParent = jest.fn()
+const mockFetchSharedDriveSharingLinks = jest.fn()
+const mockGetDocumentPermissions = jest.fn().mockReturnValue([])
 const mockShowAlert = jest.fn()
 const mockOnClose = jest.fn()
 
@@ -27,7 +29,8 @@ jest.mock('../../hooks/useSharingContext', () => ({
     revoke: mockRevoke,
     getSharingLink: mockGetSharingLink,
     getFederatedShareLink: mockGetFederatedShareLink,
-    getDocumentPermissions: jest.fn().mockReturnValue([]),
+    getDocumentPermissions: mockGetDocumentPermissions,
+    fetchSharedDriveSharingLinks: mockFetchSharedDriveSharingLinks,
     getOwner: jest.fn(),
     getRecipients: mockGetRecipients,
     getSharingById: mockGetSharingById,
@@ -65,7 +68,8 @@ const createSharingContextValue = () => ({
   hasWriteAccess: jest.fn(),
   getRecipients: jest.fn(),
   getSharingLink: mockGetSharingLink,
-  getDocumentPermissions: jest.fn().mockReturnValue([]),
+  getDocumentPermissions: mockGetDocumentPermissions,
+  fetchSharedDriveSharingLinks: mockFetchSharedDriveSharingLinks,
   share: mockShare
 })
 
@@ -96,6 +100,8 @@ describe('FederatedFolderModal', () => {
 
   beforeEach(() => {
     jest.clearAllMocks()
+    mockGetDocumentPermissions.mockReturnValue([])
+    mockFetchSharedDriveSharingLinks.mockResolvedValue([])
     mockGetSharingLink.mockReturnValue('https://example.com/share/abc123')
     mockGetFederatedShareLink.mockReturnValue(
       'https://example.com/share/federated-abc123'
@@ -227,6 +233,85 @@ describe('FederatedFolderModal', () => {
     })
   })
 
+  describe('shared drive link fetch on mount', () => {
+    it('should fetch shared drive sharing links when document has a driveId and no permissions yet', async () => {
+      mockGetDocumentPermissions.mockReturnValue([])
+
+      setup({
+        document: { ...mockDocument, driveId: 'federated-folder-id' }
+      })
+
+      await waitFor(() => {
+        expect(mockFetchSharedDriveSharingLinks).toHaveBeenCalledTimes(1)
+      })
+      expect(mockFetchSharedDriveSharingLinks).toHaveBeenCalledWith(
+        expect.objectContaining({
+          _id: mockDocument._id,
+          driveId: 'federated-folder-id'
+        })
+      )
+    })
+
+    it('should use document.id when _id is missing', async () => {
+      const document = {
+        id: 'folder-id-only',
+        name: 'My Test Folder',
+        path: '/test/folder',
+        driveId: 'federated-folder-id'
+      }
+
+      setup({ document })
+
+      await waitFor(() => {
+        expect(mockFetchSharedDriveSharingLinks).toHaveBeenCalledWith(document)
+      })
+      expect(mockGetDocumentPermissions).toHaveBeenCalledWith('folder-id-only')
+    })
+
+    it('should not fetch shared drive sharing links when document has no driveId', async () => {
+      const { findByText } = setup({ document: mockDocument })
+
+      await findByText('Copy link')
+
+      expect(mockFetchSharedDriveSharingLinks).not.toHaveBeenCalled()
+    })
+
+    it('should not refetch after one attempt when permissions stay empty', async () => {
+      const document = { ...mockDocument, driveId: 'federated-folder-id' }
+      const { rerender } = setup({ document })
+
+      await waitFor(() => {
+        expect(mockFetchSharedDriveSharingLinks).toHaveBeenCalledTimes(1)
+      })
+
+      rerender(
+        <AppLike client={client} sharingContextValue={sharingContextValue}>
+          <FederatedFolderModal document={document} onClose={mockOnClose} />
+        </AppLike>
+      )
+
+      expect(mockFetchSharedDriveSharingLinks).toHaveBeenCalledTimes(1)
+    })
+
+    it('should not fetch shared drive sharing links when permissions are already loaded', async () => {
+      mockGetDocumentPermissions.mockReturnValue([
+        {
+          id: 'perm-1',
+          type: 'io.cozy.permissions',
+          attributes: { shortcodes: { code: 'abc' } }
+        }
+      ])
+
+      const { findByText } = setup({
+        document: { ...mockDocument, driveId: 'federated-folder-id' }
+      })
+
+      await findByText('Copy link')
+
+      expect(mockFetchSharedDriveSharingLinks).not.toHaveBeenCalled()
+    })
+  })
+
   describe('onSend callback', () => {
     const pendingRecipient = { name: 'Alice', email: 'alice@example.com' }
 

package/src/components/ShareButton.jsx

@@ -22,7 +22,7 @@ export const ShareButton = ({ label, onClick, className, ...props }) => (
 export const SharedByMeButton = ({ label, onClick, className, ...props }) => (
   <Button
     data-test-id="share-by-me-button"
-    className={classNames(styles['coz-btn-shared'], className)}
+    className={className}
     onClick={() => onClick()}
     icon={<Icon icon={ShareIcon} />}
     label={label}

package/src/styles/button.styl

@@ -4,11 +4,6 @@
     color: var(--primaryContrastTextColor)
     transition all .2s ease-out
 
-    &:focus
-    &:not([disabled]):not([aria-disabled=true]):hover
-        border-color: var(--malachite)
-        background-color: var(--malachite)
-
 .coz-btn-sharedWithMe
     border-color: #B449E7
     background-color: #B449E7