cozy-sharing 4.0.5 → 4.1.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-sharing",
-  "version": "4.0.5",
+  "version": "4.1.3",
   "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",
@@ -37,18 +37,18 @@
   },
   "devDependencies": {
     "@babel/core": "7.16.12",
-    "@material-ui/core": "4",
+    "@material-ui/core": "4.12.3",
     "babel-jest": "26.6.3",
-    "babel-plugin-css-modules-transform": "^1.6.2",
-    "babel-plugin-inline-react-svg": "^1.1.0",
+    "babel-plugin-css-modules-transform": "1.6.2",
+    "babel-plugin-inline-react-svg": "1.1.2",
     "cozy-client": "23.19.1",
-    "cozy-ui": "54.0.0",
+    "cozy-ui": "62.0.0",
     "enzyme": "3.11.0",
     "enzyme-adapter-react-16": "1.15.6",
-    "enzyme-to-json": "3.4.4",
+    "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": "eec61451b9351f99ead28b7cff22fd172fae1471"
+  "gitHead": "d248d58ef7828f260799b3dfce1451ebb40ae994"
 }

package/src/ShareButton.spec.jsx

@@ -2,7 +2,7 @@ import React from 'react'
 import { render } from '@testing-library/react'
 import { ShareButton } from './ShareButton'
 
-jest.mock('cozy-ui/transpiled/react', () => ({
+jest.mock('cozy-ui/transpiled/react/Button', () => ({
   Button: props => {
     if (props.t || props.t || props.lang) {
       throw 'do not pass html button invalid props'

package/src/SharingBanner/components/PublicBanner.jsx

@@ -5,7 +5,7 @@ import snarkdown from 'snarkdown'
 import { useClient } from 'cozy-client'
 import Banner from 'cozy-ui/transpiled/react/Banner'
 import Button, { ButtonLink } from 'cozy-ui/transpiled/react/Button'
-import { useI18n } from 'cozy-ui/transpiled/react'
+import { useI18n } from 'cozy-ui/transpiled/react/I18n'
 
 import CozyHomeLinkIcon from './CozyHomeLinkIcon'
 import getHomeLinkHref from './getHomeLinkHref'
@@ -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/SharingBanner/test/AppLike.jsx

@@ -3,7 +3,7 @@ import { CozyProvider } from 'cozy-client'
 import { Provider } from 'react-redux'
 import { createStore } from 'redux'
 
-import { I18n } from 'cozy-ui/transpiled/react'
+import { I18n } from 'cozy-ui/transpiled/react/I18n'
 import SharingContext from '../../context'
 
 import langEn from '../../../locales/en.json'

package/src/components/ShareAutosuggest.jsx

@@ -2,7 +2,7 @@ import React, { Component } from 'react'
 import PropTypes from 'prop-types'
 import Autosuggest from 'react-autosuggest'
 
-import { Spinner } from 'cozy-ui/transpiled/react'
+import { Spinner } from 'cozy-ui/transpiled/react/Spinner'
 import palette from 'cozy-ui/transpiled/react/palette'
 
 import styles from './autosuggest.styl'

package/src/components/ShareButton.jsx

@@ -1,6 +1,6 @@
 import React from 'react'
 import classNames from 'classnames'
-import { Button } from 'cozy-ui/transpiled/react'
+import { Button } from 'cozy-ui/transpiled/react/Button'
 
 import styles from './button.styl'
 

package/src/components/Sharesubmit.jsx

@@ -1,6 +1,6 @@
 import React from 'react'
 import PropTypes from 'prop-types'
-import { Button } from 'cozy-ui/transpiled/react'
+import { Button } from 'cozy-ui/transpiled/react/Button'
 
 const ShareSubmit = props => (
   <Button

package/src/components/Sharetypeselect.jsx

@@ -4,7 +4,7 @@ import PropTypes from 'prop-types'
 
 import SelectBox, { components } from 'cozy-ui/transpiled/react/SelectBox'
 import palette from 'cozy-ui/transpiled/react/palette'
-import { Icon } from 'cozy-ui/transpiled/react'
+import Icon from 'cozy-ui/transpiled/react/Icon'
 
 import styles from '../share.styl'
 

package/test/AppLike.jsx

@@ -1,7 +1,7 @@
 import React from 'react'
 
 import { BreakpointsProvider } from 'cozy-ui/transpiled/react/hooks/useBreakpoints'
-import { I18n } from 'cozy-ui/transpiled/react'
+import { I18n } from 'cozy-ui/transpiled/react/I18n'
 import { CozyProvider, createMockClient } from 'cozy-client'
 
 import langEn from '../locales/en.json'