cozy-sharing 34.1.0 → 34.1.1

package/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [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,7 +41,7 @@ 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,
       existingDocument = _ref.document,
@@ -59,6 +60,7 @@ 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;
@@ -220,8 +222,56 @@ 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);
   useEffect(function () {
@@ -233,39 +283,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 _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
+        return _regeneratorRuntime.wrap(function _callee3$(_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
             case 0:
               setIsFetchingSharingLinks(true);
-              _context2.prev = 1;
-              _context2.next = 4;
+              _context3.prev = 1;
+              _context3.next = 4;
               return fetchSharedDriveSharingLinks(existingDocument);
 
             case 4:
-              _context2.next = 9;
+              _context3.next = 9;
               break;
 
             case 6:
-              _context2.prev = 6;
-              _context2.t0 = _context2["catch"](1);
-              log.error('Failed to fetch shared drive sharing links', _context2.t0);
+              _context3.prev = 6;
+              _context3.t0 = _context3["catch"](1);
+              log.error('Failed to fetch shared drive sharing links', _context3.t0);
 
             case 9:
-              _context2.prev = 9;
+              _context3.prev = 9;
               setFetchedSharingLinksDocumentId(documentId);
               setIsFetchingSharingLinks(false);
-              return _context2.finish(9);
+              return _context3.finish(9);
 
             case 13:
             case "end":
-              return _context2.stop();
+              return _context3.stop();
           }
-        }, _callee2, null, [[1, 6, 9, 13]]);
+        }, _callee3, null, [[1, 6, 9, 13]]);
       }));
 
       return function fetchSharingLinks() {
-        return _ref3.apply(this, arguments);
+        return _ref4.apply(this, arguments);
       };
     }();
 

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

@@ -40,6 +40,7 @@ jest.mock('../../hooks/useSharingContext', function () {
         fetchSharedDriveSharingLinks: mockFetchSharedDriveSharingLinks,
         getOwner: jest.fn(),
         getRecipients: mockGetRecipients,
+        getSharedParentPath: jest.fn().mockReturnValue(null),
         getSharingById: mockGetSharingById,
         hasSharedChild: mockHasSharedChild,
         hasSharedParent: mockHasSharedParent

package/package.json

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

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'
@@ -40,6 +41,7 @@ const FederatedFolderModalContent = ({
     getDocumentPermissions,
     fetchSharedDriveSharingLinks,
     getRecipients,
+    getSharedParentPath,
     hasSharedChild,
     hasSharedParent,
     revoke
@@ -178,7 +180,40 @@ 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)
     : []

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

@@ -33,6 +33,7 @@ jest.mock('../../hooks/useSharingContext', () => ({
     fetchSharedDriveSharingLinks: mockFetchSharedDriveSharingLinks,
     getOwner: jest.fn(),
     getRecipients: mockGetRecipients,
+    getSharedParentPath: jest.fn().mockReturnValue(null),
     getSharingById: mockGetSharingById,
     hasSharedChild: mockHasSharedChild,
     hasSharedParent: mockHasSharedParent