cozy-harvest-lib 9.0.0 → 9.1.0

package/CHANGELOG.md

@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [9.1.0](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@9.0.0...cozy-harvest-lib@9.1.0) (2022-05-02)
+
+
+### Bug Fixes
+
+* Multiple fixes after review ([0351500](https://github.com/cozy/cozy-libs/commit/0351500e1845df6ef4a31211aec6061090ccf66e))
+
+
+### Features
+
+* Open InAppBrowser via cozy-intent when in flaghip app ([5ee31ea](https://github.com/cozy/cozy-libs/commit/5ee31eafcb62e23a6242386bb6b09312f778e871))
+
+
+
+
+
 # [9.0.0](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@8.4.3...cozy-harvest-lib@9.0.0) (2022-04-29)
 
 

package/dist/components/InAppBrowser.js

@@ -0,0 +1,65 @@
+import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
+import { useEffect } from 'react';
+import PropTypes from 'prop-types';
+import { useWebviewIntent } from 'cozy-intent';
+import logger from '../logger';
+
+var InAppBrowser = function InAppBrowser(_ref) {
+  var url = _ref.url,
+      onClose = _ref.onClose;
+  var webviewIntent = useWebviewIntent();
+  useEffect(function () {
+    function insideEffect() {
+      return _insideEffect.apply(this, arguments);
+    }
+
+    function _insideEffect() {
+      _insideEffect = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+        var result;
+        return _regeneratorRuntime.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                if (!webviewIntent) {
+                  _context.next = 5;
+                  break;
+                }
+
+                _context.next = 3;
+                return webviewIntent.call('showInAppBrowser', {
+                  url: url
+                });
+
+              case 3:
+                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') {
+                  logger.error('Unexpected InAppBrowser result', result);
+                }
+
+              case 5:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee);
+      }));
+      return _insideEffect.apply(this, arguments);
+    }
+
+    insideEffect();
+    return function cleanup() {
+      webviewIntent.call('closeInAppBrowser');
+    };
+  }, [webviewIntent, url, onClose]);
+  return null;
+};
+
+InAppBrowser.propTypes = {
+  url: PropTypes.string.isRequired,
+  onClose: PropTypes.func
+};
+export default InAppBrowser;

package/dist/components/InAppBrowser.spec.js

@@ -0,0 +1,104 @@
+import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
+import React from 'react';
+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() {
+    var url, intentCall, webviewService;
+    return _regeneratorRuntime.wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            url = 'https://test.url';
+            intentCall = jest.fn();
+            webviewService = {
+              call: intentCall
+            };
+            intentCall.mockResolvedValue({
+              type: 'dismiss'
+            });
+            render( /*#__PURE__*/React.createElement(WebviewIntentProvider, {
+              webviewService: webviewService
+            }, /*#__PURE__*/React.createElement(InAppBrowser, {
+              url: url
+            })));
+            expect(webviewService.call).toHaveBeenNthCalledWith(1, 'showInAppBrowser', {
+              url: url
+            });
+
+          case 6:
+          case "end":
+            return _context.stop();
+        }
+      }
+    }, _callee);
+  })));
+  it('should call onClose when user closes the inAppBrowser in app', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
+    var url, intentCall, webviewService, onClose;
+    return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+      while (1) {
+        switch (_context2.prev = _context2.next) {
+          case 0:
+            url = 'https://test.url';
+            intentCall = jest.fn();
+            webviewService = {
+              call: intentCall
+            };
+            onClose = jest.fn();
+            intentCall.mockResolvedValue({
+              type: 'cancel'
+            });
+            render( /*#__PURE__*/React.createElement(WebviewIntentProvider, {
+              webviewService: webviewService
+            }, /*#__PURE__*/React.createElement(InAppBrowser, {
+              url: url,
+              onClose: onClose
+            })));
+            _context2.next = 8;
+            return waitFor(function () {
+              return expect(onClose).toHaveBeenCalledTimes(1);
+            });
+
+          case 8:
+            expect(onClose).toHaveBeenCalledWith();
+
+          case 9:
+          case "end":
+            return _context2.stop();
+        }
+      }
+    }, _callee2);
+  })));
+  it('should call closeInAppBrowser when the component is unmounted', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
+    var url, intentCall, webviewService, _render, unmount;
+
+    return _regeneratorRuntime.wrap(function _callee3$(_context3) {
+      while (1) {
+        switch (_context3.prev = _context3.next) {
+          case 0:
+            url = 'https://test.url';
+            intentCall = jest.fn();
+            webviewService = {
+              call: intentCall
+            };
+            intentCall.mockResolvedValue({
+              type: 'dismiss'
+            });
+            _render = render( /*#__PURE__*/React.createElement(WebviewIntentProvider, {
+              webviewService: webviewService
+            }, /*#__PURE__*/React.createElement(InAppBrowser, {
+              url: url
+            }))), unmount = _render.unmount;
+            unmount();
+            expect(webviewService.call).toHaveBeenNthCalledWith(2, 'closeInAppBrowser');
+
+          case 7:
+          case "end":
+            return _context3.stop();
+        }
+      }
+    }, _callee3);
+  })));
+});

