cozy-sharing 34.1.0 → 34.1.2

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.
 
+## [34.1.2](https://github.com/cozy/cozy-libs/compare/cozy-sharing@34.1.1...cozy-sharing@34.1.2) (2026-06-25)
+
+### Bug Fixes
+
+- **sharing:** Call self revoke for federated recipients ([25e62c2](https://github.com/cozy/cozy-libs/commit/25e62c2416e4b91bdab1e06fbbd77b00574a0b11))
+
+## [34.1.1](https://github.com/cozy/cozy-libs/compare/cozy-sharing@34.1.0...cozy-sharing@34.1.1) (2026-06-25)
+
+### Bug Fixes
+
+- **federated:** Show correct recipients for files inside shared folder ([b656e73](https://github.com/cozy/cozy-libs/commit/b656e73240a30303c8063494ee052a197736d07c))
+
 # [34.1.0](https://github.com/cozy/cozy-libs/compare/cozy-sharing@34.0.2...cozy-sharing@34.1.0) (2026-06-25)
 
 ### Features

package/dist/components/FederatedFolder/FederatedFolderModal.js

@@ -15,6 +15,7 @@ import { getOrCreateFromArray } from '../../helpers/contacts';
 import withLocales from '../../hoc/withLocales';
 import { usePendingRecipients } from '../../hooks/usePendingRecipients';
 import { useSharingContext } from '../../hooks/useSharingContext';
+import { getRecipientsFromSharing } from '../../state';
 var styles = {
   "share-modal-content": "share__share-modal-content___1iqEq",
   "coz-form": "share__coz-form___1ICST",
@@ -40,9 +41,10 @@ import WhoHasAccess from '../WhoHasAccess';
 var log = minilog('FederatedFolderModal');
 
 var FederatedFolderModalContent = function FederatedFolderModalContent(_ref) {
-  var _sharedDriveSharing$a;
+  var _sharedDriveSharing$a, _sharedDriveSharing$a2;
 
   var onClose = _ref.onClose,
+      onRevokeSuccess = _ref.onRevokeSuccess,
       existingDocument = _ref.document,
       autoOpenShareRestriction = _ref.autoOpenShareRestriction,
       showGenerateLinkButton = _ref.showGenerateLinkButton;
@@ -59,9 +61,12 @@ var FederatedFolderModalContent = function FederatedFolderModalContent(_ref) {
       getDocumentPermissions = _useSharingContext.getDocumentPermissions,
       fetchSharedDriveSharingLinks = _useSharingContext.fetchSharedDriveSharingLinks,
       getRecipients = _useSharingContext.getRecipients,
+      getSharedParentPath = _useSharingContext.getSharedParentPath,
       hasSharedChild = _useSharingContext.hasSharedChild,
       hasSharedParent = _useSharingContext.hasSharedParent,
-      revoke = _useSharingContext.revoke;
+      isOwner = _useSharingContext.isOwner,
+      revoke = _useSharingContext.revoke,
+      revokeSelf = _useSharingContext.revokeSelf;
 
   var _useAlert = useAlert(),
       showAlert = _useAlert.showAlert;
@@ -220,10 +225,83 @@ var FederatedFolderModalContent = function FederatedFolderModalContent(_ref) {
     };
   }();
 
-  var documentId = (existingDocument === null || existingDocument === void 0 ? void 0 : existingDocument._id) || (existingDocument === null || existingDocument === void 0 ? void 0 : existingDocument.id);
-  var existingRecipients = documentId ? getRecipients(documentId) : [];
+  var documentId = (existingDocument === null || existingDocument === void 0 ? void 0 : existingDocument._id) || (existingDocument === null || existingDocument === void 0 ? void 0 : existingDocument.id); // Owner case: when document is inside a shared folder (via path) but has no driveId,
+  // find the parent shared folder to use its _id for recipient/permission lookups.
+
+  var sharedParentPath = !sharedDriveSharing && hasSharedParentByPath && documentPath ? getSharedParentPath(documentPath) : null;
+
+  var _useState11 = useState(null),
+      _useState12 = _slicedToArray(_useState11, 2),
+      sharedParentFolder = _useState12[0],
+      setSharedParentFolder = _useState12[1];
+
+  useEffect(function () {
+    if (!sharedParentPath) return;
+
+    var fetchParentFolder = /*#__PURE__*/function () {
+      var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
+        var res;
+        return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
+            case 0:
+              _context2.prev = 0;
+              _context2.next = 3;
+              return client.collection('io.cozy.files').statByPath(sharedParentPath);
+
+            case 3:
+              res = _context2.sent;
+              if (res.data) setSharedParentFolder(res.data);
+              _context2.next = 10;
+              break;
+
+            case 7:
+              _context2.prev = 7;
+              _context2.t0 = _context2["catch"](0);
+              log.error('Failed to fetch shared parent folder', _context2.t0);
+
+            case 10:
+            case "end":
+              return _context2.stop();
+          }
+        }, _callee2, null, [[0, 7]]);
+      }));
+
+      return function fetchParentFolder() {
+        return _ref3.apply(this, arguments);
+      };
+    }();
+
+    fetchParentFolder();
+  }, [sharedParentPath, client]);
+  var sharingReferenceId = !sharedDriveSharing && sharedParentFolder !== null && sharedParentFolder !== void 0 && sharedParentFolder._id ? sharedParentFolder._id : documentId;
+  var existingRecipients = sharedDriveSharing !== null && sharedDriveSharing !== void 0 && (_sharedDriveSharing$a2 = sharedDriveSharing.attributes) !== null && _sharedDriveSharing$a2 !== void 0 && _sharedDriveSharing$a2.members && documentId ? getRecipientsFromSharing(sharedDriveSharing, documentId) : sharingReferenceId ? getRecipients(sharingReferenceId) : [];
   var documentPermissions = documentId ? getDocumentPermissions(documentId) : [];
   var displayedLink = existingDocument !== null && existingDocument !== void 0 && existingDocument.driveId ? getFederatedShareLink(existingDocument) : getSharingLink(existingDocument === null || existingDocument === void 0 ? void 0 : existingDocument._id);
