cozy-sharing 36.2.1 → 36.4.0

package/CHANGELOG.md

@@ -3,6 +3,21 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [36.4.0](https://github.com/cozy/cozy-libs/compare/cozy-sharing@36.3.0...cozy-sharing@36.4.0) (2026-07-07)
+
+### Features
+
+- **cozy-sharing:** Expose MemberAvatar in main API ([2af294e](https://github.com/cozy/cozy-libs/commit/2af294e565eb3c727a9d0505e6e5c204f3d8e05c))
+- **cozy-sharing:** MemberAvatar can get avatar image with cozy.url path ([2f694bd](https://github.com/cozy/cozy-libs/commit/2f694bde7c8bd2e30ae9b5c6a51d31e229fec2ef))
+- **cozy-sharing:** Now getInitials return 2 letters if possible ([175ad40](https://github.com/cozy/cozy-libs/commit/175ad40116f6face3bdfdff1642a8d26cdc01596))
+- **cozy-sharing:** Use MemberAvatar in ContactSuggestion ([b03da9f](https://github.com/cozy/cozy-libs/commit/b03da9f1d3f3e23b5b90154c313fd5adbab7aa8a))
+
+# [36.3.0](https://github.com/cozy/cozy-libs/compare/cozy-sharing@36.2.1...cozy-sharing@36.3.0) (2026-07-01)
+
+### Features
+
+- **cozy-sharing:** Hide email for org instance owner ([5d15a29](https://github.com/cozy/cozy-libs/commit/5d15a297a485e98ff6c0e3afe7ab466d9bf4fe99))
+
 ## [36.2.1](https://github.com/cozy/cozy-libs/compare/cozy-sharing@36.2.0...cozy-sharing@36.2.1) (2026-06-30)
 
 **Note:** Version bump only for package cozy-sharing

package/dist/DoctypeContact.js

@@ -1,6 +1,5 @@
-import { models } from 'cozy-client';
+import { getInitials as clientGetInitials, getDisplayName as clientGetDisplayName } from 'cozy-client/dist/models/contact';
 import { Contact as DoctypeContact } from 'cozy-doctypes';
-var ContactModel = models.contact;
 
 var isContact = function isContact(candidate) {
   return candidate._type === 'io.cozy.contacts';
@@ -10,21 +9,26 @@ export var getInitials = function getInitials(contactOrRecipient) {
   var defaultValue = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
 
   if (isContact(contactOrRecipient)) {
-    return ContactModel.getInitials(contactOrRecipient);
+    return clientGetInitials(contactOrRecipient);
   } else {
     // @todo Extract to RecipientModel ?
-    var s = contactOrRecipient.public_name || contactOrRecipient.name || contactOrRecipient.email;
-    return s && s[0].toUpperCase() || defaultValue;
+    var s = contactOrRecipient.public_name || contactOrRecipient.displayName || contactOrRecipient.name || contactOrRecipient.email;
+    if (!s) return defaultValue;
+    var parts = s.split(' ').filter(Boolean);
+    if (parts.length === 0) return defaultValue;
+    var firstLetter = parts[0][0];
+    var lastLetter = parts.length > 1 ? parts.at(-1)[0] : '';
+    return (firstLetter + lastLetter).toUpperCase();
   }
 };
 export var getDisplayName = function getDisplayName(contact) {
   var defaultValue = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
 
   if (isContact(contact)) {
-    return ContactModel.getDisplayName(contact);
+    return clientGetDisplayName(contact);
   } else {
     // @todo Extract to RecipientModel ?
-    return contact.public_name || contact.name || contact.email || defaultValue;
+    return contact.public_name || contact.displayName || contact.name || contact.email || defaultValue;
   }
 };
 export default DoctypeContact;

package/dist/components/Avatar/MemberAvatar.js

@@ -9,9 +9,32 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 import React, { useState } from 'react';
 import { useClient } from 'cozy-client';
+import { getPrimaryCozy } from 'cozy-client/dist/models/contact';
 import Avatar from 'cozy-ui/transpiled/react/Avatar';
 import logger from '../../logger';
 import { getInitials } from '../../models';
+/**
+ * makeAvatarUrl derives the avatar image URL for the recipient.
+ * - If the recipient has an avatarPath (sharing context), it is
+ *   used directly with a base URI prefix (unless it is already
+ *   a full URL for a remote Cozy).
+ * - If the recipient has no avatarPath but has a cozy URL
+ *   (contact context), it points to that Cozy's public avatar.
+ * - The status is used as a cache-buster in the URL so the
+ *   browser refreshes the image when the sharing status changes.
+ *   For non-sharing recipients, 'contact' is the stable default.
+ */
+
+var makeAvatarUrl = function makeAvatarUrl(recipient, instanceUri) {
+  var avatarPath = recipient.avatarPath;
+  var cozyUrl = !avatarPath ? getPrimaryCozy(recipient) : null;
+  if (!avatarPath && !cozyUrl) return null;
+  var finalPath = avatarPath || "".concat(cozyUrl.replace(/\/$/, ''), "/public/avatar?fallback=initials");
+  var status = recipient.status || 'contact';
+  var isFullPath = finalPath.startsWith('http');
+  var base = isFullPath ? '' : instanceUri;
+  return "".concat(base).concat(finalPath).concat(finalPath.includes('?') ? '&' : '?', "v=").concat(status);
+};
 
 var MemberAvatar = function MemberAvatar(_ref) {
   var recipient = _ref.recipient,
@@ -37,19 +60,8 @@ var MemberAvatar = function MemberAvatar(_ref) {
     }, rest));
     return null;
   }
-  /**
-   * avatarPath is always the same for a recipient, but image
-   * can be different since the stack generate it on the fly
-   * because they can be customized by the user.
-   * It can be "gray" during the first load depending of the
-   * status' sharing, but can become active (from the realtime)
-   * so we need a way to "refresh" the image. Passing the
-   * status in the url force the refresh of the image when the
-   * status changes
-   */
-
 
-  var image = recipient.avatarPath && recipient.status ? "".concat(client.options.uri).concat(recipient.avatarPath).concat(recipient.avatarPath.includes('?') ? '&' : '?', "v=").concat(recipient.status) : null; // The avatar can become unreachable (eg. the related sharing is revoked
+  var image = makeAvatarUrl(recipient, client.options.uri); // The avatar can become unreachable (eg. the related sharing is revoked
   // while its members are still rendered), in which case the image request
   // fails. Without a fallback the browser shows a broken-image icon, so we
   // render the initials instead.

package/dist/components/Avatar/MemberAvatar.spec.js

@@ -48,25 +48,66 @@ describe('MemberAvatar', function () {
 
     expect(container.querySelector('img').getAttribute('src')).toBe('http://cozy.example.com/public/avatar?fallback=initials&v=owner');
   });
-  it('renders the initials when there is no avatarPath', function () {
+  it('renders a full URL avatarPath without prefixing the local instance URI', function () {
     var _setup4 = setup({
+      public_name: 'Jon Snow',
+      status: 'contact',
+      avatarPath: 'https://jonsnow.mycozy.cloud/public/avatar?fallback=initials'
+    }),
+        container = _setup4.container;
+
+    expect(container.querySelector('img').getAttribute('src')).toBe('https://jonsnow.mycozy.cloud/public/avatar?fallback=initials&v=contact');
+  });
+  it('derives avatarPath from cozy URL when avatarPath is not set', function () {
+    var _setup5 = setup({
+      _type: 'io.cozy.contacts',
+      name: {
+        givenName: 'Jon',
+        familyName: 'Snow'
+      },
+      cozy: [{
+        url: 'https://jonsnow.mycozy.cloud'
+      }]
+    }),
+        container = _setup5.container;
+
+    var img = container.querySelector('img');
+    expect(img).toBeTruthy();
+    expect(img.getAttribute('src')).toBe('https://jonsnow.mycozy.cloud/public/avatar?fallback=initials&v=contact');
+  });
+  it('renders initials when there is no avatarPath and no cozy URL', function () {
+    var _setup6 = setup({
+      _type: 'io.cozy.contacts',
+      name: {
+        givenName: 'Jon',
+        familyName: 'Snow'
+      }
+    }),
+        container = _setup6.container,
+        getByText = _setup6.getByText;
+
+    expect(container.querySelector('img')).toBeNull();
+    expect(getByText('JS')).toBeTruthy();
+  });
+  it('renders the initials when there is no avatarPath', function () {
+    var _setup7 = setup({
       public_name: 'Bob',
       status: 'owner'
     }),
-        container = _setup4.container,
-        getByText = _setup4.getByText;
+        container = _setup7.container,
+        getByText = _setup7.getByText;
 
     expect(container.querySelector('img')).toBeNull();
     expect(getByText('B')).toBeTruthy();
   });
   it('falls back to the initials when the avatar image fails to load', function () {
-    var _setup5 = setup({
+    var _setup8 = setup({
       public_name: 'Bob',
       status: 'owner',
       avatarPath: '/sharings/123/recipients/0/avatar'
     }),
-        container = _setup5.container,
-        getByText = _setup5.getByText;
+        container = _setup8.container,
+        getByText = _setup8.getByText;
 
     var img = container.querySelector('img');
     expect(img).toBeTruthy();

package/dist/components/ContactSuggestion.js

@@ -1,44 +1,42 @@
 import PropTypes from 'prop-types';
 import React from 'react';
-import { models } from 'cozy-client';
-import Avatar from 'cozy-ui/transpiled/react/Avatar';
+import { getPrimaryCozy } from 'cozy-client/dist/models/contact';
 import ListItem from 'cozy-ui/transpiled/react/ListItem';
 import ListItemIcon from 'cozy-ui/transpiled/react/ListItemIcon';
 import ListItemText from 'cozy-ui/transpiled/react/ListItemText';
 import { useI18n } from 'twake-i18n';
-import { Contact, Group, getDisplayName, getInitials } from '../models';
+import { Contact, Group, getDisplayName } from '../models';
 import { GroupAvatar } from './Avatar/GroupAvatar';
-var ContactModel = models.contact;
+import { MemberAvatar } from './Avatar/MemberAvatar';
 export var ContactSuggestion = function ContactSuggestion(_ref) {
   var contactOrGroup = _ref.contactOrGroup;
 
   var _useI18n = useI18n(),
       t = _useI18n.t;
 
-  var avatarText, name, details;
-  var isContactGroup = contactOrGroup._type === Group.doctype;
-
-  if (isContactGroup) {
-    name = contactOrGroup.name;
-    avatarText = 'G';
-    details = t('Share.members.count', {
-      smart_count: contactOrGroup.members.length.toString()
-    });
-  } else {
-    name = getDisplayName(contactOrGroup);
-    avatarText = getInitials(contactOrGroup);
-    details = ContactModel.getPrimaryCozy(contactOrGroup);
+  if (contactOrGroup._type === Group.doctype) {
+    return /*#__PURE__*/React.createElement(ListItem, {
+      button: true
+    }, /*#__PURE__*/React.createElement(ListItemIcon, null, /*#__PURE__*/React.createElement(GroupAvatar, {
+      size: "m"
+    })), /*#__PURE__*/React.createElement(ListItemText, {
+      primary: contactOrGroup.name,
+      secondary: t('Share.members.count', {
+        smart_count: contactOrGroup.members.length.toString()
+      })
+    }));
   }
 
+  var name = getDisplayName(contactOrGroup);
+  var cozyUrl = getPrimaryCozy(contactOrGroup);
   return /*#__PURE__*/React.createElement(ListItem, {
     button: true
-  }, /*#__PURE__*/React.createElement(ListItemIcon, null, isContactGroup ? /*#__PURE__*/React.createElement(GroupAvatar, {
-    size: "m"
-  }) : /*#__PURE__*/React.createElement(Avatar, {
+  }, /*#__PURE__*/React.createElement(ListItemIcon, null, /*#__PURE__*/React.createElement(MemberAvatar, {
+    recipient: contactOrGroup,
     size: "m"
-  }, avatarText)), /*#__PURE__*/React.createElement(ListItemText, {
+  })), /*#__PURE__*/React.createElement(ListItemText, {
     primary: name,
-    secondary: details && details !== '' ? details : '-'
+    secondary: cozyUrl || '-'
   }));
 };
 var newUnknownContactProptypes = PropTypes.shape({

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

@@ -47,7 +47,10 @@ jest.mock('../../hooks/useSharingContext', function () {
         getSharedParentPath: jest.fn().mockReturnValue(null),
         getSharingById: mockGetSharingById,
         hasSharedChild: mockHasSharedChild,
-        hasSharedParent: mockHasSharedParent
+        hasSharedParent: mockHasSharedParent,
+        isOrgSharedDrive: jest.fn(function () {
+          return false;
+        })
       };
     }
   };

package/dist/components/Recipient/MemberRecipient.js

@@ -1,5 +1,5 @@
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
-var _excluded = ["instance", "isOwner", "status", "recipientConfirmationData", "verifyRecipient", "fadeIn"];
+var _excluded = ["instance", "isOwner", "status", "recipientConfirmationData", "verifyRecipient", "fadeIn", "isOrgSharedDrive"];
 import PropTypes from 'prop-types';
 import React from 'react';
 import { useClient } from 'cozy-client';
@@ -32,6 +32,7 @@ var MemberRecipient = function MemberRecipient(props) {
       recipientConfirmationData = props.recipientConfirmationData,
       verifyRecipient = props.verifyRecipient,
       fadeIn = props.fadeIn,
+      isOrgSharedDrive = props.isOrgSharedDrive,
       rest = _objectWithoutProperties(props, _excluded);
 
   var isMe = isOwner && status === 'owner' || instance === client.options.uri;
@@ -59,7 +60,8 @@ var MemberRecipient = function MemberRecipient(props) {
       isMe: isMe,
       instance: instance,
       email: rest.email,
-      name: rest.name || rest.public_name
+      name: rest.name || rest.public_name,
+      isOrgSharedDrive: isOrgSharedDrive
     })
   }), RightPart));
 };
@@ -69,6 +71,7 @@ MemberRecipient.propTypes = {
   isOwner: PropTypes.bool,
   status: PropTypes.string,
   recipientConfirmationData: PropTypes.object,
-  verifyRecipient: PropTypes.func
+  verifyRecipient: PropTypes.func,
+  isOrgSharedDrive: PropTypes.bool
 };
 export default MemberRecipient;

package/dist/components/Recipient/MemberRecipientStatus.js

@@ -10,6 +10,7 @@ var MemberRecipientStatus = function MemberRecipientStatus(_ref) {
       instance = _ref.instance,
       email = _ref.email,
       name = _ref.name,
+      isOrgSharedDrive = _ref.isOrgSharedDrive,
       typographyProps = _ref.typographyProps;
 
   var _useI18n = useI18n(),
@@ -24,7 +25,8 @@ var MemberRecipientStatus = function MemberRecipientStatus(_ref) {
     // (getDisplayName falls back to email when the recipient has no name).
     // Keep the instance visible when there is no email at all, so the user
     // can still tell the recipient lives on a different Cozy instance.
-    text = isMe || name || !email ? email || instance : '';
+    // For org shared drive owners, hide the email and instance entirely.
+    text = status === 'owner' && isOrgSharedDrive ? '' : isMe || name || !email ? email || instance : '';
   } else if (isSendingEmail) {
     text = t('Share.status.mail-not-sent');
   } else {
@@ -44,6 +46,7 @@ MemberRecipientStatus.propTypes = {
   instance: PropTypes.string,
   email: PropTypes.string,
   name: PropTypes.string,
+  isOrgSharedDrive: PropTypes.bool,
   typographyProps: PropTypes.object
 };
 export default MemberRecipientStatus;

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

@@ -63,39 +63,53 @@ describe('MemberRecipientStatus component', function () {
 
     expect(getByText('owner@example.com')).toBeTruthy();
   });
-  it('should show "Sending invitation mail..." when status is mail-not-sent and not isMe', function () {
+  it('should hide email and instance when status is owner and isOrgSharedDrive is true', function () {
     var _setup6 = setup({
+      status: 'owner',
+      isMe: false,
+      email: 'org@example.com',
+      instance: 'foo.mycozy.cloud',
+      name: 'Org Owner',
+      isOrgSharedDrive: true
+    }),
+        queryByText = _setup6.queryByText;
+
+    expect(queryByText('org@example.com')).toBe(null);
+    expect(queryByText('foo.mycozy.cloud')).toBe(null);
+  });
+  it('should show "Sending invitation mail..." when status is mail-not-sent and not isMe', function () {
+    var _setup7 = setup({
       status: 'mail-not-sent',
       isMe: false
     }),
-        getByText = _setup6.getByText;
+        getByText = _setup7.getByText;
 
     expect(getByText('Sending invitation mail...')).toBeTruthy();
   });
   it('should show "Invitation sent" when status is pending', function () {
-    var _setup7 = setup({
+    var _setup8 = setup({
       status: 'pending',
       isMe: false
     }),
-        getByText = _setup7.getByText;
+        getByText = _setup8.getByText;
 
     expect(getByText('Invitation sent')).toBeTruthy();
   });
   it('should show "Invitation seen" when status is seen', function () {
-    var _setup8 = setup({
+    var _setup9 = setup({
       status: 'seen',
       isMe: false
     }),
-        getByText = _setup8.getByText;
+        getByText = _setup9.getByText;
 
     expect(getByText('Invitation seen')).toBeTruthy();
   });
   it('should fallback to "Invitation sent" for unknown status', function () {
-    var _setup9 = setup({
+    var _setup10 = setup({
       status: 'unknown-status',
       isMe: false
     }),
-        getByText = _setup9.getByText;
+        getByText = _setup10.getByText;
 
     expect(getByText('Invitation sent')).toBeTruthy();
   });

package/dist/components/Recipient/OwnerRecipient.js

@@ -1,22 +1,27 @@
+import _extends from "@babel/runtime/helpers/extends";
 import PropTypes from 'prop-types';
 import React from 'react';
 import MemberRecipient from './MemberRecipient';
 import OwnerRecipientDefault from './OwnerRecipientDefault';
 
 var OwnerRecipient = function OwnerRecipient(_ref) {
-  var recipients = _ref.recipients;
+  var recipients = _ref.recipients,
+      isOrgSharedDrive = _ref.isOrgSharedDrive;
   var ownerRecipient = recipients.find(function (recipient) {
     return recipient.status === 'owner';
   });
 
   if (ownerRecipient) {
-    return /*#__PURE__*/React.createElement(MemberRecipient, ownerRecipient);
+    return /*#__PURE__*/React.createElement(MemberRecipient, _extends({}, ownerRecipient, {
+      isOrgSharedDrive: isOrgSharedDrive
+    }));
   }
 
   return /*#__PURE__*/React.createElement(OwnerRecipientDefault, null);
 };
 
 OwnerRecipient.propTypes = {
-  recipients: PropTypes.array.isRequired
+  recipients: PropTypes.array.isRequired,
+  isOrgSharedDrive: PropTypes.bool
 };
 export default OwnerRecipient;

package/dist/components/ShareDialogCozyToCozy.spec.js

@@ -36,7 +36,10 @@ jest.mock('../hooks/useSharingContext', function () {
         getSharingLink: jest.fn(function () {
           return null;
         }),
-        updateSharingMemberType: jest.fn()
+        updateSharingMemberType: jest.fn(),
+        isOrgSharedDrive: jest.fn(function () {
+          return false;
+        })
       };
     }
   };

package/dist/components/ShareDialogOnlyByLink.spec.js

@@ -20,7 +20,10 @@ jest.mock('../hooks/useSharingContext', function () {
           return mockSharingLink;
         },
         revokeSharingLink: jest.fn(),
-        updateDocumentPermissions: jest.fn()
+        updateDocumentPermissions: jest.fn(),
+        isOrgSharedDrive: jest.fn(function () {
+          return false;
+        })
       };
     }
   };

package/dist/components/WhoHasAccess.js

@@ -6,6 +6,7 @@ import LinkRecipient from './Recipient/LinkRecipient';
 import OwnerRecipient from './Recipient/OwnerRecipient';
 import { RecipientList } from './Recipient/RecipientList';
 import { usePrevious } from '../helpers/hooks';
+import { useSharingContext } from '../hooks/useSharingContext';
 /**
  * Displays a warning if some contacts are waiting for confirmation of their sharing
  *
@@ -52,6 +53,11 @@ var WhoHasAccess = function WhoHasAccess(_ref2) {
       permissions = _ref2.permissions;
   var previousLink = usePrevious(link);
   var linkHasBeenJustCreated = link && previousLink === null;
+
+  var _useSharingContext = useSharingContext(),
+      isOrgSharedDrive = _useSharingContext.isOrgSharedDrive;
+
+  var isOrgDrive = isOrgSharedDrive(document === null || document === void 0 ? void 0 : document._id);
   return /*#__PURE__*/React.createElement("div", {
     className: className
   }, /*#__PURE__*/React.createElement(RecipientWaitingForConfirmationAlert, {
@@ -65,7 +71,8 @@ var WhoHasAccess = function WhoHasAccess(_ref2) {
     permissions: permissions,
     fadeIn: linkHasBeenJustCreated
   }), showOwner && /*#__PURE__*/React.createElement(OwnerRecipient, {
-    recipients: recipients
+    recipients: recipients,
+    isOrgSharedDrive: isOrgDrive
   }), /*#__PURE__*/React.createElement(RecipientList, {
     recipients: recipients,
     recipientsToBeConfirmed: recipientsToBeConfirmed,

package/dist/index.js

@@ -5,6 +5,7 @@ export default SharingProvider;
 export { SharingContext, withLocales };
 export { useSharingContext } from './hooks/useSharingContext';
 export { useFetchDocumentPath } from './hooks/useFetchDocumentPath';
+export { MemberAvatar } from './components/Avatar/MemberAvatar';
 export { SharedDocument } from './SharedDocument';
 export { SharedStatus } from './SharedStatus';
 export { SharedBadge } from './SharedBadge';

package/package.json

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

package/src/DoctypeContact.js

@@ -1,29 +1,46 @@
-import { models } from 'cozy-client'
+import {
+  getInitials as clientGetInitials,
+  getDisplayName as clientGetDisplayName
+} from 'cozy-client/dist/models/contact'
 import { Contact as DoctypeContact } from 'cozy-doctypes'
-const ContactModel = models.contact
 
 const isContact = candidate => {
   return candidate._type === 'io.cozy.contacts'
 }
 export const getInitials = (contactOrRecipient, defaultValue = '') => {
   if (isContact(contactOrRecipient)) {
-    return ContactModel.getInitials(contactOrRecipient)
+    return clientGetInitials(contactOrRecipient)
   } else {
     // @todo Extract to RecipientModel ?
     const s =
       contactOrRecipient.public_name ||
+      contactOrRecipient.displayName ||
       contactOrRecipient.name ||
       contactOrRecipient.email
-    return (s && s[0].toUpperCase()) || defaultValue
+
+    if (!s) return defaultValue
+
+    const parts = s.split(' ').filter(Boolean)
+    if (parts.length === 0) return defaultValue
+    const firstLetter = parts[0][0]
+    const lastLetter = parts.length > 1 ? parts.at(-1)[0] : ''
+
+    return (firstLetter + lastLetter).toUpperCase()
   }
 }
 
 export const getDisplayName = (contact, defaultValue = '') => {
   if (isContact(contact)) {
-    return ContactModel.getDisplayName(contact)
+    return clientGetDisplayName(contact)
   } else {
     // @todo Extract to RecipientModel ?
-    return contact.public_name || contact.name || contact.email || defaultValue
+    return (
+      contact.public_name ||
+      contact.displayName ||
+      contact.name ||
+      contact.email ||
+      defaultValue
+    )
   }
 }
 

package/src/components/Avatar/MemberAvatar.jsx

@@ -1,11 +1,37 @@
 import React, { useState } from 'react'
 
 import { useClient } from 'cozy-client'
+import { getPrimaryCozy } from 'cozy-client/dist/models/contact'
 import Avatar from 'cozy-ui/transpiled/react/Avatar'
 
 import logger from '../../logger'
 import { getInitials } from '../../models'
 
+/**
+ * makeAvatarUrl derives the avatar image URL for the recipient.
+ * - If the recipient has an avatarPath (sharing context), it is
+ *   used directly with a base URI prefix (unless it is already
+ *   a full URL for a remote Cozy).
+ * - If the recipient has no avatarPath but has a cozy URL
+ *   (contact context), it points to that Cozy's public avatar.
+ * - The status is used as a cache-buster in the URL so the
+ *   browser refreshes the image when the sharing status changes.
+ *   For non-sharing recipients, 'contact' is the stable default.
+ */
+const makeAvatarUrl = (recipient, instanceUri) => {
+  const avatarPath = recipient.avatarPath
+  const cozyUrl = !avatarPath ? getPrimaryCozy(recipient) : null
+  if (!avatarPath && !cozyUrl) return null
+
+  const finalPath =
+    avatarPath ||
+    `${cozyUrl.replace(/\/$/, '')}/public/avatar?fallback=initials`
+  const status = recipient.status || 'contact'
+  const isFullPath = finalPath.startsWith('http')
+  const base = isFullPath ? '' : instanceUri
+  return `${base}${finalPath}${finalPath.includes('?') ? '&' : '?'}v=${status}`
+}
+
 const MemberAvatar = ({ recipient, ...rest }) => {
   const client = useClient()
   // Remember which image url failed to load so we can fall back to the
@@ -23,22 +49,7 @@ const MemberAvatar = ({ recipient, ...rest }) => {
     return null
   }
 
-  /**
-   * avatarPath is always the same for a recipient, but image
-   * can be different since the stack generate it on the fly
-   * because they can be customized by the user.
-   * It can be "gray" during the first load depending of the
-   * status' sharing, but can become active (from the realtime)
-   * so we need a way to "refresh" the image. Passing the
-   * status in the url force the refresh of the image when the
-   * status changes
-   */
-  const image =
-    recipient.avatarPath && recipient.status
-      ? `${client.options.uri}${recipient.avatarPath}${
-          recipient.avatarPath.includes('?') ? '&' : '?'
-        }v=${recipient.status}`
-      : null
+  const image = makeAvatarUrl(recipient, client.options.uri)
 
   // The avatar can become unreachable (eg. the related sharing is revoked
   // while its members are still rendered), in which case the image request

package/src/components/Avatar/MemberAvatar.spec.jsx

@@ -52,6 +52,42 @@ describe('MemberAvatar', () => {
     )
   })
 
+  it('renders a full URL avatarPath without prefixing the local instance URI', () => {
+    const { container } = setup({
+      public_name: 'Jon Snow',
+      status: 'contact',
+      avatarPath: 'https://jonsnow.mycozy.cloud/public/avatar?fallback=initials'
+    })
+
+    expect(container.querySelector('img').getAttribute('src')).toBe(
+      'https://jonsnow.mycozy.cloud/public/avatar?fallback=initials&v=contact'
+    )
+  })
+
+  it('derives avatarPath from cozy URL when avatarPath is not set', () => {
+    const { container } = setup({
+      _type: 'io.cozy.contacts',
+      name: { givenName: 'Jon', familyName: 'Snow' },
+      cozy: [{ url: 'https://jonsnow.mycozy.cloud' }]
+    })
+
+    const img = container.querySelector('img')
+    expect(img).toBeTruthy()
+    expect(img.getAttribute('src')).toBe(
+      'https://jonsnow.mycozy.cloud/public/avatar?fallback=initials&v=contact'
+    )
+  })
+
+  it('renders initials when there is no avatarPath and no cozy URL', () => {
+    const { container, getByText } = setup({
+      _type: 'io.cozy.contacts',
+      name: { givenName: 'Jon', familyName: 'Snow' }
+    })
+
+    expect(container.querySelector('img')).toBeNull()
+    expect(getByText('JS')).toBeTruthy()
+  })
+
   it('renders the initials when there is no avatarPath', () => {
     const { container, getByText } = setup({
       public_name: 'Bob',

package/src/components/ContactSuggestion.jsx

@@ -1,47 +1,44 @@
 import PropTypes from 'prop-types'
 import React from 'react'
 
-import { models } from 'cozy-client'
-import Avatar from 'cozy-ui/transpiled/react/Avatar'
+import { getPrimaryCozy } from 'cozy-client/dist/models/contact'
 import ListItem from 'cozy-ui/transpiled/react/ListItem'
 import ListItemIcon from 'cozy-ui/transpiled/react/ListItemIcon'
 import ListItemText from 'cozy-ui/transpiled/react/ListItemText'
 import { useI18n } from 'twake-i18n'
 
-import { Contact, Group, getDisplayName, getInitials } from '../models'
+import { Contact, Group, getDisplayName } from '../models'
 import { GroupAvatar } from './Avatar/GroupAvatar'
-
-const ContactModel = models.contact
+import { MemberAvatar } from './Avatar/MemberAvatar'
 
 export const ContactSuggestion = ({ contactOrGroup }) => {
   const { t } = useI18n()
-  let avatarText, name, details
-  const isContactGroup = contactOrGroup._type === Group.doctype
-  if (isContactGroup) {
-    name = contactOrGroup.name
-    avatarText = 'G'
-    details = t('Share.members.count', {
-      smart_count: contactOrGroup.members.length.toString()
-    })
-  } else {
-    name = getDisplayName(contactOrGroup)
-    avatarText = getInitials(contactOrGroup)
-    details = ContactModel.getPrimaryCozy(contactOrGroup)
+
+  if (contactOrGroup._type === Group.doctype) {
+    return (
+      <ListItem button>
+        <ListItemIcon>
+          <GroupAvatar size="m" />
+        </ListItemIcon>
+        <ListItemText
+          primary={contactOrGroup.name}
+          secondary={t('Share.members.count', {
+            smart_count: contactOrGroup.members.length.toString()
+          })}
+        />
+      </ListItem>
+    )
   }
 
+  const name = getDisplayName(contactOrGroup)
+  const cozyUrl = getPrimaryCozy(contactOrGroup)
+
   return (
     <ListItem button>
       <ListItemIcon>
-        {isContactGroup ? (
-          <GroupAvatar size="m" />
-        ) : (
-          <Avatar size="m">{avatarText}</Avatar>
-        )}
+        <MemberAvatar recipient={contactOrGroup} size="m" />
       </ListItemIcon>
-      <ListItemText
-        primary={name}
-        secondary={details && details !== '' ? details : '-'}
-      />
+      <ListItemText primary={name} secondary={cozyUrl || '-'} />
     </ListItem>
   )
 }

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

@@ -40,7 +40,8 @@ jest.mock('../../hooks/useSharingContext', () => ({
     getSharedParentPath: jest.fn().mockReturnValue(null),
     getSharingById: mockGetSharingById,
     hasSharedChild: mockHasSharedChild,
-    hasSharedParent: mockHasSharedParent
+    hasSharedParent: mockHasSharedParent,
+    isOrgSharedDrive: jest.fn(() => false)
   })
 }))
 

package/src/components/Recipient/MemberRecipient.jsx

@@ -32,6 +32,7 @@ const MemberRecipient = props => {
     recipientConfirmationData,
     verifyRecipient,
     fadeIn,
+    isOrgSharedDrive,
     ...rest
   } = props
 
@@ -68,6 +69,7 @@ const MemberRecipient = props => {
               instance={instance}
               email={rest.email}
               name={rest.name || rest.public_name}
+              isOrgSharedDrive={isOrgSharedDrive}
             />
           }
         />
@@ -82,7 +84,8 @@ MemberRecipient.propTypes = {
   isOwner: PropTypes.bool,
   status: PropTypes.string,
   recipientConfirmationData: PropTypes.object,
-  verifyRecipient: PropTypes.func
+  verifyRecipient: PropTypes.func,
+  isOrgSharedDrive: PropTypes.bool
 }
 
 export default MemberRecipient

package/src/components/Recipient/MemberRecipientStatus.jsx

@@ -10,6 +10,7 @@ const MemberRecipientStatus = ({
   instance,
   email,
   name,
+  isOrgSharedDrive,
   typographyProps
 }) => {
   const { t } = useI18n()
@@ -22,7 +23,13 @@ const MemberRecipientStatus = ({
     // (getDisplayName falls back to email when the recipient has no name).
     // Keep the instance visible when there is no email at all, so the user
     // can still tell the recipient lives on a different Cozy instance.
-    text = isMe || name || !email ? email || instance : ''
+    // For org shared drive owners, hide the email and instance entirely.
+    text =
+      status === 'owner' && isOrgSharedDrive
+        ? ''
+        : isMe || name || !email
+          ? email || instance
+          : ''
   } else if (isSendingEmail) {
     text = t('Share.status.mail-not-sent')
   } else {
@@ -45,6 +52,7 @@ MemberRecipientStatus.propTypes = {
   instance: PropTypes.string,
   email: PropTypes.string,
   name: PropTypes.string,
+  isOrgSharedDrive: PropTypes.bool,
   typographyProps: PropTypes.object
 }
 

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

@@ -63,6 +63,19 @@ describe('MemberRecipientStatus component', () => {
     expect(getByText('owner@example.com')).toBeTruthy()
   })
 
+  it('should hide email and instance when status is owner and isOrgSharedDrive is true', () => {
+    const { queryByText } = setup({
+      status: 'owner',
+      isMe: false,
+      email: 'org@example.com',
+      instance: 'foo.mycozy.cloud',
+      name: 'Org Owner',
+      isOrgSharedDrive: true
+    })
+    expect(queryByText('org@example.com')).toBe(null)
+    expect(queryByText('foo.mycozy.cloud')).toBe(null)
+  })
+
   it('should show "Sending invitation mail..." when status is mail-not-sent and not isMe', () => {
     const { getByText } = setup({
       status: 'mail-not-sent',

package/src/components/Recipient/OwnerRecipient.jsx

@@ -4,20 +4,26 @@ import React from 'react'
 import MemberRecipient from './MemberRecipient'
 import OwnerRecipientDefault from './OwnerRecipientDefault'
 
-const OwnerRecipient = ({ recipients }) => {
+const OwnerRecipient = ({ recipients, isOrgSharedDrive }) => {
   const ownerRecipient = recipients.find(
     recipient => recipient.status === 'owner'
   )
 
   if (ownerRecipient) {
-    return <MemberRecipient {...ownerRecipient} />
+    return (
+      <MemberRecipient
+        {...ownerRecipient}
+        isOrgSharedDrive={isOrgSharedDrive}
+      />
+    )
   }
 
   return <OwnerRecipientDefault />
 }
 
 OwnerRecipient.propTypes = {
-  recipients: PropTypes.array.isRequired
+  recipients: PropTypes.array.isRequired,
+  isOrgSharedDrive: PropTypes.bool
 }
 
 export default OwnerRecipient

package/src/components/ShareDialogCozyToCozy.spec.jsx

@@ -17,7 +17,8 @@ jest.mock('cozy-client', () => ({
 jest.mock('../hooks/useSharingContext', () => ({
   useSharingContext: () => ({
     getSharingLink: jest.fn(() => null),
-    updateSharingMemberType: jest.fn()
+    updateSharingMemberType: jest.fn(),
+    isOrgSharedDrive: jest.fn(() => false)
   })
 }))
 

package/src/components/ShareDialogOnlyByLink.spec.jsx

@@ -14,7 +14,8 @@ jest.mock('../hooks/useSharingContext', () => ({
     getDocumentPermissions: () => [],
     getSharingLink: () => mockSharingLink,
     revokeSharingLink: jest.fn(),
-    updateDocumentPermissions: jest.fn()
+    updateDocumentPermissions: jest.fn(),
+    isOrgSharedDrive: jest.fn(() => false)
   })
 }))
 

package/src/components/WhoHasAccess.jsx

@@ -8,6 +8,7 @@ import LinkRecipient from './Recipient/LinkRecipient'
 import OwnerRecipient from './Recipient/OwnerRecipient'
 import { RecipientList } from './Recipient/RecipientList'
 import { usePrevious } from '../helpers/hooks'
+import { useSharingContext } from '../hooks/useSharingContext'
 
 /**
  * Displays a warning if some contacts are waiting for confirmation of their sharing
@@ -46,6 +47,8 @@ const WhoHasAccess = ({
 }) => {
   const previousLink = usePrevious(link)
   const linkHasBeenJustCreated = link && previousLink === null
+  const { isOrgSharedDrive } = useSharingContext()
+  const isOrgDrive = isOrgSharedDrive(document?._id)
 
   return (
     <div className={className}>
@@ -65,7 +68,12 @@ const WhoHasAccess = ({
           />
         )}
 
-        {showOwner && <OwnerRecipient recipients={recipients} />}
+        {showOwner && (
+          <OwnerRecipient
+            recipients={recipients}
+            isOrgSharedDrive={isOrgDrive}
+          />
+        )}
 
         <RecipientList
           recipients={recipients}

package/src/index.jsx

@@ -9,6 +9,7 @@ export { SharingContext, withLocales }
 export { useSharingContext } from './hooks/useSharingContext'
 export { useFetchDocumentPath } from './hooks/useFetchDocumentPath'
 
+export { MemberAvatar } from './components/Avatar/MemberAvatar'
 export { SharedDocument } from './SharedDocument'
 export { SharedStatus } from './SharedStatus'
 export { SharedBadge } from './SharedBadge'