cozy-sharing 40.1.9 → 40.2.1

package/dist/helpers/contacts.spec.js

@@ -8,7 +8,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import flag from 'cozy-flags';
-import { computeContactsAndGroups, getOrCreateFromArray } from './contacts';
+import { computeContactsAndGroups, getOrCreateFromArray, suggestContacts } from './contacts';
 jest.mock('cozy-flags', function () {
   return {
     __esModule: true,
@@ -184,4 +184,153 @@ describe('computeContactsAndGroups', function () {
       return c._id;
     })).toEqual(['alice', 'bob']);
   });
+});
+describe('getOrCreateFromArray with contactsSuggestEnabled', function () {
+  it('should send people by email and keep groups, without creating contacts', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
+    var createContact, group, recipients;
+    return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          createContact = jest.fn();
+          group = {
+            _id: 'group-1',
+            _type: 'io.cozy.contacts.groups'
+          };
+          _context2.next = 4;
+          return getOrCreateFromArray(mockClient, [{
+            _id: 'org-member-1',
+            _type: 'io.cozy.contacts',
+            email: [{
+              address: 'member@org.example',
+              primary: true
+            }],
+            meta: {
+              kind: 'member'
+            }
+          }, {
+            email: 'unknown@friends.example'
+          }, group], createContact, true);
+
+        case 4:
+          recipients = _context2.sent;
+          expect(recipients).toEqual([{
+            _type: 'io.cozy.contacts',
+            email: 'member@org.example'
+          }, {
+            _type: 'io.cozy.contacts',
+            email: 'unknown@friends.example'
+          }, group]);
+          expect(createContact).not.toHaveBeenCalled();
+
+        case 7:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2);
+  })));
+  it('should keep a contact without email by id, and drop a recipient with neither', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
+    var cozyOnlyContact, recipients;
+    return _regeneratorRuntime.wrap(function _callee3$(_context3) {
+      while (1) switch (_context3.prev = _context3.next) {
+        case 0:
+          cozyOnlyContact = {
+            _id: 'contact-1',
+            _type: 'io.cozy.contacts',
+            cozy: [{
+              url: 'https://bob.example'
+            }]
+          };
+          _context3.next = 3;
+          return getOrCreateFromArray(mockClient, [cozyOnlyContact, {
+            instance: 'https://alice.example'
+          }], jest.fn(), true);
+
+        case 3:
+          recipients = _context3.sent;
+          expect(recipients).toEqual([cozyOnlyContact, undefined]);
+
+        case 5:
+        case "end":
+          return _context3.stop();
+      }
+    }, _callee3);
+  })));
+});
+describe('suggestContacts', function () {
+  it('should map the suggestions of the stack to contacts', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4() {
+    var fetchJSON, client, contacts;
+    return _regeneratorRuntime.wrap(function _callee4$(_context4) {
+      while (1) switch (_context4.prev = _context4.next) {
+        case 0:
+          fetchJSON = jest.fn().mockResolvedValue({
+            data: [{
+              type: 'io.cozy.contacts',
+              id: 'org-member-1',
+              attributes: {
+                fullname: 'Jean Dupont',
+                name: {
+                  givenName: 'Jean',
+                  familyName: 'Dupont'
+                },
+                email: [{
+                  address: 'jean@org.example',
+                  primary: true
+                }]
+              },
+              meta: {
+                kind: 'member'
+              }
+            }, {
+              type: 'io.cozy.contacts',
+              attributes: {
+                fullname: 'Paul Dupuis',
+                email: [{
+                  address: 'paul@friends.example',
+                  primary: true
+                }]
+              }
+            }]
+          });
+          client = {
+            getStackClient: function getStackClient() {
+              return {
+                fetchJSON: fetchJSON
+              };
+            }
+          };
+          _context4.next = 4;
+          return suggestContacts(client, 'dup & co');
+
+        case 4:
+          contacts = _context4.sent;
+          expect(fetchJSON).toHaveBeenCalledWith('GET', '/contacts/suggest?q=dup%20%26%20co');
+          expect(contacts).toEqual([{
+            _id: 'org-member-1',
+            id: 'org-member-1',
+            _type: 'io.cozy.contacts',
+            fullname: 'Jean Dupont',
+            name: {
+              givenName: 'Jean',
+              familyName: 'Dupont'
+            },
+            email: [{
+              address: 'jean@org.example',
+              primary: true
+            }]
+          }, {
+            _type: 'io.cozy.contacts',
+            fullname: 'Paul Dupuis',
+            displayName: 'Paul Dupuis',
+            email: [{
+              address: 'paul@friends.example',
+              primary: true
+            }]
+          }]);
+
+        case 7:
+        case "end":
+          return _context4.stop();
+      }
+    }, _callee4);
+  })));
 });

