cozy-sharing 39.0.1 → 39.0.3

package/CHANGELOG.md

@@ -3,6 +3,19 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [39.0.3](https://github.com/cozy/cozy-libs/compare/cozy-sharing@39.0.2...cozy-sharing@39.0.3) (2026-10-08)
+
+### Bug Fixes
+
+- **cozy-sharing:** Keep drive members after a recipient changes a role ([13e609c](https://github.com/cozy/cozy-libs/commit/13e609c5edf6b051321d53956b3b5e0b390ce207))
+- **cozy-sharing:** Refetch the displayed document after a role change ([5cfb13d](https://github.com/cozy/cozy-libs/commit/5cfb13dd6acf0a2c03a6d9acd2539bb06d5c04a6))
+
+## [39.0.2](https://github.com/cozy/cozy-libs/compare/cozy-sharing@39.0.1...cozy-sharing@39.0.2) (2026-10-06)
+
+### Bug Fixes
+
+- **cozy-sharing:** Avoid falling back to driveId for nested sharing ([eac16ad](https://github.com/cozy/cozy-libs/commit/eac16ad94e2eddab74ea0d9b249cb91a05e98ac1))
+
 ## [39.0.1](https://github.com/cozy/cozy-libs/compare/cozy-sharing@39.0.0...cozy-sharing@39.0.1) (2026-10-06)
 
 **Note:** Version bump only for package cozy-sharing

package/README.md

@@ -198,7 +198,7 @@ Link and email sharing can coexist on the same resource. The recipient's permiss
 |-----------|------|--------|
 | Editable modal | `isEditable = !byDocId[doc] \|\| isOwner(doc) \|\| canReshare(doc)` | `ShareModal.jsx:35-36` |
 | Non-editable view | `SharingDetailsModal` — read-only members (no cross/perm menu), with link management (gear + copy link) for shared drives | `ShareModal.jsx:53-62` |
-| Updating member type | `updateSharingMemberType` calls `setReadOnly` / `setReadWrite` on the stack | `SharingProvider.jsx:361-420` |
+| Updating member type | `updateSharingMemberType` calls `setReadOnly` / `setReadWrite` on the stack, then refetches the effective recipients of the given document (through its `driveId` on the recipient side) | `SharingProvider.jsx:361-420` |
 | Revoke self | Available to all recipients | `SharingProvider.jsx:349-353` |
 | Revoke group | Available to owner/editor; removes all group members at once | `SharingProvider.jsx:336-347` |
 

package/dist/SharingProvider.js

@@ -136,9 +136,8 @@ export var SharingProvider = /*#__PURE__*/function (_Component) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
               document = _ref2.document, recipients = _ref2.recipients, readOnlyRecipients = _ref2.readOnlyRecipients, description = _ref2.description, openSharing = _ref2.openSharing, sharedDrive = _ref2.sharedDrive;
-              _this2$props2 = _this2.props, client = _this2$props2.client, doctype = _this2$props2.doctype; // Documents nested in a shared drive have no sharing of their own
-
-              sharing = getDocumentSharing(_this2.state, document.id) || (document.driveId ? _getSharingById(_this2.state, document.driveId) : null);
+              _this2$props2 = _this2.props, client = _this2$props2.client, doctype = _this2$props2.doctype;
+              sharing = getDocumentSharing(_this2.state, document.id);
 
               if (!sharing) {
                 _context2.next = 12;
@@ -490,10 +489,11 @@ export var SharingProvider = /*#__PURE__*/function (_Component) {
      * @param {string} sharingId - The ID of the sharing
      * @param {number} memberIndex - The index of the member in the sharing members array
      * @param {string} newType - 'one-way' for read-only, 'two-way' for read-write
+     * @param {object} [document] - Document whose effective recipients are refetched once updated
      */
     _defineProperty(_this2, "updateSharingMemberType", /*#__PURE__*/function () {
-      var _ref12 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee10(sharingId, memberIndex, newType) {
-        var sharing, member, makeReadOnly, optimisticSharing, currentSharing, rollbackSharing, docId, driveId;
+      var _ref12 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee10(sharingId, memberIndex, newType, document) {
+        var sharing, member, makeReadOnly, optimisticSharing, currentSharing, rollbackSharing;
         return _regeneratorRuntime.wrap(function _callee10$(_context10) {
           while (1) switch (_context10.prev = _context10.next) {
             case 0:
@@ -585,29 +585,22 @@ export var SharingProvider = /*#__PURE__*/function (_Component) {
               throw _context10.t0;
 
             case 30:
-              docId = Object.keys(_this2.state.byDocId).find(function (id) {
-                var _this2$state$byDocId$;
-
-                return (_this2$state$byDocId$ = _this2.state.byDocId[id].sharings) === null || _this2$state$byDocId$ === void 0 ? void 0 : _this2$state$byDocId$.includes(sharingId);
-              });
-
-              if (!docId) {
-                _context10.next = 35;
+              if (!document) {
+                _context10.next = 33;
                 break;
               }
 
-              driveId = _this2.state.byDocId[docId].driveId;
-              _context10.next = 35;
-              return _this2.fetchEffectiveRecipients(docId, driveId);
+              _context10.next = 33;
+              return _this2.fetchEffectiveRecipients(getDocumentId(document), document.driveId);
 
-            case 35:
+            case 33:
             case "end":
               return _context10.stop();
           }
         }, _callee10, null, [[12, 22]]);
       }));
 
-      return function (_x16, _x17, _x18) {
+      return function (_x16, _x17, _x18, _x19) {
         return _ref12.apply(this, arguments);
       };
     }());
@@ -653,7 +646,7 @@ export var SharingProvider = /*#__PURE__*/function (_Component) {
         }, _callee11, null, [[0, 7]]);
       }));
 
-      return function (_x19, _x20) {
+      return function (_x20, _x21) {
         return _ref13.apply(this, arguments);
       };
     }());
@@ -731,7 +724,7 @@ export var SharingProvider = /*#__PURE__*/function (_Component) {
         }, _callee12, null, [[0, 15]]);
       }));
 
-      return function (_x21, _x22) {
+      return function (_x22, _x23) {
         return _ref14.apply(this, arguments);
       };
     }());
@@ -806,7 +799,7 @@ export var SharingProvider = /*#__PURE__*/function (_Component) {
         }, _callee13);
       }));
 