+  var isCurrentUserOwner = documentId ? isOwner(documentId) : false;
+
+  var handleRevokeSelf = /*#__PURE__*/function () {
+    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(document) {
+      return _regeneratorRuntime.wrap(function _callee3$(_context3) {
+        while (1) switch (_context3.prev = _context3.next) {
+          case 0:
+            _context3.next = 2;
+            return revokeSelf(document);
+
+          case 2:
+            onRevokeSuccess === null || onRevokeSuccess === void 0 || onRevokeSuccess(document);
+
+          case 3:
+          case "end":
+            return _context3.stop();
+        }
+      }, _callee3);
+    }));
+
+    return function handleRevokeSelf(_x) {
+      return _ref4.apply(this, arguments);
+    };
+  }();
+
   useEffect(function () {
     if (!(existingDocument !== null && existingDocument !== void 0 && existingDocument.driveId)) return;
     if (!documentId) return;
@@ -233,39 +311,39 @@ var FederatedFolderModalContent = function FederatedFolderModalContent(_ref) {
     if (fetchedSharingLinksDocumentId === documentId) return;
 
     var fetchSharingLinks = /*#__PURE__*/function () {
-      var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
-        return _regeneratorRuntime.wrap(function _callee2$(_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
+      var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4() {
+        return _regeneratorRuntime.wrap(function _callee4$(_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
             case 0:
               setIsFetchingSharingLinks(true);
-              _context2.prev = 1;
-              _context2.next = 4;
+              _context4.prev = 1;
+              _context4.next = 4;
               return fetchSharedDriveSharingLinks(existingDocument);
 
             case 4:
-              _context2.next = 9;
+              _context4.next = 9;
               break;
 
             case 6:
-              _context2.prev = 6;
-              _context2.t0 = _context2["catch"](1);
-              log.error('Failed to fetch shared drive sharing links', _context2.t0);
+              _context4.prev = 6;
+              _context4.t0 = _context4["catch"](1);
+              log.error('Failed to fetch shared drive sharing links', _context4.t0);
 
             case 9:
-              _context2.prev = 9;
+              _context4.prev = 9;
               setFetchedSharingLinksDocumentId(documentId);
               setIsFetchingSharingLinks(false);
-              return _context2.finish(9);
+              return _context4.finish(9);
 
             case 13:
             case "end":
-              return _context2.stop();
+              return _context4.stop();
           }
-        }, _callee2, null, [[1, 6, 9, 13]]);
+        }, _callee4, null, [[1, 6, 9, 13]]);
       }));
 
       return function fetchSharingLinks() {
-        return _ref3.apply(this, arguments);
+        return _ref5.apply(this, arguments);
       };
     }();
 
