cozy-harvest-lib 9.7.3 → 9.9.0

package/CHANGELOG.md

@@ -3,6 +3,44 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [9.9.0](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@9.8.1...cozy-harvest-lib@9.9.0) (2022-06-13)
+
+
+### Features
+
+* Add session code inAppBrowser url ([e2037ef](https://github.com/cozy/cozy-libs/commit/e2037efabd73d93106d2f88bb122f75e783afb6e))
+
+
+
+
+
+## [9.8.1](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@9.8.0...cozy-harvest-lib@9.8.1) (2022-06-12)
+
+
+### Bug Fixes
+
+* Update french locale ([902ae96](https://github.com/cozy/cozy-libs/commit/902ae967a14c106c7cc3adc0543d479d94e2f07e))
+
+
+
+
+
+# [9.8.0](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@9.7.3...cozy-harvest-lib@9.8.0) (2022-06-09)
+
+
+### Bug Fixes
+
+* Small fixes after review ([d4f50ba](https://github.com/cozy/cozy-libs/commit/d4f50ba114cd4f8d43fac8545f6356c380edd262))
+
+
+### Features
+
+* Add BI webview reconnection ([d0f9c9e](https://github.com/cozy/cozy-libs/commit/d0f9c9e556d847e072063eb877d5d4e57ee8cca0))
+
+
+
+
+
 ## [9.7.3](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@9.7.2...cozy-harvest-lib@9.7.3) (2022-06-08)
 
 

package/dist/components/EditAccountModal.js

@@ -102,7 +102,10 @@ var DumbEditAccountModal = withRouter(function (_ref) {
     onSuccess: redirectToAccount,
     showError: true,
     onVaultDismiss: redirectToAccount,
-    fieldOptions: fieldOptions
+    fieldOptions: fieldOptions,
+    reconnect: fromReconnect
+  }), /*#__PURE__*/React.createElement("div", {
+    className: "u-mb-2"
   })));
 });
 export var EditAccountModal = /*#__PURE__*/function (_Component) {

package/dist/components/InAppBrowser.js

@@ -16,36 +16,56 @@ var InAppBrowser = function InAppBrowser(_ref) {
 
     function _insideEffect() {
       _insideEffect = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-        var result;
+        var sessionCode, iabUrl, result;
         return _regeneratorRuntime.wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
                 if (!webviewIntent) {
-                  _context.next = 5;
+                  _context.next = 18;
                   break;
                 }
 
-                _context.next = 3;
+                _context.prev = 1;
+                _context.next = 4;
+                return webviewIntent.call('fetchSessionCode');
+
+              case 4:
+                sessionCode = _context.sent;
+                logger.debug('got session code', sessionCode);
+                iabUrl = new URL(url);
+                iabUrl.searchParams.append('session_code', sessionCode);
+                _context.next = 10;
                 return webviewIntent.call('showInAppBrowser', {
-                  url: url
+                  url: iabUrl.toString()
                 });
 
-              case 3:
+              case 10:
                 result = _context.sent;
 
-                if ((result === null || result === void 0 ? void 0 : result.type) === 'cancel' && onClose) {
-                  onClose();
-                } else if ((result === null || result === void 0 ? void 0 : result.type) !== 'dismiss') {
+                if ((result === null || result === void 0 ? void 0 : result.type) !== 'dismiss' && (result === null || result === void 0 ? void 0 : result.type) !== 'cancel') {
                   logger.error('Unexpected InAppBrowser result', result);
                 }
 
-              case 5:
+                _context.next = 17;
+                break;
+
+              case 14:
+                _context.prev = 14;
+                _context.t0 = _context["catch"](1);
+                logger.error('unexpected fetchSessionCode result', _context.t0);
+
+              case 17:
+                if (onClose) {
+                  onClose();
+                }
+
+              case 18:
               case "end":
                 return _context.stop();
             }
           }
-        }, _callee);
+        }, _callee, null, [[1, 14]]);
       }));
       return _insideEffect.apply(this, arguments);
     }