package/dist/components/OAuthWindow.js

@@ -15,9 +15,11 @@ import PropTypes from 'prop-types';
 import { withClient } from 'cozy-client';
 import { translate } from 'cozy-ui/transpiled/react/I18n';
 import CozyRealtime from 'cozy-realtime';
+import { isFlagshipApp } from 'cozy-device-helper';
 import { prepareOAuth, checkOAuthData, terminateOAuth, OAUTH_REALTIME_CHANNEL } from '../helpers/oauth'; // TODO use PopUp from cozy-ui
 
 import Popup from './Popup';
+import InAppBrowser from './InAppBrowser';
 var OAUTH_POPUP_HEIGHT = 800;
 var OAUTH_POPUP_WIDTH = 800;
 /**
@@ -177,14 +179,17 @@ export var OAuthWindow = /*#__PURE__*/function (_PureComponent) {
       var _this$state = this.state,
           oAuthUrl = _this$state.oAuthUrl,
           succeed = _this$state.succeed;
-      return oAuthUrl && !succeed && /*#__PURE__*/React.createElement(Popup, {
+      return oAuthUrl && !succeed && (!isFlagshipApp() ? /*#__PURE__*/React.createElement(Popup, {
         url: oAuthUrl,
         height: OAUTH_POPUP_HEIGHT,
         width: OAUTH_POPUP_WIDTH,
         onClose: this.handleClose,
         onUrlChange: this.handleUrlChange,
         title: t("oauth.window.title")
-      });
+      }) : /*#__PURE__*/React.createElement(InAppBrowser, {
+        url: oAuthUrl,
+        onClose: this.handleClose
+      }));
     }
   }]);
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-harvest-lib",
-  "version": "9.0.0",
+  "version": "9.1.0",
   "description": "Provides logic, modules and components for Cozy's harvest applications.",
   "main": "dist/index.js",
   "author": "Cozy",
@@ -55,6 +55,7 @@
     "cozy-client": "27.17.0",
     "cozy-device-helper": "^2.0.0",
     "cozy-flags": "^2.8.7",
+    "cozy-intent": "^1.17.1",
     "cozy-keys-lib": "^4.1.9",
     "cozy-realtime": "^4.0.8",
     "cozy-ui": "60.6.0",
@@ -78,6 +79,7 @@
     "cozy-client": ">=27.17.0",
     "cozy-device-helper": ">=1.10.2",
     "cozy-flags": ">=2.3.5",
+    "cozy-intent": ">=1.14.1",
     "cozy-keys-lib": ">=4.1.9",
     "cozy-realtime": ">=3.12.2",
     "cozy-ui": ">=60.6.0",
@@ -85,5 +87,5 @@
     "react-router-dom": "^5.0.1"
   },
   "sideEffects": false,
-  "gitHead": "45955517b20ac0da6a5df0add16a84024eccf791"
+  "gitHead": "2e308c267a13adc3cd826639e3058fe35770d830"
 }

package/src/components/InAppBrowser.jsx