@@ -310,13 +388,14 @@ var FederatedFolderModalContent = function FederatedFolderModalContent(_ref) {
       onSelectedOptionChange: setSelectedOption,
       enableCreateContact: true
     }))), /*#__PURE__*/React.createElement(WhoHasAccess, {
-      isOwner: true,
+      isOwner: isCurrentUserOwner,
       isSharedDrive: true,
       recipients: isSending ? frozenRecipients : existingRecipients,
       document: isSending ? frozenDoc : existingDocument,
       documentType: "Files",
       className: styles['share-dialog-members'],
       onRevoke: revoke,
+      onRevokeSelf: handleRevokeSelf,
       link: displayedLink
     })),
     actions: /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ShareByLink, {
@@ -339,6 +418,7 @@ export var FederatedFolderModal = withLocales(function (props) {
 });
 FederatedFolderModal.propTypes = {
   onClose: PropTypes.func.isRequired,
+  onRevokeSuccess: PropTypes.func,
   document: PropTypes.object.isRequired,
   autoOpenShareRestriction: PropTypes.bool,
   showGenerateLinkButton: PropTypes.bool

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

@@ -1,12 +1,12 @@
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _extends from "@babel/runtime/helpers/extends";
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
-import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { act, fireEvent, render, waitFor } from '@testing-library/react';
 import React from 'react';
 import { createMockClient } from 'cozy-client';
@@ -17,6 +17,8 @@ import AppLike from '../SharingBanner/test/AppLike';
 var mockShare = jest.fn();
 var mockShareByLink = jest.fn();
 var mockRevoke = jest.fn();
+var mockRevokeSelf = jest.fn();
+var mockIsOwner = jest.fn();
 var mockGetSharingLink = jest.fn();
 var mockGetFederatedShareLink = jest.fn();
 var mockGetRecipients = jest.fn().mockReturnValue([]);
@@ -34,12 +36,15 @@ jest.mock('../../hooks/useSharingContext', function () {
         share: mockShare,
         shareByLink: mockShareByLink,
         revoke: mockRevoke,
+        revokeSelf: mockRevokeSelf,
+        isOwner: mockIsOwner,
         getSharingLink: mockGetSharingLink,
         getFederatedShareLink: mockGetFederatedShareLink,
         getDocumentPermissions: mockGetDocumentPermissions,
         fetchSharedDriveSharingLinks: mockFetchSharedDriveSharingLinks,
         getOwner: jest.fn(),
         getRecipients: mockGetRecipients,
+        getSharedParentPath: jest.fn().mockReturnValue(null),
         getSharingById: mockGetSharingById,
         hasSharedChild: mockHasSharedChild,
         hasSharedParent: mockHasSharedParent
@@ -122,6 +127,9 @@ describe('FederatedFolderModal', function () {
   var sharingContextValue;
   beforeEach(function () {
     jest.clearAllMocks();
+    mockRevoke.mockResolvedValue();
+    mockRevokeSelf.mockResolvedValue();
+    mockIsOwner.mockReturnValue(false);
     mockGetDocumentPermissions.mockReturnValue([]);
     mockFetchSharedDriveSharingLinks.mockResolvedValue([]);
     mockGetSharingLink.mockReturnValue('https://example.com/share/abc123');
@@ -146,6 +154,9 @@ describe('FederatedFolderModal', function () {
       }
     });
     client = createTestClient();
+    client.options = _objectSpread(_objectSpread({}, client.options), {}, {
+      uri: 'https://me.mycozy.cloud'
+    });
     sharingContextValue = createSharingContextValue();
     usePendingRecipients.mockReturnValue({
       pendingRecipients: [],
@@ -672,35 +683,76 @@ describe('FederatedFolderModal', function () {
       }, _callee18);
     })));
   });
-  describe('onClose callback', function () {
-    it('should call onClose when close button is clicked', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee19() {
-      var _setup16, findByRole, closeButton;
+  describe('onRevoke callback', function () {
+    var currentUserRecipient = {
+      instance: 'https://me.mycozy.cloud',
+      memberIndex: 1,
+      sharingId: 'sharing-id',
+      type: 'two-way'
+    };
+    it('should call onRevokeSelf and onRevokeSuccess when the current user is revoked', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee19() {
+      var onRevokeSuccess, _setup16, findByLabelText;
 
       return _regeneratorRuntime.wrap(function _callee19$(_context19) {
         while (1) switch (_context19.prev = _context19.next) {
           case 0:
-            _setup16 = setup(), findByRole = _setup16.findByRole;
-            _context19.next = 3;
+            onRevokeSuccess = jest.fn();
+            mockGetRecipients.mockReturnValue([currentUserRecipient]);
+            _setup16 = setup({
+              onRevokeSuccess: onRevokeSuccess
+            }), findByLabelText = _setup16.findByLabelText;
+            _context19.t0 = fireEvent;
+            _context19.next = 6;
+            return findByLabelText('Remove from sharing');
+
+          case 6:
+            _context19.t1 = _context19.sent;
+
+            _context19.t0.click.call(_context19.t0, _context19.t1);
+
+            _context19.next = 10;
+            return waitFor(function () {
+              expect(mockRevokeSelf).toHaveBeenCalledWith(mockDocument);
+              expect(mockRevoke).not.toHaveBeenCalled();
+              expect(onRevokeSuccess).toHaveBeenCalledWith(mockDocument);
+            });
+
+          case 10:
+          case "end":
+            return _context19.stop();
+        }
+      }, _callee19);
+    })));
+  });
+  describe('onClose callback', function () {
+    it('should call onClose when close button is clicked', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee20() {
+      var _setup17, findByRole, closeButton;
+
+      return _regeneratorRuntime.wrap(function _callee20$(_context20) {
+        while (1) switch (_context20.prev = _context20.next) {
+          case 0:
+            _setup17 = setup(), findByRole = _setup17.findByRole;
+            _context20.next = 3;
             return findByRole('button', {
               name: /close/i
             });
 
           case 3:
-            closeButton = _context19.sent;
+            closeButton = _context20.sent;
             fireEvent.click(closeButton);
             expect(mockOnClose).toHaveBeenCalled();
 
           case 6:
           case "end":
-            return _context19.stop();
+            return _context20.stop();
         }
-      }, _callee19);
+      }, _callee20);
     })));
-    it('should ask confirmation when close button is clicked with pending recipients', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee20() {
-      var _setup17, getByRole, findByRole, getByText, closeButton;
+    it('should ask confirmation when close button is clicked with pending recipients', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee21() {
+      var _setup18, getByRole, findByRole, getByText, closeButton;
 
-      return _regeneratorRuntime.wrap(function _callee20$(_context20) {
-        while (1) switch (_context20.prev = _context20.next) {
+      return _regeneratorRuntime.wrap(function _callee21$(_context21) {
+        while (1) switch (_context21.prev = _context21.next) {
           case 0:
             usePendingRecipients.mockReturnValue({
               pendingRecipients: [{
@@ -711,14 +763,14 @@ describe('FederatedFolderModal', function () {
               selectedOption: 'readWrite',
               setSelectedOption: jest.fn()
             });
-            _setup17 = setup(), getByRole = _setup17.getByRole, findByRole = _setup17.findByRole, getByText = _setup17.getByText;
-            _context20.next = 4;
+            _setup18 = setup(), getByRole = _setup18.getByRole, findByRole = _setup18.findByRole, getByText = _setup18.getByText;
+            _context21.next = 4;
             return findByRole('button', {
               name: /close/i
             });
 
           case 4:
-            closeButton = _context20.sent;
+            closeButton = _context21.sent;
             fireEvent.click(closeButton);
             expect(getByText("Discard the changes you haven't saved?")).toBeTruthy();
             expect(mockOnClose).not.toHaveBeenCalled();
@@ -729,15 +781,15 @@ describe('FederatedFolderModal', function () {
 
           case 10:
           case "end":
-            return _context20.stop();
+            return _context21.stop();
         }
-      }, _callee20);
+      }, _callee21);
     })));
-    it('should close after discard confirmation', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee21() {
-      var _setup18, getByRole, findByRole, getByText, closeButton;
+    it('should close after discard confirmation', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee22() {
+      var _setup19, getByRole, findByRole, getByText, closeButton;
 
-      return _regeneratorRuntime.wrap(function _callee21$(_context21) {
-        while (1) switch (_context21.prev = _context21.next) {
+      return _regeneratorRuntime.wrap(function _callee22$(_context22) {
+        while (1) switch (_context22.prev = _context22.next) {
           case 0:
             usePendingRecipients.mockReturnValue({
               pendingRecipients: [{
@@ -748,14 +800,14 @@ describe('FederatedFolderModal', function () {
               selectedOption: 'readWrite',
               setSelectedOption: jest.fn()
             });
-            _setup18 = setup(), getByRole = _setup18.getByRole, findByRole = _setup18.findByRole, getByText = _setup18.getByText;
-            _context21.next = 4;
+            _setup19 = setup(), getByRole = _setup19.getByRole, findByRole = _setup19.findByRole, getByText = _setup19.getByText;
+            _context22.next = 4;
             return findByRole('button', {
               name: /close/i
             });
 
           case 4:
-            closeButton = _context21.sent;
+            closeButton = _context22.sent;
             fireEvent.click(closeButton);
             expect(getByText("Discard the changes you haven't saved?")).toBeTruthy();
             fireEvent.click(getByRole('button', {
@@ -765,9 +817,9 @@ describe('FederatedFolderModal', function () {
 
           case 9:
           case "end":
-            return _context21.stop();
+            return _context22.stop();
         }
-      }, _callee21);
+      }, _callee22);
     })));
   });
 });

package/dist/components/Recipient/MemberRecipientPermissions.js

@@ -20,6 +20,8 @@ var log = minilog('MemberRecipientPermissions');
 
 var MemberRecipientPermissions = function MemberRecipientPermissions(_ref) {
   var isOwner = _ref.isOwner,
+      _ref$canManageSharing = _ref.canManageSharing,
+      canManageSharing = _ref$canManageSharing === void 0 ? isOwner : _ref$canManageSharing,
       isReadOnly = _ref.isReadOnly,
       status = _ref.status,
       instance = _ref.instance,
@@ -54,7 +56,7 @@ var MemberRecipientPermissions = function MemberRecipientPermissions(_ref) {
 
   var instanceMatchesClient = instance !== undefined && instance === client.options.uri;
   var contactIsOwner = status === 'owner';
-  var shouldShowMenu = !isReadOnly && !revoking && !contactIsOwner && (instanceMatchesClient && !isOwner || isOwner);
+  var shouldShowMenu = !isReadOnly && !revoking && !contactIsOwner && (instanceMatchesClient && !isOwner || canManageSharing);
   var toggleMenu = useCallback(function () {
     setMenuDisplayed(function (displayed) {
       return !displayed;
@@ -70,13 +72,13 @@ var MemberRecipientPermissions = function MemberRecipientPermissions(_ref) {
           setRevoking(true);
           _context.prev = 1;
 
-          if (!isOwner) {
+          if (!(instanceMatchesClient && !isOwner)) {
             _context.next = 7;
             break;
           }
 
           _context.next = 5;
-          return onRevoke(document, sharingId, memberIndex);
+          return onRevokeSelf(document);
 
         case 5:
           _context.next = 9;
@@ -84,7 +86,7 @@ var MemberRecipientPermissions = function MemberRecipientPermissions(_ref) {
 
         case 7:
           _context.next = 9;
-          return onRevokeSelf(document);
+          return onRevoke(document, sharingId, memberIndex);
 
         case 9:
           _context.prev = 9;
@@ -96,7 +98,7 @@ var MemberRecipientPermissions = function MemberRecipientPermissions(_ref) {
           return _context.stop();
       }
     }, _callee, null, [[1,, 9, 12]]);
-  })), [isOwner, onRevoke, onRevokeSelf, document, sharingId, memberIndex]);
+  })), [document, instanceMatchesClient, isOwner, memberIndex, onRevoke, onRevokeSelf, sharingId]);
   var setType = useCallback( /*#__PURE__*/function () {
     var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(newType) {
       return _regeneratorRuntime.wrap(function _callee2$(_context2) {

package/dist/components/Recipient/RecipientList.js

@@ -9,6 +9,7 @@ var RecipientList = function RecipientList(_ref) {
   var recipients = _ref.recipients,
       recipientsToBeConfirmed = _ref.recipientsToBeConfirmed,
       isOwner = _ref.isOwner,
+      canManageSharing = _ref.canManageSharing,
       isSharedDrive = _ref.isSharedDrive,
       isReadOnly = _ref.isReadOnly,
       document = _ref.document,
@@ -40,6 +41,7 @@ var RecipientList = function RecipientList(_ref) {
     return /*#__PURE__*/React.createElement(MemberRecipient, _extends({}, recipient, {
       key: recipient.index,
       isOwner: isOwner,
+      canManageSharing: canManageSharing,
       isSharedDrive: isSharedDrive,
       isReadOnly: isReadOnly,
       document: document,

package/dist/components/ShareModal/ShareModal.js

@@ -63,7 +63,8 @@ export var ShareModal = withLocales(function (props) {
 
     if (isFederatedMode && allLoaded) {
       return /*#__PURE__*/React.createElement(FederatedFolderModal, _extends({
-        document: document
+        document: document,
+        onRevokeSuccess: onRevokeSuccess
       }, rest));
     }
 

package/dist/components/WhoHasAccess.js

@@ -30,6 +30,8 @@ var RecipientWaitingForConfirmationAlert = function RecipientWaitingForConfirmat
 var WhoHasAccess = function WhoHasAccess(_ref2) {
   var _ref2$isOwner = _ref2.isOwner,
       isOwner = _ref2$isOwner === void 0 ? false : _ref2$isOwner,
+      _ref2$canManageSharin = _ref2.canManageSharing,
+      canManageSharing = _ref2$canManageSharin === void 0 ? isOwner : _ref2$canManageSharin,
       _ref2$isSharedDrive = _ref2.isSharedDrive,
       isSharedDrive = _ref2$isSharedDrive === void 0 ? false : _ref2$isSharedDrive,
       _ref2$isReadOnly = _ref2.isReadOnly,
@@ -68,6 +70,7 @@ var WhoHasAccess = function WhoHasAccess(_ref2) {
     recipients: recipients,
     recipientsToBeConfirmed: recipientsToBeConfirmed,
     isOwner: isOwner,
+    canManageSharing: canManageSharing,
     isSharedDrive: isSharedDrive,
     isReadOnly: isReadOnly,
     document: document,
@@ -81,6 +84,7 @@ var WhoHasAccess = function WhoHasAccess(_ref2) {
 
 WhoHasAccess.propTypes = {
   isOwner: PropTypes.bool,
+  canManageSharing: PropTypes.bool,
   showOwner: PropTypes.bool,
   recipients: PropTypes.array.isRequired,
   recipientsToBeConfirmed: PropTypes.arrayOf(PropTypes.shape({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-sharing",
-  "version": "34.1.0",
+  "version": "34.1.2",
   "description": "Provides sharing login for React applications.",
   "main": "dist/index.js",
   "author": "Cozy",
@@ -85,5 +85,5 @@
   "sideEffects": [
     "*.css"
   ],
-  "gitHead": "4e29033c8179810abb9897d1a9d6b90446c53f47"
+  "gitHead": "3f975f8efa4061617d6fa5df190f1cbb83170f09"
 }

package/src/components/FederatedFolder/FederatedFolderModal.jsx

@@ -16,6 +16,7 @@ import { getOrCreateFromArray } from '../../helpers/contacts'
 import withLocales from '../../hoc/withLocales'
 import { usePendingRecipients } from '../../hooks/usePendingRecipients'
 import { useSharingContext } from '../../hooks/useSharingContext'
+import { getRecipientsFromSharing } from '../../state'
 import styles from '../../styles/share.styl'
 import AntivirusAlert from '../AntivirusAlert'
 import { default as DumbShareByEmail } from '../ShareByEmail'
@@ -26,6 +27,7 @@ const log = minilog('FederatedFolderModal')
 
 const FederatedFolderModalContent = ({
   onClose,
+  onRevokeSuccess,
   document: existingDocument,
   autoOpenShareRestriction,
   showGenerateLinkButton
@@ -40,9 +42,12 @@ const FederatedFolderModalContent = ({
     getDocumentPermissions,
     fetchSharedDriveSharingLinks,
     getRecipients,
+    getSharedParentPath,
     hasSharedChild,
     hasSharedParent,
-    revoke
+    isOwner,
+    revoke,
+    revokeSelf
   } = useSharingContext()
   const { showAlert } = useAlert()
   const { showConfirmDialog, closeConfirmDialog } = useConfirmDialog()
@@ -178,13 +183,52 @@ const FederatedFolderModalContent = ({
   }
 
   const documentId = existingDocument?._id || existingDocument?.id
-  const existingRecipients = documentId ? getRecipients(documentId) : []
+  // Owner case: when document is inside a shared folder (via path) but has no driveId,
+  // find the parent shared folder to use its _id for recipient/permission lookups.
+  const sharedParentPath =
+    !sharedDriveSharing && hasSharedParentByPath && documentPath
+      ? getSharedParentPath(documentPath)
+      : null
+  const [sharedParentFolder, setSharedParentFolder] = useState(null)
+
+  useEffect(() => {
+    if (!sharedParentPath) return
+    const fetchParentFolder = async () => {
+      try {
+        const res = await client
+          .collection('io.cozy.files')
+          .statByPath(sharedParentPath)
+        if (res.data) setSharedParentFolder(res.data)
+      } catch (err) {
+        log.error('Failed to fetch shared parent folder', err)
+      }
+    }
+    fetchParentFolder()
+  }, [sharedParentPath, client])
+
+  const sharingReferenceId =
+    !sharedDriveSharing && sharedParentFolder?._id
+      ? sharedParentFolder._id
+      : documentId
+
+  const existingRecipients =
+    sharedDriveSharing?.attributes?.members && documentId
+      ? getRecipientsFromSharing(sharedDriveSharing, documentId)
+      : sharingReferenceId
+        ? getRecipients(sharingReferenceId)
+        : []
   const documentPermissions = documentId
     ? getDocumentPermissions(documentId)
     : []
   const displayedLink = existingDocument?.driveId
     ? getFederatedShareLink(existingDocument)
     : getSharingLink(existingDocument?._id)
+  const isCurrentUserOwner = documentId ? isOwner(documentId) : false
+
+  const handleRevokeSelf = async document => {
+    await revokeSelf(document)
+    onRevokeSuccess?.(document)
+  }
 
   useEffect(() => {
     if (!existingDocument?.driveId) return
@@ -278,13 +322,14 @@ const FederatedFolderModalContent = ({
             )}
           </div>
           <WhoHasAccess
-            isOwner
+            isOwner={isCurrentUserOwner}
             isSharedDrive
             recipients={isSending ? frozenRecipients : existingRecipients}
             document={isSending ? frozenDoc : existingDocument}
             documentType="Files"
             className={styles['share-dialog-members']}
             onRevoke={revoke}
+            onRevokeSelf={handleRevokeSelf}
             link={displayedLink}
           />
         </div>
@@ -320,6 +365,7 @@ export const FederatedFolderModal = withLocales(props => (
 
 FederatedFolderModal.propTypes = {
   onClose: PropTypes.func.isRequired,
+  onRevokeSuccess: PropTypes.func,
   document: PropTypes.object.isRequired,
   autoOpenShareRestriction: PropTypes.bool,
   showGenerateLinkButton: PropTypes.bool

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

@@ -11,6 +11,8 @@ import AppLike from '../SharingBanner/test/AppLike'
 const mockShare = jest.fn()
 const mockShareByLink = jest.fn()
 const mockRevoke = jest.fn()
+const mockRevokeSelf = jest.fn()
+const mockIsOwner = jest.fn()
 const mockGetSharingLink = jest.fn()
 const mockGetFederatedShareLink = jest.fn()
 const mockGetRecipients = jest.fn().mockReturnValue([])
@@ -27,12 +29,15 @@ jest.mock('../../hooks/useSharingContext', () => ({
     share: mockShare,
     shareByLink: mockShareByLink,
     revoke: mockRevoke,
+    revokeSelf: mockRevokeSelf,
+    isOwner: mockIsOwner,
     getSharingLink: mockGetSharingLink,
     getFederatedShareLink: mockGetFederatedShareLink,
     getDocumentPermissions: mockGetDocumentPermissions,
     fetchSharedDriveSharingLinks: mockFetchSharedDriveSharingLinks,
     getOwner: jest.fn(),
     getRecipients: mockGetRecipients,
+    getSharedParentPath: jest.fn().mockReturnValue(null),
     getSharingById: mockGetSharingById,
     hasSharedChild: mockHasSharedChild,
     hasSharedParent: mockHasSharedParent
@@ -100,6 +105,9 @@ describe('FederatedFolderModal', () => {
 
   beforeEach(() => {
     jest.clearAllMocks()
+    mockRevoke.mockResolvedValue()
+    mockRevokeSelf.mockResolvedValue()
+    mockIsOwner.mockReturnValue(false)
     mockGetDocumentPermissions.mockReturnValue([])
     mockFetchSharedDriveSharingLinks.mockResolvedValue([])
     mockGetSharingLink.mockReturnValue('https://example.com/share/abc123')
@@ -124,6 +132,10 @@ describe('FederatedFolderModal', () => {
       }
     })
     client = createTestClient()
+    client.options = {
+      ...client.options,
+      uri: 'https://me.mycozy.cloud'
+    }
     sharingContextValue = createSharingContextValue()
     usePendingRecipients.mockReturnValue({
       pendingRecipients: [],
@@ -437,6 +449,30 @@ describe('FederatedFolderModal', () => {
     })
   })
 
+  describe('onRevoke callback', () => {
+    const currentUserRecipient = {
+      instance: 'https://me.mycozy.cloud',
+      memberIndex: 1,
+      sharingId: 'sharing-id',
+      type: 'two-way'
+    }
+
+    it('should call onRevokeSelf and onRevokeSuccess when the current user is revoked', async () => {
+      const onRevokeSuccess = jest.fn()
+      mockGetRecipients.mockReturnValue([currentUserRecipient])
+
+      const { findByLabelText } = setup({ onRevokeSuccess })
+
+      fireEvent.click(await findByLabelText('Remove from sharing'))
+
+      await waitFor(() => {
+        expect(mockRevokeSelf).toHaveBeenCalledWith(mockDocument)
+        expect(mockRevoke).not.toHaveBeenCalled()
+        expect(onRevokeSuccess).toHaveBeenCalledWith(mockDocument)
+      })
+    })
+  })
+
   describe('onClose callback', () => {
     it('should call onClose when close button is clicked', async () => {
       const { findByRole } = setup()

package/src/components/Recipient/MemberRecipientPermissions.jsx

@@ -20,6 +20,7 @@ const log = minilog('MemberRecipientPermissions')
 
 const MemberRecipientPermissions = ({
   isOwner,
+  canManageSharing = isOwner,
   isReadOnly,
   status,
   instance,
@@ -46,7 +47,7 @@ const MemberRecipientPermissions = ({
     !isReadOnly &&
     !revoking &&
     !contactIsOwner &&
-    ((instanceMatchesClient && !isOwner) || isOwner)
+    ((instanceMatchesClient && !isOwner) || canManageSharing)
 
   const toggleMenu = useCallback(() => {
     setMenuDisplayed(displayed => !displayed)
@@ -58,15 +59,23 @@ const MemberRecipientPermissions = ({
   const handleRevocation = useCallback(async () => {
     setRevoking(true)
     try {
-      if (isOwner) {
-        await onRevoke(document, sharingId, memberIndex)
-      } else {
+      if (instanceMatchesClient && !isOwner) {
         await onRevokeSelf(document)
+      } else {
+        await onRevoke(document, sharingId, memberIndex)
       }
     } finally {
       setRevoking(false)
     }
-  }, [isOwner, onRevoke, onRevokeSelf, document, sharingId, memberIndex])
+  }, [
+    document,
+    instanceMatchesClient,
+    isOwner,
+    memberIndex,
+    onRevoke,
+    onRevokeSelf,
+    sharingId
+  ])
 
   const setType = useCallback(
     async newType => {

package/src/components/Recipient/RecipientList.jsx

@@ -9,6 +9,7 @@ const RecipientList = ({
   recipients,
   recipientsToBeConfirmed,
   isOwner,
+  canManageSharing,
   isSharedDrive,
   isReadOnly,
   document,
@@ -50,6 +51,7 @@ const RecipientList = ({
         {...recipient}
         key={recipient.index}
         isOwner={isOwner}
+        canManageSharing={canManageSharing}
         isSharedDrive={isSharedDrive}
         isReadOnly={isReadOnly}
         document={document}

package/src/components/ShareModal/ShareModal.jsx

@@ -38,7 +38,13 @@ export const ShareModal = withLocales(props => {
   if (isEditable) {
     const isFederatedMode = flag('drive.federated-shared-folder.enabled')
     if (isFederatedMode && allLoaded) {
-      return <FederatedFolderModal document={document} {...rest} />
+      return (
+        <FederatedFolderModal
+          document={document}
+          onRevokeSuccess={onRevokeSuccess}
+          {...rest}
+        />
+      )
     }
 
     return <EditableSharingModal document={document} {...rest} />

package/src/components/WhoHasAccess.jsx

@@ -28,6 +28,7 @@ const RecipientWaitingForConfirmationAlert = ({ recipientsToBeConfirmed }) => {
 
 const WhoHasAccess = ({
   isOwner = false,
+  canManageSharing = isOwner,
   isSharedDrive = false,
   isReadOnly = false,
   showOwner = true,
@@ -70,6 +71,7 @@ const WhoHasAccess = ({
           recipients={recipients}
           recipientsToBeConfirmed={recipientsToBeConfirmed}
           isOwner={isOwner}
+          canManageSharing={canManageSharing}
           isSharedDrive={isSharedDrive}
           isReadOnly={isReadOnly}
           document={document}
@@ -86,6 +88,7 @@ const WhoHasAccess = ({
 
 WhoHasAccess.propTypes = {
   isOwner: PropTypes.bool,
+  canManageSharing: PropTypes.bool,
   showOwner: PropTypes.bool,
   recipients: PropTypes.array.isRequired,
   recipientsToBeConfirmed: PropTypes.arrayOf(