cozy-sharing 9.0.0 → 9.0.2

package/CHANGELOG.md

@@ -3,6 +3,28 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [9.0.2](https://github.com/cozy/cozy-libs/compare/cozy-sharing@9.0.1...cozy-sharing@9.0.2) (2023-09-11)
+
+
+### Bug Fixes
+
+* BuildSharingLink works also for perm from mes papiers ([64980a8](https://github.com/cozy/cozy-libs/commit/64980a81c769168c927fd0348a320db60a48d1bb))
+
+
+
+
+
+## [9.0.1](https://github.com/cozy/cozy-libs/compare/cozy-sharing@9.0.0...cozy-sharing@9.0.1) (2023-09-06)
+
+
+### Bug Fixes
+
+* Index only existing document after a realtime update ([f678ef7](https://github.com/cozy/cozy-libs/commit/f678ef71f658583b7c10bf0db853b550e24f15d9))
+
+
+
+
+
 # 9.0.0 (2023-08-23)
 
 

package/dist/SharingProvider.js

@@ -26,7 +26,7 @@ import { fetchFilesPaths } from './helpers/files';
 import { getSharingObject, createSharingInStore, updateSharingInStore } from './helpers/sharings';
 import { SynchronousJobQueue } from './helpers/synchronousJobQueue';
 import { fetchApps } from './queries/queries';
-import reducer, { receiveSharings, addSharing, updateSharing, addSharingLink, updateSharingLink, revokeSharingLink, revokeRecipient, revokeSelf, receivePaths, isOwner as _isOwner, canReshare as _canReshare, getOwner as _getOwner, getRecipients as _getRecipients, getSharingById, getSharingDocIds, getSharingForSelf as _getSharingForSelf, getSharingType as _getSharingType, getSharingLink as _getSharingLink, getSharedDocIdsBySharings, getDocumentSharing, getDocumentPermissions as _getDocumentPermissions, hasSharedParent as _hasSharedParent, hasSharedChild as _hasSharedChild, getSharedParentPath as _getSharedParentPath } from './state';
+import reducer, { receiveSharings, addSharing, updateSharing, addSharingLink, updateSharingLink, revokeSharingLink, revokeRecipient, revokeSelf, receivePaths, isOwner as _isOwner, canReshare as _canReshare, getOwner as _getOwner, getRecipients as _getRecipients, getSharingById, getExternalSharingIds, getSharingForSelf as _getSharingForSelf, getSharingType as _getSharingType, getSharingLink as _getSharingLink, getSharedDocIdsBySharings, getDocumentSharing, getDocumentPermissions as _getDocumentPermissions, hasSharedParent as _hasSharedParent, hasSharedChild as _hasSharedChild, getSharedParentPath as _getSharedParentPath } from './state';
 var SHARING_DOCTYPE = 'io.cozy.sharings';
 var PERMISSION_DOCTYPE = 'io.cozy.permissions';
 export var SharingProvider = /*#__PURE__*/function (_Component) {
@@ -81,7 +81,7 @@ export var SharingProvider = /*#__PURE__*/function (_Component) {
               if (internalSharing) {
                 updateSharingInStore(_this.dispatch, newSharing);
               } else {
-                docsId = getSharingDocIds(newSharing);
+                docsId = getExternalSharingIds(newSharing, client.getStackClient().uri);
 
                 _this.synchronousJobQueue.push({
                   function: createSharingInStore,

package/dist/helpers/sharings.js

@@ -3,6 +3,7 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { Q } from 'cozy-client';
 import { fetchFilesPaths } from './files';
 import { updateInternalObjectFromRealtime, normalizeDocFromRealtime } from './realtime';
+import logger from '../logger';
 import { addSharing, updateSharing } from '../state';
 export var getSharingObject = function getSharingObject(internalSharing, sharing) {
   if (internalSharing) {
@@ -25,56 +26,65 @@ export var createSharingInStore = /*#__PURE__*/function () {
               return _regeneratorRuntime.wrap(function _callee$(_context) {
                 while (1) switch (_context.prev = _context.next) {
                   case 0:
+                    _context.prev = 0;
+
                     if (!(doctype === 'io.cozy.files')) {
-                      _context.next = 6;
+                      _context.next = 7;
                       break;
                     }
 
-                    _context.next = 3;
+                    _context.next = 4;
                     return client.query(Q(doctype).getById(id));
 
-                  case 3:
+                  case 4:
                     _context.t0 = _context.sent;
-                    _context.next = 7;
+                    _context.next = 8;
                     break;
 
-                  case 6:
+                  case 7:
                     _context.t0 = undefined;
 
-                  case 7:
+                  case 8:
                     file = _context.t0;
                     _context.t1 = file;
 
                     if (!_context.t1) {
-                      _context.next = 16;
+                      _context.next = 17;
                       break;
                     }
 
                     _context.t2 = file.data.path;
 
                     if (_context.t2) {
-                      _context.next = 15;
+                      _context.next = 16;
                       break;
                     }
 
-                    _context.next = 14;
+                    _context.next = 15;
                     return fetchFilesPaths(client, doctype, [file.data]);
 
-                  case 14:
+                  case 15:
                     _context.t2 = _context.sent;
 
-                  case 15:
+                  case 16:
                     _context.t1 = _context.t2;
 
-                  case 16:
+                  case 17:
                     path = _context.t1;
                     dispatch(addSharing(sharing, path));
+                    _context.next = 24;
+                    break;
+
+                  case 21:
+                    _context.prev = 21;
+                    _context.t3 = _context["catch"](0);
+                    logger.log(_context.t3);
 
-                  case 18:
+                  case 24:
                   case "end":
                     return _context.stop();
                 }
-              }, _callee);
+              }, _callee, null, [[0, 21]]);
             }));
 
             return function (_x2) {

package/dist/state.js

@@ -408,8 +408,15 @@ export var getSharingLink = function getSharingLink(state, docId, documentType)
   // This shouldn't have happened, but unfortunately some duplicate sharing links have been created in the past
   var perms = getDocumentPermissions(state, docId);
   if (perms.length === 0) return null;
-  var perm = perms[0];
-  var code = get(perm, 'attributes.shortcodes.email') || get(perm, 'attributes.codes.email');
+  var perm = perms[0]; // We used to use `email` as `codes` attribute for a sharingByLink.
+  // But when we use cozy-client to create a Permission, by default
+  // the codes attribute is set to `code`. MesPapiers app is using this
+  // default behavior... So the sharing by link created by mes papiers
+  // didn't appear correctly in cozy-sharing.
+  // This is a bit ugly, we should have a better way to know if this is
+  // a sharing by link or not.
+
+  var code = get(perm, 'attributes.shortcodes.email') || get(perm, 'attributes.shortcodes.code') || get(perm, 'attributes.codes.email') || get(perm, 'attributes.codes.code');
 
   if (code) {
     return buildSharingLink(state, documentType, code);
@@ -509,6 +516,33 @@ export var getSharingDocIds = function getSharingDocIds(sharing) {
     docs.push(sharing.attributes.shortcut_id);
   }
 
+  return docs;
+};
+/**
+ * Get ids of shared documents, but only if sharing is ready so files exist
+ * @param {object} sharing
+ * @param {string} instanceUri
+ * @returns {string[]} List of document ids of a sharing
+ */
+
+export var getExternalSharingIds = function getExternalSharingIds(sharing, instanceUri) {
+  var member = sharing.attributes.members.find(function (member) {
+    return member.instance === instanceUri;
+  });
+  var docs = [];
+
+  if ((member === null || member === void 0 ? void 0 : member.status) === 'ready') {
+    docs = sharing.attributes.rules.map(function (r) {
+      return r.values;
+    }).reduce(function (acc, val) {
+      return acc.concat(val);
+    }, []);
+  }
+
+  if (sharing.attributes.shortcut_id) {
+    docs.push(sharing.attributes.shortcut_id);
+  }
+
   return docs;
 }; // Some permissions can not have values since they can
 // be on a global doctype. In that case, we can't sort

package/dist/state.spec.js

@@ -4,7 +4,7 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 
 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; }
 
-import reducer, { receiveSharings, addSharing, addSharingLink, updateSharingLink, revokeSharingLink, getRecipients, revokeRecipient, revokeSelf, matchingInstanceName, getSharingLink, hasSharedParent, hasSharedChild, getSharedDocIdsBySharings, getSharingType, getPermissionDocIds, getDocumentSharingType, getSharedParentPath } from './state';
+import reducer, { receiveSharings, addSharing, addSharingLink, updateSharingLink, revokeSharingLink, getRecipients, revokeRecipient, revokeSelf, matchingInstanceName, getSharingLink, hasSharedParent, hasSharedChild, getSharedDocIdsBySharings, getSharingType, getPermissionDocIds, getDocumentSharingType, getSharedParentPath, getExternalSharingIds } from './state';
 import { SHARING_1, SHARING_2, SHARING_3, SHARING_READ_ONLY, PERM_1, PERM_2, PERM_WITHOUT_DOC, SHARING_NO_ACTIVE, SHARING_WITH_SHORTCUT, APPS } from '../__tests__/fixtures';
 describe('Sharing state', function () {
   it('should have a default state', function () {
@@ -475,4 +475,55 @@ describe('getSharedParentPath', function () {
     expect(getSharedParentPath(state, '/folder-2/sub-folder-2/file-2')).toBe('/folder-2');
     expect(getSharedParentPath(state, '/folder-3/sub-folder-4/sub-folder-5/file-4')).toBe('/folder-3/sub-folder-4');
   });
+});
+/* eslint-disable jest/no-focused-tests */
+
+fdescribe('getExternalSharingIds', function () {
+  var getAttributes = function getAttributes() {
+    var memberStatus = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'mail-not-sent';
+    return {
+      rules: [{
+        title: 'Photos',
+        doctype: 'io.cozy.files',
+        values: ['5f8c1090afad686a8f7f56cce07e8098'],
+        add: 'sync',
+        update: 'sync',
+        remove: 'sync'
+      }],
+      members: [{
+        status: 'owner',
+        name: 'Jane Doe',
+        email: 'jane@doe.com',
+        instance: 'http://cozy.tools:8080'
+      }, {
+        status: memberStatus,
+        name: 'John Doe',
+        email: 'john@doe.com',
+        instance: 'http://cozy.local:8080'
+      }]
+    };
+  };
+
+  it('should add shorcut ', function () {
+    var res = getExternalSharingIds({
+      attributes: _objectSpread({}, getAttributes('ready'))
+    }, 'http://cozy.local:8080');
+    expect(res).toStrictEqual(['5f8c1090afad686a8f7f56cce07e8098']);
+  });
+  it('should get only shorcut if share is not ready', function () {
+    var res = getExternalSharingIds({
+      attributes: _objectSpread(_objectSpread({}, getAttributes()), {}, {
+        shortcut_id: 'c63de58b2c898e457fbdfdc11a24a986'
+      })
+    }, 'http://cozy.local:8080');
+    expect(res).toStrictEqual(['c63de58b2c898e457fbdfdc11a24a986']);
+  });
+  it('should add shorcut ', function () {
+    var res = getExternalSharingIds({
+      attributes: _objectSpread(_objectSpread({}, getAttributes('ready')), {}, {
+        shortcut_id: 'c63de58b2c898e457fbdfdc11a24a986'
+      })
+    }, 'http://cozy.local:8080');
+    expect(res).toStrictEqual(['5f8c1090afad686a8f7f56cce07e8098', 'c63de58b2c898e457fbdfdc11a24a986']);
+  });
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-sharing",
-  "version": "9.0.0",
+  "version": "9.0.2",
   "description": "Provides sharing login for React applications.",
   "main": "dist/index.js",
   "author": "Cozy",
@@ -61,5 +61,5 @@
   "sideEffects": [
     "*.css"
   ],
-  "gitHead": "670ac9c9b27b720c7f4a7423b60a34ed445d3c53"
+  "gitHead": "2476315ef7d75a1b63d34637fefbe93db710c3e9"
 }

package/src/SharingProvider.jsx

@@ -27,7 +27,7 @@ import reducer, {
   getOwner,
   getRecipients,
   getSharingById,
-  getSharingDocIds,
+  getExternalSharingIds,
   getSharingForSelf,
   getSharingType,
   getSharingLink,
@@ -155,7 +155,10 @@ export class SharingProvider extends Component {
     if (internalSharing) {
       updateSharingInStore(this.dispatch, newSharing)
     } else {
-      const docsId = getSharingDocIds(newSharing)
+      const docsId = getExternalSharingIds(
+        newSharing,
+        client.getStackClient().uri
+      )
       this.synchronousJobQueue.push({
         function: createSharingInStore,
         arguments: {

package/src/helpers/sharings.js

@@ -5,6 +5,7 @@ import {
   updateInternalObjectFromRealtime,
   normalizeDocFromRealtime
 } from './realtime'
+import logger from '../logger'
 import { addSharing, updateSharing } from '../state'
 
 export const getSharingObject = (internalSharing, sharing) => {
@@ -25,17 +26,21 @@ export const createSharingInStore = async ({
   // TODO Check if we can getByIds to avoid query in map
   await Promise.all(
     docsId.map(async id => {
-      const file =
-        doctype === 'io.cozy.files'
-          ? await client.query(Q(doctype).getById(id))
-          : undefined
+      try {
+        const file =
+          doctype === 'io.cozy.files'
+            ? await client.query(Q(doctype).getById(id))
+            : undefined
 
-      const path =
-        file &&
-        (file.data.path ||
-          (await fetchFilesPaths(client, doctype, [file.data])))
+        const path =
+          file &&
+          (file.data.path ||
+            (await fetchFilesPaths(client, doctype, [file.data])))
 
-      dispatch(addSharing(sharing, path))
+        dispatch(addSharing(sharing, path))
+      } catch (e) {
+        logger.log(e)
+      }
     })
   )
 }

package/src/state.js

@@ -304,9 +304,18 @@ export const getSharingLink = (state, docId, documentType) => {
   const perms = getDocumentPermissions(state, docId)
   if (perms.length === 0) return null
   const perm = perms[0]
+  // We used to use `email` as `codes` attribute for a sharingByLink.
+  // But when we use cozy-client to create a Permission, by default
+  // the codes attribute is set to `code`. MesPapiers app is using this
+  // default behavior... So the sharing by link created by mes papiers
+  // didn't appear correctly in cozy-sharing.
+  // This is a bit ugly, we should have a better way to know if this is
+  // a sharing by link or not.
   const code =
     get(perm, 'attributes.shortcodes.email') ||
-    get(perm, 'attributes.codes.email')
+    get(perm, 'attributes.shortcodes.code') ||
+    get(perm, 'attributes.codes.email') ||
+    get(perm, 'attributes.codes.code')
   if (code) {
     return buildSharingLink(state, documentType, code)
   } else {
@@ -395,6 +404,31 @@ export const getSharingDocIds = sharing => {
   return docs
 }
 
+/**
+ * Get ids of shared documents, but only if sharing is ready so files exist
+ * @param {object} sharing
+ * @param {string} instanceUri
+ * @returns {string[]} List of document ids of a sharing
+ */
+export const getExternalSharingIds = (sharing, instanceUri) => {
+  const member = sharing.attributes.members.find(
+    member => member.instance === instanceUri
+  )
+
+  let docs = []
+  if (member?.status === 'ready') {
+    docs = sharing.attributes.rules
+      .map(r => r.values)
+      .reduce((acc, val) => acc.concat(val), [])
+  }
+
+  if (sharing.attributes.shortcut_id) {
+    docs.push(sharing.attributes.shortcut_id)
+  }
+
+  return docs
+}
+
 // Some permissions can not have values since they can
 // be on a global doctype. In that case, we can't sort
 // them by id

package/src/state.spec.js

@@ -15,7 +15,8 @@ import reducer, {
   getSharingType,
   getPermissionDocIds,
   getDocumentSharingType,
-  getSharedParentPath
+  getSharedParentPath,
+  getExternalSharingIds
 } from './state'
 import {
   SHARING_1,
@@ -643,3 +644,74 @@ describe('getSharedParentPath', () => {
     ).toBe('/folder-3/sub-folder-4')
   })
 })
+
+/* eslint-disable jest/no-focused-tests */
+fdescribe('getExternalSharingIds', () => {
+  const getAttributes = (memberStatus = 'mail-not-sent') => ({
+    rules: [
+      {
+        title: 'Photos',
+        doctype: 'io.cozy.files',
+        values: ['5f8c1090afad686a8f7f56cce07e8098'],
+        add: 'sync',
+        update: 'sync',
+        remove: 'sync'
+      }
+    ],
+    members: [
+      {
+        status: 'owner',
+        name: 'Jane Doe',
+        email: 'jane@doe.com',
+        instance: 'http://cozy.tools:8080'
+      },
+      {
+        status: memberStatus,
+        name: 'John Doe',
+        email: 'john@doe.com',
+        instance: 'http://cozy.local:8080'
+      }
+    ]
+  })
+
+  it('should add shorcut ', () => {
+    const res = getExternalSharingIds(
+      {
+        attributes: {
+          ...getAttributes('ready')
+        }
+      },
+      'http://cozy.local:8080'
+    )
+    expect(res).toStrictEqual(['5f8c1090afad686a8f7f56cce07e8098'])
+  })
+
+  it('should get only shorcut if share is not ready', () => {
+    const res = getExternalSharingIds(
+      {
+        attributes: {
+          ...getAttributes(),
+          shortcut_id: 'c63de58b2c898e457fbdfdc11a24a986'
+        }
+      },
+      'http://cozy.local:8080'
+    )
+    expect(res).toStrictEqual(['c63de58b2c898e457fbdfdc11a24a986'])
+  })
+
+  it('should add shorcut ', () => {
+    const res = getExternalSharingIds(
+      {
+        attributes: {
+          ...getAttributes('ready'),
+          shortcut_id: 'c63de58b2c898e457fbdfdc11a24a986'
+        }
+      },
+      'http://cozy.local:8080'
+    )
+    expect(res).toStrictEqual([
+      '5f8c1090afad686a8f7f56cce07e8098',
+      'c63de58b2c898e457fbdfdc11a24a986'
+    ])
+  })
+})