From 2f9db56ce0ff3ea525ce2953359b963c2f03fb20 Mon Sep 17 00:00:00 2001 From: Etienne LOUPIAS <eloupias@grandlyon.com> Date: Mon, 20 Mar 2023 15:00:16 +0100 Subject: [PATCH] publish: :arrow_up: cozy-konnector-build generated from commit f5685d83c6cc249e19ab93d9fac5a426480cfadf --- index.js | 401 ++++++++++++++++----------------------------- onDeleteAccount.js | 388 ++++++++++++++++--------------------------- package.json | 6 +- 3 files changed, 281 insertions(+), 514 deletions(-) diff --git a/index.js b/index.js index d6ee4fd..92616e4 100644 --- a/index.js +++ b/index.js @@ -720,19 +720,6 @@ module.exports = __webpack_require__(3)["default"]; /* 3 */ /***/ ((module, exports, __webpack_require__) => { -const _excluded = ["debug"], - _excluded2 = ["cheerio", "userAgent"]; - -function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; } - -function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; } - -function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } - -function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; } - -function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; } - /** * This is a function which returns an instance of * [request-promise](https://www.npmjs.com/package/request-promise) initialized with @@ -822,14 +809,12 @@ exports = module.exports = { DEFAULT_USER_AGENT }; -function requestFactory(_ref = { +function requestFactory({ + debug, + ...options +} = { debug: false }) { - let { - debug - } = _ref, - options = _objectWithoutProperties(_ref, _excluded); - const logFn = setDebugFunction(debug); debug && requestdebug(request, logFn); return request.defaults(getRequestOptions(mergeDefaultOptions(options))); @@ -902,39 +887,39 @@ function mergeDefaultOptions(options = {}) { options.json = false; } - return _objectSpread(_objectSpread({}, defaultOptions), options); + return { ...defaultOptions, + ...options + }; } function transformWithCheerio(body, response, resolveWithFullResponse) { const result = (__webpack_require__(256).load)(body); if (resolveWithFullResponse) { - return _objectSpread(_objectSpread({}, response), {}, { + return { ...response, body: result - }); + }; } return result; } -function getRequestOptions(_ref2) { - let { - cheerio, - userAgent - } = _ref2, - options = _objectWithoutProperties(_ref2, _excluded2); - +function getRequestOptions({ + cheerio, + userAgent, + ...options +}) { const userAgentOption = options.headers['User-Agent']; - return cheerio ? _objectSpread(_objectSpread({}, options), {}, { + return cheerio ? { ...options, transform: transformWithCheerio, - headers: _objectSpread(_objectSpread({}, options.headers), {}, { + headers: { ...options.headers, 'User-Agent': userAgentOption ? userAgentOption : userAgent === false ? undefined : DEFAULT_USER_AGENT - }) - }) : _objectSpread(_objectSpread({}, options), {}, { - headers: _objectSpread(_objectSpread({}, options.headers), {}, { + } + } : { ...options, + headers: { ...options.headers, 'User-Agent': userAgent ? DEFAULT_USER_AGENT : options.headers['User-Agent'] - }) - }); + } + }; } /***/ }), @@ -66700,12 +66685,6 @@ module.exports = noop; /* 484 */ /***/ ((module, __unused_webpack_exports, __webpack_require__) => { -function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; } - -function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; } - -function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } - /** * Small utilities helping to develop konnectors. * @@ -66837,7 +66816,7 @@ const findDuplicates = async (doctype, options) => { for (let key in groups) { const group = groups[key]; toKeep.push(group[0]); - toRemove.push.apply(toRemove, group.slice(1).map(doc => _objectSpread(_objectSpread({}, doc), {}, { + toRemove.push.apply(toRemove, group.slice(1).map(doc => ({ ...doc, original: group[0]._id }))); } @@ -153767,12 +153746,6 @@ module.exports = JSON.parse('{"com":{"tricount.expenses":"Expenses Tricount","sp /* 953 */ /***/ ((module, __unused_webpack_exports, __webpack_require__) => { -function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; } - -function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; } - -function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } - /* global __WEBPACK_PROVIDED_MANIFEST__ */ /** @@ -153829,7 +153802,9 @@ function getCozyMetadata(data = {}) { } } - return _objectSpread(_objectSpread({}, defaultData), data); + return { ...defaultData, + ...data + }; } module.exports = { @@ -153842,12 +153817,6 @@ module.exports = { /* 954 */ /***/ ((module, __unused_webpack_exports, __webpack_require__) => { -function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; } - -function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; } - -function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } - const fs = __webpack_require__(149); const path = __webpack_require__(142); @@ -153969,11 +153938,11 @@ module.exports = { if (doctype === 'io.cozy.accounts') { const configPath = path.resolve('konnector-dev-config.json'); const config = JSON.parse(stripJsonComments(fs.readFileSync(configPath, 'utf8'))); - result = _objectSpread(_objectSpread({ - _id: id - }, result), {}, { + result = { + _id: id, + ...result, auth: config.fields - }); + }; if (!accountExists) { this.create(doctype, result); @@ -154060,7 +154029,9 @@ module.exports = { await renameFile(id, attrs.name); } - doc.attributes = _objectSpread(_objectSpread({}, doc.attributes), attrs); + doc.attributes = { ...doc.attributes, + ...attrs + }; db.get('io.cozy.files').updateById(id, doc).write(); } }, @@ -179135,12 +179106,6 @@ function yearsToQuarters(years) { /* 1270 */ /***/ ((module, __unused_webpack_exports, __webpack_require__) => { -function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; } - -function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; } - -function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } - /** * Bank transactions categorization * @@ -179222,10 +179187,10 @@ async function createCategorizer(options = {}) { } try { - localModel = await createLocalModel(_objectSpread(_objectSpread({}, classifierOptions), {}, { + localModel = await createLocalModel({ ...classifierOptions, pretrainedClassifier, customTransactionFetcher - })); + }); } catch (e) { log('warn', 'Failed to create local model:'); log('warn', e.message); @@ -179503,16 +179468,12 @@ module.exports = { /* 1275 */ /***/ ((module, __unused_webpack_exports, __webpack_require__) => { -function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; } - -function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; } - -function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } - const bayes = __webpack_require__(1276); function createClassifier(parameters, options) { - parameters.options = _objectSpread(_objectSpread({}, parameters.options), options); + parameters.options = { ...parameters.options, + ...options + }; const classifier = bayes.fromJson(parameters); return classifier; } @@ -184955,12 +184916,6 @@ module.exports = { /* 1282 */ /***/ ((module, __unused_webpack_exports, __webpack_require__) => { -const _excluded = ["pretrainedClassifier"]; - -function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; } - -function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; } - const { createClassifier } = __webpack_require__(1283); @@ -184988,10 +184943,9 @@ const log = logger.namespace('categorization/localModel/model'); async function createModel(options) { const { - pretrainedClassifier - } = options, - remainingOptions = _objectWithoutProperties(options, _excluded); - + pretrainedClassifier, + ...remainingOptions + } = options; let classifier; if (pretrainedClassifier) { @@ -185050,18 +185004,6 @@ module.exports = { /* 1283 */ /***/ ((module, __unused_webpack_exports, __webpack_require__) => { -const _excluded = ["customTransactionFetcher"]; - -function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; } - -function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; } - -function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } - -function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; } - -function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; } - const { fetchTransactionsWithManualCat } = __webpack_require__(1284); @@ -185088,14 +185030,10 @@ const FAKE_TRANSACTION = { manualCategoryId: '0' }; const TOKENS_TO_REWEIGHT = ['tag_neg', 'tag_v_b_expense', 'tag_neg tag_v_b_expense', 'tag_b_expense', 'tag_neg tag_b_expense', 'tag_expense', 'tag_neg tag_expense', 'tag_noise_neg', 'tag_neg tag_noise_neg', 'tag_pos', 'tag_noise_pos', 'tag_pos tag_noise_pos', 'tag_income', 'tag_pos tag_income', 'tag_b_income', 'tag_pos tag_b_income', 'tag_activity_income', 'tag_pos tag_activity_income']; -/** - * Get the classifier options, mainly to get the alpha parameter - * - * @param {number} nbUniqueCategories - Number of unique categories - * @returns {object} the classifier options - */ -const getClassifierOptions = nbUniqueCategories => { +const getClassifierOptions = transactionsWithManualCat => { + const uniqueCategories = getUniqueCategories(transactionsWithManualCat); + const nbUniqueCategories = uniqueCategories.length; log('debug', 'Number of unique categories in transactions with manual categories: ' + nbUniqueCategories); const alpha = getAlphaParameter(nbUniqueCategories, ALPHA_MIN, ALPHA_MAX, ALPHA_MAX_SMOOTHING); log('debug', 'Alpha parameter value is ' + alpha); @@ -185191,10 +185129,9 @@ const reweightModel = classifier => { const createClassifier = async options => { const { - customTransactionFetcher - } = options, - remainingOptions = _objectWithoutProperties(options, _excluded); - + customTransactionFetcher, + ...remainingOptions + } = options; let transactions = []; if (!customTransactionFetcher) { @@ -185207,9 +185144,10 @@ const createClassifier = async options => { log('debug', `Fetched ${transactions.length} transactions`); log('debug', 'Instanciating a new classifier'); - const uniqueCategories = getUniqueCategories(transactions); - const classifierOptions = getClassifierOptions((uniqueCategories === null || uniqueCategories === void 0 ? void 0 : uniqueCategories.length) || 0); - const classifier = createLocalClassifier(transactions, _objectSpread(_objectSpread({}, remainingOptions), classifierOptions.initialization), classifierOptions.configuration); + const classifierOptions = getClassifierOptions(transactions); + const classifier = createLocalClassifier(transactions, { ...remainingOptions, + ...classifierOptions.initialization + }, classifierOptions.configuration); log('debug', 'Reweighting model to lower the impact of amount in the prediction'); reweightModel(classifier); log('debug', 'Reweighting model to lower the impact of amount in the prediction'); @@ -185218,8 +185156,7 @@ const createClassifier = async options => { }; module.exports = { - createClassifier, - getClassifierOptions + createClassifier }; /***/ }), @@ -185306,12 +185243,6 @@ module.exports = log; /* 1288 */ /***/ ((module, __unused_webpack_exports, __webpack_require__) => { -function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; } - -function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; } - -function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } - const cozy = __webpack_require__(485); const log = (__webpack_require__(354).namespace)('BaseKonnector'); @@ -185705,7 +185636,9 @@ class BaseKonnector { heartBeat: 5 * s, retry: false }; - options = _objectSpread(_objectSpread({}, defaultParams), options); + options = { ...defaultParams, + ...options + }; if (options.timeout) { log('warn', `The timeout option for waitForTwoFaCode is deprecated. Please use the endTime option now`); @@ -185774,10 +185707,11 @@ class BaseKonnector { saveBills(entries, fields, options) { - return saveBills(entries, fields, _objectSpread({ + return saveBills(entries, fields, { sourceAccount: this.accountId, - sourceAccountIdentifier: fields.login - }, options)); + sourceAccountIdentifier: fields.login, + ...options + }); } /** * This is saveFiles function from cozy-konnector-libs which automatically adds sourceAccount and @@ -185788,10 +185722,11 @@ class BaseKonnector { saveFiles(entries, fields, options) { - return saveFiles(entries, fields, _objectSpread({ + return saveFiles(entries, fields, { sourceAccount: this.accountId, - sourceAccountIdentifier: fields.login - }, options)); + sourceAccountIdentifier: fields.login, + ...options + }); } /** * This is updateOrCreate function from cozy-konnector-libs which automatically adds sourceAccount in @@ -185802,10 +185737,11 @@ class BaseKonnector { updateOrCreate(entries, doctype, matchingAttributes, options) { - return updateOrCreate(entries, doctype, matchingAttributes, _objectSpread({ + return updateOrCreate(entries, doctype, matchingAttributes, { sourceAccount: this.accountId, - sourceAccountIdentifier: get(options, 'fields.login') - }, options)); + sourceAccountIdentifier: get(options, 'fields.login'), + ...options + }); } /** * This is saveIdentity function from cozy-konnector-libs which automatically adds sourceAccount in @@ -185816,10 +185752,11 @@ class BaseKonnector { saveIdentity(contact, accountIdentifier, options = {}) { - return saveIdentity(contact, accountIdentifier, _objectSpread({ + return saveIdentity(contact, accountIdentifier, { sourceAccount: this.accountId, - sourceAccountIdentifier: accountIdentifier - }, options)); + sourceAccountIdentifier: accountIdentifier, + ...options + }); } /** * This is signin function from cozy-konnector-libs which automatically adds deactivateAutoSuccessfulLogin @@ -186176,12 +186113,6 @@ module.exports.manageContractsData = manageContractsData; /* 1290 */ /***/ ((module, __unused_webpack_exports, __webpack_require__) => { -function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; } - -function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; } - -function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } - /** * Saves the given files in the given folder via the Cozy API. * @@ -186347,9 +186278,9 @@ const saveFiles = async (entries, fields, options = {}) => { if (canBeSaved(entry)) { const folderPath = await getOrCreateDestinationPath(entry, saveOptions); - entry = await saveEntry(entry, _objectSpread(_objectSpread({}, saveOptions), {}, { + entry = await saveEntry(entry, { ...saveOptions, folderPath - })); + }); if (entry && entry._cozy_file_to_create) { savedFiles++; @@ -186541,14 +186472,19 @@ async function createFile(entry, options, method, fileId) { } } - createFileOptions = _objectSpread(_objectSpread(_objectSpread({}, createFileOptions), entry.fileAttributes), options.sourceAccountOptions); + createFileOptions = { ...createFileOptions, + ...entry.fileAttributes, + ...options.sourceAccountOptions + }; if (options.fileIdAttributes) { - createFileOptions = _objectSpread(_objectSpread({}, createFileOptions), { - metadata: _objectSpread(_objectSpread({}, createFileOptions.metadata), {}, { - fileIdAttributes: calculateFileKey(entry, options.fileIdAttributes) - }) - }); + createFileOptions = { ...createFileOptions, + ...{ + metadata: { ...createFileOptions.metadata, + fileIdAttributes: calculateFileKey(entry, options.fileIdAttributes) + } + } + }; } let toCreate; @@ -186558,9 +186494,9 @@ async function createFile(entry, options, method, fileId) { } else if (entry.fetchFile || options.fetchFile) { toCreate = await (entry.fetchFile || options.fetchFile)(entry); } else { - toCreate = downloadEntry(entry, _objectSpread(_objectSpread({}, options), {}, { + toCreate = downloadEntry(entry, { ...options, simple: false - })); + }); } let fileDocument; @@ -186814,7 +186750,9 @@ function getRequestOptions(entry, options) { defaultRequestOptions.jar = true; } - return _objectSpread(_objectSpread({}, defaultRequestOptions), entry.requestOptions); + return { ...defaultRequestOptions, + ...entry.requestOptions + }; } function attachFileToEntry(entry, fileDocument) { @@ -190356,12 +190294,6 @@ module.exports = { /* 1310 */ /***/ ((module, __unused_webpack_exports, __webpack_require__) => { -function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; } - -function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; } - -function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } - /** * Saves the data into the cozy blindly without check. * @@ -190414,14 +190346,13 @@ const addData = (entries, doctype, options = {}) => { return bluebird.mapSeries(entries, async entry => { log('debug', entry, 'Adding this entry'); - - const metaEntry = _objectSpread({ - cozyMetadata: getCozyMetadata(_objectSpread(_objectSpread({}, entry.cozyMetadata), {}, { + const metaEntry = { + cozyMetadata: getCozyMetadata({ ...entry.cozyMetadata, sourceAccount: options.sourceAccount, sourceAccountIdentifier: options.sourceAccountIdentifier - })) - }, entry); - + }), + ...entry + }; const dbEntry = await (metaEntry._id ? cozy.data.update(doctype, metaEntry, omit(metaEntry, '_rev')) : cozy.data.create(doctype, metaEntry)); // Also update the original entry _id to allow saveBills' // linkBankOperation entries to have an id @@ -190436,12 +190367,6 @@ module.exports = addData; /* 1311 */ /***/ ((module, __unused_webpack_exports, __webpack_require__) => { -function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; } - -function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; } - -function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } - /** * Finds links between bills and bank operations. * @@ -190582,7 +190507,8 @@ class Linker { } getOptions(opts = {}) { - const options = _objectSpread({}, opts); + const options = { ...opts + }; if (typeof options.identifiers === 'string') { options.identifiers = [options.identifiers.toLowerCase()]; @@ -190744,12 +190670,12 @@ class Linker { } combineBills(...bills) { - return _objectSpread(_objectSpread({}, bills[0]), {}, { + return { ...bills[0], _id: ['combined', ...bills.map(bill => bill._id)].join(':'), amount: sumBy(bills, bill => bill.amount), originalAmount: sumBy(bills, bill => bill.originalAmount), originalBills: bills - }); + }; } } @@ -191998,18 +191924,6 @@ module.exports = ( function () { /* 1330 */ /***/ ((module, __unused_webpack_exports, __webpack_require__) => { -const _excluded = ["url", "formSelector", "formData", "parse", "validate"]; - -function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; } - -function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; } - -function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } - -function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; } - -function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; } - /** * Provides an handy method to log the user in, * on HTML form pages. On success, it resolves to a promise with a parsed body. @@ -192099,16 +192013,14 @@ const cheerio = __webpack_require__(256); */ -function signin(_ref = {}) { - let { - url, - formSelector, - formData = {}, - parse = 'cheerio', - validate = defaultValidate - } = _ref, - requestOpts = _objectWithoutProperties(_ref, _excluded); - +function signin({ + url, + formSelector, + formData = {}, + parse = 'cheerio', + validate = defaultValidate, + ...requestOpts +} = {}) { // Check for mandatory arguments if (url === undefined) { throw new Error('signin: `url` must be defined'); @@ -192118,10 +192030,11 @@ function signin(_ref = {}) { throw new Error('signin: `formSelector` must be defined'); } - const rq = requestOpts.requestInstance || requestFactory(_objectSpread({ + const rq = requestOpts.requestInstance || requestFactory({ jar: true, - json: false - }, requestOpts)); + json: false, + ...requestOpts + }); const parseBody = getStrategy(parse); return rq({ uri: url, @@ -192193,7 +192106,8 @@ function submitForm(rq, uri, inputs, parseBody, referer) { return rq({ uri: uri, method: 'POST', - form: _objectSpread({}, inputs), + form: { ...inputs + }, transform: (body, response) => [response.statusCode, parseBody(body), response], headers: { Referer: referer @@ -192236,12 +192150,6 @@ module.exports = __webpack_require__(44); /* 1333 */ /***/ ((module, __unused_webpack_exports, __webpack_require__) => { -function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; } - -function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; } - -function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } - /** * Creates or updates the given entries according to if they already * exist in the cozy or not @@ -192279,13 +192187,13 @@ const { const updateOrCreate = (entries = [], doctype, matchingAttributes = [], options = {}) => { return cozy.data.findAll(doctype).then(existings => bluebird.mapSeries(entries, entry => { - const metaEntry = _objectSpread({ - cozyMetadata: getCozyMetadata(_objectSpread(_objectSpread({}, entry.cozyMetadata), {}, { + const metaEntry = { + cozyMetadata: getCozyMetadata({ ...entry.cozyMetadata, sourceAccount: options.sourceAccount, sourceAccountIdentifier: options.sourceAccountIdentifier - })) - }, entry); // try to find a corresponding existing element - + }), + ...entry + }; // try to find a corresponding existing element const toUpdate = existings.find(doc => matchingAttributes.reduce((isMatching, matchingAttribute) => isMatching && get(doc, matchingAttribute) === get(metaEntry, matchingAttribute), true)); @@ -192306,12 +192214,6 @@ module.exports = updateOrCreate; /* 1334 */ /***/ ((module, __unused_webpack_exports, __webpack_require__) => { -function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; } - -function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; } - -function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } - /** * Helper to set or merge io.cozy.identities * See https://github.com/cozy/cozy-doctypes/blob/master/docs/io.cozy.identities.md @@ -192414,22 +192316,22 @@ const saveIdentity = async (contactOrIdentity, accountIdentifier, options = {}) log('debug', 'Updating existing identity'); let newIdentity = existingIdentity[0]; newIdentity.contact = identity.contact; - await newClient.save(_objectSpread(_objectSpread({}, newIdentity), {}, { + await newClient.save({ ...newIdentity, _type: 'io.cozy.identities' - })); + }); } else { try { - await newClient.save(_objectSpread(_objectSpread({}, identity), {}, { + await newClient.save({ ...identity, _type: 'io.cozy.identities' - })); + }); } catch (e) { log('error', e); } } } else { - await updateOrCreate([identity], 'io.cozy.identities', ['identifier', 'cozyMetadata.createdByApp'], _objectSpread(_objectSpread({}, options), {}, { + await updateOrCreate([identity], 'io.cozy.identities', ['identifier', 'cozyMetadata.createdByApp'], { ...options, sourceAccountIdentifier: accountIdentifier - })); + }); } return; @@ -195510,12 +195412,6 @@ module.exports = { /* 1368 */ /***/ ((module, __unused_webpack_exports, __webpack_require__) => { -function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; } - -function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; } - -function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } - const log = (__webpack_require__(354).namespace)('CookieKonnector'); const BaseKonnector = __webpack_require__(1288); @@ -195615,9 +195511,9 @@ class CookieKonnector extends BaseKonnector { requestFactory(options) { this._jar = this._jar || requestFactory().jar(); - return requestFactory(_objectSpread(_objectSpread({}, options), {}, { + return requestFactory({ ...options, jar: this._jar - })); + }); } /** * Reset cookie session with a new empty session and save it to the associated account @@ -195681,9 +195577,9 @@ class CookieKonnector extends BaseKonnector { async saveSession(obj) { - const accountData = _objectSpread(_objectSpread({}, this._account.data), {}, { + const accountData = { ...this._account.data, auth: {} - }); + }; if (obj && obj.getCookieJar) { this._jar._jar = obj.getCookieJar(); @@ -195703,9 +195599,9 @@ class CookieKonnector extends BaseKonnector { async signin(options) { - const result = await super.signin(_objectSpread(_objectSpread({}, options), {}, { + const result = await super.signin({ ...options, requestInstance: this.request - })); + }); await this.saveSession(); return result; } @@ -195718,9 +195614,9 @@ class CookieKonnector extends BaseKonnector { saveFiles(entries, fields, options) { - return super.saveFiles(entries, fields, _objectSpread(_objectSpread({}, options), {}, { + return super.saveFiles(entries, fields, { ...options, requestInstance: this.request - })); + }); } /** * This is saveBills function from cozy-konnector-libs which is forced to use the current cookies @@ -195731,9 +195627,9 @@ class CookieKonnector extends BaseKonnector { saveBills(entries, fields, options) { - return super.saveBills(entries, fields, _objectSpread(_objectSpread({}, options), {}, { + return super.saveBills(entries, fields, { ...options, requestInstance: this.request - })); + }); } } @@ -195744,12 +195640,6 @@ module.exports = CookieKonnector; /* 1369 */ /***/ ((module, __unused_webpack_exports, __webpack_require__) => { -function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; } - -function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; } - -function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } - const { URL } = __webpack_require__(63); @@ -195888,12 +195778,12 @@ function htmlToPDF($, frag, $parent, opts) { htmlToPDF($, frag.table({ widths: [5 * pdf.cm, null], borderWidth: 1 - }), $el, _objectSpread(_objectSpread({}, opts), {}, { + }), $el, { ...opts, tableState: { tableWidth: 2, colRemaining: 2 } - })); + }); parentDL = null; break; @@ -196297,12 +196187,6 @@ module.exports = normalizeFilename; /* 1374 */ /***/ ((module, __unused_webpack_exports, __webpack_require__) => { -function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; } - -function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; } - -function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } - /** * Use every possible means to solve a captcha. At the moment, Anticaptcha web service is used if * any related secret key is found in COZY_PARAMETERS environment variable. @@ -196359,7 +196243,9 @@ const solveCaptcha = async (params = {}) => { type: 'recaptcha', timeout: DEFAULT_TIMEOUT }; - params = _objectSpread(_objectSpread({}, defaultParams), params); + params = { ...defaultParams, + ...params + }; const secrets = JSON.parse(process.env.COZY_PARAMETERS || '{}').secret; if (params.type === 'recaptcha') { @@ -247622,17 +247508,12 @@ async function getInseeCode(postalCode, city) { if (!city) throw new Error('No city') const parsedCity = sanitizeCity(city) + console.log(parsedCity) - const filteredResponse = response.data.filter(commune => - sanitizeCity(commune.nomCommune).includes(parsedCity) + const filteredResponse = response.data.filter( + town => sanitizeCity(town.nomCommune) === parsedCity ) - if (filteredResponse.length > 1) { - throw new Error( - 'Input city is not precise enough, more than one city was found' - ) - } - return filteredResponse[0].codeCommune } } catch (error) { @@ -253174,7 +253055,7 @@ var SpanStatus; (function (SpanStatus) { /***/ ((module) => { "use strict"; -module.exports = JSON.parse('{"name":"enedissgegrandlyon","version":"1.2.5","description":"","repository":{"type":"https","url":"https://forge.grandlyon.com/web-et-numerique/llle_project/enedis-sge-konnector"},"keywords":[],"main":"./src/index.js","author":"Cozy Cloud","license":"AGPL-3.0","eslintConfig":{"extends":["cozy-app"]},"eslintIgnore":["build","data"],"husky":{"hooks":{"pre-commit":"yarn lint"}},"jest":{"setupFiles":["./setupTests.js"]},"scripts":{"build":"webpack","clean":"rm -rf ./data","cozyPublish":"cozy-app-publish --token $REGISTRY_TOKEN --build-commit $(git rev-parse ${DEPLOY_BRANCH:-build})","deploy":"git-directory-deploy --directory build/ --branch ${DEPLOY_BRANCH:-build}","deploy-dev":"git-directory-deploy --directory build/ --branch ${DEPLOY_BRANCH:-build-dev}","dev":"cozy-konnector-dev","lint":"eslint --fix .","onDeleteAccount:standalone":"cozy-konnector-standalone src/onDeleteAccount.js","onDeleteAccount":"cozy-konnector-dev src/onDeleteAccount.js","pretest":"npm run clean","release":"standard-version --no-verify","standalone":"cozy-konnector-standalone","standalone-no-data":"NO_DATA=true cozy-konnector-standalone src/index.js","start":"node ./src/index.js","test:cov":"jest --coverage","test":"jest","travisDeployKey":"./bin/generate_travis_deploy_key"},"dependencies":{"@sentry/node":"^7.23.0","@sentry/tracing":"^7.23.0","axios":"^0.27.2","cozy-konnector-libs":"5.2.1","easy-soap-request":"^4.7.0","jest":"^28.1.3","moment":"^2.29.3","moment-timezone":"^0.5.34","xml2js":"^0.4.23"},"devDependencies":{"cozy-jobs-cli":"2.0.3","cozy-konnector-build":"1.4.4","eslint-config-cozy-app":"1.3.3","eslint-plugin-prettier":"^4.0.0","git-directory-deploy":"1.5.1","jest-junit":"^14.0.0","standard-version":"^9.5.0"}}'); +module.exports = JSON.parse('{"name":"enedissgegrandlyon","version":"1.2.5","description":"","repository":{"type":"https","url":"https://forge.grandlyon.com/web-et-numerique/llle_project/enedis-sge-konnector"},"keywords":[],"main":"./src/index.js","author":"Cozy Cloud","license":"AGPL-3.0","eslintConfig":{"extends":["cozy-app"]},"eslintIgnore":["build","data"],"husky":{"hooks":{"pre-commit":"yarn lint"}},"jest":{"setupFiles":["./setupTests.js"]},"scripts":{"build":"webpack","clean":"rm -rf ./data","cozyPublish":"cozy-app-publish --token $REGISTRY_TOKEN --build-commit $(git rev-parse ${DEPLOY_BRANCH:-build})","deploy":"git-directory-deploy --directory build/ --branch ${DEPLOY_BRANCH:-build}","deploy-dev":"git-directory-deploy --directory build/ --branch ${DEPLOY_BRANCH:-build-dev}","dev":"cozy-konnector-dev","lint":"eslint --fix .","onDeleteAccount:standalone":"cozy-konnector-standalone src/onDeleteAccount.js","onDeleteAccount":"cozy-konnector-dev src/onDeleteAccount.js","pretest":"npm run clean","release":"standard-version --no-verify","standalone":"cozy-konnector-standalone","standalone-no-data":"NO_DATA=true cozy-konnector-standalone src/index.js","start":"node ./src/index.js","test:cov":"jest --coverage","test":"jest","travisDeployKey":"./bin/generate_travis_deploy_key"},"dependencies":{"@sentry/node":"^7.23.0","@sentry/tracing":"^7.23.0","axios":"^0.27.2","cozy-konnector-libs":"5.0.0","easy-soap-request":"^4.7.0","jest":"^28.1.3","moment":"^2.29.3","moment-timezone":"^0.5.34","xml2js":"^0.4.23"},"devDependencies":{"cozy-jobs-cli":"2.0.0","cozy-konnector-build":"1.4.5","eslint-config-cozy-app":"1.3.3","eslint-plugin-prettier":"^4.0.0","git-directory-deploy":"1.5.1","jest-junit":"^14.0.0","standard-version":"^9.5.0"}}'); /***/ }) /******/ ]); diff --git a/onDeleteAccount.js b/onDeleteAccount.js index f039e3b..6cdcba3 100644 --- a/onDeleteAccount.js +++ b/onDeleteAccount.js @@ -62,19 +62,6 @@ module.exports = __webpack_require__(3)["default"]; /* 3 */ /***/ ((module, exports, __webpack_require__) => { -const _excluded = ["debug"], - _excluded2 = ["cheerio", "userAgent"]; - -function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; } - -function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; } - -function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } - -function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; } - -function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; } - /** * This is a function which returns an instance of * [request-promise](https://www.npmjs.com/package/request-promise) initialized with @@ -164,14 +151,12 @@ exports = module.exports = { DEFAULT_USER_AGENT }; -function requestFactory(_ref = { +function requestFactory({ + debug, + ...options +} = { debug: false }) { - let { - debug - } = _ref, - options = _objectWithoutProperties(_ref, _excluded); - const logFn = setDebugFunction(debug); debug && requestdebug(request, logFn); return request.defaults(getRequestOptions(mergeDefaultOptions(options))); @@ -244,39 +229,39 @@ function mergeDefaultOptions(options = {}) { options.json = false; } - return _objectSpread(_objectSpread({}, defaultOptions), options); + return { ...defaultOptions, + ...options + }; } function transformWithCheerio(body, response, resolveWithFullResponse) { const result = (__webpack_require__(256).load)(body); if (resolveWithFullResponse) { - return _objectSpread(_objectSpread({}, response), {}, { + return { ...response, body: result - }); + }; } return result; } -function getRequestOptions(_ref2) { - let { - cheerio, - userAgent - } = _ref2, - options = _objectWithoutProperties(_ref2, _excluded2); - +function getRequestOptions({ + cheerio, + userAgent, + ...options +}) { const userAgentOption = options.headers['User-Agent']; - return cheerio ? _objectSpread(_objectSpread({}, options), {}, { + return cheerio ? { ...options, transform: transformWithCheerio, - headers: _objectSpread(_objectSpread({}, options.headers), {}, { + headers: { ...options.headers, 'User-Agent': userAgentOption ? userAgentOption : userAgent === false ? undefined : DEFAULT_USER_AGENT - }) - }) : _objectSpread(_objectSpread({}, options), {}, { - headers: _objectSpread(_objectSpread({}, options.headers), {}, { + } + } : { ...options, + headers: { ...options.headers, 'User-Agent': userAgent ? DEFAULT_USER_AGENT : options.headers['User-Agent'] - }) - }); + } + }; } /***/ }), @@ -66042,12 +66027,6 @@ module.exports = noop; /* 484 */ /***/ ((module, __unused_webpack_exports, __webpack_require__) => { -function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; } - -function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; } - -function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } - /** * Small utilities helping to develop konnectors. * @@ -66179,7 +66158,7 @@ const findDuplicates = async (doctype, options) => { for (let key in groups) { const group = groups[key]; toKeep.push(group[0]); - toRemove.push.apply(toRemove, group.slice(1).map(doc => _objectSpread(_objectSpread({}, doc), {}, { + toRemove.push.apply(toRemove, group.slice(1).map(doc => ({ ...doc, original: group[0]._id }))); } @@ -153109,12 +153088,6 @@ module.exports = JSON.parse('{"com":{"tricount.expenses":"Expenses Tricount","sp /* 953 */ /***/ ((module, __unused_webpack_exports, __webpack_require__) => { -function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; } - -function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; } - -function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } - /* global __WEBPACK_PROVIDED_MANIFEST__ */ /** @@ -153171,7 +153144,9 @@ function getCozyMetadata(data = {}) { } } - return _objectSpread(_objectSpread({}, defaultData), data); + return { ...defaultData, + ...data + }; } module.exports = { @@ -153184,12 +153159,6 @@ module.exports = { /* 954 */ /***/ ((module, __unused_webpack_exports, __webpack_require__) => { -function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; } - -function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; } - -function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } - const fs = __webpack_require__(149); const path = __webpack_require__(142); @@ -153311,11 +153280,11 @@ module.exports = { if (doctype === 'io.cozy.accounts') { const configPath = path.resolve('konnector-dev-config.json'); const config = JSON.parse(stripJsonComments(fs.readFileSync(configPath, 'utf8'))); - result = _objectSpread(_objectSpread({ - _id: id - }, result), {}, { + result = { + _id: id, + ...result, auth: config.fields - }); + }; if (!accountExists) { this.create(doctype, result); @@ -153402,7 +153371,9 @@ module.exports = { await renameFile(id, attrs.name); } - doc.attributes = _objectSpread(_objectSpread({}, doc.attributes), attrs); + doc.attributes = { ...doc.attributes, + ...attrs + }; db.get('io.cozy.files').updateById(id, doc).write(); } }, @@ -178477,12 +178448,6 @@ function yearsToQuarters(years) { /* 1270 */ /***/ ((module, __unused_webpack_exports, __webpack_require__) => { -function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; } - -function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; } - -function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } - /** * Bank transactions categorization * @@ -178564,10 +178529,10 @@ async function createCategorizer(options = {}) { } try { - localModel = await createLocalModel(_objectSpread(_objectSpread({}, classifierOptions), {}, { + localModel = await createLocalModel({ ...classifierOptions, pretrainedClassifier, customTransactionFetcher - })); + }); } catch (e) { log('warn', 'Failed to create local model:'); log('warn', e.message); @@ -178845,16 +178810,12 @@ module.exports = { /* 1275 */ /***/ ((module, __unused_webpack_exports, __webpack_require__) => { -function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; } - -function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; } - -function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } - const bayes = __webpack_require__(1276); function createClassifier(parameters, options) { - parameters.options = _objectSpread(_objectSpread({}, parameters.options), options); + parameters.options = { ...parameters.options, + ...options + }; const classifier = bayes.fromJson(parameters); return classifier; } @@ -184297,12 +184258,6 @@ module.exports = { /* 1282 */ /***/ ((module, __unused_webpack_exports, __webpack_require__) => { -const _excluded = ["pretrainedClassifier"]; - -function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; } - -function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; } - const { createClassifier } = __webpack_require__(1283); @@ -184330,10 +184285,9 @@ const log = logger.namespace('categorization/localModel/model'); async function createModel(options) { const { - pretrainedClassifier - } = options, - remainingOptions = _objectWithoutProperties(options, _excluded); - + pretrainedClassifier, + ...remainingOptions + } = options; let classifier; if (pretrainedClassifier) { @@ -184392,18 +184346,6 @@ module.exports = { /* 1283 */ /***/ ((module, __unused_webpack_exports, __webpack_require__) => { -const _excluded = ["customTransactionFetcher"]; - -function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; } - -function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; } - -function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } - -function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; } - -function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; } - const { fetchTransactionsWithManualCat } = __webpack_require__(1284); @@ -184430,14 +184372,10 @@ const FAKE_TRANSACTION = { manualCategoryId: '0' }; const TOKENS_TO_REWEIGHT = ['tag_neg', 'tag_v_b_expense', 'tag_neg tag_v_b_expense', 'tag_b_expense', 'tag_neg tag_b_expense', 'tag_expense', 'tag_neg tag_expense', 'tag_noise_neg', 'tag_neg tag_noise_neg', 'tag_pos', 'tag_noise_pos', 'tag_pos tag_noise_pos', 'tag_income', 'tag_pos tag_income', 'tag_b_income', 'tag_pos tag_b_income', 'tag_activity_income', 'tag_pos tag_activity_income']; -/** - * Get the classifier options, mainly to get the alpha parameter - * - * @param {number} nbUniqueCategories - Number of unique categories - * @returns {object} the classifier options - */ -const getClassifierOptions = nbUniqueCategories => { +const getClassifierOptions = transactionsWithManualCat => { + const uniqueCategories = getUniqueCategories(transactionsWithManualCat); + const nbUniqueCategories = uniqueCategories.length; log('debug', 'Number of unique categories in transactions with manual categories: ' + nbUniqueCategories); const alpha = getAlphaParameter(nbUniqueCategories, ALPHA_MIN, ALPHA_MAX, ALPHA_MAX_SMOOTHING); log('debug', 'Alpha parameter value is ' + alpha); @@ -184533,10 +184471,9 @@ const reweightModel = classifier => { const createClassifier = async options => { const { - customTransactionFetcher - } = options, - remainingOptions = _objectWithoutProperties(options, _excluded); - + customTransactionFetcher, + ...remainingOptions + } = options; let transactions = []; if (!customTransactionFetcher) { @@ -184549,9 +184486,10 @@ const createClassifier = async options => { log('debug', `Fetched ${transactions.length} transactions`); log('debug', 'Instanciating a new classifier'); - const uniqueCategories = getUniqueCategories(transactions); - const classifierOptions = getClassifierOptions((uniqueCategories === null || uniqueCategories === void 0 ? void 0 : uniqueCategories.length) || 0); - const classifier = createLocalClassifier(transactions, _objectSpread(_objectSpread({}, remainingOptions), classifierOptions.initialization), classifierOptions.configuration); + const classifierOptions = getClassifierOptions(transactions); + const classifier = createLocalClassifier(transactions, { ...remainingOptions, + ...classifierOptions.initialization + }, classifierOptions.configuration); log('debug', 'Reweighting model to lower the impact of amount in the prediction'); reweightModel(classifier); log('debug', 'Reweighting model to lower the impact of amount in the prediction'); @@ -184560,8 +184498,7 @@ const createClassifier = async options => { }; module.exports = { - createClassifier, - getClassifierOptions + createClassifier }; /***/ }), @@ -184648,12 +184585,6 @@ module.exports = log; /* 1288 */ /***/ ((module, __unused_webpack_exports, __webpack_require__) => { -function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; } - -function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; } - -function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } - const cozy = __webpack_require__(485); const log = (__webpack_require__(354).namespace)('BaseKonnector'); @@ -185047,7 +184978,9 @@ class BaseKonnector { heartBeat: 5 * s, retry: false }; - options = _objectSpread(_objectSpread({}, defaultParams), options); + options = { ...defaultParams, + ...options + }; if (options.timeout) { log('warn', `The timeout option for waitForTwoFaCode is deprecated. Please use the endTime option now`); @@ -185116,10 +185049,11 @@ class BaseKonnector { saveBills(entries, fields, options) { - return saveBills(entries, fields, _objectSpread({ + return saveBills(entries, fields, { sourceAccount: this.accountId, - sourceAccountIdentifier: fields.login - }, options)); + sourceAccountIdentifier: fields.login, + ...options + }); } /** * This is saveFiles function from cozy-konnector-libs which automatically adds sourceAccount and @@ -185130,10 +185064,11 @@ class BaseKonnector { saveFiles(entries, fields, options) { - return saveFiles(entries, fields, _objectSpread({ + return saveFiles(entries, fields, { sourceAccount: this.accountId, - sourceAccountIdentifier: fields.login - }, options)); + sourceAccountIdentifier: fields.login, + ...options + }); } /** * This is updateOrCreate function from cozy-konnector-libs which automatically adds sourceAccount in @@ -185144,10 +185079,11 @@ class BaseKonnector { updateOrCreate(entries, doctype, matchingAttributes, options) { - return updateOrCreate(entries, doctype, matchingAttributes, _objectSpread({ + return updateOrCreate(entries, doctype, matchingAttributes, { sourceAccount: this.accountId, - sourceAccountIdentifier: get(options, 'fields.login') - }, options)); + sourceAccountIdentifier: get(options, 'fields.login'), + ...options + }); } /** * This is saveIdentity function from cozy-konnector-libs which automatically adds sourceAccount in @@ -185158,10 +185094,11 @@ class BaseKonnector { saveIdentity(contact, accountIdentifier, options = {}) { - return saveIdentity(contact, accountIdentifier, _objectSpread({ + return saveIdentity(contact, accountIdentifier, { sourceAccount: this.accountId, - sourceAccountIdentifier: accountIdentifier - }, options)); + sourceAccountIdentifier: accountIdentifier, + ...options + }); } /** * This is signin function from cozy-konnector-libs which automatically adds deactivateAutoSuccessfulLogin @@ -185518,12 +185455,6 @@ module.exports.manageContractsData = manageContractsData; /* 1290 */ /***/ ((module, __unused_webpack_exports, __webpack_require__) => { -function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; } - -function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; } - -function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } - /** * Saves the given files in the given folder via the Cozy API. * @@ -185689,9 +185620,9 @@ const saveFiles = async (entries, fields, options = {}) => { if (canBeSaved(entry)) { const folderPath = await getOrCreateDestinationPath(entry, saveOptions); - entry = await saveEntry(entry, _objectSpread(_objectSpread({}, saveOptions), {}, { + entry = await saveEntry(entry, { ...saveOptions, folderPath - })); + }); if (entry && entry._cozy_file_to_create) { savedFiles++; @@ -185883,14 +185814,19 @@ async function createFile(entry, options, method, fileId) { } } - createFileOptions = _objectSpread(_objectSpread(_objectSpread({}, createFileOptions), entry.fileAttributes), options.sourceAccountOptions); + createFileOptions = { ...createFileOptions, + ...entry.fileAttributes, + ...options.sourceAccountOptions + }; if (options.fileIdAttributes) { - createFileOptions = _objectSpread(_objectSpread({}, createFileOptions), { - metadata: _objectSpread(_objectSpread({}, createFileOptions.metadata), {}, { - fileIdAttributes: calculateFileKey(entry, options.fileIdAttributes) - }) - }); + createFileOptions = { ...createFileOptions, + ...{ + metadata: { ...createFileOptions.metadata, + fileIdAttributes: calculateFileKey(entry, options.fileIdAttributes) + } + } + }; } let toCreate; @@ -185900,9 +185836,9 @@ async function createFile(entry, options, method, fileId) { } else if (entry.fetchFile || options.fetchFile) { toCreate = await (entry.fetchFile || options.fetchFile)(entry); } else { - toCreate = downloadEntry(entry, _objectSpread(_objectSpread({}, options), {}, { + toCreate = downloadEntry(entry, { ...options, simple: false - })); + }); } let fileDocument; @@ -186156,7 +186092,9 @@ function getRequestOptions(entry, options) { defaultRequestOptions.jar = true; } - return _objectSpread(_objectSpread({}, defaultRequestOptions), entry.requestOptions); + return { ...defaultRequestOptions, + ...entry.requestOptions + }; } function attachFileToEntry(entry, fileDocument) { @@ -189698,12 +189636,6 @@ module.exports = { /* 1310 */ /***/ ((module, __unused_webpack_exports, __webpack_require__) => { -function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; } - -function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; } - -function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } - /** * Saves the data into the cozy blindly without check. * @@ -189756,14 +189688,13 @@ const addData = (entries, doctype, options = {}) => { return bluebird.mapSeries(entries, async entry => { log('debug', entry, 'Adding this entry'); - - const metaEntry = _objectSpread({ - cozyMetadata: getCozyMetadata(_objectSpread(_objectSpread({}, entry.cozyMetadata), {}, { + const metaEntry = { + cozyMetadata: getCozyMetadata({ ...entry.cozyMetadata, sourceAccount: options.sourceAccount, sourceAccountIdentifier: options.sourceAccountIdentifier - })) - }, entry); - + }), + ...entry + }; const dbEntry = await (metaEntry._id ? cozy.data.update(doctype, metaEntry, omit(metaEntry, '_rev')) : cozy.data.create(doctype, metaEntry)); // Also update the original entry _id to allow saveBills' // linkBankOperation entries to have an id @@ -189778,12 +189709,6 @@ module.exports = addData; /* 1311 */ /***/ ((module, __unused_webpack_exports, __webpack_require__) => { -function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; } - -function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; } - -function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } - /** * Finds links between bills and bank operations. * @@ -189924,7 +189849,8 @@ class Linker { } getOptions(opts = {}) { - const options = _objectSpread({}, opts); + const options = { ...opts + }; if (typeof options.identifiers === 'string') { options.identifiers = [options.identifiers.toLowerCase()]; @@ -190086,12 +190012,12 @@ class Linker { } combineBills(...bills) { - return _objectSpread(_objectSpread({}, bills[0]), {}, { + return { ...bills[0], _id: ['combined', ...bills.map(bill => bill._id)].join(':'), amount: sumBy(bills, bill => bill.amount), originalAmount: sumBy(bills, bill => bill.originalAmount), originalBills: bills - }); + }; } } @@ -191340,18 +191266,6 @@ module.exports = ( function () { /* 1330 */ /***/ ((module, __unused_webpack_exports, __webpack_require__) => { -const _excluded = ["url", "formSelector", "formData", "parse", "validate"]; - -function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; } - -function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; } - -function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } - -function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; } - -function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; } - /** * Provides an handy method to log the user in, * on HTML form pages. On success, it resolves to a promise with a parsed body. @@ -191441,16 +191355,14 @@ const cheerio = __webpack_require__(256); */ -function signin(_ref = {}) { - let { - url, - formSelector, - formData = {}, - parse = 'cheerio', - validate = defaultValidate - } = _ref, - requestOpts = _objectWithoutProperties(_ref, _excluded); - +function signin({ + url, + formSelector, + formData = {}, + parse = 'cheerio', + validate = defaultValidate, + ...requestOpts +} = {}) { // Check for mandatory arguments if (url === undefined) { throw new Error('signin: `url` must be defined'); @@ -191460,10 +191372,11 @@ function signin(_ref = {}) { throw new Error('signin: `formSelector` must be defined'); } - const rq = requestOpts.requestInstance || requestFactory(_objectSpread({ + const rq = requestOpts.requestInstance || requestFactory({ jar: true, - json: false - }, requestOpts)); + json: false, + ...requestOpts + }); const parseBody = getStrategy(parse); return rq({ uri: url, @@ -191535,7 +191448,8 @@ function submitForm(rq, uri, inputs, parseBody, referer) { return rq({ uri: uri, method: 'POST', - form: _objectSpread({}, inputs), + form: { ...inputs + }, transform: (body, response) => [response.statusCode, parseBody(body), response], headers: { Referer: referer @@ -191578,12 +191492,6 @@ module.exports = __webpack_require__(44); /* 1333 */ /***/ ((module, __unused_webpack_exports, __webpack_require__) => { -function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; } - -function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; } - -function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } - /** * Creates or updates the given entries according to if they already * exist in the cozy or not @@ -191621,13 +191529,13 @@ const { const updateOrCreate = (entries = [], doctype, matchingAttributes = [], options = {}) => { return cozy.data.findAll(doctype).then(existings => bluebird.mapSeries(entries, entry => { - const metaEntry = _objectSpread({ - cozyMetadata: getCozyMetadata(_objectSpread(_objectSpread({}, entry.cozyMetadata), {}, { + const metaEntry = { + cozyMetadata: getCozyMetadata({ ...entry.cozyMetadata, sourceAccount: options.sourceAccount, sourceAccountIdentifier: options.sourceAccountIdentifier - })) - }, entry); // try to find a corresponding existing element - + }), + ...entry + }; // try to find a corresponding existing element const toUpdate = existings.find(doc => matchingAttributes.reduce((isMatching, matchingAttribute) => isMatching && get(doc, matchingAttribute) === get(metaEntry, matchingAttribute), true)); @@ -191648,12 +191556,6 @@ module.exports = updateOrCreate; /* 1334 */ /***/ ((module, __unused_webpack_exports, __webpack_require__) => { -function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; } - -function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; } - -function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } - /** * Helper to set or merge io.cozy.identities * See https://github.com/cozy/cozy-doctypes/blob/master/docs/io.cozy.identities.md @@ -191756,22 +191658,22 @@ const saveIdentity = async (contactOrIdentity, accountIdentifier, options = {}) log('debug', 'Updating existing identity'); let newIdentity = existingIdentity[0]; newIdentity.contact = identity.contact; - await newClient.save(_objectSpread(_objectSpread({}, newIdentity), {}, { + await newClient.save({ ...newIdentity, _type: 'io.cozy.identities' - })); + }); } else { try { - await newClient.save(_objectSpread(_objectSpread({}, identity), {}, { + await newClient.save({ ...identity, _type: 'io.cozy.identities' - })); + }); } catch (e) { log('error', e); } } } else { - await updateOrCreate([identity], 'io.cozy.identities', ['identifier', 'cozyMetadata.createdByApp'], _objectSpread(_objectSpread({}, options), {}, { + await updateOrCreate([identity], 'io.cozy.identities', ['identifier', 'cozyMetadata.createdByApp'], { ...options, sourceAccountIdentifier: accountIdentifier - })); + }); } return; @@ -194852,12 +194754,6 @@ module.exports = { /* 1368 */ /***/ ((module, __unused_webpack_exports, __webpack_require__) => { -function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; } - -function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; } - -function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } - const log = (__webpack_require__(354).namespace)('CookieKonnector'); const BaseKonnector = __webpack_require__(1288); @@ -194957,9 +194853,9 @@ class CookieKonnector extends BaseKonnector { requestFactory(options) { this._jar = this._jar || requestFactory().jar(); - return requestFactory(_objectSpread(_objectSpread({}, options), {}, { + return requestFactory({ ...options, jar: this._jar - })); + }); } /** * Reset cookie session with a new empty session and save it to the associated account @@ -195023,9 +194919,9 @@ class CookieKonnector extends BaseKonnector { async saveSession(obj) { - const accountData = _objectSpread(_objectSpread({}, this._account.data), {}, { + const accountData = { ...this._account.data, auth: {} - }); + }; if (obj && obj.getCookieJar) { this._jar._jar = obj.getCookieJar(); @@ -195045,9 +194941,9 @@ class CookieKonnector extends BaseKonnector { async signin(options) { - const result = await super.signin(_objectSpread(_objectSpread({}, options), {}, { + const result = await super.signin({ ...options, requestInstance: this.request - })); + }); await this.saveSession(); return result; } @@ -195060,9 +194956,9 @@ class CookieKonnector extends BaseKonnector { saveFiles(entries, fields, options) { - return super.saveFiles(entries, fields, _objectSpread(_objectSpread({}, options), {}, { + return super.saveFiles(entries, fields, { ...options, requestInstance: this.request - })); + }); } /** * This is saveBills function from cozy-konnector-libs which is forced to use the current cookies @@ -195073,9 +194969,9 @@ class CookieKonnector extends BaseKonnector { saveBills(entries, fields, options) { - return super.saveBills(entries, fields, _objectSpread(_objectSpread({}, options), {}, { + return super.saveBills(entries, fields, { ...options, requestInstance: this.request - })); + }); } } @@ -195086,12 +194982,6 @@ module.exports = CookieKonnector; /* 1369 */ /***/ ((module, __unused_webpack_exports, __webpack_require__) => { -function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; } - -function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; } - -function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } - const { URL } = __webpack_require__(63); @@ -195230,12 +195120,12 @@ function htmlToPDF($, frag, $parent, opts) { htmlToPDF($, frag.table({ widths: [5 * pdf.cm, null], borderWidth: 1 - }), $el, _objectSpread(_objectSpread({}, opts), {}, { + }), $el, { ...opts, tableState: { tableWidth: 2, colRemaining: 2 } - })); + }); parentDL = null; break; @@ -195639,12 +195529,6 @@ module.exports = normalizeFilename; /* 1374 */ /***/ ((module, __unused_webpack_exports, __webpack_require__) => { -function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; } - -function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; } - -function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } - /** * Use every possible means to solve a captcha. At the moment, Anticaptcha web service is used if * any related secret key is found in COZY_PARAMETERS environment variable. @@ -195701,7 +195585,9 @@ const solveCaptcha = async (params = {}) => { type: 'recaptcha', timeout: DEFAULT_TIMEOUT }; - params = _objectSpread(_objectSpread({}, defaultParams), params); + params = { ...defaultParams, + ...params + }; const secrets = JSON.parse(process.env.COZY_PARAMETERS || '{}').secret; if (params.type === 'recaptcha') { diff --git a/package.json b/package.json index 45f8ac2..a33a68f 100644 --- a/package.json +++ b/package.json @@ -52,7 +52,7 @@ "@sentry/node": "^7.23.0", "@sentry/tracing": "^7.23.0", "axios": "^0.27.2", - "cozy-konnector-libs": "5.2.1", + "cozy-konnector-libs": "5.0.0", "easy-soap-request": "^4.7.0", "jest": "^28.1.3", "moment": "^2.29.3", @@ -60,8 +60,8 @@ "xml2js": "^0.4.23" }, "devDependencies": { - "cozy-jobs-cli": "2.0.3", - "cozy-konnector-build": "1.4.4", + "cozy-jobs-cli": "2.0.0", + "cozy-konnector-build": "1.4.5", "eslint-config-cozy-app": "1.3.3", "eslint-plugin-prettier": "^4.0.0", "git-directory-deploy": "1.5.1", -- GitLab