cozy-sharing 26.5.1 → 26.5.2

package/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [26.5.2](https://github.com/cozy/cozy-libs/compare/cozy-sharing@26.5.1...cozy-sharing@26.5.2) (2025-10-07)
+
+### Bug Fixes
+
+- Check correct sharing rule in shared drive :bug: ([6dc7dad](https://github.com/cozy/cozy-libs/commit/6dc7dadf1192912563c656050606c18379a7bdcc))
+
 ## [26.5.1](https://github.com/cozy/cozy-libs/compare/cozy-sharing@26.5.0...cozy-sharing@26.5.1) (2025-10-06)
 
 ### Bug Fixes

package/dist/SharedDocument.js

@@ -2,7 +2,8 @@ import React from 'react';
 import SharingContext from './context';
 export var SharedDocument = function SharedDocument(_ref) {
   var docId = _ref.docId,
-      children = _ref.children;
+      children = _ref.children,
+      driveId = _ref.driveId;
   return /*#__PURE__*/React.createElement(SharingContext.Consumer, null, function () {
     var _ref2 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
         hasWriteAccess = _ref2.hasWriteAccess,
@@ -14,7 +15,7 @@ export var SharedDocument = function SharedDocument(_ref) {
         revokeSelf = _ref2.revokeSelf;
 
     return children({
-      hasWriteAccess: hasWriteAccess(docId),
+      hasWriteAccess: hasWriteAccess(docId, driveId),
       isShared: byDocId !== undefined && byDocId[docId],
       isSharedByMe: byDocId !== undefined && byDocId[docId] && isOwner(docId),
       isSharedWithMe: byDocId !== undefined && byDocId[docId] && !isOwner(docId),

package/dist/SharingProvider.js

@@ -39,7 +39,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, revokeGroup as revokeGroupFromState, revokeSelf, receivePaths, isOwner as _isOwner, isSharedDrive as _isSharedDrive, 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';
+import reducer, { receiveSharings, addSharing, updateSharing, addSharingLink, updateSharingLink, revokeSharingLink, revokeRecipient, revokeGroup as revokeGroupFromState, revokeSelf, receivePaths, isOwner as _isOwner, isSharedDrive as _isSharedDrive, 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, getSharedDriveSharingType, SHARING_TYPE } from './state';
 var log = minilog('SharingProvider');
 var SHARING_DOCTYPE = 'io.cozy.sharings';
 var PERMISSION_DOCTYPE = 'io.cozy.permissions';
@@ -563,9 +563,21 @@ export var SharingProvider = /*#__PURE__*/function (_Component) {
     }());
 
     _defineProperty(_this2, "hasWriteAccess", function (docId) {
+      var driveId = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : undefined;
+
       var instanceUri = _this2.props.client.getStackClient().uri;
+      /** Split another case for checking sharing type for shared drive
+       * In case of shared drive, we just check if shared drive has write access or not.
+       * All the files / folders inside must follow the sharing rule of shared drive.
+       * `driveId` only exist in files / folders from recipient, so we don't need to check it belong to owner or not.
+       */
+
+
+      if (driveId) {
+        return getSharedDriveSharingType(_this2.state, driveId, instanceUri) === SHARING_TYPE.TWO_WAY;
+      }
 
-      return !_this2.state.byDocId || !_this2.state.byDocId[docId] || _isOwner(_this2.state, docId) || _getSharingType(_this2.state, docId, instanceUri) === 'two-way';
+      return !_this2.state.byDocId || !_this2.state.byDocId[docId] || _isOwner(_this2.state, docId) || _getSharingType(_this2.state, docId, instanceUri) === SHARING_TYPE.TWO_WAY;
     });
 
     var _instanceUri = props.client.getStackClient().uri;

package/dist/state.js

@@ -21,7 +21,11 @@ var REVOKE_SELF = 'REVOKE_SELF';
 var ADD_SHARING_LINK = 'ADD_SHARING_LINK';
 var UPDATE_SHARING_LINK = 'UPDATE_SHARING_LINK';
 var REVOKE_SHARING_LINK = 'REVOKE_SHARING_LINK';
-var RECEIVE_PATHS = 'RECEIVE_PATHS'; // actions
+var RECEIVE_PATHS = 'RECEIVE_PATHS';
+export var SHARING_TYPE = {
+  TWO_WAY: 'two-way',
+  ONE_WAY: 'one-way'
+}; // actions
 
 export var receiveSharings = function receiveSharings(_ref) {
   var instanceUri = _ref.instanceUri,
@@ -697,7 +701,7 @@ var getDirectorySharingType = function getDirectorySharingType(rule) {
   // If a document has no rule, it is a shortcut preview of a sharing.
   // Since the sharing hasn't been accepted, it can't be synced so we return the "one-way" type.
   // TODO : the sharing type shouldn't be based on rule but on ready_only prop of the member
-  return rule && rule.update === 'sync' && rule.remove === 'sync' ? 'two-way' : 'one-way';
+  return rule && rule.update === 'sync' && rule.remove === 'sync' ? SHARING_TYPE.TWO_WAY : SHARING_TYPE.ONE_WAY;
 };
 /**
  * Returns the sharing type of a file
@@ -710,7 +714,7 @@ var getFileSharingType = function getFileSharingType(rule) {
   // If a document has no rule, it is a shortcut preview of a sharing.
   // Since the sharing hasn't been accepted, it can't be synced so we return the "one-way" type.
   // TODO : the sharing type shouldn't be based on rule but on ready_only prop of the member
-  return rule && rule.update === 'sync' && rule.remove === 'revoke' ? 'two-way' : 'one-way';
+  return rule && rule.update === 'sync' && rule.remove === 'revoke' ? SHARING_TYPE.TWO_WAY : SHARING_TYPE.ONE_WAY;
 };
 /**
  * Returns the sharing type of a document
@@ -725,13 +729,13 @@ export var getDocumentSharingType = function getDocumentSharingType(sharing, doc
   var rule = getSharingRule(sharing, docId);
   var directorySharingType = getDirectorySharingType(rule);
   var fileSharingType = getFileSharingType(rule);
-  return directorySharingType === 'two-way' || fileSharingType === 'two-way' ? 'two-way' : 'one-way';
+  return directorySharingType === SHARING_TYPE.TWO_WAY || fileSharingType === SHARING_TYPE.TWO_WAY ? SHARING_TYPE.TWO_WAY : SHARING_TYPE.ONE_WAY;
 };
 export var isReadOnlySharing = function isReadOnlySharing(sharing, docId) {
   var rule = getSharingRule(sharing, docId);
   var directorySharingType = getDirectorySharingType(rule);
   var fileSharingType = getFileSharingType(rule);
-  return directorySharingType === 'two-way' || fileSharingType === 'two-way' ? false : true;
+  return directorySharingType === SHARING_TYPE.TWO_WAY || fileSharingType === SHARING_TYPE.TWO_WAY ? false : true;
 };
 
 var buildSharingLink = function buildSharingLink(state, documentType, sharecode) {
@@ -792,4 +796,41 @@ export var getSharedDocIdsBySharings = function getSharedDocIdsBySharings(sharin
     }
   });
   return docs;
+};
+/**
+ * Resolves shared drive sharing type.
+ *
+ * @param {object} sharing
+ * @returns {'two-way'|'one-way'|null}
+ */
+
+var resolveDriveSharingTypeFromRule = function resolveDriveSharingTypeFromRule(sharing) {
+  var _sharing$attributes;
+
+  if (!(sharing !== null && sharing !== void 0 && (_sharing$attributes = sharing.attributes) !== null && _sharing$attributes !== void 0 && (_sharing$attributes = _sharing$attributes.rules) !== null && _sharing$attributes !== void 0 && _sharing$attributes.length)) return null;
+  var rule = sharing.attributes.rules[0];
+  var dirType = getDirectorySharingType(rule);
+  var fileType = getFileSharingType(rule);
+  return dirType === SHARING_TYPE.TWO_WAY || fileType === SHARING_TYPE.TWO_WAY ? SHARING_TYPE.TWO_WAY : SHARING_TYPE.ONE_WAY;
+};
+/**
+ * Computes the effective sharing type for a drive.
+ *
+ * @param {string} state - the state
+ * @param {string} driveId - the shared drive ID
+ * @param {string} instanceUri - the URI of the instance
+ * @returns {string|null} - the sharing type
+ */
+
+
+export var getSharedDriveSharingType = function getSharedDriveSharingType(state, driveId, instanceUri) {
+  var _sharing$attributes$m;
+
+  var sharing = getSharingById(state, driveId);
+  if (!sharing) return null;
+  var baseType = resolveDriveSharingTypeFromRule(sharing);
+  if (sharing.attributes.owner) return baseType;
+  var me = (_sharing$attributes$m = sharing.attributes.members) === null || _sharing$attributes$m === void 0 ? void 0 : _sharing$attributes$m.find(matchingInstanceName(instanceUri));
+  if (!me) return baseType;
+  return me.read_only ? SHARING_TYPE.ONE_WAY : baseType;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-sharing",
-  "version": "26.5.1",
+  "version": "26.5.2",
   "description": "Provides sharing login for React applications.",
   "main": "dist/index.js",
   "author": "Cozy",
@@ -79,5 +79,5 @@
   "sideEffects": [
     "*.css"
   ],
-  "gitHead": "d9725e74f7a7245a8f8abd3d2cf595202ff6bf56"
+  "gitHead": "4ff71a0d8c2f1483f60b2a5febad0a92b49e8aa2"
 }

package/src/SharedDocument.jsx

@@ -2,7 +2,7 @@ import React from 'react'
 
 import SharingContext from './context'
 
-export const SharedDocument = ({ docId, children }) => (
+export const SharedDocument = ({ docId, children, driveId }) => (
   <SharingContext.Consumer>
     {({
       hasWriteAccess,
@@ -14,7 +14,7 @@ export const SharedDocument = ({ docId, children }) => (
       revokeSelf
     } = {}) =>
       children({
-        hasWriteAccess: hasWriteAccess(docId),
+        hasWriteAccess: hasWriteAccess(docId, driveId),
         isShared: byDocId !== undefined && byDocId[docId],
         isSharedByMe: byDocId !== undefined && byDocId[docId] && isOwner(docId),
         isSharedWithMe:

package/src/SharingProvider.jsx

@@ -39,7 +39,9 @@ import reducer, {
   getDocumentPermissions,
   hasSharedParent,
   hasSharedChild,
-  getSharedParentPath
+  getSharedParentPath,
+  getSharedDriveSharingType,
+  SHARING_TYPE
 } from './state'
 
 const log = minilog('SharingProvider')
@@ -374,14 +376,26 @@ export class SharingProvider extends Component {
     this.dispatch(revokeSharingLink(perms))
   }
 
-  hasWriteAccess = docId => {
+  hasWriteAccess = (docId, driveId = undefined) => {
     const instanceUri = this.props.client.getStackClient().uri
 
+    /** Split another case for checking sharing type for shared drive
+     * In case of shared drive, we just check if shared drive has write access or not.
+     * All the files / folders inside must follow the sharing rule of shared drive.
+     * `driveId` only exist in files / folders from recipient, so we don't need to check it belong to owner or not.
+     */
+    if (driveId) {
+      return (
+        getSharedDriveSharingType(this.state, driveId, instanceUri) ===
+        SHARING_TYPE.TWO_WAY
+      )
+    }
+
     return (
       !this.state.byDocId ||
       !this.state.byDocId[docId] ||
       isOwner(this.state, docId) ||
-      getSharingType(this.state, docId, instanceUri) === 'two-way'
+      getSharingType(this.state, docId, instanceUri) === SHARING_TYPE.TWO_WAY
     )
   }
 

package/src/state.js

@@ -12,6 +12,10 @@ const ADD_SHARING_LINK = 'ADD_SHARING_LINK'
 const UPDATE_SHARING_LINK = 'UPDATE_SHARING_LINK'
 const REVOKE_SHARING_LINK = 'REVOKE_SHARING_LINK'
 const RECEIVE_PATHS = 'RECEIVE_PATHS'
+export const SHARING_TYPE = {
+  TWO_WAY: 'two-way',
+  ONE_WAY: 'one-way'
+}
 
 // actions
 export const receiveSharings = ({
@@ -575,8 +579,8 @@ const getDirectorySharingType = rule => {
   // Since the sharing hasn't been accepted, it can't be synced so we return the "one-way" type.
   // TODO : the sharing type shouldn't be based on rule but on ready_only prop of the member
   return rule && rule.update === 'sync' && rule.remove === 'sync'
-    ? 'two-way'
-    : 'one-way'
+    ? SHARING_TYPE.TWO_WAY
+    : SHARING_TYPE.ONE_WAY
 }
 
 /**
@@ -589,8 +593,8 @@ const getFileSharingType = rule => {
   // Since the sharing hasn't been accepted, it can't be synced so we return the "one-way" type.
   // TODO : the sharing type shouldn't be based on rule but on ready_only prop of the member
   return rule && rule.update === 'sync' && rule.remove === 'revoke'
-    ? 'two-way'
-    : 'one-way'
+    ? SHARING_TYPE.TWO_WAY
+    : SHARING_TYPE.ONE_WAY
 }
 
 /**
@@ -605,9 +609,10 @@ export const getDocumentSharingType = (sharing, docId) => {
   const directorySharingType = getDirectorySharingType(rule)
   const fileSharingType = getFileSharingType(rule)
 
-  return directorySharingType === 'two-way' || fileSharingType === 'two-way'
-    ? 'two-way'
-    : 'one-way'
+  return directorySharingType === SHARING_TYPE.TWO_WAY ||
+    fileSharingType === SHARING_TYPE.TWO_WAY
+    ? SHARING_TYPE.TWO_WAY
+    : SHARING_TYPE.ONE_WAY
 }
 
 export const isReadOnlySharing = (sharing, docId) => {
@@ -615,7 +620,8 @@ export const isReadOnlySharing = (sharing, docId) => {
   const directorySharingType = getDirectorySharingType(rule)
   const fileSharingType = getFileSharingType(rule)
 
-  return directorySharingType === 'two-way' || fileSharingType === 'two-way'
+  return directorySharingType === SHARING_TYPE.TWO_WAY ||
+    fileSharingType === SHARING_TYPE.TWO_WAY
     ? false
     : true
 }
@@ -670,3 +676,42 @@ export const getSharedDocIdsBySharings = sharings => {
   })
   return docs
 }
+
+/**
+ * Resolves shared drive sharing type.
+ *
+ * @param {object} sharing
+ * @returns {'two-way'|'one-way'|null}
+ */
+const resolveDriveSharingTypeFromRule = sharing => {
+  if (!sharing?.attributes?.rules?.length) return null
+
+  const rule = sharing.attributes.rules[0]
+  const dirType = getDirectorySharingType(rule)
+  const fileType = getFileSharingType(rule)
+
+  return dirType === SHARING_TYPE.TWO_WAY || fileType === SHARING_TYPE.TWO_WAY
+    ? SHARING_TYPE.TWO_WAY
+    : SHARING_TYPE.ONE_WAY
+}
+
+/**
+ * Computes the effective sharing type for a drive.
+ *
+ * @param {string} state - the state
+ * @param {string} driveId - the shared drive ID
+ * @param {string} instanceUri - the URI of the instance
+ * @returns {string|null} - the sharing type
+ */
+export const getSharedDriveSharingType = (state, driveId, instanceUri) => {
+  const sharing = getSharingById(state, driveId)
+  if (!sharing) return null
+
+  const baseType = resolveDriveSharingTypeFromRule(sharing)
+  if (sharing.attributes.owner) return baseType
+
+  const me = sharing.attributes.members?.find(matchingInstanceName(instanceUri))
+  if (!me) return baseType
+
+  return me.read_only ? SHARING_TYPE.ONE_WAY : baseType
+}