cozy-sharing 19.0.0 → 21.0.0

package/src/components/ShareRestrictionModal/ShareRestrictionContentModal.jsx

@@ -1,4 +1,4 @@
-import { addDays } from 'date-fns'
+import { addDays, isValid } from 'date-fns'
 import PropTypes from 'prop-types'
 import React from 'react'
 
@@ -9,6 +9,8 @@ import { useI18n } from 'cozy-ui/transpiled/react/providers/I18n'
 import { BoxDate } from './BoxDate'
 import { BoxEditingRights } from './BoxEditingRights'
 import { BoxPassword } from './BoxPassword'
+import { checkIsPermissionHasPassword } from '../../helpers/permissions'
+import { useSharingContext } from '../../hooks/useSharingContext'
 
 const PASSWORD_MIN_LENGTH = 4
 
@@ -32,24 +34,43 @@ export const ShareRestrictionContentModal = ({
   setEditingRights
 }) => {
   const { t } = useI18n()
+  const { getDocumentPermissions } = useSharingContext()
+  const permissions = getDocumentPermissions(file._id)
+  const hasPassword = checkIsPermissionHasPassword(permissions)
 
-  const handlePasswordToggle = val => {
-    setPasswordToggle(val)
-  }
   const handlePassword = value => {
     setPassword(value)
     setIsValidPassword(
-      value.trim().length === 0 || value.trim().length >= PASSWORD_MIN_LENGTH
+      (hasPassword && value.trim().length === 0) ||
+        value.trim().length >= PASSWORD_MIN_LENGTH
     )
   }
 
+  const handlePasswordToggle = val => {
+    setPasswordToggle(val)
+    setPassword('')
+    if (val && !password) {
+      setIsValidPassword(hasPassword)
+    } else {
+      setIsValidPassword(true)
+    }
+  }
+
+  const handleDate = date => {
+    setSelectedDate(date)
+    setIsValidDate(isValid(date))
+  }
+
   const handleDateToggle = val => {
+    setDateToggle(val)
     if (!val) {
+      setSelectedDate(null)
+      setIsValidDate(true)
+    } else {
+      const defaultValue = val ? addDays(new Date(), 30) : null
+      setSelectedDate(defaultValue)
       setIsValidDate(true)
     }
-    const defaultValue = val ? addDays(new Date(), 30) : null
-    setSelectedDate(defaultValue, true)
-    setDateToggle(val)
   }
 
   return (
@@ -64,12 +85,13 @@ export const ShareRestrictionContentModal = ({
         setEditingRights={setEditingRights}
       />
       <BoxDate
-        onChange={setSelectedDate}
+        onChange={handleDate}
         date={selectedDate}
         onToggle={handleDateToggle}
         toggle={dateToggle}
       />
       <BoxPassword
+        file={file}
         onChange={handlePassword}
         password={password}
         onToggle={handlePasswordToggle}

package/src/components/ShareRestrictionModal/ShareRestrictionModal.jsx

@@ -2,9 +2,7 @@ import { addDays } from 'date-fns'
 import PropTypes from 'prop-types'
 import React, { useState } from 'react'
 
-import { useClient } from 'cozy-client'
-import { getSharingLink as makeSharingLink } from 'cozy-client/dist/models/sharing'
-import { isMobile } from 'cozy-device-helper'
+import { generateWebLink, useClient } from 'cozy-client'
 import Button from 'cozy-ui/transpiled/react/Buttons'
 import { ConfirmDialog } from 'cozy-ui/transpiled/react/CozyDialogs'
 import Icon from 'cozy-ui/transpiled/react/Icon'
@@ -14,14 +12,17 @@ import { useI18n } from 'cozy-ui/transpiled/react/providers/I18n'
 import { ShareRestrictionContentModal } from './ShareRestrictionContentModal'
 import {
   copyToClipboard,
-  forwardFile,
   updatePermissions,
   makeTTL,
-  READ_ONLY_PERMS,
-  WRITE_PERMS,
-  revokePermissions
+  revokePermissions,
+  createPermissions
 } from './helpers'
-import { checkIsReadOnlyPermissions } from '../../helpers/permissions'
+import {
+  checkIsPermissionHasExpiresDate,
+  checkIsPermissionHasPassword,
+  checkIsReadOnlyPermissions,
+  getPermissionExpiresDate
+} from '../../helpers/permissions'
 import { useSharingContext } from '../../hooks/useSharingContext'
 
 const PASSWORD_MIN_LENGTH = 4
@@ -31,11 +32,8 @@ export const ShareRestrictionModal = ({ file, onClose }) => {
   const { t } = useI18n()
   const { showAlert } = useAlert()
   const [password, setPassword] = useState('')
-  const [selectedDate, setSelectedDate] = useState(addDays(new Date(), 30))
   const [isValidDate, setIsValidDate] = useState(true)
   const [isValidPassword, setIsValidPassword] = useState(true)
-  const [dateToggle, setDateToggle] = useState(true)
-  const [passwordToggle, setPasswordToggle] = useState(false)
   const [loading, setLoading] = useState(false)
 
   const {
@@ -50,64 +48,75 @@ export const ShareRestrictionModal = ({ file, onClose }) => {
   const hasSharingLink = getSharingLink(file._id) !== null
   const permissions = getDocumentPermissions(file._id)
   const isReadOnlyPermissions = checkIsReadOnlyPermissions(permissions)
-
+  const hasPassword = checkIsPermissionHasPassword(permissions)
+  const hasExpiresDate = checkIsPermissionHasExpiresDate(permissions)
+  const expiresDate = getPermissionExpiresDate(permissions)
+  const defaultDate = expiresDate
+    ? new Date(expiresDate)
+    : addDays(new Date(), 30)
+
+  const [selectedDate, setSelectedDate] = useState(defaultDate)
+  const [dateToggle, setDateToggle] = useState(
+    permissions.length > 0 ? hasExpiresDate : true
+  )
+  const [passwordToggle, setPasswordToggle] = useState(hasPassword)
   const [editingRights, setEditingRights] = useState(
     isReadOnlyPermissions || permissions.length === 0 ? 'readOnly' : 'write'
   )
 
-  const isDesktopOrMobileWithoutShareAPI =
-    (isMobile() && !navigator.share) || !isMobile()
-
   const helperTextPassword = !isValidPassword
     ? t('ShareRestrictionModal.invalidPasswordMessage', {
         smart_count: PASSWORD_MIN_LENGTH - password.length
       })
     : null
 
-  const handleDateChange = (date, isValid) => {
-    setSelectedDate(date)
-    setIsValidDate(isValid)
-  }
-
   const handleClick = async () => {
     setLoading(true)
     // If the file is not shared, we create a new sharing link
     if (!hasSharingLink) {
-      const verbs = editingRights === 'readOnly' ? READ_ONLY_PERMS : WRITE_PERMS
-      await shareByLink(file, { verbs })
-      const url = getSharingLink(file._id)
-      await copyToClipboard(url, { t, showAlert })
-      onClose()
-      return
-    }
-
-    await updatePermissions({
-      file,
-      t,
-      editingRights,
-      documentType,
-      updateDocumentPermissions,
-      showAlert
-    })
-
-    const ttl = makeTTL(dateToggle && selectedDate)
-    if (isDesktopOrMobileWithoutShareAPI) {
-      const url = await makeSharingLink(client, [file._id], {
+      const ttl = makeTTL(dateToggle && selectedDate)
+      const { data: perms } = await createPermissions({
+        file,
+        t,
         ttl,
-        password
+        password,
+        editingRights,
+        documentType,
+        shareByLink,
+        showAlert
+      })
+      const url = generateWebLink({
+        cozyUrl: client.getStackClient().uri,
+        searchParams: [['sharecode', perms.attributes.shortcodes.code]],
+        pathname: '/public',
+        slug: 'drive',
+        subDomainType: client.capabilities.flat_subdomains ? 'flat' : 'nested'
       })
       await copyToClipboard(url, { t, showAlert })
+      onClose()
     } else {
-      await forwardFile({
-        client,
+      const [{ data: perms }] = await updatePermissions({
         file,
         t,
-        ttl,
+        dateToggle,
+        selectedDate,
+        passwordToggle,
         password,
+        editingRights,
+        documentType,
+        updateDocumentPermissions,
         showAlert
       })
+      const url = generateWebLink({
+        cozyUrl: client.getStackClient().uri,
+        searchParams: [['sharecode', perms.attributes.shortcodes.code]],
+        pathname: '/public',
+        slug: 'drive',
+        subDomainType: client.capabilities.flat_subdomains ? 'flat' : 'nested'
+      })
+      await copyToClipboard(url, { t, showAlert })
+      onClose()
     }
-    onClose()
   }
 
   const handleRevokeLink = async () => {
@@ -132,7 +141,7 @@ export const ShareRestrictionModal = ({ file, onClose }) => {
           // Date
           dateToggle={dateToggle}
           setDateToggle={setDateToggle}
-          setSelectedDate={handleDateChange}
+          setSelectedDate={setSelectedDate}
           selectedDate={selectedDate}
           setIsValidDate={setIsValidDate}
           // Password

package/src/components/ShareRestrictionModal/helpers.js

@@ -109,11 +109,53 @@ export const forwardFile = async ({
   }
 }
 
+/**
+ * createPermissions - Create the permissions of a file
+ * @param {object} options
+ * @param {import('cozy-client/types/types').IOCozyFile} options.file File to update permissions
+ * @param {Function} options.t i18n function
+ * @param {Date|string} options.ttl - Time to live of the sharing link
+ * @param {string} options.password - Password
+ * @param {'readOnly'|'write'} options.editingRights - Editing rights
+ * @param {string} options.documentType - Type of the document
+ * @param {Function} options.shareByLink - Function to create permissions
+ * @param {Function} options.showAlert - Function to display an alert
+ */
+export const createPermissions = async ({
+  file,
+  t,
+  ttl,
+  password,
+  editingRights,
+  documentType,
+  shareByLink,
+  showAlert
+}) => {
+  try {
+    const verbs = editingRights === 'readOnly' ? READ_ONLY_PERMS : WRITE_PERMS
+    return shareByLink(file, { verbs, ttl, password })
+  } catch (err) {
+    showAlert({
+      message: t(`${documentType}.share.shareByLink.permserror`),
+      severity: 'error',
+      variant: 'filled'
+    })
+    log.error(
+      "Error in 'readOnlyPermissionLink' function when trying to change permission",
+      err
+    )
+  }
+}
+
 /**
  * updatePermissions - Updates the permissions of a file
  * @param {object} options
  * @param {import('cozy-client/types/types').IOCozyFile} options.file File to update permissions
  * @param {Function} options.t i18n function
+ * @param {boolean} options.dateToggle - Expiration date toggle
+ * @param {Date|null} options.selectedDate - Expiration date
+ * @param {boolean} options.passwordToggle - Password toggle
+ * @param {string} options.password - Password
  * @param {string} options.documentType - Type of the document
  * @param {'readOnly'|'write'} options.editingRights - Editing rights
  * @param {Function} options.updateDocumentPermissions - Function to update permissions
@@ -122,42 +164,34 @@ export const forwardFile = async ({
 export const updatePermissions = async ({
   file,
   t,
+  dateToggle,
+  selectedDate,
+  passwordToggle,
+  password,
   editingRights,
   documentType,
   updateDocumentPermissions,
   showAlert
 }) => {
-  switch (editingRights) {
-    case 'readOnly':
-      try {
-        return updateDocumentPermissions(file, READ_ONLY_PERMS)
-      } catch (err) {
-        showAlert({
-          message: t(`${documentType}.share.shareByLink.permserror`),
-          severity: 'error',
-          variant: 'filled'
-        })
-        log.error(
-          "Error in 'readOnlyPermissionLink' function when trying to change permission",
-          err
-        )
-      }
-      break
-    case 'write':
-      try {
-        return updateDocumentPermissions(file, WRITE_PERMS)
-      } catch (err) {
-        showAlert({
-          message: t(`${documentType}.share.shareByLink.permserror`),
-          severity: 'error',
-          variant: 'filled'
-        })
-        log.error(
-          "Error in 'editPermissionLink' function when trying to change permission",
-          err
-        )
-      }
-      break
+  try {
+    const expiresAt = dateToggle ? selectedDate?.toISOString() || undefined : ''
+    const ensurePassword = passwordToggle ? password || undefined : ''
+    const verbs = editingRights === 'readOnly' ? READ_ONLY_PERMS : WRITE_PERMS
+    return updateDocumentPermissions(file, {
+      verbs,
+      expiresAt,
+      password: ensurePassword
+    })
+  } catch (err) {
+    showAlert({
+      message: t(`${documentType}.share.shareByLink.permserror`),
+      severity: 'error',
+      variant: 'filled'
+    })
+    log.error(
+      "Error in 'updateDocumentPermissions' function when trying to change permission",
+      err
+    )
   }
 }
 

package/src/components/ShareRestrictionModal/helpers.spec.js

@@ -21,40 +21,121 @@ describe('ShareRestrictionModal/helpers', () => {
     it('should call updateDocumentPermissions with "readOnly" permission', async () => {
       const updateDocumentPermissions = jest.fn()
       const file = { _id: '123' }
-      const editingRights = 'readOnly'
 
       await updatePermissions({
         file,
         t: jest.fn(),
-        editingRights,
+        dateToggle: false,
+        selectedDate: null,
+        passwordToggle: false,
+        password: '',
+        editingRights: 'readOnly',
         documentType,
         updateDocumentPermissions,
         showAlert: jest.fn()
       })
 
-      expect(updateDocumentPermissions).toHaveBeenCalledWith(file, ['GET'])
+      expect(updateDocumentPermissions).toHaveBeenCalledWith(file, {
+        expiresAt: '',
+        password: '',
+        verbs: ['GET']
+      })
     })
 
     it('should call updateDocumentPermissions with "write" permissions', async () => {
       const updateDocumentPermissions = jest.fn()
       const file = { _id: '123' }
-      const editingRights = 'write'
 
       await updatePermissions({
         file,
         t: jest.fn(),
-        editingRights,
+        dateToggle: false,
+        selectedDate: null,
+        passwordToggle: false,
+        password: '',
+        editingRights: 'write',
+        documentType,
+        updateDocumentPermissions,
+        showAlert: jest.fn()
+      })
+
+      expect(updateDocumentPermissions).toHaveBeenCalledWith(file, {
+        expiresAt: '',
+        password: '',
+        verbs: ['GET', 'POST', 'PUT', 'PATCH']
+      })
+    })
+
+    it('should call updateDocumentPermissions with empty date & password if their switches are false', async () => {
+      const updateDocumentPermissions = jest.fn()
+      const file = { _id: '123' }
+
+      await updatePermissions({
+        file,
+        t: jest.fn(),
+        dateToggle: false,
+        selectedDate: null,
+        passwordToggle: false,
+        password: '',
+        editingRights: 'readOnly',
+        documentType,
+        updateDocumentPermissions,
+        showAlert: jest.fn()
+      })
+
+      expect(updateDocumentPermissions).toHaveBeenCalledWith(file, {
+        expiresAt: '',
+        password: '',
+        verbs: ['GET']
+      })
+    })
+
+    it('should call updateDocumentPermissions with "undefined" date & password if their switches are true but the permission doesn\'t yet have these values', async () => {
+      const updateDocumentPermissions = jest.fn()
+      const file = { _id: '123' }
+
+      await updatePermissions({
+        file,
+        t: jest.fn(),
+        dateToggle: true,
+        selectedDate: null,
+        passwordToggle: true,
+        password: '',
+        editingRights: 'readOnly',
+        documentType,
+        updateDocumentPermissions,
+        showAlert: jest.fn()
+      })
+
+      expect(updateDocumentPermissions).toHaveBeenCalledWith(file, {
+        expiresAt: undefined,
+        password: undefined,
+        verbs: ['GET']
+      })
+    })
+
+    it('should call updateDocumentPermissions with expected date & password if their switches are true', async () => {
+      const updateDocumentPermissions = jest.fn()
+      const file = { _id: '123' }
+
+      await updatePermissions({
+        file,
+        t: jest.fn(),
+        dateToggle: true,
+        selectedDate: new Date('2100-01-01T00:00:00.000Z'),
+        passwordToggle: true,
+        password: '1234',
+        editingRights: 'readOnly',
         documentType,
         updateDocumentPermissions,
         showAlert: jest.fn()
       })
 
-      expect(updateDocumentPermissions).toHaveBeenCalledWith(file, [
-        'GET',
-        'POST',
-        'PUT',
-        'PATCH'
-      ])
+      expect(updateDocumentPermissions).toHaveBeenCalledWith(file, {
+        expiresAt: '2100-01-01T00:00:00.000Z',
+        password: '1234',
+        verbs: ['GET']
+      })
     })
   })
 

package/src/components/SharingBanner/components/PublicBanner.jsx

@@ -49,12 +49,12 @@ const openExternalLink = url => (window.location = url)
 const SharingBannerCozyToCozy = ({
   sharing,
   isSharingShortcutCreated,
-  discoveryLink,
+  addSharingLink,
   onClose
 }) => {
   const { t } = useI18n()
 
-  const action = () => openExternalLink(discoveryLink)
+  const action = () => openExternalLink(addSharingLink)
   const buttonOne = isSharingShortcutCreated
     ? {
         label: t('Share.banner.sync_to_mine', { smart_count: 2 }),
@@ -139,7 +139,7 @@ const SharingBannerByLink = ({ onClose }) => {
 SharingBannerCozyToCozy.propTypes = {
   sharing: PropTypes.object.isRequired,
   isSharingShortcutCreated: PropTypes.bool.isRequired,
-  discoveryLink: PropTypes.string.isRequired,
+  addToCozySharingLink: PropTypes.string.isRequired,
   onClose: PropTypes.func.isRequired
 }
 export { SharingBannerCozyToCozy, SharingBannerByLink }

package/src/components/SharingBanner/components/PublicBanner.spec.jsx

@@ -34,7 +34,7 @@ describe('PublicBanner', () => {
       <SharingBannerCozyToCozy
         sharing={sharing}
         isSharingShortcutCreated={true}
-        discoveryLink="discoveryLink"
+        addSharingLink="discoveryLink"
         onClose={() => {}}
       />
     )

package/src/components/SharingBanner/components/SharingBanner.jsx

@@ -7,19 +7,19 @@ export const SharingBanner = ({ sharingInfos }) => {
   const [isOpened, setIsOpened] = useState(true)
   const onClose = useCallback(() => setIsOpened(false), [setIsOpened])
 
-  const { loading, discoveryLink, sharing, isSharingShortcutCreated } =
+  const { loading, addSharingLink, sharing, isSharingShortcutCreated } =
     sharingInfos
 
   if (loading) return null
   return (
     isOpened &&
-    (!discoveryLink ? (
+    (!addSharingLink ? (
       <SharingBannerByLink onClose={onClose} />
     ) : (
       <SharingBannerCozyToCozy
         isSharingShortcutCreated={isSharingShortcutCreated}
         sharing={sharing}
-        discoveryLink={discoveryLink}
+        addSharingLink={addSharingLink}
         onClose={onClose}
       />
     ))

package/src/components/SharingBanner/hooks/useSharingInfos.jsx

@@ -12,10 +12,13 @@ const getSharingId = permission => {
   return sharingId
 }
 
+const CREATE_COZY_LINK = 'https://manager.cozycloud.cc/cozy/create'
+
 export const useSharingInfos = (previewPath = '/preview') => {
   const client = useClient()
 
-  const [discoveryLink, setDiscoveryLink] = useState()
+  const [addSharingLink, setAddSharingLink] = useState()
+  const [syncSharingLink, setSyncSharingLink] = useState()
   const [isSharingShortcutCreated, setIsSharingSharingcutCreated] =
     useState(false)
   const [sharing, setSharing] = useState()
@@ -35,6 +38,9 @@ export const useSharingInfos = (previewPath = '/preview') => {
         const { sharecode } = getQueryParameter()
 
         const link = client
+          .collection('io.cozy.sharings')
+          .getDiscoveryLink(sharingId, sharecode, { shortcut: true })
+        const linkSync = client
           .collection('io.cozy.sharings')
           .getDiscoveryLink(sharingId, sharecode)
         const sharingsByIdQuery = buildSharingsByIdQuery(sharingId)
@@ -42,7 +48,8 @@ export const useSharingInfos = (previewPath = '/preview') => {
           sharingsByIdQuery.definition
         )
 
-        setDiscoveryLink(link)
+        setAddSharingLink(link)
+        setSyncSharingLink(linkSync)
         setIsSharingSharingcutCreated(isSharingShortcutCreated)
         setSharing(sharing)
       } catch (e) {
@@ -62,7 +69,9 @@ export const useSharingInfos = (previewPath = '/preview') => {
   return {
     sharing,
     loading,
-    discoveryLink,
+    addSharingLink,
+    syncSharingLink,
+    createCozyLink: CREATE_COZY_LINK,
     isSharingShortcutCreated
   }
 }

package/src/components/SharingBanner/hooks/useSharingInfos.spec.js

@@ -81,8 +81,8 @@ describe('useSharingInfos', () => {
   })
 
   it('returns the right infos when using useSharingInfo', async () => {
-    const discoveryLink = '/link'
-    getDiscoveryLinkMock.mockReturnValue(discoveryLink)
+    const addSharingLink = '/addSharingLink'
+    getDiscoveryLinkMock.mockReturnValue(addSharingLink)
     fetchOwnPermissionsMock.mockResolvedValue(mockedPermissionsWithInstance)
     queryMock.mockResolvedValue(mockSharing)
     const { result, waitForNextUpdate } = setup()
@@ -93,12 +93,12 @@ describe('useSharingInfos', () => {
     expect(result.current.loading).toEqual(false)
     expect(result.current.isSharingShortcutCreated).toEqual(true)
     expect(result.current.sharing).toEqual(mockSharing.data)
-    expect(result.current.discoveryLink).toEqual(discoveryLink)
+    expect(result.current.addSharingLink).toEqual(addSharingLink)
   })
 
-  it('returns the right infos when using useSharingInfo without discoveryLink', async () => {
-    const discoveryLink = false
-    getDiscoveryLinkMock.mockReturnValue(discoveryLink)
+  it('returns the right infos when using useSharingInfo without addSharingLink', async () => {
+    const addSharingLink = undefined
+    getDiscoveryLinkMock.mockReturnValue(addSharingLink)
     fetchOwnPermissionsMock.mockResolvedValue(mockedPermissionsWithoutInstance)
     queryMock.mockResolvedValue(mockSharing)
     const { result, waitForNextUpdate } = setup()
@@ -109,7 +109,7 @@ describe('useSharingInfos', () => {
     expect(result.current.loading).toEqual(false)
     expect(result.current.isSharingShortcutCreated).toEqual(false)
     expect(result.current.sharing).toEqual(mockSharing.data)
-    expect(result.current.discoveryLink).toEqual(discoveryLink)
+    expect(result.current.addSharingLink).toEqual(addSharingLink)
   })
 
   it('returns loading false if there is nothing to do aka sharing by link', () => {

package/src/helpers/permissions.js

@@ -14,3 +14,15 @@ export const checkIsReadOnlyPermissions = permissions => {
     ).length > 0
   )
 }
+
+export const checkIsPermissionHasExpiresDate = permissions => {
+  return Boolean(permissions?.[0]?.attributes?.expires_at)
+}
+
+export const getPermissionExpiresDate = permissions => {
+  return permissions?.[0]?.attributes?.expires_at
+}
+
+export const checkIsPermissionHasPassword = permissions => {
+  return Boolean(permissions?.[0]?.attributes?.password)
+}

package/src/index.jsx

@@ -33,5 +33,7 @@ export {
   NativeFileSharingProvider,
   useNativeFileSharing
 } from './providers/NativeFileSharingProvider'
-export { openSharingLink } from './actions/openSharingLink'
+export { createCozySharingLink } from './actions/createCozySharingLink'
+export { addToCozySharingLink } from './actions/addToCozySharingLink'
+export { syncToCozySharingLink } from './actions/syncToCozySharingLink'
 export { shareNative } from './actions/shareNative'