-      return function (_x23) {
+      return function (_x24) {
         return _ref15.apply(this, arguments);
       };
     }());
@@ -914,7 +907,7 @@ export var SharingProvider = /*#__PURE__*/function (_Component) {
         }, _callee14);
       }));
 
-      return function (_x24, _x25) {
+      return function (_x25, _x26) {
         return _ref16.apply(this, arguments);
       };
     }());
@@ -967,7 +960,7 @@ export var SharingProvider = /*#__PURE__*/function (_Component) {
         }, _callee15);
       }));
 
-      return function (_x26, _x27) {
+      return function (_x27, _x28) {
         return _ref17.apply(this, arguments);
       };
     }());
@@ -999,7 +992,7 @@ export var SharingProvider = /*#__PURE__*/function (_Component) {
         }, _callee16);
       }));
 
-      return function (_x28) {
+      return function (_x29) {
         return _ref18.apply(this, arguments);
       };
     }());
@@ -1035,7 +1028,7 @@ export var SharingProvider = /*#__PURE__*/function (_Component) {
         }, _callee17);
       }));
 
-      return function (_x29, _x30, _x31, _x32) {
+      return function (_x30, _x31, _x32, _x33) {
         return _ref19.apply(this, arguments);
       };
     }());
@@ -1133,7 +1126,7 @@ export var SharingProvider = /*#__PURE__*/function (_Component) {
                   }, _callee18);
                 }));
 