package/dist/components/InAppBrowser.spec.js

@@ -5,7 +5,7 @@ import { render, waitFor } from '@testing-library/react';
 import InAppBrowser from './InAppBrowser';
 import { WebviewIntentProvider } from 'cozy-intent';
 describe('InAppBrowser', function () {
-  it('should call showInAppBrowser', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+  it('should call fetchSessionCode and showInAppBrowser', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
     var url, intentCall, webviewService;
     return _regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) {
@@ -16,7 +16,7 @@ describe('InAppBrowser', function () {
             webviewService = {
               call: intentCall
             };
-            intentCall.mockResolvedValue({
+            intentCall.mockResolvedValueOnce('sessioncode').mockResolvedValueOnce({
               type: 'dismiss'
             });
             render( /*#__PURE__*/React.createElement(WebviewIntentProvider, {
@@ -24,11 +24,18 @@ describe('InAppBrowser', function () {
             }, /*#__PURE__*/React.createElement(InAppBrowser, {
               url: url
             })));
-            expect(webviewService.call).toHaveBeenNthCalledWith(1, 'showInAppBrowser', {
-              url: url
+            _context.next = 7;
+            return waitFor(function () {
+              return expect(webviewService.call).toHaveBeenCalled();
             });
 
-          case 6:
+          case 7:
+            expect(webviewService.call).toHaveBeenNthCalledWith(1, 'fetchSessionCode');
+            expect(webviewService.call).toHaveBeenNthCalledWith(2, 'showInAppBrowser', {
+              url: url + '/?session_code=sessioncode'
+            });
+
+          case 9:
           case "end":
             return _context.stop();
         }

package/dist/components/OAuthForm.js

@@ -38,7 +38,6 @@ export var OAuthForm = /*#__PURE__*/function (_PureComponent) {
     _this.handleOAuthCancel = _this.handleOAuthCancel.bind(_assertThisInitialized(_this));
     _this.handleExtraParams = _this.handleExtraParams.bind(_assertThisInitialized(_this));
     _this.state = {
-      initialValues: null,
       showingOAuthModal: false
     };
     return _this;
@@ -52,9 +51,6 @@ export var OAuthForm = /*#__PURE__*/function (_PureComponent) {
           konnector = _this$props.konnector,
           flow = _this$props.flow,
           client = _this$props.client;
-      this.setState({
-        initialValues: account ? account.oauth : null
-      });
       var konnectorPolicy = findKonnectorPolicy(konnector);
 
       if (konnectorPolicy.fetchExtraOAuthUrlParams) {
@@ -114,25 +110,29 @@ export var OAuthForm = /*#__PURE__*/function (_PureComponent) {
       var _this$props2 = this.props,
           konnector = _this$props2.konnector,
           t = _this$props2.t,
-          flowState = _this$props2.flowState;
+          flowState = _this$props2.flowState,
+          reconnect = _this$props2.reconnect,
+          account = _this$props2.account;
       var _this$state = this.state,
-          initialValues = _this$state.initialValues,
           showOAuthWindow = _this$state.showOAuthWindow,
           needExtraParams = _this$state.needExtraParams,
           extraParams = _this$state.extraParams;
       var isBusy = showOAuthWindow === true || flowState.running || needExtraParams && !extraParams;
-      return initialValues ? null : /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Button, {
+      var buttonLabel = reconnect ? 'oauth.reconnect.label' : 'oauth.connect.label';
+      return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Button, {
         className: "u-mt-1",
         busy: isBusy,
         disabled: isBusy,
         extension: "full",
-        label: t('oauth.connect.label'),
+        label: t(buttonLabel),
         onClick: this.handleConnect
       }), showOAuthWindow && /*#__PURE__*/React.createElement(OAuthWindow, {
         extraParams: extraParams,
         konnector: konnector,
+        reconnect: reconnect,
         onSuccess: this.handleAccountId,
-        onCancel: this.handleOAuthCancel
+        onCancel: this.handleOAuthCancel,
+        account: account
       }));
     }
   }]);
@@ -150,6 +150,9 @@ OAuthForm.propTypes = {
   onSuccess: PropTypes.func,
 
   /** Translation function */
-  t: PropTypes.func.isRequired
+  t: PropTypes.func.isRequired,
+
+  /** Is it a reconnection or not */
+  reconnect: PropTypes.bool
 };
 export default compose(translate(), withConnectionFlow())(OAuthForm);

package/dist/components/OAuthForm.spec.js

@@ -30,7 +30,7 @@ describe('OAuthForm', function () {
     })).getElement();
     expect(component).toMatchSnapshot();
   });
-  it('should not render button when update', function () {
+  it('should render reconnect button when updating an account', function () {
     var component = shallow( /*#__PURE__*/React.createElement(OAuthForm, {
       flowState: {},
       account: {
@@ -39,9 +39,10 @@ describe('OAuthForm', function () {
         }
       },
       konnector: fixtures.konnector,
+      reconnect: true,
       t: t
     })).getElement();
-    expect(component).toBeNull();
+    expect(component).toMatchSnapshot();
   });
   it('should call policy fetchExtraOAuthUrlParams with proper params', function () {
     shallow( /*#__PURE__*/React.createElement(OAuthForm, {

package/dist/components/OAuthWindow.js

@@ -65,13 +65,15 @@ export var OAuthWindow = /*#__PURE__*/function (_PureComponent) {
           client = _this$props.client,
           konnector = _this$props.konnector,
           redirectSlug = _this$props.redirectSlug,
-          extraParams = _this$props.extraParams;
+          extraParams = _this$props.extraParams,
+          reconnect = _this$props.reconnect,
+          account = _this$props.account;
       this.realtime = new CozyRealtime({
         client: client
       });
       this.realtime.subscribe('notified', 'io.cozy.accounts', OAUTH_REALTIME_CHANNEL, this.handleMessage);
 
-      var _prepareOAuth = prepareOAuth(client, konnector, redirectSlug, extraParams),
+      var _prepareOAuth = prepareOAuth(client, konnector, redirectSlug, extraParams, reconnect, account),
           oAuthStateKey = _prepareOAuth.oAuthStateKey,
           oAuthUrl = _prepareOAuth.oAuthUrl;
 
@@ -210,6 +212,12 @@ OAuthWindow.propTypes = {
   onCancel: PropTypes.func,
 
   /** The app we want to redirect the user on, after the OAuth flow. It used by the stack */
-  redirectSlug: PropTypes.string
+  redirectSlug: PropTypes.string,
+
+  /** Is it a reconnection or not */
+  reconnect: PropTypes.bool,
+
+  /** Existing account */
+  account: PropTypes.object
 };
 export default translate()(withClient(OAuthWindow));

package/dist/components/TriggerManager.js

@@ -507,7 +507,8 @@ export var DumbTriggerManager = /*#__PURE__*/function (_Component) {
           flow = _this$props5.flow,
           flowState = _this$props5.flowState,
           client = _this$props5.client,
-          OAuthFormWrapperComp = _this$props5.OAuthFormWrapperComp;
+          OAuthFormWrapperComp = _this$props5.OAuthFormWrapperComp,
+          reconnect = _this$props5.reconnect;
       var submitting = flowState.running;
       var _this$state = this.state,
           account = _this$state.account,
@@ -527,6 +528,7 @@ export var DumbTriggerManager = /*#__PURE__*/function (_Component) {
           client: client,
           flow: flow,
           account: account,
+          reconnect: reconnect,
           konnector: konnector,
           onSuccess: this.handleOAuthAccountId
         }));
@@ -617,7 +619,10 @@ DumbTriggerManager.propTypes = {
   flow: PropTypes.object,
   flowState: PropTypes.object,
   // Used to inject a component around OAuthForm, and so customize the UI from the app
-  OAuthFormWrapperComp: PropTypes.node
+  OAuthFormWrapperComp: PropTypes.node,
+
+  /** Is it a reconnection or not */
+  reconnect: PropTypes.bool
 };
 var TriggerManager = compose(translate(), withClient, withVaultUnlockContext, withConnectionFlow())(DumbTriggerManager); // TriggerManager is exported wrapped in FlowProvider to avoid breaking changes.
 

package/dist/components/__snapshots__/OAuthForm.spec.js.snap

@@ -12,3 +12,16 @@ exports[`OAuthForm should render 1`] = `
   />
 </React.Fragment>
 `;
+
+exports[`OAuthForm should render reconnect button when update 1`] = `
+<React.Fragment>
+  <DefaultButton
+    busy={true}
+    className="u-mt-1"
+    disabled={true}
+    extension="full"
+    label="oauth.reconnect.label"
+    onClick={[Function]}
+  />
+</React.Fragment>
+`;

package/dist/helpers/oauth.js

@@ -1,3 +1,4 @@
+import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import uuid from 'uuid/v4';
 import get from 'lodash/get';
 import CozyClient from 'cozy-client';
@@ -94,6 +95,9 @@ export var handleOAuthResponse = function handleOAuthResponse() {
  * @param  {string} redirectSlug The app we want to redirect the user on after the end of the flow
  * @param  {string} nonce unique nonce string
  * @param  {Object} extraParams some extra parameters to add to the query string
+ * @param  {Boolean} reconnect Are we trying to reconnect an existing account ?
+ * @param  {io.cozy.accounts} account targeted account if any
+ * @returns {String} final OAuth url string
  */
 
 export var getOAuthUrl = function getOAuthUrl(_ref) {
@@ -104,25 +108,35 @@ export var getOAuthUrl = function getOAuthUrl(_ref) {
       oAuthConf = _ref$oAuthConf === void 0 ? {} : _ref$oAuthConf,
       nonce = _ref.nonce,
       redirectSlug = _ref.redirectSlug,
-      extraParams = _ref.extraParams;
-  var oAuthUrl = "".concat(cozyUrl, "/accounts/").concat(accountType, "/start?state=").concat(oAuthStateKey, "&nonce=").concat(nonce);
+      extraParams = _ref.extraParams,
+      reconnect = _ref.reconnect,
+      account = _ref.account;
+  var startOrReconnect = reconnect ? 'reconnect' : 'start';
+  var accountIdParam = reconnect ? account._id + '/' : '';
+  var oAuthUrl = new URL("".concat(cozyUrl, "/accounts/").concat(accountType, "/").concat(accountIdParam).concat(startOrReconnect));
+  oAuthUrl.searchParams.set('state', oAuthStateKey);
+  oAuthUrl.searchParams.set('nonce', nonce);
 
   if (oAuthConf.scope !== undefined && oAuthConf.scope !== null && oAuthConf.scope !== false) {
     var urlScope = Array.isArray(oAuthConf.scope) ? oAuthConf.scope.join('+') : oAuthConf.scope;
-    oAuthUrl += "&scope=".concat(urlScope);
+    oAuthUrl.searchParams.set('scope', urlScope);
   }
 
   if (redirectSlug) {
-    oAuthUrl += "&slug=".concat(redirectSlug);
+    oAuthUrl.searchParams.set('slug', redirectSlug);
   }
 
   if (extraParams) {
-    for (var key in extraParams) {
-      oAuthUrl += "&".concat(key, "=").concat(extraParams[key]);
-    }
+    Object.entries(extraParams).forEach(function (_ref2) {
+      var _ref3 = _slicedToArray(_ref2, 2),
+          key = _ref3[0],
+          value = _ref3[1];
+
+      return oAuthUrl.searchParams.set(key, value);
+    });
   }
 
-  return oAuthUrl;
+  return oAuthUrl.toString();
 };
 
 var getAppSlug = function getAppSlug(client) {
@@ -135,12 +149,16 @@ var getAppSlug = function getAppSlug(client) {
  * @param  {string} domain    Cozy domain
  * @param  {Object} konnector
  * @param  {string} redirectSlug The app we want to redirect the user on after the end of the flow
- * @return {Object}           Object containing: `oAuthUrl` (URL of cozy stack
- * OAuth endpoint) and `oAuthStateKey` (localStorage key)
+ * @param  {Object} extraParams some extra parameters to add to the query string
+ * @param  {Boolean} reconnect Are we trying to reconnect an existing account ?
+ * @param  {io.cozy.accounts} account targetted account if any
+ * @return {Object}           Object containing: `oAuthUrl` (URL of cozy stack OAuth endpoint) and `oAuthStateKey` (localStorage key)
  */
 
 
 export var prepareOAuth = function prepareOAuth(client, konnector, redirectSlug, extraParams) {
+  var reconnect = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
+  var account = arguments.length > 5 ? arguments[5] : undefined;
   var oauth = konnector.oauth;
   var accountType = konnectors.getAccountType(konnector); // We use localStorage to store the account related data
   // We will later check in localStorage that the received information is
@@ -159,7 +177,9 @@ export var prepareOAuth = function prepareOAuth(client, konnector, redirectSlug,
     oAuthConf: oauth,
     nonce: Date.now(),
     redirectSlug: redirectSlug || getAppSlug(client),
-    extraParams: extraParams
+    extraParams: extraParams,
+    reconnect: reconnect,
+    account: account
   });
   return {
     oAuthStateKey: oAuthStateKey,

package/dist/helpers/oauth.spec.js

@@ -53,7 +53,7 @@ describe('Oauth helper', function () {
           scope: ['thescope', 'thescope2']
         }
       }));
-      expect(url).toEqual('https://cozyurl/accounts/testslug/start?state=statekey&nonce=1234&scope=thescope+thescope2');
+      expect(url).toEqual('https://cozyurl/accounts/testslug/start?state=statekey&nonce=1234&scope=thescope%2Bthescope2');
     });
     it('should use redirectSlug if present', function () {
       var url = getOAuthUrl(_objectSpread(_objectSpread({}, defaultConf), {}, {
@@ -72,6 +72,20 @@ describe('Oauth helper', function () {
       }));
       expect(url).toEqual('https://cozyurl/accounts/testslug/start?state=statekey&nonce=1234&token=thetoken&id_connector=40');
     });
+    it('should return reconnect url with account id if reconnect', function () {
+      var url = getOAuthUrl(_objectSpread(_objectSpread({}, defaultConf), {}, {
+        oAuthConf: {},
+        account: {
+          _id: 'accountid'
+        },
+        reconnect: true,
+        extraParams: {
+          code: 'thecode',
+          connection_id: 12345
+        }
+      }));
+      expect(url).toEqual('https://cozyurl/accounts/testslug/accountid/reconnect?state=statekey&nonce=1234&code=thecode&connection_id=12345');
+    });
   });
   describe('handleOAuthResponse', function () {
     var originalLocation;

package/dist/locales/en.json

@@ -386,6 +386,9 @@
     }
   },
   "oauth": {
+    "reconnect": {
+      "label": "Reconnect"
+    },
     "connect": {
       "label": "Connect"
     },

package/dist/locales/fr.json

@@ -386,8 +386,11 @@
     }
   },
   "oauth": {
+    "reconnect": {
+      "label": "Se reconnecter"
+    },
     "connect": {
-      "label": "Connecter"
+      "label": "Ajouter un compte"
     },
     "window": {
       "title": "OAuth"