cozy-sharing 28.9.1 → 28.10.0

package/CHANGELOG.md

@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [28.10.0](https://github.com/cozy/cozy-libs/compare/cozy-sharing@28.9.2...cozy-sharing@28.10.0) (2026-03-17)
+
+### Features
+
+- Allow to revoke shared drive file sharing link ([7cff1da](https://github.com/cozy/cozy-libs/commit/7cff1da36a8b048a25efd302a5e3e0efb114e327))
+
+## [28.9.2](https://github.com/cozy/cozy-libs/compare/cozy-sharing@28.9.1...cozy-sharing@28.9.2) (2026-03-16)
+
+**Note:** Version bump only for package cozy-sharing
+
 ## [28.9.1](https://github.com/cozy/cozy-libs/compare/cozy-sharing@28.9.0...cozy-sharing@28.9.1) (2026-03-16)
 
 **Note:** Version bump only for package cozy-sharing

package/dist/SharingProvider.js

@@ -788,32 +788,73 @@ export var SharingProvider = /*#__PURE__*/function (_Component) {
       };
     }());
 
-    _defineProperty(_this2, "revokeSharingLink", /*#__PURE__*/function () {
-      var _ref18 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee16(document) {
-        var perms;
+    _defineProperty(_this2, "revokeSharedDriveSharingLink", /*#__PURE__*/function () {
+      var _ref18 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee16(document, perms) {
+        var client, drivePermissionCollection;
         return _regeneratorRuntime.wrap(function _callee16$(_context16) {
           while (1) switch (_context16.prev = _context16.next) {
+            case 0:
+              client = _this2.props.client;
+              drivePermissionCollection = client.collection('io.cozy.permissions', {
+                driveId: document.driveId
+              });
+              _context16.next = 4;
+              return Promise.all(perms.map(function (p) {
+                return drivePermissionCollection.destroy(p);
+              }));
+
+            case 4:
+            case "end":
+              return _context16.stop();
+          }
+        }, _callee16);
+      }));
+
+      return function (_x30, _x31) {
+        return _ref18.apply(this, arguments);
+      };
+    }());
+
+    _defineProperty(_this2, "revokeSharingLink", /*#__PURE__*/function () {
+      var _ref19 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee17(document) {
+        var perms;
+        return _regeneratorRuntime.wrap(function _callee17$(_context17) {
+          while (1) switch (_context17.prev = _context17.next) {
             case 0:
               // Because some duplicate links have been created in the past, we must ensure
               // we revoke all of them
               perms = _getDocumentPermissions(_this2.state, document.id);
-              _context16.next = 3;
+
+              if (!document.driveId) {
+                _context17.next = 6;
+                break;
+              }
+
+              _context17.next = 4;
+              return _this2.revokeSharedDriveSharingLink(document, perms);
+
+            case 4:
+              _context17.next = 8;
+              break;
+
+            case 6:
+              _context17.next = 8;
               return Promise.all(perms.map(function (p) {
                 return _this2.permissionCol.destroy(p);
               }));
 
-            case 3:
+            case 8:
               _this2.dispatch(revokeSharingLink(perms));
 
-            case 4:
+            case 9:
             case "end":
-              return _context16.stop();
+              return _context17.stop();
           }
-        }, _callee16);
+        }, _callee17);
       }));
 
-      return function (_x30) {
-        return _ref18.apply(this, arguments);
+      return function (_x32) {
+        return _ref19.apply(this, arguments);
       };
     }());
 
