cozy-sharing 33.3.4 → 33.4.1

package/CHANGELOG.md

@@ -3,6 +3,23 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [33.4.1](https://github.com/cozy/cozy-libs/compare/cozy-sharing@33.4.0...cozy-sharing@33.4.1) (2026-06-15)
+
+### Bug Fixes
+
+- **cozy-sharing:** Keep the owner avatar visible in the share modal ([f63ae1d](https://github.com/cozy/cozy-libs/commit/f63ae1de24de5ca7746b0c6da579f52fa5593806))
+
+# [33.4.0](https://github.com/cozy/cozy-libs/compare/cozy-sharing@33.3.4...cozy-sharing@33.4.0) (2026-06-15)
+
+### Bug Fixes
+
+- **cozy-sharing:** Prevent duplicate shared drive links ([0d93ae5](https://github.com/cozy/cozy-libs/commit/0d93ae50cba1d6fe9f6f070bba87b874119fffb7))
+- **cozy-sharing:** Prevent repeated shared drive link fetches ([fa8833e](https://github.com/cozy/cozy-libs/commit/fa8833e058a5432eef6743923b38ed42916ea3e3))
+
+### Features
+
+- **cozy-sharing:** Show shared drive links ([3736586](https://github.com/cozy/cozy-libs/commit/37365866117c630f730b108c69e56d0526fa5736))
+
 ## [33.3.4](https://github.com/cozy/cozy-libs/compare/cozy-sharing@33.3.3...cozy-sharing@33.3.4) (2026-06-11)
 
 ### Bug Fixes

package/dist/SharingProvider.js

@@ -547,42 +547,71 @@ export var SharingProvider = /*#__PURE__*/function (_Component) {
 
     _defineProperty(_this2, "shareByLink", /*#__PURE__*/function () {
       var _ref13 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee11(document, options) {
-        var resp;
+        var resp, permissions;
         return _regeneratorRuntime.wrap(function _callee11$(_context11) {
           while (1) switch (_context11.prev = _context11.next) {
             case 0:
+              _context11.prev = 0;
+
               if (!document.driveId) {
-                _context11.next = 6;
+                _context11.next = 7;
                 break;
               }
 
-              _context11.next = 3;
+              _context11.next = 4;
               return _this2.createSharedDriveSharingLink(document, options);
 
-            case 3:
+            case 4:
               _context11.t0 = _context11.sent;
-              _context11.next = 9;
+              _context11.next = 10;
               break;
 
-            case 6:
-              _context11.next = 8;
+            case 7:
+              _context11.next = 9;
               return _this2.permissionCol.createSharingLink(document, options);
 
-            case 8:
+            case 9:
               _context11.t0 = _context11.sent;
 
-            case 9:
+            case 10:
               resp = _context11.t0;
 
               _this2.dispatch(addSharingLink(resp.data));
 
               return _context11.abrupt("return", resp);
 
-            case 12:
+            case 15:
+              _context11.prev = 15;
+              _context11.t1 = _context11["catch"](0);
+
+              if (!(document.driveId && _context11.t1 && _context11.t1.status === 409)) {
+                _context11.next = 23;
+                break;
+              }
+
+              _context11.next = 20;
+              return _this2.fetchSharedDriveSharingLinks(document);
+
+            case 20:
+              permissions = _context11.sent;
+
+              if (!(permissions && permissions.length > 0)) {
+                _context11.next = 23;
+                break;
+              }
+
+              return _context11.abrupt("return", {
+                data: permissions[0]
+              });
+
+            case 23:
+              throw _context11.t1;
+
+            case 24:
             case "end":
               return _context11.stop();
           }
-        }, _callee11);
+        }, _callee11, null, [[0, 15]]);
       }));
 
       return function (_x19, _x20) {
@@ -591,9 +620,11 @@ export var SharingProvider = /*#__PURE__*/function (_Component) {
     }());
 
     _defineProperty(_this2, "getFederatedShareLink", function (document) {
-      if (!document.driveId) return null;
+      if (!(document !== null && document !== void 0 && document.driveId)) return null;
+      var documentId = document._id || document.id;
+      if (!documentId) return null;
 
-      var permissions = _getDocumentPermissions(_this2.state, document._id);
+      var permissions = _getDocumentPermissions(_this2.state, documentId);
 
       var perm = permissions.find(function (p) {
         return getShortcode(p);
@@ -641,39 +672,99 @@ export var SharingProvider = /*#__PURE__*/function (_Component) {
       };
     }());
 
-    _defineProperty(_this2, "updateSharedDrivePermissions", /*#__PURE__*/function () {
-      var _ref15 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee13(document, permissionDocument, updatedPermissions, options) {
-        var client, expiresAt, password, drivePermissionCollection, resp;
+    _defineProperty(_this2, "fetchSharedDriveSharingLinks", /*#__PURE__*/function () {
+      var _ref15 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee13(document) {
+        var client, drivePermissionCollection, documentId, resp, permissions, existingPermissions, existingPermissionIds, newPermissions;
         return _regeneratorRuntime.wrap(function _callee13$(_context13) {
           while (1) switch (_context13.prev = _context13.next) {
+            case 0:
+              if (!(!document || !document.driveId)) {
+                _context13.next = 2;
+                break;
+              }
+
+              return _context13.abrupt("return", []);
+
+            case 2:
+              client = _this2.props.client;
+              drivePermissionCollection = client.collection('io.cozy.permissions', {
+                driveId: document.driveId
+              });
+              documentId = document._id || document.id;
+
+              if (documentId) {
+                _context13.next = 7;
+                break;
+              }
+
+              return _context13.abrupt("return", []);
+
+            case 7:
+              _context13.next = 9;
+              return drivePermissionCollection.findLinksByIds([documentId]);
+
+            case 9:
+              resp = _context13.sent;
+              permissions = resp.data || [];
+              existingPermissions = _getDocumentPermissions(_this2.state, documentId);
+              existingPermissionIds = existingPermissions.map(function (permission) {
+                return permission.id;
+              });
+              newPermissions = permissions.filter(function (permission) {
+                return !existingPermissionIds.includes(permission.id);
+              });
+
+              if (newPermissions.length > 0) {
+                _this2.dispatch(addSharingLink(newPermissions));
+              }
+
+              return _context13.abrupt("return", permissions);
+
+            case 16:
+            case "end":
+              return _context13.stop();
+          }
+        }, _callee13);
+      }));
+
+      return function (_x23) {
+        return _ref15.apply(this, arguments);
+      };
+    }());
+
+    _defineProperty(_this2, "updateSharedDrivePermissions", /*#__PURE__*/function () {
+      var _ref16 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee14(document, permissionDocument, updatedPermissions, options) {
+        var client, expiresAt, password, drivePermissionCollection, resp;
+        return _regeneratorRuntime.wrap(function _callee14$(_context14) {
+          while (1) switch (_context14.prev = _context14.next) {
             case 0:
               client = _this2.props.client;
               expiresAt = options.expiresAt, password = options.password;
               drivePermissionCollection = client.collection('io.cozy.permissions', {
                 driveId: document.driveId
               });
-              _context13.next = 5;
+              _context14.next = 5;
               return drivePermissionCollection.add(permissionDocument, updatedPermissions, {
                 expiresAt: expiresAt,
                 password: password
               });
 
             case 5:
-              resp = _context13.sent;
+              resp = _context14.sent;
 
               _this2.dispatch(updateSharingLink(resp.data));
 
-              return _context13.abrupt("return", resp);
+              return _context14.abrupt("return", resp);
 
             case 8:
             case "end":
-              return _context13.stop();
+              return _context14.stop();
           }
-        }, _callee13);
+        }, _callee14);
       }));
 
-      return function (_x23, _x24, _x25, _x26) {
-        return _ref15.apply(this, arguments);
+      return function (_x24, _x25, _x26, _x27) {
+        return _ref16.apply(this, arguments);
       };
     }());
 
@@ -689,28 +780,28 @@ export var SharingProvider = /*#__PURE__*/function (_Component) {
      * @return {Array}
      */
     _defineProperty(_this2, "updateDocumentPermissions", /*#__PURE__*/function () {
-      var _ref16 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee15(document, options) {
+      var _ref17 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee16(document, options) {
         var verbs, expiresAt, password, permissions, responses;
-        return _regeneratorRuntime.wrap(function _callee15$(_context15) {
-          while (1) switch (_context15.prev = _context15.next) {
+        return _regeneratorRuntime.wrap(function _callee16$(_context16) {
+          while (1) switch (_context16.prev = _context16.next) {
             case 0:
               verbs = options.verbs, expiresAt = options.expiresAt, password = options.password;
               permissions = _getDocumentPermissions(_this2.state, document.id);
 
               if (!(!permissions || permissions.length === 0)) {
-                _context15.next = 4;
+                _context16.next = 4;
                 break;
               }
 
-              return _context15.abrupt("return", []);
+              return _context16.abrupt("return", []);
 
             case 4:
-              _context15.next = 6;
+              _context16.next = 6;
               return Promise.all(permissions.map( /*#__PURE__*/function () {
-                var _ref17 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee14(permissionDocument) {
+                var _ref18 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee15(permissionDocument) {
                   var updatedPermissions, resp;
-                  return _regeneratorRuntime.wrap(function _callee14$(_context14) {
-                    while (1) switch (_context14.prev = _context14.next) {
+                  return _regeneratorRuntime.wrap(function _callee15$(_context15) {
+                    while (1) switch (_context15.prev = _context15.next) {
                       case 0:
                         updatedPermissions = permissionDocument.attributes.permissions;
                         Object.keys(updatedPermissions).forEach(function (permType) {
@@ -718,114 +809,114 @@ export var SharingProvider = /*#__PURE__*/function (_Component) {
                         });
 
                         if (!document.driveId) {
-                          _context14.next = 8;
+                          _context15.next = 8;
                           break;
                         }
 
-                        _context14.next = 5;
+                        _context15.next = 5;
                         return _this2.updateSharedDrivePermissions(document, permissionDocument, updatedPermissions, options);
 
                       case 5:
-                        _context14.t0 = _context14.sent;
-                        _context14.next = 11;
+                        _context15.t0 = _context15.sent;
+                        _context15.next = 11;
                         break;
 
                       case 8:
-                        _context14.next = 10;
+                        _context15.next = 10;
                         return _this2.permissionCol.add(permissionDocument, updatedPermissions, {
                           expiresAt: expiresAt,
                           password: password
                         });
 
                       case 10:
-                        _context14.t0 = _context14.sent;
+                        _context15.t0 = _context15.sent;
 
                       case 11:
-                        resp = _context14.t0;
+                        resp = _context15.t0;
 
                         _this2.dispatch(updateSharingLink(resp.data));
 
-                        return _context14.abrupt("return", resp);
+                        return _context15.abrupt("return", resp);
 
                       case 14:
                       case "end":
-                        return _context14.stop();
+                        return _context15.stop();
                     }
-                  }, _callee14);
+                  }, _callee15);
                 }));
 
-                return function (_x29) {
-                  return _ref17.apply(this, arguments);
+                return function (_x30) {
+                  return _ref18.apply(this, arguments);
                 };
               }()));
 
             case 6:
-              responses = _context15.sent;
-              return _context15.abrupt("return", responses);
+              responses = _context16.sent;
+              return _context16.abrupt("return", responses);
 
             case 8:
             case "end":
-              return _context15.stop();
+              return _context16.stop();
           }
-        }, _callee15);
+        }, _callee16);
       }));
 
-      return function (_x27, _x28) {
-        return _ref16.apply(this, arguments);
+      return function (_x28, _x29) {
+        return _ref17.apply(this, arguments);
       };
     }());
 
     _defineProperty(_this2, "revokeSharedDriveSharingLink", /*#__PURE__*/function () {
-      var _ref18 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee16(document, perms) {
+      var _ref19 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee17(document, perms) {
         var client, drivePermissionCollection;
-        return _regeneratorRuntime.wrap(function _callee16$(_context16) {
-          while (1) switch (_context16.prev = _context16.next) {
+        return _regeneratorRuntime.wrap(function _callee17$(_context17) {
+          while (1) switch (_context17.prev = _context17.next) {
             case 0:
               client = _this2.props.client;
               drivePermissionCollection = client.collection('io.cozy.permissions', {
                 driveId: document.driveId
               });
-              _context16.next = 4;
+              _context17.next = 4;
               return Promise.all(perms.map(function (p) {
                 return drivePermissionCollection.destroy(p);
               }));
 
             case 4:
             case "end":
-              return _context16.stop();
+              return _context17.stop();
           }
-        }, _callee16);
+        }, _callee17);
       }));
 
-      return function (_x30, _x31) {
-        return _ref18.apply(this, arguments);
+      return function (_x31, _x32) {
+        return _ref19.apply(this, arguments);
       };
     }());
 
     _defineProperty(_this2, "revokeSharingLink", /*#__PURE__*/function () {
-      var _ref19 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee17(document) {
+      var _ref20 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee18(document) {
         var perms;
-        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:
               // Because some duplicate links have been created in the past, we must ensure
               // we revoke all of them
               perms = _getDocumentPermissions(_this2.state, document.id);
 
               if (!document.driveId) {
-                _context17.next = 6;
+                _context18.next = 6;
                 break;
               }
 
-              _context17.next = 4;
+              _context18.next = 4;
               return _this2.revokeSharedDriveSharingLink(document, perms);
 
             case 4:
-              _context17.next = 8;
+              _context18.next = 8;
               break;
 
             case 6:
-              _context17.next = 8;
+              _context18.next = 8;
               return Promise.all(perms.map(function (p) {
                 return _this2.permissionCol.destroy(p);
               }));
@@ -835,13 +926,13 @@ export var SharingProvider = /*#__PURE__*/function (_Component) {
 
             case 9:
             case "end":
-              return _context17.stop();
+              return _context18.stop();
           }
-        }, _callee17);
+        }, _callee18);
       }));
 
-      return function (_x32) {
-        return _ref19.apply(this, arguments);
+      return function (_x33) {
+        return _ref20.apply(this, arguments);
       };
     }());
 
@@ -921,6 +1012,7 @@ export var SharingProvider = /*#__PURE__*/function (_Component) {
       revokeSelf: _this2.revokeSelf,
       shareByLink: _this2.shareByLink,
       getFederatedShareLink: _this2.getFederatedShareLink,
+      fetchSharedDriveSharingLinks: _this2.fetchSharedDriveSharingLinks,
       updateDocumentPermissions: _this2.updateDocumentPermissions,
       revokeSharingLink: _this2.revokeSharingLink,
       hasLoadedAtLeastOnePage: false,
@@ -965,14 +1057,14 @@ export var SharingProvider = /*#__PURE__*/function (_Component) {
   }, {
     key: "fetchAllSharings",
     value: function () {
-      var _fetchAllSharings = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee18() {
+      var _fetchAllSharings = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee19() {
         var _this$props, doctype, client, _yield$Promise$all, _yield$Promise$all2, sharings, permissions, apps, sharedDocIds, resp, folderPaths, filePaths;
 
-        return _regeneratorRuntime.wrap(function _callee18$(_context18) {
-          while (1) switch (_context18.prev = _context18.next) {
+        return _regeneratorRuntime.wrap(function _callee19$(_context19) {
+          while (1) switch (_context19.prev = _context19.next) {
             case 0:
               if (!this.isPublic) {
-                _context18.next = 4;
+                _context19.next = 4;
                 break;
               }
 
@@ -981,17 +1073,17 @@ export var SharingProvider = /*#__PURE__*/function (_Component) {
               this.setState({
                 allLoaded: true
               });
-              return _context18.abrupt("return");
+              return _context19.abrupt("return");
 
             case 4:
               _this$props = this.props, doctype = _this$props.doctype, client = _this$props.client;
-              _context18.next = 7;
+              _context19.next = 7;
               return Promise.all([this.sharingCol.findByDoctype(doctype, {
                 withSharedDocs: false
               }), this.permissionCol.findLinksByDoctype(doctype), client.fetchQueryAndGetFromState(fetchApps())]);
 
             case 7:
-              _yield$Promise$all = _context18.sent;
+              _yield$Promise$all = _context19.sent;
               _yield$Promise$all2 = _slicedToArray(_yield$Promise$all, 3);
               sharings = _yield$Promise$all2[0];
               permissions = _yield$Promise$all2[1];
@@ -1005,35 +1097,35 @@ export var SharingProvider = /*#__PURE__*/function (_Component) {
               this.setState({
                 hasLoadedAtLeastOnePage: true
               });
-              _context18.next = 16;
+              _context19.next = 16;
               return fetchNextPermissions(permissions, this.dispatch, this.permissionCol);
 
             case 16:
               if (!(doctype === 'io.cozy.files')) {
-                _context18.next = 26;
+                _context19.next = 26;
                 break;
               }
 
               sharedDocIds = getSharedDocIdsBySharings(sharings);
-              _context18.next = 20;
+              _context19.next = 20;
               return client.collection(doctype).all({
                 keys: sharedDocIds
               });
 
             case 20:
-              resp = _context18.sent;
+              resp = _context19.sent;
               folderPaths = resp.data.filter(function (f) {
                 return f.type === 'directory' && !f.trashed;
               }).map(function (f) {
                 return f.path;
               });
-              _context18.next = 24;
+              _context19.next = 24;
               return fetchFilesPaths(client, doctype, resp.data.filter(function (f) {
                 return f.type !== 'directory' && !f.trashed;
               }));
 
             case 24:
-              filePaths = _context18.sent;
+              filePaths = _context19.sent;
               this.dispatch(receivePaths([].concat(_toConsumableArray(folderPaths), _toConsumableArray(filePaths))));
 
             case 26:
@@ -1043,9 +1135,9 @@ export var SharingProvider = /*#__PURE__*/function (_Component) {
 
             case 27:
             case "end":
-              return _context18.stop();
+              return _context19.stop();
           }
-        }, _callee18, this);
+        }, _callee19, this);
       }));
 
       function fetchAllSharings() {