cozy-sharing 33.4.0 → 33.4.1

package/CHANGELOG.md

@@ -3,6 +3,12 @@
 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

package/dist/components/Avatar/MemberAvatar.js

@@ -1,4 +1,5 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
+import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
 var _excluded = ["recipient"];
 
@@ -6,7 +7,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 React from 'react';
+import React, { useState } from 'react';
 import { useClient } from 'cozy-client';
 import Avatar from 'cozy-ui/transpiled/react/Avatar';
 import logger from '../../logger';
@@ -16,11 +17,19 @@ var MemberAvatar = function MemberAvatar(_ref) {
   var recipient = _ref.recipient,
       rest = _objectWithoutProperties(_ref, _excluded);
 
-  var client = useClient(); // There are cases when due to apparent memory leaks, the recipient does not exist
+  var client = useClient(); // 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.
+
+  var _useState = useState(null),
+      _useState2 = _slicedToArray(_useState, 2),
+      erroredSrc = _useState2[0],
+      setErroredSrc = _useState2[1]; // There are cases when due to apparent memory leaks, the recipient does not exist
   // This will trigger an unhanded error in the Avatar component and crash the app
   // At the moment, we are not sure where is the root cause of this cascading undefined props
   // Nevertheless, we can prevent the crash by returning null if the recipient is undefined
 
+
   if (!recipient) {
     // eslint-disable-next-line
     logger.warn('RecipientAvatar: recipient is missing, see props:', _objectSpread({
@@ -40,11 +49,18 @@ var MemberAvatar = function MemberAvatar(_ref) {
    */
 
 
-  var image = recipient.avatarPath && recipient.status ? "".concat(client.options.uri).concat(recipient.avatarPath, "?v=").concat(recipient.status) : null;
-  return /*#__PURE__*/React.createElement(Avatar, rest, image ? /*#__PURE__*/React.createElement("img", {
+  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
+  // 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 /*#__PURE__*/React.createElement(Avatar, rest, image && erroredSrc !== image ? /*#__PURE__*/React.createElement("img", {
     width: "100%",
     height: "100%",
-    src: image
+    src: image,
+    onError: function onError() {
+      return setErroredSrc(image);
+    }
   }) : getInitials(recipient));
 };
 

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

@@ -0,0 +1,77 @@
+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', function () {
+  var client = createMockClient({});
+  client.options = {
+    uri: 'http://cozy.example.com'
+  };
+
+  var setup = function setup(recipient) {
+    return render( /*#__PURE__*/React.createElement(AppLike, {
+      client: client
+    }, /*#__PURE__*/React.createElement(MemberAvatar, {
+      recipient: recipient
+    })));
+  };
+
+  it('renders nothing when the recipient is missing', function () {
+    var _setup = setup(undefined),
+        container = _setup.container; // The component returns null; only the provider wrappers remain, with no
+    // avatar rendered inside.
+
+
+    expect(container.querySelector('[class*="MuiAvatar-root"]')).toBeNull();
+    expect(container.querySelector('img')).toBeNull();
+  });
+  it('renders the avatar image when the recipient has an avatarPath and a status', function () {
+    var _setup2 = setup({
+      public_name: 'Bob',
+      status: 'owner',
+      avatarPath: '/sharings/123/recipients/0/avatar'
+    }),
+        container = _setup2.container;
+
+    var img = container.querySelector('img');
+    expect(img).toBeTruthy();
+    expect(img.getAttribute('src')).toBe('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', function () {
+    var _setup3 = setup({
+      public_name: 'Bob',
+      status: 'owner',
+      avatarPath: '/public/avatar?fallback=initials'
+    }),
+        container = _setup3.container;
+
+    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 () {
+    var _setup4 = setup({
+      public_name: 'Bob',
+      status: 'owner'
+    }),
+        container = _setup4.container,
+        getByText = _setup4.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({
+      public_name: 'Bob',
+      status: 'owner',
+      avatarPath: '/sharings/123/recipients/0/avatar'
+    }),
+        container = _setup5.container,
+        getByText = _setup5.getByText;
+
+    var img = container.querySelector('img');
+    expect(img).toBeTruthy();
+    fireEvent.error(img);
+    expect(container.querySelector('img')).toBeNull();
+    expect(getByText('B')).toBeTruthy();
+  });
+});

package/dist/components/Recipient/OwnerRecipientDefault.js

@@ -1,7 +1,13 @@
 import React from 'react';
 import { useClient, useQuery, hasQueryBeenLoaded } from 'cozy-client';
 import MemberRecipient from './MemberRecipient';
-import { buildInstanceSettingsQuery } from '../../queries/queries';
+import { buildInstanceSettingsQuery } from '../../queries/queries'; // When the owner is not part of a sharing's members (eg. the folder only has
+// a link), there is no per-sharing avatar to reference. The instance's public
+// avatar still holds the owner's picture. fallback=initials makes the stack
+// serve a generated initials avatar (instead of the app icon) when no picture
+// has been uploaded, matching how avatars are rendered everywhere else.
+
+var OWNER_PUBLIC_AVATAR_PATH = '/public/avatar?fallback=initials';
 
 var OwnerRecipientDefault = function OwnerRecipientDefault() {
   var _instanceSettingsResu;
@@ -13,6 +19,7 @@ var OwnerRecipientDefault = function OwnerRecipientDefault() {
     isOwner: true,
     status: "owner",
     instance: client.options.uri,
+    avatarPath: OWNER_PUBLIC_AVATAR_PATH,
     public_name: instanceSettingsResult === null || instanceSettingsResult === void 0 || (_instanceSettingsResu = instanceSettingsResult.data) === null || _instanceSettingsResu === void 0 || (_instanceSettingsResu = _instanceSettingsResu.attributes) === null || _instanceSettingsResu === void 0 ? void 0 : _instanceSettingsResu.public_name
   });
 };

package/dist/components/Recipient/OwnerRecipientDefaultLite.js

@@ -2,7 +2,10 @@ import React from 'react';
 import { useClient, useQuery, hasQueryBeenLoaded } from 'cozy-client';
 import MemberRecipientLite from './MemberRecipientLite';
 import withLocales from '../../hoc/withLocales';
-import { buildInstanceSettingsQuery } from '../../queries/queries';
+import { buildInstanceSettingsQuery } from '../../queries/queries'; // See OwnerRecipientDefault: show the instance public avatar (with an initials
+// fallback) when the owner has no per-sharing avatar to reference.
+
+var OWNER_PUBLIC_AVATAR_PATH = '/public/avatar?fallback=initials';
 
 var OwnerRecipientDefaultLite = function OwnerRecipientDefaultLite() {
   var _instanceSettingsResu;
@@ -14,6 +17,7 @@ var OwnerRecipientDefaultLite = function OwnerRecipientDefaultLite() {
     recipient: {
       status: 'owner',
       instance: client.options.uri,
+      avatarPath: OWNER_PUBLIC_AVATAR_PATH,
       public_name: instanceSettingsResult === null || instanceSettingsResult === void 0 || (_instanceSettingsResu = instanceSettingsResult.data) === null || _instanceSettingsResu === void 0 || (_instanceSettingsResu = _instanceSettingsResu.attributes) === null || _instanceSettingsResu === void 0 ? void 0 : _instanceSettingsResu.public_name
     },
     isOwner: true

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-sharing",
-  "version": "33.4.0",
+  "version": "33.4.1",
   "description": "Provides sharing login for React applications.",
   "main": "dist/index.js",
   "author": "Cozy",
@@ -83,5 +83,5 @@
   "sideEffects": [
     "*.css"
   ],
-  "gitHead": "2359cb47aa065de03f5491ba05114a860a44d9ca"
+  "gitHead": "a2e29d6c728ebf0fdc890666a9ec3505e90551ed"
 }

package/src/components/Avatar/MemberAvatar.jsx

@@ -1,4 +1,4 @@
-import React from 'react'
+import React, { useState } from 'react'
 
 import { useClient } from 'cozy-client'
 import Avatar from 'cozy-ui/transpiled/react/Avatar'
@@ -8,6 +8,10 @@ import { getInitials } from '../../models'
 
 const MemberAvatar = ({ recipient, ...rest }) => {
   const client = useClient()
+  // 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.
+  const [erroredSrc, setErroredSrc] = useState(null)
 
   // There are cases when due to apparent memory leaks, the recipient does not exist
   // This will trigger an unhanded error in the Avatar component and crash the app
@@ -31,13 +35,24 @@ const MemberAvatar = ({ recipient, ...rest }) => {
    */
   const image =
     recipient.avatarPath && recipient.status
-      ? `${client.options.uri}${recipient.avatarPath}?v=${recipient.status}`
+      ? `${client.options.uri}${recipient.avatarPath}${
+          recipient.avatarPath.includes('?') ? '&' : '?'
+        }v=${recipient.status}`
       : null
 
+  // 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 ? (
-        <img width="100%" height="100%" src={image} />
+      {image && erroredSrc !== image ? (
+        <img
+          width="100%"
+          height="100%"
+          src={image}
+          onError={() => setErroredSrc(image)}
+        />
       ) : (
         getInitials(recipient)
       )}

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

@@ -0,0 +1,80 @@
+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 =>
+    render(
+      <AppLike client={client}>
+        <MemberAvatar recipient={recipient} />
+      </AppLike>
+    )
+
+  it('renders nothing when the recipient is missing', () => {
+    const { container } = setup(undefined)
+
+    // The component returns null; only the provider wrappers remain, with no
+    // avatar rendered inside.
+    expect(container.querySelector('[class*="MuiAvatar-root"]')).toBeNull()
+    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(
+      '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 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()
+
+    fireEvent.error(img)
+
+    expect(container.querySelector('img')).toBeNull()
+    expect(getByText('B')).toBeTruthy()
+  })
+})

package/src/components/Recipient/OwnerRecipientDefault.jsx

@@ -5,6 +5,13 @@ import { useClient, useQuery, hasQueryBeenLoaded } from 'cozy-client'
 import MemberRecipient from './MemberRecipient'
 import { buildInstanceSettingsQuery } from '../../queries/queries'
 
+// When the owner is not part of a sharing's members (eg. the folder only has
+// a link), there is no per-sharing avatar to reference. The instance's public
+// avatar still holds the owner's picture. fallback=initials makes the stack
+// serve a generated initials avatar (instead of the app icon) when no picture
+// has been uploaded, matching how avatars are rendered everywhere else.
+const OWNER_PUBLIC_AVATAR_PATH = '/public/avatar?fallback=initials'
+
 const OwnerRecipientDefault = () => {
   const client = useClient()
 
@@ -20,6 +27,7 @@ const OwnerRecipientDefault = () => {
         isOwner={true}
         status="owner"
         instance={client.options.uri}
+        avatarPath={OWNER_PUBLIC_AVATAR_PATH}
         public_name={instanceSettingsResult?.data?.attributes?.public_name}
       />
     )

package/src/components/Recipient/OwnerRecipientDefaultLite.jsx

@@ -6,6 +6,10 @@ import MemberRecipientLite from './MemberRecipientLite'
 import withLocales from '../../hoc/withLocales'
 import { buildInstanceSettingsQuery } from '../../queries/queries'
 
+// See OwnerRecipientDefault: show the instance public avatar (with an initials
+// fallback) when the owner has no per-sharing avatar to reference.
+const OWNER_PUBLIC_AVATAR_PATH = '/public/avatar?fallback=initials'
+
 const OwnerRecipientDefaultLite = () => {
   const client = useClient()
 
@@ -21,6 +25,7 @@ const OwnerRecipientDefaultLite = () => {
         recipient={{
           status: 'owner',
           instance: client.options.uri,
+          avatarPath: OWNER_PUBLIC_AVATAR_PATH,
           public_name: instanceSettingsResult?.data?.attributes?.public_name
         }}
         isOwner={true}