cozy-sharing 4.1.1 → 4.1.4

package/CHANGELOG.md

@@ -3,6 +3,39 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [4.1.4](https://github.com/cozy/cozy-libs/compare/cozy-sharing@4.1.3...cozy-sharing@4.1.4) (2022-03-01)
+
+
+### Bug Fixes
+
+* **sharing:** Upgrade cozy-ui to remove justifyContent warning ([eb6318f](https://github.com/cozy/cozy-libs/commit/eb6318f0d0cd2e39e47b80b35e30efb766d6e553))
+
+
+
+
+
+## [4.1.3](https://github.com/cozy/cozy-libs/compare/cozy-sharing@4.1.2...cozy-sharing@4.1.3) (2022-02-21)
+
+
+### Bug Fixes
+
+* **sharing:** Escape public name in public cozy2cozy view ([b5af978](https://github.com/cozy/cozy-libs/commit/b5af978e6f349819b8f76e097f328a87a6c18912))
+
+
+
+
+
+## [4.1.2](https://github.com/cozy/cozy-libs/compare/cozy-sharing@4.1.1...cozy-sharing@4.1.2) (2022-02-18)
+
+
+### Bug Fixes
+
+* **deps:** pin dependencies ([e53d065](https://github.com/cozy/cozy-libs/commit/e53d065090224ea340b2c25c3afd14f223f4d119))
+
+
+
+
+
 ## [4.1.1](https://github.com/cozy/cozy-libs/compare/cozy-sharing@4.1.0...cozy-sharing@4.1.1) (2022-02-15)
 
 

package/dist/SharingBanner/components/PublicBanner.js

@@ -29,19 +29,21 @@ var PublicBannerCozyToCozyContent = function PublicBannerCozyToCozyContent(_ref)
   var knowMore = /*#__PURE__*/React.createElement("a", {
     href: "https://cozy.io",
     target: "_blank",
-    className: 'u-link',
+    className: "u-link",
     rel: "noopener noreferrer"
   }, t('Share.banner.know_more'));
   var withAvatar = snarkdown(t('Share.banner.shared_from', {
     name: name,
     image: avatarURL
   }));
+  var beginning = withAvatar.split('<img src');
+  var translated = beginning[1].split('alt="avatar">');
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("span", {
-    className: styles['bannermarkdown'],
-    dangerouslySetInnerHTML: {
-      __html: withAvatar
-    }
-  }), /*#__PURE__*/React.createElement("span", null, ' ', text, " ", knowMore));
+    className: styles['bannermarkdown']
+  }, beginning[0], /*#__PURE__*/React.createElement("img", {
+    src: avatarURL,
+    alt: "avatar"
+  }), translated[1]), /*#__PURE__*/React.createElement("span", null, ' ', text, " ", knowMore));
 };
 
 PublicBannerCozyToCozyContent.propTypes = {

package/dist/SharingBanner/components/PublicBanner.spec.js

@@ -0,0 +1,47 @@
+import React from 'react';
+import { render } from '@testing-library/react';
+import { SharingBannerCozyToCozy } from './PublicBanner';
+import { useI18n } from 'cozy-ui/transpiled/react/I18n';
+import { useClient } from 'cozy-client';
+jest.mock('cozy-ui/transpiled/react/I18n');
+jest.mock('cozy-client');
+describe('PublicBanner', function () {
+  beforeEach(function () {
+    useClient.mockReturnValue({
+      options: {
+        uri: 'http://cozy.localhost:8080'
+      }
+    });
+  });
+  it('should not add dangerous html', function () {
+    // Given
+    useI18n.mockReturnValue({
+      t: function t(localeToTranslate, options) {
+        if (localeToTranslate === 'Share.banner.shared_from') {
+          return "Shared from ![avatar](".concat(options.image, ") ").concat(options.name, "'s cozy.");
+        }
+
+        return localeToTranslate;
+      }
+    });
+    var publicName = '[Click me!](https://evil.com)';
+    var sharing = {
+      attributes: {
+        members: [{
+          public_name: publicName
+        }]
+      }
+    }; // When
+
+    var _render = render( /*#__PURE__*/React.createElement(SharingBannerCozyToCozy, {
+      sharing: sharing,
+      isSharingShortcutCreated: true,
+      discoveryLink: 'discoveryLink',
+      onClose: function onClose() {}
+    })),
+        container = _render.container; // Then
+
+
+    expect(container.querySelector('.bannermarkdown').innerHTML).toEqual("Shared from <img src=\"http://cozy.localhost:8080/public/avatar?fallback=initials\" alt=\"avatar\"> &lt;a href=\"https://evil.com\"&gt;Click me!&lt;/a&gt;'s cozy.");
+  });
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-sharing",
-  "version": "4.1.1",
+  "version": "4.1.4",
   "description": "Provides sharing login for React applications.",
   "main": "dist/index.js",
   "author": "Cozy",
@@ -29,7 +29,7 @@
     "classnames": "^2.2.6",
     "copy-text-to-clipboard": "^2.1.1",
     "cozy-device-helper": "^1.17.0",
-    "cozy-doctypes": "^1.83.5",
+    "cozy-doctypes": "^1.83.6",
     "lodash": "^4.17.19",
     "react-autosuggest": "^9.4.3",
     "react-tooltip": "^3.11.1",
@@ -39,16 +39,16 @@
     "@babel/core": "7.16.12",
     "@material-ui/core": "4.12.3",
     "babel-jest": "26.6.3",
-    "babel-plugin-css-modules-transform": "^1.6.2",
+    "babel-plugin-css-modules-transform": "1.6.2",
     "babel-plugin-inline-react-svg": "1.1.2",
     "cozy-client": "23.19.1",
-    "cozy-ui": "62.0.0",
+    "cozy-ui": "62.1.2",
     "enzyme": "3.11.0",
     "enzyme-adapter-react-16": "1.15.6",
     "enzyme-to-json": "3.6.2",
     "jest": "26.6.3",
-    "react": "^16.12.0",
-    "react-dom": "^16.12.0"
+    "react": "16.12.0",
+    "react-dom": "16.12.0"
   },
   "peerDependencies": {
     "@material-ui/core": "4",
@@ -61,5 +61,5 @@
   "sideEffects": [
     "*.css"
   ],
-  "gitHead": "5f0a839a3dcc01f2aa0106ccdbd67062c8faf44f"
+  "gitHead": "b5e309bdcc2cb816a3cfe5aca22267285afd76ae"
 }

package/src/SharingBanner/components/PublicBanner.jsx

@@ -30,24 +30,28 @@ const PublicBannerCozyToCozyContent = ({
     <a
       href="https://cozy.io"
       target="_blank"
-      className={'u-link'}
+      className="u-link"
       rel="noopener noreferrer"
     >
       {t('Share.banner.know_more')}
     </a>
   )
+
   const withAvatar = snarkdown(
     t('Share.banner.shared_from', {
       name: name,
       image: avatarURL
     })
   )
+  const beginning = withAvatar.split('<img src')
+  const translated = beginning[1].split('alt="avatar">')
   return (
     <>
-      <span
-        className={styles['bannermarkdown']}
-        dangerouslySetInnerHTML={{ __html: withAvatar }}
-      />
+      <span className={styles['bannermarkdown']}>
+        {beginning[0]}
+        <img src={avatarURL} alt="avatar" />
+        {translated[1]}
+      </span>
       <span>
         {' '}
         {text} {knowMore}

package/src/SharingBanner/components/PublicBanner.spec.jsx

@@ -0,0 +1,45 @@
+import React from 'react'
+import { render } from '@testing-library/react'
+import { SharingBannerCozyToCozy } from './PublicBanner'
+import { useI18n } from 'cozy-ui/transpiled/react/I18n'
+import { useClient } from 'cozy-client'
+
+jest.mock('cozy-ui/transpiled/react/I18n')
+jest.mock('cozy-client')
+
+describe('PublicBanner', () => {
+  beforeEach(() => {
+    useClient.mockReturnValue({
+      options: { uri: 'http://cozy.localhost:8080' }
+    })
+  })
+
+  it('should not add dangerous html', () => {
+    // Given
+    useI18n.mockReturnValue({
+      t: (localeToTranslate, options) => {
+        if (localeToTranslate === 'Share.banner.shared_from') {
+          return `Shared from ![avatar](${options.image}) ${options.name}'s cozy.`
+        }
+        return localeToTranslate
+      }
+    })
+    const publicName = '[Click me!](https://evil.com)'
+    const sharing = { attributes: { members: [{ public_name: publicName }] } }
+
+    // When
+    const { container } = render(
+      <SharingBannerCozyToCozy
+        sharing={sharing}
+        isSharingShortcutCreated={true}
+        discoveryLink={'discoveryLink'}
+        onClose={() => {}}
+      />
+    )
+
+    // Then
+    expect(container.querySelector('.bannermarkdown').innerHTML).toEqual(
+      `Shared from <img src="http://cozy.localhost:8080/public/avatar?fallback=initials" alt="avatar"> &lt;a href="https://evil.com"&gt;Click me!&lt;/a&gt;'s cozy.`
+    )
+  })
+})

package/src/components/__snapshots__/ContactSuggestion.spec.jsx.snap

@@ -58,6 +58,7 @@ exports[`ContactSuggestion component should display contact suggestion for a con
     <Avatar
       className=""
       disabled={false}
+      ghost={false}
       icon={[Function]}
       image=""
       size="small"
@@ -143,6 +144,7 @@ exports[`ContactSuggestion component should display contact suggestion for a con
     <Avatar
       className=""
       disabled={false}
+      ghost={false}
       icon={[Function]}
       image=""
       size="small"
@@ -279,6 +281,7 @@ exports[`ContactSuggestion component should display contact suggestion for a gro
     <Avatar
       className=""
       disabled={false}
+      ghost={false}
       icon={[Function]}
       image=""
       size="small"