cozy-harvest-lib 9.2.6 → 9.4.0

package/CHANGELOG.md

@@ -3,6 +3,40 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [9.4.0](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@9.3.0...cozy-harvest-lib@9.4.0) (2022-05-18)
+
+
+### Features
+
+* **harvest:** HandleOAuthResponse can deal with cozy-data from DOM ([7c6ac1a](https://github.com/cozy/cozy-libs/commit/7c6ac1a8de7dd2b136530d0aafdb1e3f9e28fa56))
+* **harvest:** OAuthFormWrapperComp can be passed to TriggerManager ([76ee8b7](https://github.com/cozy/cozy-libs/commit/76ee8b74d9314d3c66593dfe925880e6a296b420))
+
+
+
+
+
+# [9.3.0](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@9.2.7...cozy-harvest-lib@9.3.0) (2022-05-17)
+
+
+### Features
+
+* Remove useVaultClient call in LegacyTriggerManager ([439e603](https://github.com/cozy/cozy-libs/commit/439e603cef915e9fede72ae293ae35ca330347eb))
+
+
+
+
+
+## [9.2.7](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@9.2.6...cozy-harvest-lib@9.2.7) (2022-05-14)
+
+
+### Bug Fixes
+
+* bump leaflet from 1.7.1 to 1.8.0 ([e4ae32d](https://github.com/cozy/cozy-libs/commit/e4ae32d7610a5e969147354405cfdde5e913bf34))
+
+
+
+
+
 ## [9.2.6](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@9.2.5...cozy-harvest-lib@9.2.6) (2022-05-13)
 
 **Note:** Version bump only for package cozy-harvest-lib

package/dist/components/TriggerManager.js

@@ -1,6 +1,5 @@
 import _extends from "@babel/runtime/helpers/extends";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
@@ -10,9 +9,6 @@ import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstruct
 import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
 var _excluded = ["onLaunch", "onSuccess", "onLoginSuccess", "onError", "initialTrigger"],
     _excluded2 = ["vaultUnlockFormProps"];
-
-var _DumbTriggerManager$p;
-
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
@@ -28,7 +24,7 @@ import { Account } from 'cozy-doctypes';
 import { translate } from 'cozy-ui/transpiled/react/I18n';
 import Spinner from 'cozy-ui/transpiled/react/Spinner';
 import { ModalBackButton } from 'cozy-ui/transpiled/react/Modal';
-import { CipherType, withVaultUnlockContext, VaultUnlockPlaceholder, VaultUnlockProvider, useVaultClient, CozyUtils } from 'cozy-keys-lib';
+import { CipherType, withVaultUnlockContext, VaultUnlockPlaceholder, VaultUnlockProvider, CozyUtils } from 'cozy-keys-lib';
 import AccountForm from './AccountForm';
 import OAuthForm from './OAuthForm';
 import { fetchAccount } from '../connections/accounts';
@@ -510,7 +506,8 @@ export var DumbTriggerManager = /*#__PURE__*/function (_Component) {
           fieldOptions = _this$props5.fieldOptions,
           flow = _this$props5.flow,
           flowState = _this$props5.flowState,
-          client = _this$props5.client;
+          client = _this$props5.client,
+          OAuthFormWrapperComp = _this$props5.OAuthFormWrapperComp;
       var submitting = flowState.running;
       var _this$state = this.state,
           account = _this$state.account,
@@ -525,13 +522,14 @@ export var DumbTriggerManager = /*#__PURE__*/function (_Component) {
       var konnectorPolicy = findKonnectorPolicy(konnector);
 
       if (oauth || konnectorPolicy.isBIWebView) {
-        return /*#__PURE__*/React.createElement(OAuthForm, {
+        var Wrapper = OAuthFormWrapperComp ? OAuthFormWrapperComp : React.Fragment;
+        return /*#__PURE__*/React.createElement(Wrapper, null, /*#__PURE__*/React.createElement(OAuthForm, {
           client: client,
           flow: flow,
           account: account,
           konnector: konnector,
           onSuccess: this.handleOAuthAccountId
-        });
+        }));
       }
 
       if (showSpinner) {
@@ -568,7 +566,7 @@ export var DumbTriggerManager = /*#__PURE__*/function (_Component) {
 
   return DumbTriggerManager;
 }(Component);
-DumbTriggerManager.propTypes = (_DumbTriggerManager$p = {
+DumbTriggerManager.propTypes = {
   /**
    * Account document. Used to get initial form values.
    * If no account is passed, AccountForm will use empty initial values.
@@ -609,21 +607,21 @@ DumbTriggerManager.propTypes = (_DumbTriggerManager$p = {
   vaultClient: PropTypes.object,
   client: PropTypes.object,
   onError: PropTypes.func,
-  showUnlockForm: PropTypes.func
-}, _defineProperty(_DumbTriggerManager$p, "onVaultDismiss", PropTypes.func), _defineProperty(_DumbTriggerManager$p, "error", PropTypes.any), _defineProperty(_DumbTriggerManager$p, "showError", PropTypes.bool), _defineProperty(_DumbTriggerManager$p, "fieldOptions", PropTypes.object), _defineProperty(_DumbTriggerManager$p, "flow", PropTypes.object), _defineProperty(_DumbTriggerManager$p, "flowState", PropTypes.object), _DumbTriggerManager$p);
+  showUnlockForm: PropTypes.func,
+  error: PropTypes.any,
+
+  /**
+   * Used to have options on fields (forceEncryptedPlaceholder or focus)
+   */
+  fieldOptions: PropTypes.object,
+  flow: PropTypes.object,
+  flowState: PropTypes.object,
+  // Used to inject a component around OAuthForm, and so customize the UI from the app
+  OAuthFormWrapperComp: PropTypes.node
+};
 var TriggerManager = compose(translate(), withClient, withVaultUnlockContext, withConnectionFlow())(DumbTriggerManager); // TriggerManager is exported wrapped in FlowProvider to avoid breaking changes.
 
 var LegacyTriggerManager = function LegacyTriggerManager(props) {
-  // Since the 4.1.0 of cozy-keys-lib, we
-  // render children even if vaultClient is
-  // not defined yet. In that case we we were
-  // displaying TriggerManager without vaultClient.
-  // It was raising an error.
-  // The current fix, is to not display the
-  // TriggerManager when vaultClient is null.
-  var vaultClient = useVaultClient();
-  if (!vaultClient) return null;
-
   var onLaunch = props.onLaunch,
       onSuccess = props.onSuccess,
       onLoginSuccess = props.onLoginSuccess,

package/dist/helpers/oauth.js

@@ -1,8 +1,9 @@
 import uuid from 'uuid/v4';
-import * as konnectors from './konnectors';
+import get from 'lodash/get';
 import CozyClient from 'cozy-client';
 import CozyRealtime from 'cozy-realtime';
-import get from 'lodash/get';
+import { readCozyDataFromDOM } from 'cozy-ui/transpiled/react/helpers/appDataset';
+import * as konnectors from './konnectors';
 export var OAUTH_REALTIME_CHANNEL = 'oauth-popup';
 /**
  * Checks that the given data for the given konnector is consistent with the
@@ -51,10 +52,11 @@ export var handleOAuthResponse = function handleOAuthResponse() {
     var client = options.client;
 
     if (!client) {
-      var root = document.querySelector('[role=application]');
+      var domain = readCozyDataFromDOM('domain');
+      var token = readCozyDataFromDOM('token');
       client = new CozyClient({
-        uri: "".concat(window.location.protocol, "//").concat(root.dataset.cozyDomain),
-        token: root.dataset.cozyToken
+        uri: "".concat(window.location.protocol, "//").concat(domain),
+        token: token
       });
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-harvest-lib",
-  "version": "9.2.6",
+  "version": "9.4.0",
   "description": "Provides logic, modules and components for Cozy's harvest applications.",
   "main": "dist/index.js",
   "author": "Cozy",
@@ -67,7 +67,7 @@
     "jest-environment-jsdom-sixteen": "1.0.3",
     "jest-resolve-cached": "1.0.0",
     "jsdom": "16.4.0",
-    "leaflet": "1.7.1",
+    "leaflet": "1.8.0",
     "prop-types": "15.7.2",
     "react": "16.12.0",
     "react-dom": "16.13.0",
@@ -87,5 +87,5 @@
     "react-router-dom": "^5.0.1"
   },
   "sideEffects": false,
-  "gitHead": "0c0ce75d7f0653cb0bc974823e768b8c774a6643"
+  "gitHead": "9ab356f1f7eea371ff0d364ec1eb740aa8d4fd47"
 }

package/src/components/TriggerManager.jsx

@@ -15,7 +15,6 @@ import {
   withVaultUnlockContext,
   VaultUnlockPlaceholder,
   VaultUnlockProvider,
-  useVaultClient,
   CozyUtils
 } from 'cozy-keys-lib'
 
@@ -313,8 +312,16 @@ export class DumbTriggerManager extends Component {
   }
 
   render() {
-    const { konnector, showError, t, fieldOptions, flow, flowState, client } =
-      this.props
+    const {
+      konnector,
+      showError,
+      t,
+      fieldOptions,
+      flow,
+      flowState,
+      client,
+      OAuthFormWrapperComp
+    } = this.props
 
     const submitting = flowState.running
 
@@ -329,14 +336,19 @@ export class DumbTriggerManager extends Component {
     const konnectorPolicy = findKonnectorPolicy(konnector)
 
     if (oauth || konnectorPolicy.isBIWebView) {
+      const Wrapper = OAuthFormWrapperComp
+        ? OAuthFormWrapperComp
+        : React.Fragment
       return (
-        <OAuthForm
-          client={client}
-          flow={flow}
-          account={account}
-          konnector={konnector}
-          onSuccess={this.handleOAuthAccountId}
-        />
+        <Wrapper>
+          <OAuthForm
+            client={client}
+            flow={flow}
+            account={account}
+            konnector={konnector}
+            onSuccess={this.handleOAuthAccountId}
+          />
+        </Wrapper>
       )
     }
 
@@ -424,21 +436,15 @@ DumbTriggerManager.propTypes = {
   client: PropTypes.object,
   onError: PropTypes.func,
   showUnlockForm: PropTypes.func,
-  onVaultDismiss: PropTypes.func,
   error: PropTypes.any,
-   /**
-   * Indicates if the AccountForm has to show errors. Sometimes errors may be
-   * displayed elsewhere. However, a KonnectorJobError corresponding to a login
-   * error is always displayed.
-   * @type {Boolean}
-   */
-    showError: PropTypes.bool,
   /**
    * Used to have options on fields (forceEncryptedPlaceholder or focus)
    */
   fieldOptions: PropTypes.object,
   flow: PropTypes.object,
-  flowState: PropTypes.object
+  flowState: PropTypes.object,
+  // Used to inject a component around OAuthForm, and so customize the UI from the app
+  OAuthFormWrapperComp: PropTypes.node
 }
 
 const TriggerManager = compose(
@@ -450,15 +456,6 @@ const TriggerManager = compose(
 
 // TriggerManager is exported wrapped in FlowProvider to avoid breaking changes.
 const LegacyTriggerManager = props => {
-  // Since the 4.1.0 of cozy-keys-lib, we
-  // render children even if vaultClient is
-  // not defined yet. In that case we we were
-  // displaying TriggerManager without vaultClient.
-  // It was raising an error.
-  // The current fix, is to not display the
-  // TriggerManager when vaultClient is null.
-  const vaultClient = useVaultClient()
-  if (!vaultClient) return null
   const {
     onLaunch,
     onSuccess,

package/src/helpers/oauth.js

@@ -1,9 +1,11 @@
 import uuid from 'uuid/v4'
+import get from 'lodash/get'
 
-import * as konnectors from './konnectors'
 import CozyClient from 'cozy-client'
 import CozyRealtime from 'cozy-realtime'
-import get from 'lodash/get'
+import { readCozyDataFromDOM } from 'cozy-ui/transpiled/react/helpers/appDataset'
+
+import * as konnectors from './konnectors'
 
 export const OAUTH_REALTIME_CHANNEL = 'oauth-popup'
 
@@ -55,10 +57,12 @@ export const handleOAuthResponse = (options = {}) => {
   if (!realtime) {
     let client = options.client
     if (!client) {
-      const root = document.querySelector('[role=application]')
+      const domain = readCozyDataFromDOM('domain')
+      const token = readCozyDataFromDOM('token')
+
       client = new CozyClient({
-        uri: `${window.location.protocol}//${root.dataset.cozyDomain}`,
-        token: root.dataset.cozyToken
+        uri: `${window.location.protocol}//${domain}`,
+        token: token
       })
     }
     realtime = new CozyRealtime({ client })