@@ -0,0 +1,33 @@
+import { useEffect } from 'react'
+import PropTypes from 'prop-types'
+import { useWebviewIntent } from 'cozy-intent'
+import logger from '../logger'
+
+const InAppBrowser = ({ url, onClose }) => {
+  const webviewIntent = useWebviewIntent()
+
+  useEffect(() => {
+    async function insideEffect() {
+      if (webviewIntent) {
+        const result = await webviewIntent.call('showInAppBrowser', { url })
+        if (result?.type === 'cancel' && onClose) {
+          onClose()
+        } else if (result?.type !== 'dismiss') {
+          logger.error('Unexpected InAppBrowser result', result)
+        }
+      }
+    }
+    insideEffect()
+    return function cleanup() {
+      webviewIntent.call('closeInAppBrowser')
+    }
+  }, [webviewIntent, url, onClose])
+  return null
+}
+
+InAppBrowser.propTypes = {
+  url: PropTypes.string.isRequired,
+  onClose: PropTypes.func
+}
+
+export default InAppBrowser

package/src/components/InAppBrowser.spec.jsx

@@ -0,0 +1,60 @@
+import React from 'react'
+import { render, waitFor } from '@testing-library/react'
+import InAppBrowser from './InAppBrowser'
+import { WebviewIntentProvider } from 'cozy-intent'
+
+describe('InAppBrowser', () => {
+  it('should call showInAppBrowser', async () => {
+    const url = 'https://test.url'
+    const intentCall = jest.fn()
+    const webviewService = {
+      call: intentCall
+    }
+    intentCall.mockResolvedValue({type: 'dismiss'})
+    render(
+      <WebviewIntentProvider webviewService={webviewService}>
+        <InAppBrowser url={url} />
+      </WebviewIntentProvider>
+    )
+
+    expect(webviewService.call).toHaveBeenNthCalledWith(1, 'showInAppBrowser', {
+      url
+    })
+  })
+  it('should call onClose when user closes the inAppBrowser in app', async () => {
+    const url = 'https://test.url'
+    const intentCall = jest.fn()
+    const webviewService = {
+      call: intentCall
+    }
+    const onClose = jest.fn()
+
+    intentCall.mockResolvedValue({type: 'cancel'})
+    render(
+      <WebviewIntentProvider webviewService={webviewService}>
+        <InAppBrowser url={url} onClose={onClose} />
+      </WebviewIntentProvider>
+    )
+
+    await waitFor(() => expect(onClose).toHaveBeenCalledTimes(1))
+    expect(onClose).toHaveBeenCalledWith()
+
+
+  })
+  it('should call closeInAppBrowser when the component is unmounted', async () => {
+    const url = 'https://test.url'
+    const intentCall = jest.fn()
+    const webviewService = {
+      call: intentCall
+    }
+    intentCall.mockResolvedValue({type: 'dismiss'})
+    const { unmount } = render(
+      <WebviewIntentProvider webviewService={webviewService}>
+        <InAppBrowser url={url} />
+      </WebviewIntentProvider>
+    )
+
+    unmount()
+    expect(webviewService.call).toHaveBeenNthCalledWith(2, 'closeInAppBrowser')
+  })
+})

package/src/components/OAuthWindow.jsx

@@ -4,6 +4,7 @@ import PropTypes from 'prop-types'
 import { withClient } from 'cozy-client'
 import { translate } from 'cozy-ui/transpiled/react/I18n'
 import CozyRealtime from 'cozy-realtime'
+import { isFlagshipApp } from 'cozy-device-helper'
 
 import {
   prepareOAuth,
@@ -13,6 +14,7 @@ import {
 } from '../helpers/oauth'
 // TODO use PopUp from cozy-ui
 import Popup from './Popup'
+import InAppBrowser from './InAppBrowser'
 
 const OAUTH_POPUP_HEIGHT = 800
 const OAUTH_POPUP_WIDTH = 800
@@ -141,7 +143,8 @@ export class OAuthWindow extends PureComponent {
     const { oAuthUrl, succeed } = this.state
     return (
       oAuthUrl &&
-      !succeed && (
+      !succeed &&
+      (!isFlagshipApp() ? (
         <Popup
           url={oAuthUrl}
           height={OAUTH_POPUP_HEIGHT}
@@ -150,7 +153,9 @@ export class OAuthWindow extends PureComponent {
           onUrlChange={this.handleUrlChange}
           title={t(`oauth.window.title`)}
         />
-      )
+      ) : (
+        <InAppBrowser url={oAuthUrl} onClose={this.handleClose} />
+      ))
     )
   }
 }