-                return function (_x35) {
+                return function (_x36) {
                   return _ref21.apply(this, arguments);
                 };
               }()));
@@ -1149,7 +1142,7 @@ export var SharingProvider = /*#__PURE__*/function (_Component) {
         }, _callee19);
       }));
 
-      return function (_x33, _x34) {
+      return function (_x34, _x35) {
         return _ref20.apply(this, arguments);
       };
     }());
@@ -1176,7 +1169,7 @@ export var SharingProvider = /*#__PURE__*/function (_Component) {
         }, _callee20);
       }));
 
-      return function (_x36, _x37) {
+      return function (_x37, _x38) {
         return _ref24.apply(this, arguments);
       };
     }());
@@ -1219,7 +1212,7 @@ export var SharingProvider = /*#__PURE__*/function (_Component) {
         }, _callee21);
       }));
 
-      return function (_x38) {
+      return function (_x39) {
         return _ref25.apply(this, arguments);
       };
     }());

package/dist/SharingProvider.spec.js

@@ -793,21 +793,18 @@ describe('shared drive recipient revocation', function () {
       }
     }, _callee14);
   })));
-  it('adds recipients to the existing shared drive when sharing a document nested inside it', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee15() {
+  it('creates a new sharing when sharing a document nested inside a shared drive without its own sharing', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee15() {
     var nestedDocument;
     return _regeneratorRuntime.wrap(function _callee15$(_context15) {
       while (1) switch (_context15.prev = _context15.next) {
         case 0:
-          sharingCol.addRecipients.mockResolvedValue({
-            data: SHARED_DRIVE
-          });
           nestedDocument = {
             _id: 'nested_folder_456',
             id: 'nested_folder_456',
             driveId: SHARED_DRIVE.id,
             path: '/Shared folder/Sub folder'
           };
-          _context15.next = 4;
+          _context15.next = 3;
           return provider.share({
             document: nestedDocument,
             recipients: [recipient],
@@ -817,15 +814,19 @@ describe('shared drive recipient revocation', function () {
             sharedDrive: true
           });
 
-        case 4:
-          expect(sharingCol.create).not.toHaveBeenCalled();
-          expect(sharingCol.addRecipients).toHaveBeenCalledWith({
-            document: SHARED_DRIVE,
+        case 3:
+          expect(sharingCol.create).toHaveBeenCalledWith({
+            document: nestedDocument,
             recipients: [recipient],
-            readOnlyRecipients: []
+            readOnlyRecipients: [],
+            description: 'Sub folder',
+            previewPath: '/preview',
+            openSharing: false,
+            sharedDrive: true
           });
+          expect(sharingCol.addRecipients).not.toHaveBeenCalled();
 
-        case 6:
+        case 5:
         case "end":
           return _context15.stop();
       }
@@ -1714,6 +1715,71 @@ describe('updateSharingMemberType', function () {
       }
     }, _callee39);
   })));
+  it('should refetch effective recipients of the given document through its drive', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee40() {
+    return _regeneratorRuntime.wrap(function _callee40$(_context40) {
+      while (1) switch (_context40.prev = _context40.next) {
+        case 0:
+          _context40.next = 2;
+          return instance.updateSharingMemberType('sharing-123', 1, 'one-way', {
+            _id: 'nested-folder',
+            driveId: 'drive-sharing'
+          });
+
+        case 2:
+          expect(instance.sharingCol.fetchEffectiveRecipients).toHaveBeenCalledWith('nested-folder', {
+            driveId: 'drive-sharing'
+          });
+
+        case 3:
+        case "end":
+          return _context40.stop();
+      }
+    }, _callee40);
+  })));
+  it('should refetch effective recipients of an owned document locally', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee41() {
+    return _regeneratorRuntime.wrap(function _callee41$(_context41) {
+      while (1) switch (_context41.prev = _context41.next) {
+        case 0:
+          _context41.next = 2;
+          return instance.updateSharingMemberType('sharing-123', 1, 'one-way', {
+            _id: 'owned-folder'
+          });
+
+        case 2:
+          expect(instance.sharingCol.fetchEffectiveRecipients).toHaveBeenCalledWith('owned-folder', {
+            driveId: undefined
+          });
+
+        case 3:
+        case "end":
+          return _context41.stop();
+      }
+    }, _callee41);
+  })));
+  it('should not refetch effective recipients without a document', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee42() {
+    return _regeneratorRuntime.wrap(function _callee42$(_context42) {
+      while (1) switch (_context42.prev = _context42.next) {
+        case 0:
+          instance.state = _objectSpread(_objectSpread({}, instance.state), {}, {
+            byDocId: {
+              'drive-root': {
+                sharings: ['sharing-123'],
+                permissions: []
+              }
+            }
+          });
+          _context42.next = 3;
+          return instance.updateSharingMemberType('sharing-123', 1, 'one-way');
+
+        case 3:
+          expect(instance.sharingCol.fetchEffectiveRecipients).not.toHaveBeenCalled();
+
+        case 4:
+        case "end":
+          return _context42.stop();
+      }
+    }, _callee42);
+  })));
 });
 describe('hasWriteAccess', function () {
   var createClient = function createClient() {

package/dist/components/Recipient/PermissionTypeMenu.js

@@ -182,7 +182,7 @@ var PermissionTypeMenuComponent = function PermissionTypeMenuComponent(_ref) {
 
           case 33:
             _context.next = 35;
-            return updateSharingMemberType(sharingId, memberIndex, newType);
+            return updateSharingMemberType(sharingId, memberIndex, newType, document);
 
           case 35:
             _context.next = 41;

package/dist/components/Recipient/PermissionTypeMenu.spec.js

@@ -105,7 +105,7 @@ describe('PermissionTypeMenu component', function () {
           fireEvent.click(getByRole('menuitem', {
             name: 'Viewer'
           }));
-          expect(mockUpdateSharingMemberType).toHaveBeenCalledWith('sharing-123', 1, 'one-way');
+          expect(mockUpdateSharingMemberType).toHaveBeenCalledWith('sharing-123', 1, 'one-way', undefined);
 
         case 5:
         case "end":
@@ -129,7 +129,7 @@ describe('PermissionTypeMenu component', function () {
           fireEvent.click(getByRole('menuitem', {
             name: 'Editor'
           }));
-          expect(mockUpdateSharingMemberType).toHaveBeenCalledWith('sharing-123', 1, 'two-way');
+          expect(mockUpdateSharingMemberType).toHaveBeenCalledWith('sharing-123', 1, 'two-way', undefined);
 
         case 5:
         case "end":
@@ -318,7 +318,7 @@ describe('PermissionTypeMenu component', function () {
             }));
             _context6.next = 7;
             return waitFor(function () {
-              expect(mockUpdateSharingMemberType).toHaveBeenCalledWith('sharing-123', 1, 'one-way');
+              expect(mockUpdateSharingMemberType).toHaveBeenCalledWith('sharing-123', 1, 'one-way', folderDocument);
             });
 
           case 7:
@@ -367,7 +367,7 @@ describe('PermissionTypeMenu component', function () {
             }));
             _context7.next = 7;
             return waitFor(function () {
-              expect(mockUpdateSharingMemberType.mock.calls).toEqual([['sharing-parent', 2, 'one-way'], ['sharing-123', 1, 'one-way']]);
+              expect(mockUpdateSharingMemberType.mock.calls).toEqual([['sharing-parent', 2, 'one-way'], ['sharing-123', 1, 'one-way', folderDocument]]);
             });
 
           case 7:
@@ -414,7 +414,7 @@ describe('PermissionTypeMenu component', function () {
       fireEvent.click(getByRole('menuitem', {
         name: 'Viewer'
       }));
-      expect(mockUpdateSharingMemberType).toHaveBeenCalledWith('sharing-123', 1, 'one-way');
+      expect(mockUpdateSharingMemberType).toHaveBeenCalledWith('sharing-123', 1, 'one-way', folderDocument);
       expect(queryByRole('button', {
         name: 'Update parent'
       })).toBe(null);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-sharing",
-  "version": "39.0.1",
+  "version": "39.0.3",
   "description": "Provides sharing login for React applications.",
   "main": "dist/index.js",
   "author": "Cozy",
@@ -58,7 +58,7 @@
     "cozy-intent": "^2.31.1",
     "cozy-minilog": "^3.10.1",
     "cozy-ui": "^140.5.0",
-    "cozy-ui-plus": "^14.0.0",
+    "cozy-ui-plus": "^14.0.2",
     "jest": "30.3.0",
     "jest-environment-jsdom": "30.3.0",
     "react": "16.12.0",
@@ -84,5 +84,5 @@
   "sideEffects": [
     "*.css"
   ],
-  "gitHead": "10d189a754a9ad65733ac9d1921834da3782e77b"
+  "gitHead": "1cea8c57eb694f2b8adce458b2e692566e49f27d"
 }

package/src/SharingProvider.jsx

@@ -260,10 +260,7 @@ export class SharingProvider extends Component {
     sharedDrive
   }) => {
     const { client, doctype } = this.props
-    // Documents nested in a shared drive have no sharing of their own
-    const sharing =
-      getDocumentSharing(this.state, document.id) ||
-      (document.driveId ? getSharingById(this.state, document.driveId) : null)
+    const sharing = getDocumentSharing(this.state, document.id)
     if (sharing) {
       const sharingResult = await this.addRecipients({
         document: sharing,
@@ -390,8 +387,14 @@ export class SharingProvider extends Component {
    * @param {string} sharingId - The ID of the sharing
    * @param {number} memberIndex - The index of the member in the sharing members array
    * @param {string} newType - 'one-way' for read-only, 'two-way' for read-write
+   * @param {object} [document] - Document whose effective recipients are refetched once updated
    */
-  updateSharingMemberType = async (sharingId, memberIndex, newType) => {
+  updateSharingMemberType = async (
+    sharingId,
+    memberIndex,
+    newType,
+    document
+  ) => {
     const sharing = getSharingById(this.state, sharingId)
     if (!sharing) throw new Error('Sharing not found')
 
@@ -457,12 +460,11 @@ export class SharingProvider extends Component {
       throw error
     }
 
-    const docId = Object.keys(this.state.byDocId).find(id =>
-      this.state.byDocId[id].sharings?.includes(sharingId)
-    )
-    if (docId) {
-      const driveId = this.state.byDocId[docId].driveId
-      await this.fetchEffectiveRecipients(docId, driveId)
+    if (document) {
+      await this.fetchEffectiveRecipients(
+        getDocumentId(document),
+        document.driveId
+      )
     }
   }
 

package/src/SharingProvider.spec.jsx

@@ -572,8 +572,7 @@ describe('shared drive recipient revocation', () => {
     })
   })
 
-  it('adds recipients to the existing shared drive when sharing a document nested inside it', async () => {
-    sharingCol.addRecipients.mockResolvedValue({ data: SHARED_DRIVE })
+  it('creates a new sharing when sharing a document nested inside a shared drive without its own sharing', async () => {
     const nestedDocument = {
       _id: 'nested_folder_456',
       id: 'nested_folder_456',
@@ -590,12 +589,16 @@ describe('shared drive recipient revocation', () => {
       sharedDrive: true
     })
 
-    expect(sharingCol.create).not.toHaveBeenCalled()
-    expect(sharingCol.addRecipients).toHaveBeenCalledWith({
-      document: SHARED_DRIVE,
+    expect(sharingCol.create).toHaveBeenCalledWith({
+      document: nestedDocument,
       recipients: [recipient],
-      readOnlyRecipients: []
+      readOnlyRecipients: [],
+      description: 'Sub folder',
+      previewPath: '/preview',
+      openSharing: false,
+      sharedDrive: true
     })
+    expect(sharingCol.addRecipients).not.toHaveBeenCalled()
   })
 
   it('clears effective recipients when the sharing was deleted (404)', async () => {
@@ -1328,6 +1331,42 @@ describe('updateSharingMemberType', () => {
       readOnly: false
     })
   })
+
+  it('should refetch effective recipients of the given document through its drive', async () => {
+    await instance.updateSharingMemberType('sharing-123', 1, 'one-way', {
+      _id: 'nested-folder',
+      driveId: 'drive-sharing'
+    })
+
+    expect(instance.sharingCol.fetchEffectiveRecipients).toHaveBeenCalledWith(
+      'nested-folder',
+      { driveId: 'drive-sharing' }
+    )
+  })
+
+  it('should refetch effective recipients of an owned document locally', async () => {
+    await instance.updateSharingMemberType('sharing-123', 1, 'one-way', {
+      _id: 'owned-folder'
+    })
+
+    expect(instance.sharingCol.fetchEffectiveRecipients).toHaveBeenCalledWith(
+      'owned-folder',
+      { driveId: undefined }
+    )
+  })
+
+  it('should not refetch effective recipients without a document', async () => {
+    instance.state = {
+      ...instance.state,
+      byDocId: {
+        'drive-root': { sharings: ['sharing-123'], permissions: [] }
+      }
+    }
+
+    await instance.updateSharingMemberType('sharing-123', 1, 'one-way')
+
+    expect(instance.sharingCol.fetchEffectiveRecipients).not.toHaveBeenCalled()
+  })
 })
 
 describe('hasWriteAccess', () => {

package/src/components/Recipient/PermissionTypeMenu.jsx

@@ -91,7 +91,7 @@ const PermissionTypeMenuComponent = ({
           }
         }
 
-        await updateSharingMemberType(sharingId, memberIndex, newType)
+        await updateSharingMemberType(sharingId, memberIndex, newType, document)
       } catch (error) {
         log.error('Failed to change member permission type', error)
         showAlert({

package/src/components/Recipient/PermissionTypeMenu.spec.jsx

@@ -95,7 +95,8 @@ describe('PermissionTypeMenu component', () => {
     expect(mockUpdateSharingMemberType).toHaveBeenCalledWith(
       'sharing-123',
       1,
-      'one-way'
+      'one-way',
+      undefined
     )
   })
 
@@ -110,7 +111,8 @@ describe('PermissionTypeMenu component', () => {
     expect(mockUpdateSharingMemberType).toHaveBeenCalledWith(
       'sharing-123',
       1,
-      'two-way'
+      'two-way',
+      undefined
     )
   })
 
@@ -238,7 +240,8 @@ describe('PermissionTypeMenu component', () => {
         expect(mockUpdateSharingMemberType).toHaveBeenCalledWith(
           'sharing-123',
           1,
-          'one-way'
+          'one-way',
+          folderDocument
         )
       })
     })
@@ -276,7 +279,7 @@ describe('PermissionTypeMenu component', () => {
       await waitFor(() => {
         expect(mockUpdateSharingMemberType.mock.calls).toEqual([
           ['sharing-parent', 2, 'one-way'],
-          ['sharing-123', 1, 'one-way']
+          ['sharing-123', 1, 'one-way', folderDocument]
         ])
       })
     })
@@ -309,7 +312,8 @@ describe('PermissionTypeMenu component', () => {
       expect(mockUpdateSharingMemberType).toHaveBeenCalledWith(
         'sharing-123',
         1,
-        'one-way'
+        'one-way',
+        folderDocument
       )
       expect(queryByRole('button', { name: 'Update parent' })).toBe(null)
     })