cozy-harvest-lib 9.23.1 → 9.23.2

package/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [9.23.2](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@9.23.1...cozy-harvest-lib@9.23.2) (2022-07-26)
+
+
+### Bug Fixes
+
+* Invalidate temporary token cache when there is a change of BI user ([0fa3893](https://github.com/cozy/cozy-libs/commit/0fa3893bb6ac3c02bc88d15dae79e3772a6aef97))
+
+
+
+
+
 ## [9.23.1](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@9.23.0...cozy-harvest-lib@9.23.1) (2022-07-26)
 
 

package/dist/services/biWebView.js

@@ -576,16 +576,22 @@ function _getBiTemporaryTokenFromCache() {
   return _getBiTemporaryTokenFromCache.apply(this, arguments);
 }
 
-function isCacheExpired(_ref17) {
-  var tokenCache = _ref17.tokenCache;
+export function isCacheExpired(_ref17) {
+  var tokenCache = _ref17.tokenCache,
+      biUser = _ref17.biUser;
   var cacheAge = Date.now() - Number(tokenCache === null || tokenCache === void 0 ? void 0 : tokenCache.timestamp);
   logger.debug('tokenCache age', cacheAge / 1000 / 60, 'minutes');
   var MAX_TOKEN_CACHE_AGE = 29 * 60 * 1000;
+  var isSameUserId = tokenCache.userId === (biUser === null || biUser === void 0 ? void 0 : biUser.userId);
 
-  if (tokenCache && cacheAge < MAX_TOKEN_CACHE_AGE) {
+  if (tokenCache && cacheAge < MAX_TOKEN_CACHE_AGE && isSameUserId) {
     return false;
   }
 
+  if (!isSameUserId) {
+    logger.warn("BI user id in cache ".concat(tokenCache.userId, " is different than current user id ").concat(biUser === null || biUser === void 0 ? void 0 : biUser.userId));
+  }
+
   return true;
 }
 /**
@@ -598,7 +604,6 @@ function isCacheExpired(_ref17) {
  * @return {createTemporaryTokenResponse}
  */
 
-
 function updateCache(_x9) {
   return _updateCache.apply(this, arguments);
 }
@@ -663,7 +668,7 @@ export var createTemporaryToken = /*#__PURE__*/function () {
   var _ref20 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee8(_ref19) {
     var _tokenCache;
 
-    var client, konnector, account, tokenCache, cozyBankIds, _tokenCache2, biMapping;
+    var client, konnector, account, tokenCache, cozyBankIds, _yield$client$query, biUser, _tokenCache2, biMapping;
 
     return _regeneratorRuntime.wrap(function _callee8$(_context8) {
       while (1) {
@@ -682,16 +687,23 @@ export var createTemporaryToken = /*#__PURE__*/function () {
               konnector: konnector,
               account: account
             });
+            _context8.next = 8;
+            return client.query(Q('io.cozy.accounts').getById('bi-aggregator-user'));
+
+          case 8:
+            _yield$client$query = _context8.sent;
+            biUser = _yield$client$query.data;
 
             if (!isCacheExpired({
-              tokenCache: tokenCache
+              tokenCache: tokenCache,
+              biUser: biUser
             })) {
-              _context8.next = 11;
+              _context8.next = 15;
               break;
             }
 
             logger.debug('temporaryToken cache is expired. Updating');
-            _context8.next = 10;
+            _context8.next = 14;
             return updateCache({
               client: client,
               konnector: konnector,
@@ -699,10 +711,10 @@ export var createTemporaryToken = /*#__PURE__*/function () {
               cozyBankIds: cozyBankIds
             });
 
-          case 10:
+          case 14:
             tokenCache = _context8.sent;
 
-          case 11:
+          case 15:
             assert(cozyBankIds.length, 'createTemporaryToken: Could not determine cozyBankIds from account or konnector');
             assert((_tokenCache = tokenCache) === null || _tokenCache === void 0 ? void 0 : _tokenCache.biMapping, 'createTemporaryToken: could not find a BI mapping in createTemporaryToken response, you should update your konnector to the last version');
             _tokenCache2 = tokenCache, biMapping = _tokenCache2.biMapping;
@@ -711,7 +723,7 @@ export var createTemporaryToken = /*#__PURE__*/function () {
             })));
             return _context8.abrupt("return", tokenCache);
 
-          case 16:
+          case 20:
           case "end":
             return _context8.stop();
         }

package/dist/services/biWebView.spec.js

@@ -7,7 +7,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import CozyClient from 'cozy-client';
-import { handleOAuthAccount, checkBIConnection, isBiWebViewConnector, fetchContractSynchronizationUrl, refreshContracts, fetchExtraOAuthUrlParams } from './biWebView';
+import { handleOAuthAccount, checkBIConnection, isBiWebViewConnector, fetchContractSynchronizationUrl, refreshContracts, fetchExtraOAuthUrlParams, isCacheExpired } from './biWebView';
 import ConnectionFlow from '../models/ConnectionFlow';
 import { waitForRealtimeEvent } from './jobUtils';
 import biPublicKeyProd from './bi-public-key-prod.json';
@@ -539,6 +539,72 @@ describe('refreshContracts', function () {
     }, _callee9);
   })));
 });
