cozy-client 43.6.0 → 44.1.0

package/dist/CozyClient.js

@@ -2703,7 +2703,7 @@ var CozyClient = /*#__PURE__*/function () {
 CozyClient.hooks = CozyClient.hooks || {};
 CozyClient.fetchPolicies = _policies.default; //COZY_CLIENT_VERSION_PACKAGE in replaced by babel. See babel config
 
-CozyClient.version = "43.6.0";
+CozyClient.version = "44.1.0";
 
 _microee.default.mixin(CozyClient);
 

package/dist/models/file.js

@@ -659,33 +659,27 @@ var overrideFileForPath = /*#__PURE__*/function () {
  * Method to generate a new filename if there is a conflict
  *
  * @param {string} filenameWithoutExtension - A filename without the extension
- * @param {RegExp} [originalNameFormatRegex] - A regex to check if the name is still in his original format
+ * @param {import('../types').ConflictOptions} [conflictOptions] - Conflict options
  * @returns {string} A filename with the right suffix
  */
 
 
 exports.overrideFileForPath = overrideFileForPath;
 
-var generateNewFileNameOnConflict = function generateNewFileNameOnConflict(filenameWithoutExtension, originalNameFormatRegex) {
-  var isOriginalNameFormat = false;
+var generateNewFileNameOnConflict = function generateNewFileNameOnConflict(filenameWithoutExtension, conflictOptions) {
+  var delimiter = (conflictOptions === null || conflictOptions === void 0 ? void 0 : conflictOptions.delimiter) || '_'; //Check if the string ends by _1
 
-  if (originalNameFormatRegex && originalNameFormatRegex.test(filenameWithoutExtension)) {
-    isOriginalNameFormat = true;
-  } //Check if the string ends by _1
-
-
-  var regex = new RegExp('(_)([0-9]+)$');
+  var regex = new RegExp("(".concat(delimiter, ")([0-9]+)$"));
   var matches = filenameWithoutExtension.match(regex);
-  var shouldIncrement = matches && !isOriginalNameFormat;
 
-  if (shouldIncrement) {
+  if (matches) {
     var versionNumber = parseInt(matches[2]); //increment versionNumber
 
     versionNumber++;
-    var newFilenameWithoutExtension = filenameWithoutExtension.replace(new RegExp('(_)([0-9]+)$'), "_".concat(versionNumber));
+    var newFilenameWithoutExtension = filenameWithoutExtension.replace(new RegExp("(".concat(delimiter, ")([0-9]+)$")), "".concat(delimiter).concat(versionNumber));
     return newFilenameWithoutExtension;
   } else {
-    return "".concat(filenameWithoutExtension, "_1");
+    return "".concat(filenameWithoutExtension).concat(delimiter, "1");
   }
 };
 /**
@@ -713,6 +707,7 @@ var generateFileNameForRevision = function generateFileNameForRevision(file, rev
  * @property {object} [metadata]          - An object containing the metadata to attach
  * @property {string} [contentType]       - The file Content-Type
  * @property {string} [conflictStrategy]  - Erase / rename
+ * @property {import('../types').ConflictOptions} [conflictOptions] - Conflict options
  */
 
 /**
@@ -736,13 +731,13 @@ exports.generateFileNameForRevision = generateFileNameForRevision;
 
 var uploadFileWithConflictStrategy = /*#__PURE__*/function () {
   var _ref7 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee6(client, file, options) {
-    var name, dirId, conflictStrategy, path, existingFile, fileId, resp, _splitFilename2, filename, extension, newFileName;
+    var name, dirId, conflictStrategy, conflictOptions, path, existingFile, fileId, resp, _splitFilename2, filename, extension, newFileName;
 
     return _regenerator.default.wrap(function _callee6$(_context6) {
       while (1) {
         switch (_context6.prev = _context6.next) {
           case 0:
-            name = options.name, dirId = options.dirId, conflictStrategy = options.conflictStrategy;
+            name = options.name, dirId = options.dirId, conflictStrategy = options.conflictStrategy, conflictOptions = options.conflictOptions;
             _context6.prev = 1;
             _context6.next = 4;
             return getFullpath(client, dirId, name);
@@ -776,7 +771,7 @@ var uploadFileWithConflictStrategy = /*#__PURE__*/function () {
               name: name,
               type: 'file'
             }), filename = _splitFilename2.filename, extension = _splitFilename2.extension;
-            newFileName = generateNewFileNameOnConflict(filename) + extension; //recall itself with the newFilename.
+            newFileName = generateNewFileNameOnConflict(filename, conflictOptions) + extension; //recall itself with the newFilename.
 
             return _context6.abrupt("return", uploadFileWithConflictStrategy(client, file, _objectSpread(_objectSpread({}, options), {}, {
               name: newFileName

package/dist/models/file.spec.js

@@ -569,31 +569,44 @@ describe('File Model', () => {
       expect(filename2).toEqual('test_2')
       const filename3 = fileModel.generateNewFileNameOnConflict('test_1_1_test')
       expect(filename3).toEqual('test_1_1_test_1')
-      const filename4 = fileModel.generateNewFileNameOnConflict('test_')
-      expect(filename4).toEqual('test__1')
-      const filename5 = fileModel.generateNewFileNameOnConflict('test_1_1')
-      expect(filename5).toEqual('test_1_2')
+      const filename4 = fileModel.generateNewFileNameOnConflict(
+        'test_1_1_test_1'
+      )
+      expect(filename4).toEqual('test_1_1_test_2')
+      const filename5 = fileModel.generateNewFileNameOnConflict('test_')
+      expect(filename5).toEqual('test__1')
     })
 
-    it('should generate the right file name with _X when passing a format', () => {
-      const regex = new RegExp('^([a-z]+)(_)([0-9]+)$') // test_1
+    it('should generate the right file name with _cozyX', () => {
+      const conflictOptions = {
+        delimiter: '_cozy'
+      }
 
-      const filename1 = fileModel.generateNewFileNameOnConflict('test', regex)
-      expect(filename1).toEqual('test_1')
-      const filename2 = fileModel.generateNewFileNameOnConflict('test_1', regex)
-      expect(filename2).toEqual('test_1_1')
+      const filename1 = fileModel.generateNewFileNameOnConflict(
+        'test',
+        conflictOptions
+      )
+      expect(filename1).toEqual('test_cozy1')
+      const filename2 = fileModel.generateNewFileNameOnConflict(
+        'test_cozy1',
+        conflictOptions
+      )
+      expect(filename2).toEqual('test_cozy2')
       const filename3 = fileModel.generateNewFileNameOnConflict(
-        'test_1_1_test',
-        regex
+        'test_cozy1_test',
+        conflictOptions
       )
-      expect(filename3).toEqual('test_1_1_test_1')
-      const filename4 = fileModel.generateNewFileNameOnConflict('test_', regex)
-      expect(filename4).toEqual('test__1')
+      expect(filename3).toEqual('test_cozy1_test_cozy1')
+      const filename4 = fileModel.generateNewFileNameOnConflict(
+        'test_cozy1_test_cozy1',
+        conflictOptions
+      )
+      expect(filename4).toEqual('test_cozy1_test_cozy2')
       const filename5 = fileModel.generateNewFileNameOnConflict(
-        'test_1_1',
-        regex
+        'test_',
+        conflictOptions
       )
-      expect(filename5).toEqual('test_1_2')
+      expect(filename5).toEqual('test__cozy1')
     })
   })
 
@@ -674,6 +687,33 @@ describe('File Model', () => {
       })
     })
 
+    it('should rename the file with "_cozyX" if there is a conflict', async () => {
+      const dirId = 'toto'
+      //first call we return an existing file => conflict
+      //second call, we reject as not found
+      statByPathSpy
+        .mockReturnValueOnce({
+          data: {
+            _id: 'file_id',
+            _type: 'io.cozy.files'
+          }
+        })
+        .mockRejectedValueOnce(new Error('Not Found'))
+
+      const opts = {
+        name: 'filename',
+        dirId,
+        conflictStrategy: 'rename',
+        conflictOptions: { delimiter: '_cozy' },
+        contentType: 'image/jpeg'
+      }
+      await fileModel.uploadFileWithConflictStrategy(cozyClient, '', opts)
+      expect(createFileSpy).toHaveBeenCalledWith('', {
+        ...opts,
+        name: 'filename_cozy1'
+      })
+    })
+
     it('should erase the file if there is a conflict', async () => {
       const dirId = 'toto'
       //first call we return an existing file => conflict

package/dist/models/trigger.js

@@ -96,6 +96,9 @@ var triggers = {
   isKonnectorWorker: function isKonnectorWorker(trigger) {
     return trigger.worker === 'konnector';
   },
+  isKonnector: function isKonnector(trigger) {
+    return trigger.worker === 'konnector' || trigger.worker === 'client';
+  },
 
   /**
    * Returns the konnector slug that executed a trigger
@@ -105,7 +108,7 @@ var triggers = {
    * @returns {string|void} A konnector slug
    */
   getKonnector: function getKonnector(trigger) {
-    if (!triggers.isKonnectorWorker(trigger)) {
+    if (!triggers.isKonnector(trigger)) {
       return null;
     }
 

package/dist/models/trigger.spec.js

@@ -86,6 +86,22 @@ describe('trigger model', () => {
     }
   }
 
+  const cliskTrigger = {
+    _rev: '1-31eb8f0da1db0f3196ccf0d4329ea554',
+    prefix: 'toto.mycozy.cloud',
+    arguments: '0 35 0 * * 3',
+    message: {
+      account: '4cbfe8f3d89edf60542d5fe9cdcac7b1',
+      konnector: 'orangemobile'
+    },
+    _id: 'fa4c076914ce46a92fa3e7e5f0672ca5',
+    domain: 'claire.mycozy.cloud',
+    worker: 'client',
+    debounce: '',
+    options: null,
+    type: '@client'
+  }
+
   describe('getKonnectorFromTrigger', () => {
     it('should work with normal triggers', () => {
       expect(triggerModel.getKonnector(normalTrigger)).toBe('orangemobile')
@@ -94,6 +110,10 @@ describe('trigger model', () => {
     it('should work with legacy triggers', () => {
       expect(triggerModel.getKonnector(legacyTrigger)).toBe('ameli')
     })
+
+    it('should work with clisk triggers', () => {
+      expect(triggerModel.getKonnector(cliskTrigger)).toBe('orangemobile')
+    })
   })
 
   describe('getAccountId', () => {

package/dist/types.js

@@ -652,6 +652,13 @@ var _dsl = require("./queries/dsl");
  * @property {string} hash - The redirect link's path (i.e. '/folder/SOME_FOLDER_ID')
  */
 
+/**
+ * Represents available options of generateNewFileNameOnConflict method
+ *
+ * @typedef {object} ConflictOptions
+ * @property {string} [delimiter] - Delimiter before the incremented number. Default to '_'
+ */
+
 /**
  * Template to type useState
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-client",
-  "version": "43.6.0",
+  "version": "44.1.0",
   "license": "MIT",
   "main": "dist/index.node.js",
   "browser": "dist/index.js",
@@ -18,7 +18,7 @@
     "@types/jest": "^26.0.20",
     "@types/lodash": "^4.14.170",
     "btoa": "^1.2.1",
-    "cozy-stack-client": "^43.0.0",
+    "cozy-stack-client": "^44.0.0",
     "date-fns": "2.29.3",
     "json-stable-stringify": "^1.0.1",
     "lodash": "^4.17.13",
@@ -75,5 +75,5 @@
     "react-native-ios11-devicecheck": "https://github.com/cozy/react-native-devicecheck#app-attest-v0.1"
   },
   "sideEffects": false,
-  "gitHead": "c9eaf3d5a902d852ac4c8ec6b2c72698833bf865"
+  "gitHead": "74be3146ea4706cf3c2d7a3b07c4ef1171e33df7"
 }

package/types/models/file.d.ts

@@ -52,7 +52,7 @@ export function move(client: CozyClient, fileId: string, destination: {
     path: string;
 }, force?: boolean): Promise<any>;
 export function overrideFileForPath(client: CozyClient, dirPath: string, file: object, metadata: object): Promise<import("../types").IOCozyFile>;
-export function generateNewFileNameOnConflict(filenameWithoutExtension: string, originalNameFormatRegex?: RegExp): string;
+export function generateNewFileNameOnConflict(filenameWithoutExtension: string, conflictOptions?: import('../types').ConflictOptions): string;
 export function generateFileNameForRevision(file: import("../types").IOCozyFile, revision: object, f: Function): string;
 export function uploadFileWithConflictStrategy(client: CozyClient, file: string | ArrayBuffer, options: FileUploadOptions): any;
 export function readMobileFile(fileURL: string): Promise<any>;
@@ -83,5 +83,9 @@ export type FileUploadOptions = {
      * - Erase / rename
      */
     conflictStrategy?: string;
+    /**
+     * - Conflict options
+     */
+    conflictOptions?: import('../types').ConflictOptions;
 };
 import CozyClient from "../CozyClient";

package/types/models/trigger.d.ts

@@ -7,6 +7,7 @@ export namespace triggerStates {
 }
 export namespace triggers {
     function isKonnectorWorker(trigger: import("../types").IOCozyTrigger): boolean;
+    function isKonnector(trigger: any): boolean;
     function getKonnector(trigger: import("../types").IOCozyTrigger): string | void;
     function getAccountId(trigger: import("../types").IOCozyTrigger): string;
     function isLatestErrorMuted(trigger: import("../types").IOCozyTrigger, account: import("../types").IOCozyAccount): boolean;

package/types/types.d.ts

@@ -1092,6 +1092,15 @@ export type RedirectLinkData = {
      */
     hash: string;
 };
+/**
+ * Represents available options of generateNewFileNameOnConflict method
+ */
+export type ConflictOptions = {
+    /**
+     * - Delimiter before the incremented number. Default to '_'
+     */
+    delimiter?: string;
+};
 /**
  * Template to type useState
  */