cozy-harvest-lib 9.3.0 → 9.4.0

package/CHANGELOG.md

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

package/dist/components/TriggerManager.js

@@ -506,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,
@@ -521,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) {
@@ -613,7 +615,9 @@ DumbTriggerManager.propTypes = {
    */
   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
 };
 var TriggerManager = compose(translate(), withClient, withVaultUnlockContext, withConnectionFlow())(DumbTriggerManager); // TriggerManager is exported wrapped in FlowProvider to avoid breaking changes.
 

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.3.0",
+  "version": "9.4.0",
   "description": "Provides logic, modules and components for Cozy's harvest applications.",
   "main": "dist/index.js",
   "author": "Cozy",
@@ -87,5 +87,5 @@
     "react-router-dom": "^5.0.1"
   },
   "sideEffects": false,
-  "gitHead": "057e65e2c3e1c367a49e348b494b2b21a7e90e6f"
+  "gitHead": "9ab356f1f7eea371ff0d364ec1eb740aa8d4fd47"
 }

package/src/components/TriggerManager.jsx

@@ -312,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
 
@@ -328,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>
       )
     }
 
@@ -429,7 +442,9 @@ DumbTriggerManager.propTypes = {
    */
   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(

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 })