package/dist/helpers/recipients.js

@@ -5,6 +5,7 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
+import { getPrimaryCozy } from 'cozy-client/dist/models/contact';
 import flag from 'cozy-flags';
 import { DOCTYPE_GROUPS } from '../models';
 export var DEFAULT_DISPLAY_NAME = 'Share.contacts.defaultDisplayName';
@@ -141,4 +142,41 @@ export var hasMemberActions = function hasMemberActions(_ref2) {
       canManageSharing = _ref2.canManageSharing,
       canManageMembers = _ref2.canManageMembers;
   return canManageMembers && status !== 'owner' && (isCurrentUser && !isOwner || canManageSharing);
+};
+/**
+ * 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.
+ */
+
+export 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);
+};
+/**
+ * Adds to the recipients, except groups, the URL of their avatar
+ *
+ * @param {object[]} recipients - Recipients of a sharing
+ * @param {string} instanceUri - URI of the current user's instance
+ * @returns {object[]} The recipients with their `avatarUrl`
+ */
+
+export var addAvatarUrls = function addAvatarUrls(recipients, instanceUri) {
+  return recipients.map(function (recipient) {
+    return recipient.members ? recipient : _objectSpread(_objectSpread({}, recipient), {}, {
+      avatarUrl: makeAvatarUrl(recipient, instanceUri)
+    });
+  });
 };

package/dist/helpers/recipients.spec.js

@@ -5,7 +5,7 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
-import { hasMemberActions, markCurrentUser } from './recipients';
+import { addAvatarUrls, hasMemberActions, makeAvatarUrl, markCurrentUser } from './recipients';
 var instanceUri = 'https://alice.cozy.cc';
 describe('markCurrentUser', function () {
   it('flags the recipient whose instance is the current one', function () {
@@ -86,4 +86,56 @@ describe('hasMemberActions', function () {
       status: 'ready'
     }))).toBe(false);
   });
+});
+describe('makeAvatarUrl', function () {
+  var instanceUri = 'http://cozy.example.com';
+  it('prefixes the avatarPath with the instance URI and the status', function () {
+    expect(makeAvatarUrl({
+      status: 'owner',
+      avatarPath: '/sharings/123/recipients/0/avatar'
+    }, instanceUri)).toBe('http://cozy.example.com/sharings/123/recipients/0/avatar?v=owner');
+  });
+  it('appends the status with & when avatarPath already has a query string', function () {
+    expect(makeAvatarUrl({
+      status: 'owner',
+      avatarPath: '/public/avatar?fallback=initials'
+    }, instanceUri)).toBe('http://cozy.example.com/public/avatar?fallback=initials&v=owner');
+  });
+  it('does not prefix a full URL avatarPath with the instance URI', function () {
+    expect(makeAvatarUrl({
+      status: 'contact',
+      avatarPath: 'https://jonsnow.mycozy.cloud/public/avatar?fallback=initials'
+    }, instanceUri)).toBe('https://jonsnow.mycozy.cloud/public/avatar?fallback=initials&v=contact');
+  });
+  it('points to the public avatar of the contact cozy when there is no avatarPath', function () {
+    expect(makeAvatarUrl({
+      _type: 'io.cozy.contacts',
+      cozy: [{
+        url: 'https://jonsnow.mycozy.cloud'
+      }]
+    }, instanceUri)).toBe('https://jonsnow.mycozy.cloud/public/avatar?fallback=initials&v=contact');
+  });
+  it('returns null when there is no avatarPath and no cozy URL', function () {
+    expect(makeAvatarUrl({
+      _type: 'io.cozy.contacts',
+      public_name: 'Bob'
+    }, instanceUri)).toBe(null);
+  });
+});
+describe('addAvatarUrls', function () {
+  it('adds the avatar URL to the members but not to the groups', function () {
+    var _addAvatarUrls = addAvatarUrls([{
+      status: 'ready',
+      avatarPath: '/sharings/123/recipients/1/avatar'
+    }, {
+      name: 'Team',
+      members: []
+    }], 'http://cozy.example.com'),
+        _addAvatarUrls2 = _slicedToArray(_addAvatarUrls, 2),
+        member = _addAvatarUrls2[0],
+        group = _addAvatarUrls2[1];
+
+    expect(member.avatarUrl).toBe('http://cozy.example.com/sharings/123/recipients/1/avatar?v=ready');
+    expect(group).not.toHaveProperty('avatarUrl');
+  });
 });