@@ -937,14 +978,14 @@ export var SharingProvider = /*#__PURE__*/function (_Component) {
   }, {
     key: "fetchAllSharings",
     value: function () {
-      var _fetchAllSharings = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee17() {
+      var _fetchAllSharings = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee18() {
         var _this$props, doctype, client, _yield$Promise$all, _yield$Promise$all2, sharings, permissions, apps, sharedDocIds, resp, folderPaths, filePaths;
 
-        return _regeneratorRuntime.wrap(function _callee17$(_context17) {
-          while (1) switch (_context17.prev = _context17.next) {
+        return _regeneratorRuntime.wrap(function _callee18$(_context18) {
+          while (1) switch (_context18.prev = _context18.next) {
             case 0:
               if (!this.isPublic) {
-                _context17.next = 4;
+                _context18.next = 4;
                 break;
               }
 
@@ -953,17 +994,17 @@ export var SharingProvider = /*#__PURE__*/function (_Component) {
               this.setState({
                 allLoaded: true
               });
-              return _context17.abrupt("return");
+              return _context18.abrupt("return");
 
             case 4:
               _this$props = this.props, doctype = _this$props.doctype, client = _this$props.client;
-              _context17.next = 7;
+              _context18.next = 7;
               return Promise.all([this.sharingCol.findByDoctype(doctype, {
                 withSharedDocs: false
               }), this.permissionCol.findLinksByDoctype(doctype), client.fetchQueryAndGetFromState(fetchApps())]);
 
             case 7:
-              _yield$Promise$all = _context17.sent;
+              _yield$Promise$all = _context18.sent;
               _yield$Promise$all2 = _slicedToArray(_yield$Promise$all, 3);
               sharings = _yield$Promise$all2[0];
               permissions = _yield$Promise$all2[1];
@@ -977,35 +1018,35 @@ export var SharingProvider = /*#__PURE__*/function (_Component) {
               this.setState({
                 hasLoadedAtLeastOnePage: true
               });
-              _context17.next = 16;
+              _context18.next = 16;
               return fetchNextPermissions(permissions, this.dispatch, this.permissionCol);
 
             case 16:
               if (!(doctype === 'io.cozy.files')) {
-                _context17.next = 26;
+                _context18.next = 26;
                 break;
               }
 
               sharedDocIds = getSharedDocIdsBySharings(sharings);
-              _context17.next = 20;
+              _context18.next = 20;
               return client.collection(doctype).all({
                 keys: sharedDocIds
               });
 
             case 20:
-              resp = _context17.sent;
+              resp = _context18.sent;
               folderPaths = resp.data.filter(function (f) {
                 return f.type === 'directory' && !f.trashed;
               }).map(function (f) {
                 return f.path;
               });
-              _context17.next = 24;
+              _context18.next = 24;
               return fetchFilesPaths(client, doctype, resp.data.filter(function (f) {
                 return f.type !== 'directory' && !f.trashed;
               }));
 
             case 24:
-              filePaths = _context17.sent;
+              filePaths = _context18.sent;
               this.dispatch(receivePaths([].concat(_toConsumableArray(folderPaths), _toConsumableArray(filePaths))));
 
             case 26:
@@ -1015,9 +1056,9 @@ export var SharingProvider = /*#__PURE__*/function (_Component) {
 
             case 27:
             case "end":
-              return _context17.stop();
+              return _context18.stop();
           }
-        }, _callee17, this);
+        }, _callee18, this);
       }));
 
       function fetchAllSharings() {

package/dist/SharingProvider.spec.js

@@ -257,6 +257,102 @@ describe('shareByLink', function () {
     }, _callee4);
   })));
 });
