cozy-harvest-lib 8.3.0 → 8.4.1

package/CHANGELOG.md

@@ -3,6 +3,36 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [8.4.1](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@8.4.0...cozy-harvest-lib@8.4.1) (2022-04-25)
+
+**Note:** Version bump only for package cozy-harvest-lib
+
+
+
+
+
+# [8.4.0](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@8.3.1...cozy-harvest-lib@8.4.0) (2022-04-22)
+
+
+### Features
+
+* Change harvest sentry url to errors.cozycloud.cc ([582f1f5](https://github.com/cozy/cozy-libs/commit/582f1f5ad85fae9b8a7e290d12717ead8cfb7438))
+
+
+
+
+
+## [8.3.1](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@8.3.0...cozy-harvest-lib@8.3.1) (2022-04-15)
+
+
+### Bug Fixes
+
+* Avoid to have not sanitized fields as identifier fields ([c6ed9ec](https://github.com/cozy/cozy-libs/commit/c6ed9ec194685e5eeb9f81e5c620d17beabf0289))
+
+
+
+
+
 # [8.3.0](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@8.2.1...cozy-harvest-lib@8.3.0) (2022-04-15)
 
 

package/dist/components/AccountForm/index.js

@@ -191,7 +191,7 @@ export var AccountForm = /*#__PURE__*/function (_PureComponent) {
       var _this$props = this.props,
           account = _this$props.account,
           konnector = _this$props.konnector;
-      var identifier = manifest.getIdentifier(konnector.fields);
+      var identifier = manifest.getIdentifier(manifest.sanitizeFields(konnector.fields));
 
       if (account && account.auth[identifier] && account.auth[identifier] !== values[identifier]) {
         this.showConfirmationModal();
@@ -272,7 +272,7 @@ export var AccountForm = /*#__PURE__*/function (_PureComponent) {
       var isReadOnlyIdentifier = Boolean(get(account, 'relationships.vaultCipher')) && this.props.readOnlyIdentifier;
 
       if (isReadOnlyIdentifier) {
-        var identifier = manifest.getIdentifier(fields);
+        var identifier = manifest.getIdentifier(sanitizedFields);
         sanitizedFields[identifier].type = 'hidden';
       }
 
@@ -308,7 +308,7 @@ export var AccountForm = /*#__PURE__*/function (_PureComponent) {
               className: "u-mb-1",
               onClick: onBack,
               konnector: konnector,
-              identifier: get(account, "auth.".concat(manifest.getIdentifier(konnector.fields)))
+              identifier: get(account, "auth.".concat(manifest.getIdentifier(sanitizedFields)))
             }), isRunnable({
               win: window,
               konnector: konnector

package/dist/components/AccountForm/index.spec.js

@@ -51,6 +51,19 @@ var fixtures = {
       }
     }
   },
+  konnectorWithAdvancedField: {
+    fields: {
+      advancedFields: {
+        folderPath: {
+          advanced: true,
+          isRequired: false
+        }
+      },
+      username: {
+        type: 'text'
+      }
+    }
+  },
   account: {
     auth: {
       username: 'Toto',
@@ -434,6 +447,40 @@ describe('AccountForm', function () {
       var hiddenInput = wrapper.find('input[type="hidden"][name="username"]');
       expect(hiddenInput).toHaveLength(1);
     });
+    it('should render a read-only identifier field even with advancedFields field in the manifest', function () {
+      var accountWithCipher = _objectSpread(_objectSpread({}, fixtures.account), {}, {
+        relationships: {
+          vaultCipher: {
+            _id: 'fake-cipher-id',
+            _type: 'com.bitwarden.ciphers',
+            _protocol: 'bitwarden'
+          }
+        }
+      });
+
+      var flowState = {};
+      var wrapper = mount( /*#__PURE__*/React.createElement(I18n, {
+        lang: "en",
+        dictRequire: function dictRequire() {}
+      }, /*#__PURE__*/React.createElement(AccountForm, {
+        flowState: flowState,
+        t: t,
+        konnector: fixtures.konnectorWithAdvancedField,
+        onSubmit: onSubmit,
+        account: accountWithCipher,
+        readOnlyIdentifier: true,
+        fieldOptions: {}
+      })), {
+        context: {
+          t: t
+        },
+        childContextTypes: {
+          t: PropTypes.func
+        }
+      });
+      var hiddenInput = wrapper.find('input[type="hidden"][name="username"]');
+      expect(hiddenInput).toHaveLength(1);
+    });
   });
   describe('fieldOptions', function () {
     var setup = function setup(fieldOptions) {

package/dist/sentry.js

@@ -6,7 +6,7 @@ import * as Sentry from '@sentry/browser';
  */
 
 export var client = new Sentry.BrowserClient({
-  dsn: 'https://888abd94993a47a39e751598fc6be803@sentry.cozycloud.cc/145',
+  dsn: 'https://1f8d191bad884bf98ae8cdcb6f6abb72@errors.cozycloud.cc/39',
   integrations: Sentry.defaultIntegrations,
   beforeSend: function beforeSend(event) {
     if (process.env.NODE_ENV !== 'production') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-harvest-lib",
-  "version": "8.3.0",
+  "version": "8.4.1",
   "description": "Provides logic, modules and components for Cozy's harvest applications.",
   "main": "dist/index.js",
   "author": "Cozy",
@@ -53,10 +53,10 @@
     "babel-plugin-inline-react-svg": "1.1.2",
     "babel-preset-cozy-app": "^2.0.2",
     "cozy-client": "27.17.0",
-    "cozy-device-helper": "^1.17.0",
+    "cozy-device-helper": "^1.18.0",
     "cozy-flags": "^2.8.7",
     "cozy-keys-lib": "3.8.0",
-    "cozy-realtime": "^4.0.5",
+    "cozy-realtime": "^4.0.6",
     "cozy-ui": "60.6.0",
     "enzyme": "3.11.0",
     "enzyme-adapter-react-16": "1.15.6",
@@ -85,5 +85,5 @@
     "react-router-dom": "^5.0.1"
   },
   "sideEffects": false,
-  "gitHead": "9032817fd4e41f61aef183ae8a9ef5abbad418e0"
+  "gitHead": "b7e9f419cdbc99ff51cbc1f385fabe9034efb899"
 }

package/src/components/AccountForm/index.jsx

@@ -132,7 +132,7 @@ export class AccountForm extends PureComponent {
   handleSubmit(values, form) {
     const { account, konnector } = this.props
 
-    const identifier = manifest.getIdentifier(konnector.fields)
+    const identifier = manifest.getIdentifier(manifest.sanitizeFields(konnector.fields))
     if (
       account &&
       account.auth[identifier] &&
@@ -228,7 +228,7 @@ export class AccountForm extends PureComponent {
       this.props.readOnlyIdentifier
 
     if (isReadOnlyIdentifier) {
-      const identifier = manifest.getIdentifier(fields)
+      const identifier = manifest.getIdentifier(sanitizedFields)
       sanitizedFields[identifier].type = 'hidden'
     }
 
@@ -268,7 +268,7 @@ export class AccountForm extends PureComponent {
                 konnector={konnector}
                 identifier={get(
                   account,
-                  `auth.${manifest.getIdentifier(konnector.fields)}`
+                  `auth.${manifest.getIdentifier(sanitizedFields)}`
                 )}
               />
             )}

package/src/components/AccountForm/index.spec.jsx

@@ -49,6 +49,19 @@ const fixtures = {
       }
     }
   },
+  konnectorWithAdvancedField: {
+    fields: {
+      advancedFields: {
+        folderPath: {
+          advanced: true,
+          isRequired: false
+        }
+      },
+      username: {
+        type: 'text'
+      }
+    }
+  },
   account: {
     auth: {
       username: 'Toto',
@@ -386,6 +399,42 @@ describe('AccountForm', () => {
 
       const hiddenInput = wrapper.find('input[type="hidden"][name="username"]')
 
+      expect(hiddenInput).toHaveLength(1)
+    })
+    it('should render a read-only identifier field even with advancedFields field in the manifest', () => {
+      const accountWithCipher = {
+        ...fixtures.account,
+        relationships: {
+          vaultCipher: {
+            _id: 'fake-cipher-id',
+            _type: 'com.bitwarden.ciphers',
+            _protocol: 'bitwarden'
+          }
+        }
+      }
+      const flowState = {}
+      const wrapper = mount(
+        <I18n lang="en" dictRequire={() => {}}>
+          <AccountForm
+            flowState={flowState}
+            t={t}
+            konnector={fixtures.konnectorWithAdvancedField}
+            onSubmit={onSubmit}
+            account={accountWithCipher}
+            readOnlyIdentifier={true}
+            fieldOptions={{}}
+          />
+        </I18n>,
+        {
+          context: { t },
+          childContextTypes: {
+            t: PropTypes.func
+          }
+        }
+      )
+
+      const hiddenInput = wrapper.find('input[type="hidden"][name="username"]')
+
       expect(hiddenInput).toHaveLength(1)
     })
   })

package/src/sentry.js

@@ -6,7 +6,7 @@ import * as Sentry from '@sentry/browser'
  * @param {SentryClient}
  */
 export const client = new Sentry.BrowserClient({
-  dsn: 'https://888abd94993a47a39e751598fc6be803@sentry.cozycloud.cc/145',
+  dsn: 'https://1f8d191bad884bf98ae8cdcb6f6abb72@errors.cozycloud.cc/39',
   integrations: Sentry.defaultIntegrations,
   beforeSend(event) {
     if (process.env.NODE_ENV !== 'production') {