cozy-harvest-lib 9.11.3 → 9.12.2

package/CHANGELOG.md

@@ -3,6 +3,39 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [9.12.2](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@9.12.1...cozy-harvest-lib@9.12.2) (2022-06-20)
+
+
+### Bug Fixes
+
+* Do not encode oauth url ([263e119](https://github.com/cozy/cozy-libs/commit/263e1192dc1d123585936119386acb8426d2676b))
+
+
+
+
+
+## [9.12.1](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@9.12.0...cozy-harvest-lib@9.12.1) (2022-06-20)
+
+
+### Bug Fixes
+
+* Do not show popup when intentsApi is given ([2b39abe](https://github.com/cozy/cozy-libs/commit/2b39abe6c808ea5ec12c5404c43ee698c4d49fd3))
+
+
+
+
+
+# [9.12.0](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@9.11.3...cozy-harvest-lib@9.12.0) (2022-06-17)
+
+
+### Features
+
+* Do not show Popup when intentsApi parameter is given ([6790272](https://github.com/cozy/cozy-libs/commit/67902727394c9ef3400e32bc3cbddf5468ef332c))
+
+
+
+
+
 ## [9.11.3](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@9.11.2...cozy-harvest-lib@9.11.3) (2022-06-17)
 
 

package/dist/components/KonnectorConfiguration/ConfigurationTab/BiContractActivationWindow.js

@@ -124,7 +124,7 @@ var BIContractActivationWindow = function BIContractActivationWindow(_ref) {
     onClick: function onClick() {
       return setWindowVisible(true);
     }
-  }, t('contracts.handle-synchronization'))), isWindowVisible && (isFlagshipApp() ? /*#__PURE__*/React.createElement(InAppBrowser, {
+  }, t('contracts.handle-synchronization'))), isWindowVisible && (isFlagshipApp() || intentsApi ? /*#__PURE__*/React.createElement(InAppBrowser, {
     url: initialUrl,
     onClose: onPopupClosed,
     intentsApi: intentsApi

package/dist/components/OAuthWindow.js

@@ -184,7 +184,7 @@ export var OAuthWindow = /*#__PURE__*/function (_PureComponent) {
       var _this$state = this.state,
           oAuthUrl = _this$state.oAuthUrl,
           succeed = _this$state.succeed;
-      return oAuthUrl && !succeed && (!isFlagshipApp() ? /*#__PURE__*/React.createElement(Popup, {
+      return oAuthUrl && !succeed && (!isFlagshipApp() && !intentsApi ? /*#__PURE__*/React.createElement(Popup, {
         url: oAuthUrl,
         height: OAUTH_POPUP_HEIGHT,
         width: OAUTH_POPUP_WIDTH,

package/dist/helpers/oauth.js

@@ -136,7 +136,7 @@ export var getOAuthUrl = function getOAuthUrl(_ref) {
     });
   }
 
-  return oAuthUrl.toString();
+  return decodeURIComponent(oAuthUrl.toString());
 };
 
 var getAppSlug = function getAppSlug(client) {

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%2Bthescope2');
+      expect(url).toEqual('https://cozyurl/accounts/testslug/start?state=statekey&nonce=1234&scope=thescope+thescope2');
     });
     it('should use redirectSlug if present', function () {
       var url = getOAuthUrl(_objectSpread(_objectSpread({}, defaultConf), {}, {
@@ -86,6 +86,20 @@ describe('Oauth helper', function () {
       }));
       expect(url).toEqual('https://cozyurl/accounts/testslug/accountid/reconnect?state=statekey&nonce=1234&code=thecode&connection_id=12345');
     });
+    it('should not encode url params', function () {
+      var url = getOAuthUrl(_objectSpread(_objectSpread({}, defaultConf), {}, {
+        oAuthConf: {},
+        account: {
+          _id: 'accountid'
+        },
+        reconnect: true,
+        extraParams: {
+          code: 'e/b',
+          connection_id: 12345
+        }
+      }));
+      expect(url).toEqual('https://cozyurl/accounts/testslug/accountid/reconnect?state=statekey&nonce=1234&code=e/b&connection_id=12345');
+    });
   });
   describe('handleOAuthResponse', function () {
     var originalLocation;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-harvest-lib",
-  "version": "9.11.3",
+  "version": "9.12.2",
   "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": "fc5f1b0d6ad0119af2833becb7d02bcfb3f2540c"
+  "gitHead": "975fde8ef02bab7329149c5bc813eeea8e971cfe"
 }

package/src/components/KonnectorConfiguration/ConfigurationTab/BiContractActivationWindow.jsx

@@ -75,7 +75,7 @@ const BIContractActivationWindow = ({
         </Button>
       </ButtonWrapper>
       {isWindowVisible &&
-        (isFlagshipApp() ? (
+        (isFlagshipApp() || intentsApi ? (
           <InAppBrowser
             url={initialUrl}
             onClose={onPopupClosed}

package/src/components/OAuthWindow.jsx

@@ -148,7 +148,7 @@ export class OAuthWindow extends PureComponent {
     return (
       oAuthUrl &&
       !succeed &&
-      (!isFlagshipApp() ? (
+      (!isFlagshipApp() && !intentsApi ? (
         <Popup
           url={oAuthUrl}
           height={OAUTH_POPUP_HEIGHT}

package/src/helpers/oauth.js

@@ -143,7 +143,7 @@ export const getOAuthUrl = ({
     )
   }
 
-  return oAuthUrl.toString()
+  return decodeURIComponent(oAuthUrl.toString())
 }
 
 const getAppSlug = client => {

package/src/helpers/oauth.spec.js

@@ -50,7 +50,7 @@ describe('Oauth helper', () => {
         oAuthConf: { scope: ['thescope', 'thescope2'] }
       })
       expect(url).toEqual(
-        'https://cozyurl/accounts/testslug/start?state=statekey&nonce=1234&scope=thescope%2Bthescope2'
+        'https://cozyurl/accounts/testslug/start?state=statekey&nonce=1234&scope=thescope+thescope2'
       )
     })
     it('should use redirectSlug if present', () => {
@@ -91,6 +91,21 @@ describe('Oauth helper', () => {
         'https://cozyurl/accounts/testslug/accountid/reconnect?state=statekey&nonce=1234&code=thecode&connection_id=12345'
       )
     })
+    it('should not encode url params', () => {
+      const url = getOAuthUrl({
+        ...defaultConf,
+        oAuthConf: {},
+        account: { _id: 'accountid' },
+        reconnect: true,
+        extraParams: {
+          code: 'e/b',
+          connection_id: 12345
+        }
+      })
+      expect(url).toEqual(
+        'https://cozyurl/accounts/testslug/accountid/reconnect?state=statekey&nonce=1234&code=e/b&connection_id=12345'
+      )
+    })
   })
   describe('handleOAuthResponse', () => {
     let originalLocation