+describe('revokeSharingLink', function () {
+  var PERM = {
+    type: 'io.cozy.permissions',
+    id: 'perm_1',
+    attributes: {
+      type: 'share',
+      permissions: {
+        rule0: {
+          type: 'io.cozy.files',
+          verbs: ['GET'],
+          values: ['file_id']
+        }
+      }
+    }
+  };
+  var provider;
+  var mockDestroy;
+  beforeEach(function () {
+    mockDestroy = jest.fn().mockResolvedValue({});
+    var mockClient = createMockClient({});
+
+    mockClient.getStackClient = function () {
+      return {
+        uri: 'http://cozy.local'
+      };
+    };
+
+    mockClient.collection = jest.fn().mockReturnValue({
+      destroy: mockDestroy
+    });
+    provider = new SharingProvider({
+      client: mockClient
+    });
+    provider.state = reducer(undefined, addSharingLink(PERM));
+    provider.dispatch = jest.fn(function (action) {
+      provider.state = reducer(provider.state, action);
+    });
+  });
+  it('uses permissionCol.destroy for a regular file', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5() {
+    var regularFile;
+    return _regeneratorRuntime.wrap(function _callee5$(_context5) {
+      while (1) switch (_context5.prev = _context5.next) {
+        case 0:
+          regularFile = {
+            _id: 'file_id',
+            id: 'file_id'
+          };
+          provider.permissionCol = {
+            destroy: mockDestroy
+          };
+          _context5.next = 4;
+          return provider.revokeSharingLink(regularFile);
+
+        case 4:
+          expect(mockDestroy).toHaveBeenCalledTimes(1);
+          expect(mockDestroy).toHaveBeenCalledWith(PERM);
+          expect(provider.dispatch).toHaveBeenCalledTimes(1);
+
+        case 7:
+        case "end":
+          return _context5.stop();
+      }
+    }, _callee5);
+  })));
+  it('uses drivePermissionCollection.destroy for a shared drive file', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6() {
+    var driveFile, mockDriveCollection;
+    return _regeneratorRuntime.wrap(function _callee6$(_context6) {
+      while (1) switch (_context6.prev = _context6.next) {
+        case 0:
+          driveFile = {
+            _id: 'file_id',
+            id: 'file_id',
+            driveId: 'drive_123'
+          };
+          mockDriveCollection = {
+            destroy: mockDestroy
+          };
+          provider.props.client.collection = jest.fn().mockReturnValue(mockDriveCollection);
+          _context6.next = 5;
+          return provider.revokeSharingLink(driveFile);
+
+        case 5:
+          expect(provider.props.client.collection).toHaveBeenCalledWith('io.cozy.permissions', {
+            driveId: 'drive_123'
+          });
+          expect(mockDestroy).toHaveBeenCalledTimes(1);
+          expect(mockDestroy).toHaveBeenCalledWith(PERM);
+          expect(provider.dispatch).toHaveBeenCalledTimes(1);
+
+        case 9:
+        case "end":
+          return _context6.stop();
+      }
+    }, _callee6);
+  })));
+});
 describe('updateDocumentPermissions', function () {
   var PERM_DRIVE_FILE = {
     type: 'io.cozy.permissions',
@@ -275,10 +371,10 @@ describe('updateDocumentPermissions', function () {
       }
     }
   };
-  it('sends only one PATCH request for a shared drive file', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5() {
+  it('sends only one PATCH request for a shared drive file', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7() {
     var driveFile, mockAdd, mockClient, provider;
-    return _regeneratorRuntime.wrap(function _callee5$(_context5) {
-      while (1) switch (_context5.prev = _context5.next) {
+    return _regeneratorRuntime.wrap(function _callee7$(_context7) {
+      while (1) switch (_context7.prev = _context7.next) {
         case 0:
           driveFile = {
             _id: 'file_in_drive',
@@ -298,7 +394,7 @@ describe('updateDocumentPermissions', function () {
 
           provider.state = reducer(undefined, addSharingLink(PERM_DRIVE_FILE));
           provider.dispatch = jest.fn();
-          _context5.next = 9;
+          _context7.next = 9;
           return provider.updateDocumentPermissions(driveFile, {
             verbs: ['GET'],
             expiresAt: '',
@@ -310,9 +406,9 @@ describe('updateDocumentPermissions', function () {
 
         case 10:
         case "end":
-          return _context5.stop();
+          return _context7.stop();
       }
-    }, _callee5);
+    }, _callee7);
   })));
 });
 describe('updateSharingMemberType', function () {
@@ -362,53 +458,53 @@ describe('updateSharingMemberType', function () {
     };
     jest.spyOn(instance, 'addRecipients').mockResolvedValue({});
   });
-  it('should throw when sharing is not found', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6() {
-    return _regeneratorRuntime.wrap(function _callee6$(_context6) {
-      while (1) switch (_context6.prev = _context6.next) {
+  it('should throw when sharing is not found', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee8() {
+    return _regeneratorRuntime.wrap(function _callee8$(_context8) {
+      while (1) switch (_context8.prev = _context8.next) {
         case 0:
-          _context6.next = 2;
+          _context8.next = 2;
           return expect(instance.updateSharingMemberType('unknown-id', 1, 'one-way')).rejects.toThrow('Sharing not found');
 
         case 2:
         case "end":
-          return _context6.stop();
+          return _context8.stop();
       }
-    }, _callee6);
+    }, _callee8);
   })));
-  it('should throw when member is not found', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7() {
-    return _regeneratorRuntime.wrap(function _callee7$(_context7) {
-      while (1) switch (_context7.prev = _context7.next) {
+  it('should throw when member is not found', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee9() {
+    return _regeneratorRuntime.wrap(function _callee9$(_context9) {
+      while (1) switch (_context9.prev = _context9.next) {
         case 0:
-          _context7.next = 2;
+          _context9.next = 2;
           return expect(instance.updateSharingMemberType('sharing-123', 99, 'one-way')).rejects.toThrow('Member not found');
 
         case 2:
         case "end":
-          return _context7.stop();
+          return _context9.stop();
       }
-    }, _callee7);
+    }, _callee9);
   })));
-  it('should throw when contact is not found', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee8() {
-    return _regeneratorRuntime.wrap(function _callee8$(_context8) {
-      while (1) switch (_context8.prev = _context8.next) {
+  it('should throw when contact is not found', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee10() {
+    return _regeneratorRuntime.wrap(function _callee10$(_context10) {
+      while (1) switch (_context10.prev = _context10.next) {
         case 0:
           mockContactsCollection.find.mockResolvedValue({
             data: []
           });
-          _context8.next = 3;
+          _context10.next = 3;
           return expect(instance.updateSharingMemberType('sharing-123', 1, 'one-way')).rejects.toThrow('Contact not found');
 
         case 3:
         case "end":
-          return _context8.stop();
+          return _context10.stop();
       }
-    }, _callee8);
+    }, _callee10);
   })));
-  it('should revoke and re-add with readOnly when switching to one-way', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee9() {
-    return _regeneratorRuntime.wrap(function _callee9$(_context9) {
-      while (1) switch (_context9.prev = _context9.next) {
+  it('should revoke and re-add with readOnly when switching to one-way', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee11() {
+    return _regeneratorRuntime.wrap(function _callee11$(_context11) {
+      while (1) switch (_context11.prev = _context11.next) {
         case 0:
-          _context9.next = 2;
+          _context11.next = 2;
           return instance.updateSharingMemberType('sharing-123', 1, 'one-way');
 
         case 2:
@@ -421,15 +517,15 @@ describe('updateSharingMemberType', function () {
 
         case 4:
         case "end":
-          return _context9.stop();
+          return _context11.stop();
       }
-    }, _callee9);
+    }, _callee11);
   })));
-  it('should revoke and re-add as read-write when switching to two-way', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee10() {
-    return _regeneratorRuntime.wrap(function _callee10$(_context10) {
-      while (1) switch (_context10.prev = _context10.next) {
+  it('should revoke and re-add as read-write when switching to two-way', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee12() {
+    return _regeneratorRuntime.wrap(function _callee12$(_context12) {
+      while (1) switch (_context12.prev = _context12.next) {
         case 0:
-          _context10.next = 2;
+          _context12.next = 2;
           return instance.updateSharingMemberType('sharing-123', 1, 'two-way');
 
         case 2:
@@ -442,23 +538,23 @@ describe('updateSharingMemberType', function () {
 
         case 4:
         case "end":
-          return _context10.stop();
+          return _context12.stop();
       }
-    }, _callee10);
+    }, _callee12);
   })));
-  it('should rethrow error if addRecipients fails after revocation', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee11() {
-    return _regeneratorRuntime.wrap(function _callee11$(_context11) {
-      while (1) switch (_context11.prev = _context11.next) {
+  it('should rethrow error if addRecipients fails after revocation', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee13() {
+    return _regeneratorRuntime.wrap(function _callee13$(_context13) {
+      while (1) switch (_context13.prev = _context13.next) {
         case 0:
           instance.addRecipients.mockRejectedValue(new Error('Network error'));
-          _context11.next = 3;
+          _context13.next = 3;
           return expect(instance.updateSharingMemberType('sharing-123', 1, 'one-way')).rejects.toThrow('Network error');
 
         case 3:
         case "end":
-          return _context11.stop();
+          return _context13.stop();
       }
-    }, _callee11);
+    }, _callee13);
   })));
 }); // TODO Convert with react-testing-library
 // describe('hasWriteAccess', () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-sharing",
-  "version": "28.9.1",
+  "version": "28.10.0",
   "description": "Provides sharing login for React applications.",
   "main": "dist/index.js",
   "author": "Cozy",
@@ -59,14 +59,14 @@
     "cozy-intent": "^2.30.4",
     "cozy-minilog": "^3.10.1",
     "cozy-ui": "^135.0.0",
-    "cozy-ui-plus": "^5.2.2",
+    "cozy-ui-plus": "^5.2.3",
     "jest": "27.5.1",
     "jest-environment-jsdom": "27.5.1",
     "react": "16.12.0",
     "react-dom": "16.13.0",
     "react-router": "^5.0.1",
     "storybook": "7.6.0",
-    "twake-i18n": "^0.3.3"
+    "twake-i18n": "^0.3.4"
   },
   "peerDependencies": {
     "cozy-client": ">=60.22.0",
@@ -83,5 +83,5 @@
   "sideEffects": [
     "*.css"
   ],
-  "gitHead": "81041f18f0134c0ead8f325adc27e6182965c875"
+  "gitHead": "e7dd5e7bebc8462801a3851ae9658b6dd50a2ffd"
 }

package/src/SharingProvider.jsx

@@ -496,11 +496,23 @@ export class SharingProvider extends Component {
     return responses
   }
 
+  revokeSharedDriveSharingLink = async (document, perms) => {
+    const { client } = this.props
+    const drivePermissionCollection = client.collection('io.cozy.permissions', {
+      driveId: document.driveId
+    })
+    await Promise.all(perms.map(p => drivePermissionCollection.destroy(p)))
+  }
+
   revokeSharingLink = async document => {
     // Because some duplicate links have been created in the past, we must ensure
     // we revoke all of them
     const perms = getDocumentPermissions(this.state, document.id)
-    await Promise.all(perms.map(p => this.permissionCol.destroy(p)))
+    if (document.driveId) {
+      await this.revokeSharedDriveSharingLink(document, perms)
+    } else {
+      await Promise.all(perms.map(p => this.permissionCol.destroy(p)))
+    }
     this.dispatch(revokeSharingLink(perms))
   }
 

package/src/SharingProvider.spec.jsx

@@ -192,6 +192,63 @@ describe('shareByLink', () => {
   })
 })
 
+describe('revokeSharingLink', () => {
+  const PERM = {
+    type: 'io.cozy.permissions',
+    id: 'perm_1',
+    attributes: {
+      type: 'share',
+      permissions: {
+        rule0: { type: 'io.cozy.files', verbs: ['GET'], values: ['file_id'] }
+      }
+    }
+  }
+
+  let provider
+  let mockDestroy
+
+  beforeEach(() => {
+    mockDestroy = jest.fn().mockResolvedValue({})
+    const mockClient = createMockClient({})
+    mockClient.getStackClient = () => ({ uri: 'http://cozy.local' })
+    mockClient.collection = jest.fn().mockReturnValue({ destroy: mockDestroy })
+    provider = new SharingProvider({ client: mockClient })
+    provider.state = reducer(undefined, addSharingLink(PERM))
+    provider.dispatch = jest.fn(action => {
+      provider.state = reducer(provider.state, action)
+    })
+  })
+
+  it('uses permissionCol.destroy for a regular file', async () => {
+    const regularFile = { _id: 'file_id', id: 'file_id' }
+    provider.permissionCol = { destroy: mockDestroy }
+
+    await provider.revokeSharingLink(regularFile)
+
+    expect(mockDestroy).toHaveBeenCalledTimes(1)
+    expect(mockDestroy).toHaveBeenCalledWith(PERM)
+    expect(provider.dispatch).toHaveBeenCalledTimes(1)
+  })
+
+  it('uses drivePermissionCollection.destroy for a shared drive file', async () => {
+    const driveFile = { _id: 'file_id', id: 'file_id', driveId: 'drive_123' }
+    const mockDriveCollection = { destroy: mockDestroy }
+    provider.props.client.collection = jest
+      .fn()
+      .mockReturnValue(mockDriveCollection)
+
+    await provider.revokeSharingLink(driveFile)
+
+    expect(provider.props.client.collection).toHaveBeenCalledWith(
+      'io.cozy.permissions',
+      { driveId: 'drive_123' }
+    )
+    expect(mockDestroy).toHaveBeenCalledTimes(1)
+    expect(mockDestroy).toHaveBeenCalledWith(PERM)
+    expect(provider.dispatch).toHaveBeenCalledTimes(1)
+  })
+})
+
 describe('updateDocumentPermissions', () => {
   const PERM_DRIVE_FILE = {
     type: 'io.cozy.permissions',