cozy-client 44.0.0 → 44.1.1

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 = "44.0.0";
+CozyClient.version = "44.1.1";
 
 _microee.default.mixin(CozyClient);
 

package/dist/models/file.js

@@ -47,7 +47,7 @@ var FILENAME_WITH_EXTENSION_REGEX = /(.+)(\..*)$/;
  * Returns base filename and extension
  *
  * @param {import("../types").IOCozyFile} file An io.cozy.files
- * @returns {object}  {filename, extension}
+ * @returns {{filename: string, extension: string}}
  */
 
 var splitFilename = function splitFilename(file) {
@@ -707,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
  */
 
 /**
@@ -730,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);
@@ -770,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

@@ -687,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-client",
-  "version": "44.0.0",
+  "version": "44.1.1",
   "license": "MIT",
   "main": "dist/index.node.js",
   "browser": "dist/index.js",
@@ -75,5 +75,5 @@
     "react-native-ios11-devicecheck": "https://github.com/cozy/react-native-devicecheck#app-attest-v0.1"
   },
   "sideEffects": false,
-  "gitHead": "852539500a548a92416af09279398e6ded88bd7f"
+  "gitHead": "872a9d48bd8fbe743322d74829c68dd97d6c8980"
 }

package/types/models/file.d.ts

@@ -25,7 +25,10 @@ export function ensureFilePath(file: object, parent: object): object;
  */
 export function getParentFolderId(file: object): string | null;
 export const ALBUMS_DOCTYPE: "io.cozy.photos.albums";
-export function splitFilename(file: import("../types").IOCozyFile): object;
+export function splitFilename(file: import("../types").IOCozyFile): {
+    filename: string;
+    extension: string;
+};
 export function isFile(file: import("../types").IOCozyFile): boolean;
 export function isDirectory(file: import("../types").IOCozyFile): boolean;
 export function isNote(file: import("../types").IOCozyFile): boolean;
@@ -83,5 +86,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;