cozy-sharing 28.7.0 → 28.9.0

package/CHANGELOG.md

@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [28.9.0](https://github.com/cozy/cozy-libs/compare/cozy-sharing@28.8.0...cozy-sharing@28.9.0) (2026-03-12)
+
+### Features
+
+- Disable Twake Creation from public sharing link ([e8e6fcf](https://github.com/cozy/cozy-libs/commit/e8e6fcfc5e659796f06378818044debb09c7c4e2))
+
+# [28.8.0](https://github.com/cozy/cozy-libs/compare/cozy-sharing@28.7.0...cozy-sharing@28.8.0) (2026-03-12)
+
+### Features
+
+- **cozy-sharing:** Use FederatedFolderModal on existing sharings ([541de13](https://github.com/cozy/cozy-libs/commit/541de1310631170b5567694ff1366bc997fb3ea3))
+
 # [28.7.0](https://github.com/cozy/cozy-libs/compare/cozy-sharing@28.6.0...cozy-sharing@28.7.0) (2026-03-12)
 
 ### Features

package/dist/components/FederatedFolder/FederatedFolderModal.js

@@ -1,3 +1,4 @@
+import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
@@ -24,7 +25,9 @@ export var FederatedFolderModal = withLocales(function (_ref) {
       getFederatedShareLink = _useSharingContext.getFederatedShareLink,
       getDocumentPermissions = _useSharingContext.getDocumentPermissions,
       getOwner = _useSharingContext.getOwner,
-      getSharingById = _useSharingContext.getSharingById;
+      getSharingById = _useSharingContext.getSharingById,
+      getRecipients = _useSharingContext.getRecipients,
+      revoke = _useSharingContext.revoke;
 
   var _useAlert = useAlert(),
       showAlert = _useAlert.showAlert;
@@ -162,21 +165,50 @@ export var FederatedFolderModal = withLocales(function (_ref) {
     }
   };
 
-  var onRevoke = function onRevoke(index) {
-    var _id = index.split(RECIPIENT_INDEX_PREFIX)[1];
-    setFederatedRecipients(function (prev) {
-      return {
-        recipients: prev.recipients.filter(function (r) {
-          return r._id !== _id;
-        }),
-        readOnlyRecipients: prev.readOnlyRecipients.filter(function (r) {
-          return r._id !== _id;
-        })
-      };
-    });
-  };
+  var onRevoke = /*#__PURE__*/function () {
+    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(documentOrIndex, sharingId, memberIndex) {
+      var _id;
+
+      return _regeneratorRuntime.wrap(function _callee3$(_context3) {
+        while (1) switch (_context3.prev = _context3.next) {
+          case 0:
+            if (!(typeof documentOrIndex === 'string' && documentOrIndex.startsWith(RECIPIENT_INDEX_PREFIX))) {
+              _context3.next = 5;
+              break;
+            }
+
+            _id = documentOrIndex.split(RECIPIENT_INDEX_PREFIX)[1];
+            setFederatedRecipients(function (prev) {
+              return {
+                recipients: prev.recipients.filter(function (r) {
+                  return r._id !== _id;
+                }),
+                readOnlyRecipients: prev.readOnlyRecipients.filter(function (r) {
+                  return r._id !== _id;
+                })
+              };
+            });
+            _context3.next = 7;
+            break;
+
+          case 5:
+            _context3.next = 7;
+            return revoke(documentOrIndex, sharingId, memberIndex);
+
+          case 7:
+          case "end":
+            return _context3.stop();
+        }
+      }, _callee3);
+    }));
+
+    return function onRevoke(_x, _x2, _x3) {
+      return _ref4.apply(this, arguments);
+    };
+  }();
 
-  var recipients = formatRecipients(federatedRecipients);
+  var existingRecipients = existingDocument ? getRecipients(existingDocument._id) : [];
+  var recipients = [].concat(_toConsumableArray(existingRecipients), _toConsumableArray(formatRecipients(federatedRecipients)));
   var modalTitle = t('FederatedFolder.shareTitle', {
     name: folderName
   });
@@ -189,7 +221,7 @@ export var FederatedFolderModal = withLocales(function (_ref) {
     },
     recipients: recipients,
     readOnlyRecipients: federatedRecipients.readOnlyRecipients,
-    currentRecipients: [],
+    currentRecipients: existingRecipients,
     onRevoke: onRevoke,
     onSetType: onSetType,
     onSend: onSend,

package/dist/components/FederatedFolder/FederatedFolderModal.spec.js

@@ -7,7 +7,9 @@ import { createMockClient } from 'cozy-client';
 import { FederatedFolderModal } from './FederatedFolderModal';
 import AppLike from '../SharingBanner/test/AppLike';
 var mockShare = jest.fn();
+var mockRevoke = jest.fn();
 var mockGetSharingLink = jest.fn();
+var mockGetRecipients = jest.fn().mockReturnValue([]);
 var mockShowAlert = jest.fn();
 var mockOnClose = jest.fn();
 jest.mock('../../hooks/useSharingContext', function () {
@@ -15,8 +17,10 @@ jest.mock('../../hooks/useSharingContext', function () {
     useSharingContext: function useSharingContext() {
       return {
         share: mockShare,
+        revoke: mockRevoke,
         getSharingLink: mockGetSharingLink,
-        getDocumentPermissions: jest.fn().mockReturnValue([])
+        getDocumentPermissions: jest.fn().mockReturnValue([]),
+        getRecipients: mockGetRecipients
       };
     }
   };
@@ -91,6 +95,13 @@ jest.mock('./DumbFederatedFolderModal', function () {
           return onRevoke('virtual-shared-drive-sharing-r1');
         }
       }, "Revoke"), /*#__PURE__*/React.createElement("button", {
+        "data-testid": "btn-revoke-existing",
+        onClick: function onClick() {
+          return onRevoke({
+            _id: 'folder-123'
+          }, 'abc', 1);
+        }
+      }, "Revoke Existing"), /*#__PURE__*/React.createElement("button", {
         "data-testid": "btn-close",
         onClick: onClose
       }, "Close"), /*#__PURE__*/React.createElement("button", {
@@ -150,6 +161,7 @@ describe('FederatedFolderModal', function () {
   beforeEach(function () {
     jest.clearAllMocks();
     mockGetSharingLink.mockReturnValue('https://example.com/share/abc123');
+    mockGetRecipients.mockReturnValue([]);
     client = createTestClient();
     sharingContextValue = createSharingContextValue();
   });
@@ -511,22 +523,109 @@ describe('FederatedFolderModal', function () {
       }, _callee12);
     })));
   });
-  describe('createContact callback', function () {
-    it('should call client.create when creating a contact', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee13() {
+  describe('existing recipients', function () {
+    var existingRecipients = [{
+      index: 'sharing-abc-member-0',
+      name: 'Charlie',
+      email: 'charlie@example.com',
+      status: 'owner',
+      type: 'two-way',
+      sharingId: 'abc',
+      memberIndex: 0
+    }, {
+      index: 'sharing-abc-member-1',
+      name: 'Diana',
+      email: 'diana@example.com',
+      status: 'ready',
+      type: 'one-way',
+      sharingId: 'abc',
+      memberIndex: 1
+    }];
+    it('should display existing recipients from getRecipients', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee13() {
       var _setup13, getByTestId;
 
       return _regeneratorRuntime.wrap(function _callee13$(_context13) {
         while (1) switch (_context13.prev = _context13.next) {
           case 0:
+            mockGetRecipients.mockReturnValue(existingRecipients);
             _setup13 = setup(), getByTestId = _setup13.getByTestId;
-            _context13.next = 3;
+            _context13.next = 4;
+            return waitFor(function () {
+              expect(getByTestId('recipients-count').textContent).toBe('2');
+            });
+
+          case 4:
+          case "end":
+            return _context13.stop();
+        }
+      }, _callee13);
+    })));
+    it('should pass existing recipients as currentRecipients', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee14() {
+      var _setup14, getByTestId;
+
+      return _regeneratorRuntime.wrap(function _callee14$(_context14) {
+        while (1) switch (_context14.prev = _context14.next) {
+          case 0:
+            mockGetRecipients.mockReturnValue(existingRecipients);
+            _setup14 = setup(), getByTestId = _setup14.getByTestId;
+            _context14.next = 4;
+            return waitFor(function () {
+              expect(getByTestId('recipients-count').textContent).toBe('2');
+            });
+
+          case 4:
+          case "end":
+            return _context14.stop();
+        }
+      }, _callee14);
+    })));
+    it('should call revoke for existing member', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee15() {
+      var _setup15, getByTestId;
+
+      return _regeneratorRuntime.wrap(function _callee15$(_context15) {
+        while (1) switch (_context15.prev = _context15.next) {
+          case 0:
+            mockGetRecipients.mockReturnValue(existingRecipients);
+            mockRevoke.mockResolvedValueOnce({});
+            _setup15 = setup(), getByTestId = _setup15.getByTestId;
+            _context15.next = 5;
+            return waitFor(function () {
+              expect(getByTestId('dumb-modal')).toBeTruthy();
+            });
+
+          case 5:
+            // Simulate revoke of an existing member (non-virtual-shared-drive index)
+            fireEvent.click(getByTestId('btn-revoke-existing'));
+            _context15.next = 8;
+            return waitFor(function () {
+              expect(mockRevoke).toHaveBeenCalledWith({
+                _id: 'folder-123'
+              }, 'abc', 1);
+            });
+
+          case 8:
+          case "end":
+            return _context15.stop();
+        }
+      }, _callee15);
+    })));
+  });
+  describe('createContact callback', function () {
+    it('should call client.create when creating a contact', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee16() {
+      var _setup16, getByTestId;
+
+      return _regeneratorRuntime.wrap(function _callee16$(_context16) {
+        while (1) switch (_context16.prev = _context16.next) {
+          case 0:
+            _setup16 = setup(), getByTestId = _setup16.getByTestId;
+            _context16.next = 3;
             return waitFor(function () {
               expect(getByTestId('btn-create-contact')).toBeTruthy();
             });
 
           case 3:
             fireEvent.click(getByTestId('btn-create-contact'));
-            _context13.next = 6;
+            _context16.next = 6;
             return waitFor(function () {
               expect(client.create).toHaveBeenCalledWith('io.cozy.contacts', {
                 email: 'test@example.com'
@@ -535,9 +634,9 @@ describe('FederatedFolderModal', function () {
 
           case 6:
           case "end":
-            return _context13.stop();
+            return _context16.stop();
         }
-      }, _callee13);
+      }, _callee16);
     })));
   });
 });

package/dist/components/ShareModal/ShareModal.js

@@ -14,7 +14,7 @@ import withLocales from '../../hoc/withLocales';
 import { useSharingContext } from '../../hooks/useSharingContext';
 import { FederatedFolderModal } from '../FederatedFolder/FederatedFolderModal';
 export var ShareModal = withLocales(function (props) {
-  var _location$state, _byDocId$document$id;
+  var _location$state;
 
   var location = useLocation === null || useLocation === void 0 ? void 0 : useLocation();
   var locationProps = location === null || location === void 0 || (_location$state = location.state) === null || _location$state === void 0 ? void 0 : _location$state.modalProps;
@@ -59,12 +59,8 @@ export var ShareModal = withLocales(function (props) {
   }();
 
   var isFederatedMode = flag('drive.federated-shared-folder.enabled');
-  var hasSharings = ((_byDocId$document$id = byDocId[document.id]) === null || _byDocId$document$id === void 0 || (_byDocId$document$id = _byDocId$document$id.sharings) === null || _byDocId$document$id === void 0 ? void 0 : _byDocId$document$id.length) > 0; // In federated mode, show FederatedFolderModal for unshared documents (sharing an existing folder).
-  // When isFederatedMode && hasSharings is true, we intentionally fall through to the legacy
-  // modals (EditableSharingModal / SharingDetailsModal) because federated-shared folders are
-  // handled by those components.
 
-  if (isFederatedMode && allLoaded && !hasSharings) {
+  if (isFederatedMode && allLoaded) {
     return /*#__PURE__*/React.createElement(FederatedFolderModal, {
       document: document,
       onClose: rest.onClose

package/dist/components/SharingBanner/components/PublicBanner.js

@@ -123,6 +123,12 @@ var SharingBannerByLink = function SharingBannerByLink(_ref3) {
       t = _useI18n4.t;
 
   var HOME_LINK_HREF = flag('signup.url');
+  var canNotCreateTwakeFromPublicSharingLink = flag('drive.twake-creation-from-public-sharing.disabled');
+
+  if (canNotCreateTwakeFromPublicSharingLink) {
+    return null;
+  }
+
   return /*#__PURE__*/React.createElement(Banner, {
     bgcolor: "var(--defaultBackgroundColor)",
     text: /*#__PURE__*/React.createElement(SharingBannerByLinkText, null),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-sharing",
-  "version": "28.7.0",
+  "version": "28.9.0",
   "description": "Provides sharing login for React applications.",
   "main": "dist/index.js",
   "author": "Cozy",
@@ -83,5 +83,5 @@
   "sideEffects": [
     "*.css"
   ],
-  "gitHead": "421077ecc24c9a15a3a1c22d9c3442917292f8ba"
+  "gitHead": "53934e510ce08e3066a3b6aad6d9bb05778dede8"
 }

package/src/components/FederatedFolder/FederatedFolderModal.jsx

@@ -25,7 +25,9 @@ export const FederatedFolderModal = withLocales(
       getFederatedShareLink,
       getDocumentPermissions,
       getOwner,
-      getSharingById
+      getSharingById,
+      getRecipients,
+      revoke
     } = useSharingContext()
     const { showAlert } = useAlert()
 
@@ -107,18 +109,29 @@ export const FederatedFolderModal = withLocales(
       }
     }
 
-    const onRevoke = index => {
-      const _id = index.split(RECIPIENT_INDEX_PREFIX)[1]
-
-      setFederatedRecipients(prev => {
-        return {
+    const onRevoke = async (documentOrIndex, sharingId, memberIndex) => {
+      if (
+        typeof documentOrIndex === 'string' &&
+        documentOrIndex.startsWith(RECIPIENT_INDEX_PREFIX)
+      ) {
+        const _id = documentOrIndex.split(RECIPIENT_INDEX_PREFIX)[1]
+        setFederatedRecipients(prev => ({
           recipients: prev.recipients.filter(r => r._id !== _id),
           readOnlyRecipients: prev.readOnlyRecipients.filter(r => r._id !== _id)
-        }
-      })
+        }))
+      } else {
+        await revoke(documentOrIndex, sharingId, memberIndex)
+      }
     }
 
-    const recipients = formatRecipients(federatedRecipients)
+    const existingRecipients = existingDocument
+      ? getRecipients(existingDocument._id)
+      : []
+
+    const recipients = [
+      ...existingRecipients,
+      ...formatRecipients(federatedRecipients)
+    ]
 
     const modalTitle = t('FederatedFolder.shareTitle', { name: folderName })
 
@@ -131,7 +144,7 @@ export const FederatedFolderModal = withLocales(
         createContact={contact => client.create('io.cozy.contacts', contact)}
         recipients={recipients}
         readOnlyRecipients={federatedRecipients.readOnlyRecipients}
-        currentRecipients={[]}
+        currentRecipients={existingRecipients}
         onRevoke={onRevoke}
         onSetType={onSetType}
         onSend={onSend}

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

@@ -7,15 +7,19 @@ import { FederatedFolderModal } from './FederatedFolderModal'
 import AppLike from '../SharingBanner/test/AppLike'
 
 const mockShare = jest.fn()
+const mockRevoke = jest.fn()
 const mockGetSharingLink = jest.fn()
+const mockGetRecipients = jest.fn().mockReturnValue([])
 const mockShowAlert = jest.fn()
 const mockOnClose = jest.fn()
 
 jest.mock('../../hooks/useSharingContext', () => ({
   useSharingContext: () => ({
     share: mockShare,
+    revoke: mockRevoke,
     getSharingLink: mockGetSharingLink,
-    getDocumentPermissions: jest.fn().mockReturnValue([])
+    getDocumentPermissions: jest.fn().mockReturnValue([]),
+    getRecipients: mockGetRecipients
   })
 }))
 
@@ -79,6 +83,12 @@ jest.mock('./DumbFederatedFolderModal', () => ({
       >
         Revoke
       </button>
+      <button
+        data-testid="btn-revoke-existing"
+        onClick={() => onRevoke({ _id: 'folder-123' }, 'abc', 1)}
+      >
+        Revoke Existing
+      </button>
       <button data-testid="btn-close" onClick={onClose}>
         Close
       </button>
@@ -135,6 +145,7 @@ describe('FederatedFolderModal', () => {
   beforeEach(() => {
     jest.clearAllMocks()
     mockGetSharingLink.mockReturnValue('https://example.com/share/abc123')
+    mockGetRecipients.mockReturnValue([])
     client = createTestClient()
     sharingContextValue = createSharingContextValue()
   })
@@ -356,6 +367,64 @@ describe('FederatedFolderModal', () => {
     })
   })
 
+  describe('existing recipients', () => {
+    const existingRecipients = [
+      {
+        index: 'sharing-abc-member-0',
+        name: 'Charlie',
+        email: 'charlie@example.com',
+        status: 'owner',
+        type: 'two-way',
+        sharingId: 'abc',
+        memberIndex: 0
+      },
+      {
+        index: 'sharing-abc-member-1',
+        name: 'Diana',
+        email: 'diana@example.com',
+        status: 'ready',
+        type: 'one-way',
+        sharingId: 'abc',
+        memberIndex: 1
+      }
+    ]
+
+    it('should display existing recipients from getRecipients', async () => {
+      mockGetRecipients.mockReturnValue(existingRecipients)
+      const { getByTestId } = setup()
+
+      await waitFor(() => {
+        expect(getByTestId('recipients-count').textContent).toBe('2')
+      })
+    })
+
+    it('should pass existing recipients as currentRecipients', async () => {
+      mockGetRecipients.mockReturnValue(existingRecipients)
+      const { getByTestId } = setup()
+
+      await waitFor(() => {
+        expect(getByTestId('recipients-count').textContent).toBe('2')
+      })
+    })
+
+    it('should call revoke for existing member', async () => {
+      mockGetRecipients.mockReturnValue(existingRecipients)
+      mockRevoke.mockResolvedValueOnce({})
+      const { getByTestId } = setup()
+
+      await waitFor(() => {
+        expect(getByTestId('dumb-modal')).toBeTruthy()
+      })
+
+      // Simulate revoke of an existing member (non-virtual-shared-drive index)
+      fireEvent.click(getByTestId('btn-revoke-existing'))
+
+      await waitFor(() => {
+        expect(mockRevoke).toHaveBeenCalledWith({ _id: 'folder-123' }, 'abc', 1)
+      })
+    })
+  })
+
   describe('createContact callback', () => {
     it('should call client.create when creating a contact', async () => {
       const { getByTestId } = setup()

package/src/components/ShareModal/ShareModal.jsx

@@ -35,13 +35,7 @@ export const ShareModal = withLocales(props => {
   }
 
   const isFederatedMode = flag('drive.federated-shared-folder.enabled')
-  const hasSharings = byDocId[document.id]?.sharings?.length > 0
-
-  // In federated mode, show FederatedFolderModal for unshared documents (sharing an existing folder).
-  // When isFederatedMode && hasSharings is true, we intentionally fall through to the legacy
-  // modals (EditableSharingModal / SharingDetailsModal) because federated-shared folders are
-  // handled by those components.
-  if (isFederatedMode && allLoaded && !hasSharings) {
+  if (isFederatedMode && allLoaded) {
     return <FederatedFolderModal document={document} onClose={rest.onClose} />
   }
 

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

@@ -113,6 +113,13 @@ const SharingBannerByLink = ({ onClose }) => {
   const { t } = useI18n()
 
   const HOME_LINK_HREF = flag('signup.url')
+  const canNotCreateTwakeFromPublicSharingLink = flag(
+    'drive.twake-creation-from-public-sharing.disabled'
+  )
+
+  if (canNotCreateTwakeFromPublicSharingLink) {
+    return null
+  }
 
   return (
     <Banner