package/dist/hooks/useResolveRecipients.js

@@ -2,6 +2,7 @@ import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { useCallback } from 'react';
 import { useClient } from 'cozy-client';
+import { useSharingContext } from './useSharingContext';
 import { getOrCreateFromArray } from '../helpers/contacts';
 import { DOCTYPE_CONTACTS } from '../models';
 /**
@@ -13,7 +14,10 @@ import { DOCTYPE_CONTACTS } from '../models';
  */
 
 export var useResolveRecipients = function useResolveRecipients() {
+  var _useSharingContext;
+
   var client = useClient();
+  var contactsSuggestEnabled = (_useSharingContext = useSharingContext()) === null || _useSharingContext === void 0 ? void 0 : _useSharingContext.contactsSuggestEnabled;
   return useCallback( /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(pendingRecipients) {
       var selectedOption,
@@ -29,7 +33,7 @@ export var useResolveRecipients = function useResolveRecipients() {
               return client.create(DOCTYPE_CONTACTS, contact);
             };
             _context.next = 4;
-            return getOrCreateFromArray(client, pendingRecipients, createContact);
+            return getOrCreateFromArray(client, pendingRecipients, createContact, contactsSuggestEnabled);
 
           case 4:
             contacts = _context.sent;
@@ -49,5 +53,5 @@ export var useResolveRecipients = function useResolveRecipients() {
     return function (_x) {
       return _ref.apply(this, arguments);
     };
-  }(), [client]);
+  }(), [client, contactsSuggestEnabled]);
 };

package/dist/hooks/useResolveRecipients.spec.js

@@ -18,6 +18,15 @@ jest.mock('../helpers/contacts', function () {
     getOrCreateFromArray: jest.fn()
   };
 });
+jest.mock('./useSharingContext', function () {
+  return {
+    useSharingContext: function useSharingContext() {
+      return {
+        contactsSuggestEnabled: true
+      };
+    }
+  };
+});
 var contacts = [{
   _id: 'alice'
 }, {
@@ -102,7 +111,7 @@ describe('useResolveRecipients', function () {
               address: 'alice@cozy.cc'
             }]
           });
