@flowerforce/flowerbase 1.7.6-beta.6 → 1.7.6-beta.7

package/dist/utils/roles/machines/fieldPermissions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fieldPermissions.d.ts","sourceRoot":"","sources":["../../../../src/utils/roles/machines/fieldPermissions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AAElC,OAAO,EAGL,IAAI,EACL,MAAM,cAAc,CAAA;AACrB,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAA;AA0C5C,eAAO,MAAM,0BAA0B,GAAI,OAAO,IAAI,YACN,CAAA;AAEhD,eAAO,MAAM,gCAAgC,GAC3C,SAAS,IAAI,CAAC,cAAc,EAAE,QAAQ,GAAG,MAAM,GAAG,MAAM,CAAC,EACzD,MAAM,MAAM,GAAG,OAAO,EACtB,UAAU;IACR,YAAY,CAAC,EAAE,OAAO,CAAA;CACvB,KACA,OAAO,CAAC,QAAQ,CA6BlB,CAAA"}
+{"version":3,"file":"fieldPermissions.d.ts","sourceRoot":"","sources":["../../../../src/utils/roles/machines/fieldPermissions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AAElC,OAAO,EAGL,IAAI,EACL,MAAM,cAAc,CAAA;AACrB,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAA;AA0C5C,eAAO,MAAM,0BAA0B,GAAI,OAAO,IAAI,YACN,CAAA;AAEhD,eAAO,MAAM,gCAAgC,GAC3C,SAAS,IAAI,CAAC,cAAc,EAAE,QAAQ,GAAG,MAAM,GAAG,MAAM,CAAC,EACzD,MAAM,MAAM,GAAG,OAAO,EACtB,UAAU;IACR,YAAY,CAAC,EAAE,OAAO,CAAA;CACvB,KACA,OAAO,CAAC,QAAQ,CAkClB,CAAA"}

package/dist/utils/roles/machines/fieldPermissions.js

@@ -46,6 +46,10 @@ const filterDocumentByFieldPermissions = (context, mode, options) => __awaiter(v
     const fields = (_b = context.role.fields) !== null && _b !== void 0 ? _b : {};
     const additionalFields = context.role.additional_fields;
     for (const [key, value] of Object.entries(source)) {
+        if (mode === 'read' && key === '_id') {
+            document[key] = value;
+            continue;
+        }
         const fieldPermission = fields[key];
         const permission = fieldPermission !== null && fieldPermission !== void 0 ? fieldPermission : getAdditionalFieldPermission(additionalFields, key);
         let allowed = (options === null || options === void 0 ? void 0 : options.defaultAllow) === true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flowerforce/flowerbase",
-  "version": "1.7.6-beta.6",
+  "version": "1.7.6-beta.7",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/utils/__tests__/checkIsValidFieldNameFn.test.ts

@@ -32,6 +32,7 @@ describe('checkIsValidFieldNameFn', () => {
 
     const result = await checkIsValidFieldNameFn(context)
     expect(result).toEqual({
+      _id: mockId,
       name: 'Alice'
     })
   })
@@ -55,6 +56,7 @@ describe('checkIsValidFieldNameFn', () => {
 
     const result = await checkIsValidFieldNameFn(context)
     expect(result).toEqual({
+      _id: mockId,
       phone: '123456789'
     })
   })
@@ -74,17 +76,41 @@ describe('checkIsValidFieldNameFn', () => {
       role: mockedRole,
       params: {
         type: 'read',
-        cursor: { avatar: 'avatar.png', name: 'Alice' }
+        cursor: { _id: mockId, avatar: 'avatar.png', name: 'Alice' }
       }
     } as MachineContext
 
     const result = await checkIsValidFieldNameFn(context)
     expect(result).toEqual({
+      _id: mockId,
       avatar: 'avatar.png',
       name: 'Alice'
     })
   })
 
+  it('always keeps _id in read results even when no field read rule is defined', async () => {
+    const mockedRole = {
+      name: 'test',
+      apply_when: { '%%true': true },
+      fields: {
+        name: { read: true }
+      }
+    } as Role
+    const context = {
+      user: mockUser,
+      role: mockedRole,
+      params: {
+        type: 'read',
+        cursor: { _id: mockId, email: 'alice@example.com' }
+      }
+    } as MachineContext
+
+    const result = await checkIsValidFieldNameFn(context)
+    expect(result).toEqual({
+      _id: mockId
+    })
+  })
+
   it('supports realm-style global additional_fields fallback', async () => {
     const mockedRole = {
       name: 'collaborator',
@@ -146,6 +172,8 @@ describe('checkIsValidFieldNameFn', () => {
     } as MachineContext
 
     const result = await checkIsValidFieldNameFn(context)
-    expect(result).toEqual({})
+    expect(result).toEqual({
+      _id: mockId
+    })
   })
 })

package/src/utils/roles/machines/fieldPermissions.ts

@@ -65,6 +65,11 @@ export const filterDocumentByFieldPermissions = async (
   const additionalFields = context.role.additional_fields
 
   for (const [key, value] of Object.entries(source)) {
+    if (mode === 'read' && key === '_id') {
+      document[key] = value
+      continue
+    }
+
     const fieldPermission = fields[key]
     const permission = fieldPermission ?? getAdditionalFieldPermission(additionalFields, key)
     let allowed = options?.defaultAllow === true