+describe('isCacheExpired', function () {
+  it('should not be marked as expired when userId did not change and cache is not old', function () {
+    var tokenCache = {
+      timestamp: Date.now(),
+      userId: 666
+    };
+    var biUser = {
+      userId: 666
+    };
+    expect(isCacheExpired({
+      tokenCache: tokenCache,
+      biUser: biUser
+    })).toBe(false);
+  });
+  it('should be marked as expired when userId did not change and cache is old', function () {
+    var tokenCache = {
+      timestamp: 0,
+      userId: 666
+    };
+    var biUser = {
+      userId: 666
+    };
+    expect(isCacheExpired({
+      tokenCache: tokenCache,
+      biUser: biUser
+    })).toBe(true);
+  });
+  it('should be marked as expired when userId did change and cache is old', function () {
+    var tokenCache = {
+      timestamp: 0,
+      userId: 666
+    };
+    var biUser = {
+      userId: 667
+    };
+    expect(isCacheExpired({
+      tokenCache: tokenCache,
+      biUser: biUser
+    })).toBe(true);
+  });
+  it('should be marked as expired when userId did change and cache is not old', function () {
+    var tokenCache = {
+      timestamp: Date.now(),
+      userId: 666
+    };
+    var biUser = {
+      userId: 667
+    };
+    expect(isCacheExpired({
+      tokenCache: tokenCache,
+      biUser: biUser
+    })).toBe(true);
+  });
+  it('should be marked as expired when cache has no user id', function () {
+    var tokenCache = {
+      timestamp: Date.now()
+    };
+    var biUser = {
+      userId: 666
+    };
+    expect(isCacheExpired({
+      tokenCache: tokenCache,
+      biUser: biUser
+    })).toBe(true);
+  });
+});
 describe('fetchExtraOAuthUrlParams', function () {
   it('should asynchronously fetch BI token', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee10() {
     var client, result;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-harvest-lib",
-  "version": "9.23.1",
+  "version": "9.23.2",
   "description": "Provides logic, modules and components for Cozy's harvest applications.",
   "main": "dist/index.js",
   "author": "Cozy",
@@ -90,5 +90,5 @@
     "react-router-dom": "^5.0.1"
   },
   "sideEffects": false,
-  "gitHead": "3e2319da1add48da77bf8dd3f9c8113e831ea752"
+  "gitHead": "c5c6e0d609fafbc41a4b8cbfa8e1d4582544bbdd"
 }

package/src/services/biWebView.js

@@ -362,13 +362,20 @@ async function getBiTemporaryTokenFromCache({ client }) {
  * @param {createTemporaryTokenResponse} options.tokenCache
  * @return {Boolean}
  */
-function isCacheExpired({ tokenCache }) {
+export function isCacheExpired({ tokenCache, biUser }) {
   const cacheAge = Date.now() - Number(tokenCache?.timestamp)
   logger.debug('tokenCache age', cacheAge / 1000 / 60, 'minutes')
   const MAX_TOKEN_CACHE_AGE = 29 * 60 * 1000
-  if (tokenCache && cacheAge < MAX_TOKEN_CACHE_AGE) {
+  const isSameUserId = tokenCache.userId === biUser?.userId
+  if (tokenCache && cacheAge < MAX_TOKEN_CACHE_AGE && isSameUserId) {
     return false
   }
+
+  if (!isSameUserId) {
+    logger.warn(
+      `BI user id in cache ${tokenCache.userId} is different than current user id ${biUser?.userId}`
+    )
+  }
   return true
 }
 
@@ -425,7 +432,12 @@ export const createTemporaryToken = async ({ client, konnector, account }) => {
 
   let tokenCache = await getBiTemporaryTokenFromCache({ client })
   const cozyBankIds = getCozyBankIds({ konnector, account })
-  if (isCacheExpired({ tokenCache })) {
+
+  const { data: biUser } = await client.query(
+    Q('io.cozy.accounts').getById('bi-aggregator-user')
+  )
+
+  if (isCacheExpired({ tokenCache, biUser })) {
     logger.debug('temporaryToken cache is expired. Updating')
     tokenCache = await updateCache({
       client,

package/src/services/biWebView.spec.js

@@ -5,7 +5,8 @@ import {
   isBiWebViewConnector,
   fetchContractSynchronizationUrl,
   refreshContracts,
-  fetchExtraOAuthUrlParams
+  fetchExtraOAuthUrlParams,
+  isCacheExpired
 } from './biWebView'
 import ConnectionFlow from '../models/ConnectionFlow'
 import { waitForRealtimeEvent } from './jobUtils'
@@ -330,6 +331,34 @@ describe('refreshContracts', () => {
   })
 })
 
+describe('isCacheExpired', () => {
+  it('should not be marked as expired when userId did not change and cache is not old', () => {
+    const tokenCache = { timestamp: Date.now(), userId: 666 }
+    const biUser = { userId: 666 }
+    expect(isCacheExpired({ tokenCache, biUser })).toBe(false)
+  })
+  it('should be marked as expired when userId did not change and cache is old', () => {
+    const tokenCache = { timestamp: 0, userId: 666 }
+    const biUser = { userId: 666 }
+    expect(isCacheExpired({ tokenCache, biUser })).toBe(true)
+  })
+  it('should be marked as expired when userId did change and cache is old', () => {
+    const tokenCache = { timestamp: 0, userId: 666 }
+    const biUser = { userId: 667 }
+    expect(isCacheExpired({ tokenCache, biUser })).toBe(true)
+  })
+  it('should be marked as expired when userId did change and cache is not old', () => {
+    const tokenCache = { timestamp: Date.now(), userId: 666 }
+    const biUser = { userId: 667 }
+    expect(isCacheExpired({ tokenCache, biUser })).toBe(true)
+  })
+  it('should be marked as expired when cache has no user id', () => {
+    const tokenCache = { timestamp: Date.now() }
+    const biUser = { userId: 666 }
+    expect(isCacheExpired({ tokenCache, biUser })).toBe(true)
+  })
+})
+
 describe('fetchExtraOAuthUrlParams', () => {
   it('should asynchronously fetch BI token', async () => {
     const client = new CozyClient({