-          expect(getOrCreateFromArray).toHaveBeenCalledWith(mockClient, pendingRecipients, expect.any(Function));
+          expect(getOrCreateFromArray).toHaveBeenCalledWith(mockClient, pendingRecipients, expect.any(Function), true);
           expect(mockClient.create).toHaveBeenCalledWith('io.cozy.contacts', {
             email: [{
               address: 'alice@cozy.cc'
@@ -129,7 +138,7 @@ describe('useResolveRecipients', function () {
           return result.current([], 'readWrite', createContact);
 
         case 4:
-          expect(getOrCreateFromArray).toHaveBeenCalledWith(mockClient, [], createContact);
+          expect(getOrCreateFromArray).toHaveBeenCalledWith(mockClient, [], createContact, true);
 
         case 5:
         case "end":

package/dist/index.js

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

package/dist/queries/queries.js

@@ -1,3 +1,9 @@
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
 import { Q, fetchPolicies } from 'cozy-client';
 import { DOCTYPE_CONTACTS, DOCTYPE_GROUPS } from '../models';
 var DEFAULT_CACHE_TIMEOUT_QUERIES = 9 * 60 * 1000;
@@ -12,12 +18,15 @@ export var buildSharingsByIdQuery = function buildSharingsByIdQuery(sharingId) {
   };
 };
 export var buildReachableContactsQuery = function buildReachableContactsQuery() {
+  var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
+      inGroups = _ref.inGroups;
+
   return {
     definition: Q(DOCTYPE_CONTACTS).where({
       _id: {
         $gt: null
       }
-    }).partialIndex({
+    }).partialIndex(_objectSpread({
       trashed: {
         $or: [{
           $eq: false
@@ -38,9 +47,13 @@ export var buildReachableContactsQuery = function buildReachableContactsQuery()
           }
         }
       }]
-    }).indexFields(['_id']).limitBy(1000),
+    }, inGroups && {
+      'relationships.groups.data': {
+        $exists: true
+      }
+    })).indexFields(['_id']).limitBy(1000),
     options: {
-      as: 'io.cozy.contacts/reachable'
+      as: inGroups ? 'io.cozy.contacts/reachable-with-groups' : 'io.cozy.contacts/reachable'
     }
   };
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-sharing",
-  "version": "40.1.9",
+  "version": "40.2.1",
   "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.1.4",
+    "cozy-ui-plus": "^14.1.6",
     "jest": "30.3.0",
     "jest-environment-jsdom": "30.3.0",
     "react": "16.12.0",
@@ -84,5 +84,5 @@
   "sideEffects": [
     "*.css"
   ],
-  "gitHead": "4dc5561f74fe7d2d000b112026294e208221a4d7"
+  "gitHead": "dc527e69d5c65ec27dc4ad7b940e01248ee6120f"
 }

package/src/SharingOwnerAvatar.jsx

@@ -1,6 +1,6 @@
 import React from 'react'
 
-import { MemberAvatar } from './components/Avatar/MemberAvatar'
+import { MemberAvatarWrapper } from './components/Avatar/MemberAvatarWrapper'
 import SharingContext from './context'
 import withLocales from './hoc/withLocales'
 
@@ -8,7 +8,7 @@ export const SharingOwnerAvatar = withLocales(({ docId, ...rest }) => (
   <SharingContext.Consumer>
     {({ byDocId, getOwner } = {}) => {
       return !byDocId || !byDocId[docId] ? null : (
-        <MemberAvatar recipient={getOwner(docId)} {...rest} />
+        <MemberAvatarWrapper recipient={getOwner(docId)} {...rest} />
       )
     }}
   </SharingContext.Consumer>

package/src/SharingProvider.jsx

@@ -745,7 +745,12 @@ export class SharingProvider extends Component {
     // but if we don't, consumers don't rerender when the state changes after loading the sharings,
     // probably because the state object remains the same...
     return (
-      <SharingContext.Provider value={{ ...this.state }}>
+      <SharingContext.Provider
+        value={{
+          ...this.state,
+          contactsSuggestEnabled: this.props.contactsSuggestEnabled
+        }}
+      >
         {this.props.children}
       </SharingContext.Provider>
     )

package/src/components/Avatar/AvatarList.jsx

@@ -7,7 +7,7 @@ import Avatar from 'cozy-ui/transpiled/react/Avatar'
 
 import { ExtraAvatar } from './ExtraAvatar'
 import { GroupAvatar } from './GroupAvatar'
-import { MemberAvatar } from './MemberAvatar'
+import { MemberAvatarWrapper } from './MemberAvatarWrapper'
 import { getDisplayName } from '../../models'
 import styles from '../../styles/recipient.styl'
 
@@ -104,7 +104,7 @@ const AvatarList = ({
             }`}
             key={recipient.index}
           >
-            <MemberAvatar recipient={recipient} size={size} />
+            <MemberAvatarWrapper recipient={recipient} size={size} />
           </span>
         )
       })}

package/src/components/Avatar/MemberAvatar.jsx

@@ -1,39 +1,11 @@
 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()
+const MemberAvatar = ({ recipient, avatarUrl, ...rest }) => {
   // Remember which image url failed to load so we can fall back to the
   // initials. Storing the url (instead of a boolean) means a new url is
   // retried automatically, without an effect to reset the error state.
@@ -49,20 +21,18 @@ const MemberAvatar = ({ recipient, ...rest }) => {
     return 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
   // fails. Without a fallback the browser shows a broken-image icon, so we
   // render the initials instead.
   return (
     <Avatar {...rest}>
-      {image && erroredSrc !== image ? (
+      {avatarUrl && erroredSrc !== avatarUrl ? (
         <img
           width="100%"
           height="100%"
-          src={image}
-          onError={() => setErroredSrc(image)}
+          src={avatarUrl}
+          onError={() => setErroredSrc(avatarUrl)}
         />
       ) : (
         getInitials(recipient)

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

@@ -1,19 +1,14 @@
 import { render, fireEvent } from '@testing-library/react'
 import React from 'react'
 
-import { createMockClient } from 'cozy-client'
-
 import { MemberAvatar } from './MemberAvatar'
 import AppLike from '../../../test/AppLike'
 
 describe('MemberAvatar', () => {
-  const client = createMockClient({})
-  client.options = { uri: 'http://cozy.example.com' }
-
-  const setup = recipient =>
+  const setup = (recipient, avatarUrl = null) =>
     render(
-      <AppLike client={client}>
-        <MemberAvatar recipient={recipient} />
+      <AppLike>
+        <MemberAvatar recipient={recipient} avatarUrl={avatarUrl} />
       </AppLike>
     )
 
@@ -26,59 +21,18 @@ describe('MemberAvatar', () => {
     expect(container.querySelector('img')).toBeNull()
   })
 
-  it('renders the avatar image when the recipient has an avatarPath and a status', () => {
-    const { container } = setup({
-      public_name: 'Bob',
-      status: 'owner',
-      avatarPath: '/sharings/123/recipients/0/avatar'
-    })
-
-    const img = container.querySelector('img')
-    expect(img).toBeTruthy()
-    expect(img.getAttribute('src')).toBe(
+  it('renders the avatar image', () => {
+    const { container } = setup(
+      { public_name: 'Bob', status: 'owner' },
       'http://cozy.example.com/sharings/123/recipients/0/avatar?v=owner'
     )
-  })
-
-  it('appends the cache-busting param with & when avatarPath already has a query string', () => {
-    const { container } = setup({
-      public_name: 'Bob',
-      status: 'owner',
-      avatarPath: '/public/avatar?fallback=initials'
-    })
-
-    expect(container.querySelector('img').getAttribute('src')).toBe(
-      'http://cozy.example.com/public/avatar?fallback=initials&v=owner'
-    )
-  })
-
-  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'
+      'http://cozy.example.com/sharings/123/recipients/0/avatar?v=owner'
     )
   })
 
-  it('renders initials when there is no avatarPath and no cozy URL', () => {
+  it('renders the initials when there is no avatar URL', () => {
     const { container, getByText } = setup({
       _type: 'io.cozy.contacts',
       name: { givenName: 'Jon', familyName: 'Snow' }
@@ -88,27 +42,13 @@ describe('MemberAvatar', () => {
     expect(getByText('JS')).toBeTruthy()
   })
 
-  it('renders the initials when there is no avatarPath', () => {
-    const { container, getByText } = setup({
-      public_name: 'Bob',
-      status: 'owner'
-    })
-
-    expect(container.querySelector('img')).toBeNull()
-    expect(getByText('B')).toBeTruthy()
-  })
-
   it('falls back to the initials when the avatar image fails to load', () => {
-    const { container, getByText } = setup({
-      public_name: 'Bob',
-      status: 'owner',
-      avatarPath: '/sharings/123/recipients/0/avatar'
-    })
-
-    const img = container.querySelector('img')
-    expect(img).toBeTruthy()
+    const { container, getByText } = setup(
+      { public_name: 'Bob', status: 'owner' },
+      'http://cozy.example.com/sharings/123/recipients/0/avatar?v=owner'
+    )
 
-    fireEvent.error(img)
+    fireEvent.error(container.querySelector('img'))
 
     expect(container.querySelector('img')).toBeNull()
     expect(getByText('B')).toBeTruthy()