@nocobase/plugin-acl 0.7.0-alpha.7 → 0.7.0-alpha.72

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-acl",
-  "version": "0.7.0-alpha.7",
+  "version": "0.7.0-alpha.72",
   "description": "",
   "license": "Apache-2.0",
   "licenses": [
@@ -11,20 +11,15 @@
   ],
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
-  "scripts": {
-    "build": "rimraf -rf lib esm dist && npm run build:cjs && npm run build:esm",
-    "build:cjs": "tsc --project tsconfig.build.json",
-    "build:esm": "tsc --project tsconfig.build.json --module es2015 --outDir esm"
-  },
   "dependencies": {
-    "@nocobase/acl": "0.7.0-alpha.7",
-    "@nocobase/database": "0.7.0-alpha.7",
-    "@nocobase/server": "0.7.0-alpha.7"
+    "@nocobase/acl": "0.7.0-alpha.72",
+    "@nocobase/database": "0.7.0-alpha.72",
+    "@nocobase/server": "0.7.0-alpha.72"
   },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/plugins/acl"
   },
-  "gitHead": "58b599aaec7ac28a536e6ba29b9990b05164a20b"
+  "gitHead": "db24b85879b0f911458914b49ea9644fd7eb7562"
 }

package/src/__tests__/acl.test.ts

@@ -72,6 +72,56 @@ describe('acl', () => {
     });
   });
 
+  it('should deny when resource action has no resource', async () => {
+    const role = await db.getRepository('roles').create({
+      values: {
+        name: 'admin',
+        title: 'Admin User',
+        allowConfigure: true,
+        strategy: {
+          actions: ['update:own', 'destroy:own', 'create', 'view'],
+        },
+      },
+    });
+
+    changeMockRole('admin');
+
+    // create c1 collection
+    await db.getRepository('collections').create({
+      values: {
+        name: 'c1',
+        title: 'table1',
+      },
+    });
+
+    // create c2 collection
+    await db.getRepository('collections').create({
+      values: {
+        name: 'c2',
+        title: 'table2',
+      },
+    });
+
+    await app
+      .agent()
+      .resource('roles.resources', 'admin')
+      .create({
+        values: {
+          name: 'c1',
+          usingActionsConfig: true,
+          actions: [],
+        },
+      });
+
+    expect(
+      acl.can({
+        role: 'admin',
+        resource: 'c1',
+        action: 'list',
+      }),
+    ).toBeNull();
+  });
+
   it('should works with resources actions', async () => {
     const role = await db.getRepository('roles').create({
       values: {

package/src/__tests__/own.test.ts

@@ -1,11 +1,10 @@
-import { mockServer, MockServer } from '@nocobase/test';
-import { Database } from '@nocobase/database';
 import { ACL } from '@nocobase/acl';
-import { UiSchemaRepository } from '@nocobase/plugin-ui-schema-storage';
-import PluginUiSchema from '@nocobase/plugin-ui-schema-storage';
-import PluginCollectionManager from '@nocobase/plugin-collection-manager';
+import { Database } from '@nocobase/database';
 import PluginACL from '@nocobase/plugin-acl';
+import PluginCollectionManager from '@nocobase/plugin-collection-manager';
+import PluginUiSchema from '@nocobase/plugin-ui-schema-storage';
 import PluginUser from '@nocobase/plugin-users';
+import { mockServer, MockServer } from '@nocobase/test';
 import supertest from 'supertest';
 
 describe('own test', () => {
@@ -38,7 +37,7 @@ describe('own test', () => {
     app.plugin(PluginCollectionManager);
     app.plugin(PluginUser, {
       jwt: {
-        secret: process.env.JWT_SECRET || '09f26e402586e2faa8da4c98a35f1b20d6b033c60',
+        secret: process.env.APP_KEY || 'test-key',
       },
     });
 

package/src/actions/role-collections.ts

@@ -2,18 +2,24 @@ import { Database } from '@nocobase/database';
 
 type UsingConfigType = 'strategy' | 'resourceAction';
 
+function totalPage(total, pageSize): number {
+  return Math.ceil(total / pageSize);
+}
+
 const roleCollectionsResource = {
   name: 'roles.collections',
   actions: {
     async list(ctx, next) {
       const role = ctx.action.params.associatedIndex;
+      const { page = 1, pageSize = 20 } = ctx.action.params;
 
       const db: Database = ctx.db;
       const collectionRepository = db.getRepository('collections');
 
       // all collections
-      const collections = await collectionRepository.find({
+      const [collections, count] = await collectionRepository.findAndCount({
         filter: ctx.action.params.filter,
+        sort: 'sort',
       });
 
       // role collections
@@ -29,8 +35,9 @@ const roleCollectionsResource = {
         .filter((roleResources) => roleResources.get('usingActionsConfig'))
         .map((roleResources) => roleResources.get('name'));
 
-      ctx.body = collections
-        .map((collection) => {
+      ctx.body = {
+        count,
+        rows: collections.map((collection) => {
           const exists = roleResourcesNames.includes(collection.get('name'));
 
           const usingConfig: UsingConfigType = roleResourceActionResourceNames.includes(collection.get('name'))
@@ -44,8 +51,11 @@ const roleCollectionsResource = {
             usingConfig,
             exists,
           };
-        })
-        .sort((a, b) => (a.name > b.name ? 1 : -1));
+        }),
+        page: Number(page),
+        pageSize: Number(pageSize),
+        totalPage: totalPage(count, pageSize),
+      };
 
       await next();
     },

package/src/model/RoleResourceActionModel.ts

@@ -51,6 +51,7 @@ export class RoleResourceActionModel extends Model {
       const fieldTarget = collectionField.get('target');
 
       if (fieldActions) {
+        // grant association actions to role
         const associationActions = fieldActions.associationActions || [];
         associationActions.forEach((associationAction) => {
           const actionName = `${resourceName}.${fieldTarget}:${associationAction}`;
@@ -62,14 +63,15 @@ export class RoleResourceActionModel extends Model {
         targetActions.forEach((targetAction) => {
           const targetActionPath = `${fieldTarget}:${targetAction}`;
 
-          grantHelper.resourceTargetActionMap.set(resourceName, [
+          // set resource target action with current resourceName
+          grantHelper.resourceTargetActionMap.set(`${role.name}.${resourceName}`, [
             ...(grantHelper.resourceTargetActionMap.get(resourceName) || []),
             targetActionPath,
           ]);
 
           grantHelper.targetActionResourceMap.set(targetActionPath, [
             ...(grantHelper.targetActionResourceMap.get(targetActionPath) || []),
-            resourceName,
+            `${role.name}.${resourceName}`,
           ]);
 
           role.grantAction(targetActionPath);

package/src/model/RoleResourceModel.ts

@@ -1,5 +1,5 @@
 import { Database, Model } from '@nocobase/database';
-import { ACL, ACLRole } from '@nocobase/acl';
+import { ACL, ACLResource, ACLRole } from '@nocobase/acl';
 import { RoleResourceActionModel } from './RoleResourceActionModel';
 import { AssociationFieldsActions, GrantHelper } from '../server';
 
@@ -8,20 +8,21 @@ export class RoleResourceModel extends Model {
     const { role, resourceName, grantHelper } = options;
     role.revokeResource(resourceName);
 
-    const targetActions = grantHelper.resourceTargetActionMap.get(resourceName) || [];
+    const targetActions = grantHelper.resourceTargetActionMap.get(`${role.name}.${resourceName}`) || [];
 
     for (const targetAction of targetActions) {
       const targetActionResource = (grantHelper.targetActionResourceMap.get(targetAction) || []).filter(
-        (item) => resourceName !== item,
+        (item) => `${role.name}.${resourceName}` !== item,
       );
 
       grantHelper.targetActionResourceMap.set(targetAction, targetActionResource);
+
       if (targetActionResource.length == 0) {
         role.revokeAction(targetAction);
       }
     }
 
-    grantHelper.resourceTargetActionMap.set(resourceName, []);
+    grantHelper.resourceTargetActionMap.set(`${role.name}.${resourceName}`, []);
   }
 
   async writeToACL(options: {
@@ -43,6 +44,13 @@ export class RoleResourceModel extends Model {
       return;
     }
 
+    const resource = new ACLResource({
+      role,
+      name: resourceName,
+    });
+
+    role.resources.set(resourceName, resource);
+
     // @ts-ignore
     const actions: RoleResourceActionModel[] = await this.getActions({
       transaction: options.transaction,

package/src/server.ts

@@ -30,6 +30,8 @@ export class GrantHelper {
 }
 
 export class PluginACL extends Plugin {
+  // association field actions config
+
   associationFieldsActions: AssociationFieldsActions = {};
 
   grantHelper = new GrantHelper();
@@ -43,6 +45,8 @@ export class PluginACL extends Plugin {
   }
 
   registerAssociationFieldsActions() {
+    // if grant create action to role, it should
+    // also grant add action and association target's view action
     this.registerAssociationFieldAction('linkTo', {
       view: {
         associationActions: ['list', 'get'],
@@ -107,6 +111,7 @@ export class PluginACL extends Plugin {
     const roles = (await this.app.db.getRepository('roles').find({
       appends: ['resources', 'resources.actions'],
     })) as RoleModel[];
+
     for (const role of roles) {
       role.writeToAcl({ acl: this.acl });
       for (const resource of role.get('resources') as RoleResourceModel[]) {

package/esm/actions/available-actions.d.ts

@@ -1,7 +0,0 @@
-declare const availableActionResource: {
-    name: string;
-    actions: {
-        list(ctx: any, next: any): Promise<void>;
-    };
-};
-export { availableActionResource };

package/esm/actions/available-actions.js

@@ -1,26 +0,0 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-const availableActionResource = {
-    name: 'availableActions',
-    actions: {
-        list(ctx, next) {
-            return __awaiter(this, void 0, void 0, function* () {
-                const acl = ctx.app.acl;
-                const availableActions = acl.getAvailableActions();
-                ctx.body = Array.from(availableActions.entries()).map(([, { name, options }]) => {
-                    return Object.assign(Object.assign({}, options), { name });
-                });
-                yield next();
-            });
-        },
-    },
-};
-export { availableActionResource };
-//# sourceMappingURL=available-actions.js.map

package/esm/actions/available-actions.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"available-actions.js","sourceRoot":"","sources":["../../src/actions/available-actions.ts"],"names":[],"mappings":";;;;;;;;;AAAA,MAAM,uBAAuB,GAAG;IAC9B,IAAI,EAAE,kBAAkB;IACxB,OAAO,EAAE;QACD,IAAI,CAAC,GAAG,EAAE,IAAI;;gBAClB,MAAM,GAAG,GAAG,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC;gBACxB,MAAM,gBAAgB,GAAG,GAAG,CAAC,mBAAmB,EAAE,CAAC;gBACnD,GAAG,CAAC,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,gBAAgB,CAAC,OAAO,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,EAAE,EAAE;oBAC9E,uCACK,OAAO,KACV,IAAI,IACJ;gBACJ,CAAC,CAAC,CAAC;gBACH,MAAM,IAAI,EAAE,CAAC;YACf,CAAC;SAAA;KACF;CACF,CAAC;AAEF,OAAO,EAAE,uBAAuB,EAAE,CAAC","sourcesContent":["const availableActionResource = {\n  name: 'availableActions',\n  actions: {\n    async list(ctx, next) {\n      const acl = ctx.app.acl;\n      const availableActions = acl.getAvailableActions();\n      ctx.body = Array.from(availableActions.entries()).map(([, { name, options }]) => {\n        return {\n          ...options,\n          name,\n        };\n      });\n      await next();\n    },\n  },\n};\n\nexport { availableActionResource };\n"]}

package/esm/actions/role-check.d.ts

@@ -1 +0,0 @@
-export declare function checkAction(ctx: any, next: any): Promise<void>;

package/esm/actions/role-check.js

@@ -1,38 +0,0 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-const map2obj = (map) => {
-    const obj = {};
-    for (let [key, value] of map) {
-        obj[key] = value;
-    }
-    return obj;
-};
-export function checkAction(ctx, next) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const currentRole = ctx.state.currentRole;
-        if (currentRole) {
-            const roleInstance = yield ctx.db.getRepository('roles').findOne({
-                filter: {
-                    name: currentRole,
-                },
-                appends: ['menuUiSchemas'],
-            });
-            const anonymous = yield ctx.db.getRepository('roles').findOne({
-                filter: {
-                    name: 'anonymous',
-                },
-            });
-            const role = ctx.app.acl.getRole(currentRole);
-            ctx.body = Object.assign(Object.assign({}, role.toJSON()), { resources: [...role.resources.keys()], actionAlias: map2obj(ctx.app.acl.actionAlias), allowAll: currentRole === 'root', allowConfigure: roleInstance.get('allowConfigure'), allowMenuItemIds: roleInstance.get('menuUiSchemas').map((uiSchema) => uiSchema.get('x-uid')), allowAnonymous: !!anonymous });
-        }
-        yield next();
-    });
-}
-//# sourceMappingURL=role-check.js.map

package/esm/actions/role-check.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"role-check.js","sourceRoot":"","sources":["../../src/actions/role-check.ts"],"names":[],"mappings":";;;;;;;;;AAAA,MAAM,OAAO,GAAG,CAAC,GAAwB,EAAE,EAAE;IAC3C,MAAM,GAAG,GAAG,EAAE,CAAC;IACf,KAAI,IAAI,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,GAAG,EAAC;QAC1B,GAAG,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;KAClB;IACF,OAAO,GAAG,CAAC;AACZ,CAAC,CAAA;AAED,MAAM,UAAgB,WAAW,CAAC,GAAG,EAAE,IAAI;;QACzC,MAAM,WAAW,GAAG,GAAG,CAAC,KAAK,CAAC,WAAW,CAAC;QAC1C,IAAI,WAAW,EAAE;YACf,MAAM,YAAY,GAAG,MAAM,GAAG,CAAC,EAAE,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC;gBAC/D,MAAM,EAAE;oBACN,IAAI,EAAE,WAAW;iBAClB;gBACD,OAAO,EAAE,CAAC,eAAe,CAAC;aAC3B,CAAC,CAAC;YAEH,MAAM,SAAS,GAAG,MAAM,GAAG,CAAC,EAAE,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC;gBAC5D,MAAM,EAAE;oBACN,IAAI,EAAE,WAAW;iBAClB;aACF,CAAC,CAAC;YAEH,MAAM,IAAI,GAAG,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;YAE9C,GAAG,CAAC,IAAI,mCACH,IAAI,CAAC,MAAM,EAAE,KAChB,SAAS,EAAE,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,EACrC,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC,EAC7C,QAAQ,EAAE,WAAW,KAAK,MAAM,EAChC,cAAc,EAAE,YAAY,CAAC,GAAG,CAAC,gBAAgB,CAAC,EAClD,gBAAgB,EAAE,YAAY,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,EAC5F,cAAc,EAAE,CAAC,CAAC,SAAS,GAC5B,CAAC;SACH;QAED,MAAM,IAAI,EAAE,CAAC;IACf,CAAC;CAAA","sourcesContent":["const map2obj = (map: Map<string, string>) => {\n  const obj = {};\n  for(let [key, value] of map){\n    obj[key] = value;\n  }\n return obj;\n}\n\nexport async function checkAction(ctx, next) {\n  const currentRole = ctx.state.currentRole;\n  if (currentRole) {\n    const roleInstance = await ctx.db.getRepository('roles').findOne({\n      filter: {\n        name: currentRole,\n      },\n      appends: ['menuUiSchemas'],\n    });\n\n    const anonymous = await ctx.db.getRepository('roles').findOne({\n      filter: {\n        name: 'anonymous',\n      },\n    });\n\n    const role = ctx.app.acl.getRole(currentRole);\n\n    ctx.body = {\n      ...role.toJSON(),\n      resources: [...role.resources.keys()],\n      actionAlias: map2obj(ctx.app.acl.actionAlias),\n      allowAll: currentRole === 'root',\n      allowConfigure: roleInstance.get('allowConfigure'),\n      allowMenuItemIds: roleInstance.get('menuUiSchemas').map((uiSchema) => uiSchema.get('x-uid')),\n      allowAnonymous: !!anonymous,\n    };\n  }\n\n  await next();\n}\n"]}

package/esm/actions/role-collections.d.ts

@@ -1,7 +0,0 @@
-declare const roleCollectionsResource: {
-    name: string;
-    actions: {
-        list(ctx: any, next: any): Promise<void>;
-    };
-};
-export { roleCollectionsResource };

package/esm/actions/role-collections.js

@@ -1,54 +0,0 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-const roleCollectionsResource = {
-    name: 'roles.collections',
-    actions: {
-        list(ctx, next) {
-            return __awaiter(this, void 0, void 0, function* () {
-                const role = ctx.action.params.associatedIndex;
-                const db = ctx.db;
-                const collectionRepository = db.getRepository('collections');
-                // all collections
-                const collections = yield collectionRepository.find({
-                    filter: ctx.action.params.filter,
-                });
-                // role collections
-                const roleResources = yield db.getRepository('rolesResources').find({
-                    filter: {
-                        roleName: role,
-                    },
-                });
-                // role collections
-                const roleResourcesNames = roleResources.map((roleResource) => roleResource.get('name'));
-                const roleResourceActionResourceNames = roleResources
-                    .filter((roleResources) => roleResources.get('usingActionsConfig'))
-                    .map((roleResources) => roleResources.get('name'));
-                ctx.body = collections
-                    .map((collection) => {
-                    const exists = roleResourcesNames.includes(collection.get('name'));
-                    const usingConfig = roleResourceActionResourceNames.includes(collection.get('name'))
-                        ? 'resourceAction'
-                        : 'strategy';
-                    return {
-                        name: collection.get('name'),
-                        title: collection.get('title'),
-                        roleName: role,
-                        usingConfig,
-                        exists,
-                    };
-                })
-                    .sort((a, b) => (a.name > b.name ? 1 : -1));
-                yield next();
-            });
-        },
-    },
-};
-export { roleCollectionsResource };
-//# sourceMappingURL=role-collections.js.map

package/esm/actions/role-collections.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"role-collections.js","sourceRoot":"","sources":["../../src/actions/role-collections.ts"],"names":[],"mappings":";;;;;;;;;AAIA,MAAM,uBAAuB,GAAG;IAC9B,IAAI,EAAE,mBAAmB;IACzB,OAAO,EAAE;QACD,IAAI,CAAC,GAAG,EAAE,IAAI;;gBAClB,MAAM,IAAI,GAAG,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC;gBAE/C,MAAM,EAAE,GAAa,GAAG,CAAC,EAAE,CAAC;gBAC5B,MAAM,oBAAoB,GAAG,EAAE,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC;gBAE7D,kBAAkB;gBAClB,MAAM,WAAW,GAAG,MAAM,oBAAoB,CAAC,IAAI,CAAC;oBAClD,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM;iBACjC,CAAC,CAAC;gBAEH,mBAAmB;gBACnB,MAAM,aAAa,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,gBAAgB,CAAC,CAAC,IAAI,CAAC;oBAClE,MAAM,EAAE;wBACN,QAAQ,EAAE,IAAI;qBACf;iBACF,CAAC,CAAC;gBAEH,mBAAmB;gBACnB,MAAM,kBAAkB,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,YAAY,EAAE,EAAE,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;gBACzF,MAAM,+BAA+B,GAAG,aAAa;qBAClD,MAAM,CAAC,CAAC,aAAa,EAAE,EAAE,CAAC,aAAa,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;qBAClE,GAAG,CAAC,CAAC,aAAa,EAAE,EAAE,CAAC,aAAa,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;gBAErD,GAAG,CAAC,IAAI,GAAG,WAAW;qBACnB,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE;oBAClB,MAAM,MAAM,GAAG,kBAAkB,CAAC,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;oBAEnE,MAAM,WAAW,GAAoB,+BAA+B,CAAC,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;wBACnG,CAAC,CAAC,gBAAgB;wBAClB,CAAC,CAAC,UAAU,CAAC;oBAEf,OAAO;wBACL,IAAI,EAAE,UAAU,CAAC,GAAG,CAAC,MAAM,CAAW;wBACtC,KAAK,EAAE,UAAU,CAAC,GAAG,CAAC,OAAO,CAAW;wBACxC,QAAQ,EAAE,IAAI;wBACd,WAAW;wBACX,MAAM;qBACP,CAAC;gBACJ,CAAC,CAAC;qBACD,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;gBAE9C,MAAM,IAAI,EAAE,CAAC;YACf,CAAC;SAAA;KACF;CACF,CAAC;AAEF,OAAO,EAAE,uBAAuB,EAAE,CAAC","sourcesContent":["import { Database } from '@nocobase/database';\n\ntype UsingConfigType = 'strategy' | 'resourceAction';\n\nconst roleCollectionsResource = {\n  name: 'roles.collections',\n  actions: {\n    async list(ctx, next) {\n      const role = ctx.action.params.associatedIndex;\n\n      const db: Database = ctx.db;\n      const collectionRepository = db.getRepository('collections');\n\n      // all collections\n      const collections = await collectionRepository.find({\n        filter: ctx.action.params.filter,\n      });\n\n      // role collections\n      const roleResources = await db.getRepository('rolesResources').find({\n        filter: {\n          roleName: role,\n        },\n      });\n\n      // role collections\n      const roleResourcesNames = roleResources.map((roleResource) => roleResource.get('name'));\n      const roleResourceActionResourceNames = roleResources\n        .filter((roleResources) => roleResources.get('usingActionsConfig'))\n        .map((roleResources) => roleResources.get('name'));\n\n      ctx.body = collections\n        .map((collection) => {\n          const exists = roleResourcesNames.includes(collection.get('name'));\n\n          const usingConfig: UsingConfigType = roleResourceActionResourceNames.includes(collection.get('name'))\n            ? 'resourceAction'\n            : 'strategy';\n\n          return {\n            name: collection.get('name') as string,\n            title: collection.get('title') as string,\n            roleName: role,\n            usingConfig,\n            exists,\n          };\n        })\n        .sort((a, b) => (a.name > b.name ? 1 : -1));\n\n      await next();\n    },\n  },\n};\n\nexport { roleCollectionsResource };\n"]}

package/esm/collections/roles.d.ts

@@ -1,3 +0,0 @@
-import { CollectionOptions } from '@nocobase/database';
-declare const _default: CollectionOptions;
-export default _default;

package/esm/collections/roles.js

@@ -1,78 +0,0 @@
-export default {
-    name: 'roles',
-    title: '{{t("Roles")}}',
-    autoGenId: false,
-    model: 'RoleModel',
-    filterTargetKey: 'name',
-    // targetKey: 'name',
-    sortable: true,
-    fields: [
-        {
-            type: 'uid',
-            name: 'name',
-            prefix: 'r_',
-            primaryKey: true,
-            interface: 'input',
-            uiSchema: {
-                type: 'string',
-                title: '{{t("Role UID")}}',
-                'x-component': 'Input',
-            },
-        },
-        {
-            type: 'string',
-            name: 'title',
-            unique: true,
-            interface: 'input',
-            uiSchema: {
-                type: 'string',
-                title: '{{t("Role name")}}',
-                'x-component': 'Input',
-            },
-        },
-        {
-            type: 'boolean',
-            name: 'default',
-        },
-        {
-            type: 'string',
-            name: 'description',
-        },
-        {
-            type: 'json',
-            name: 'strategy',
-        },
-        {
-            type: 'boolean',
-            name: 'default',
-            defaultValue: false,
-        },
-        {
-            type: 'boolean',
-            name: 'hidden',
-            defaultValue: false,
-        },
-        {
-            type: 'boolean',
-            name: 'allowConfigure',
-        },
-        {
-            type: 'boolean',
-            name: 'allowNewMenu',
-        },
-        {
-            type: 'belongsToMany',
-            name: 'menuUiSchemas',
-            target: 'uiSchemas',
-            targetKey: 'x-uid',
-        },
-        {
-            type: 'hasMany',
-            name: 'resources',
-            target: 'rolesResources',
-            sourceKey: 'name',
-            targetKey: 'name',
-        },
-    ],
-};
-//# sourceMappingURL=roles.js.map

package/esm/collections/roles.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"roles.js","sourceRoot":"","sources":["../../src/collections/roles.ts"],"names":[],"mappings":"AAEA,eAAe;IACb,IAAI,EAAE,OAAO;IACb,KAAK,EAAE,gBAAgB;IACvB,SAAS,EAAE,KAAK;IAChB,KAAK,EAAE,WAAW;IAClB,eAAe,EAAE,MAAM;IACvB,qBAAqB;IACrB,QAAQ,EAAE,IAAI;IACd,MAAM,EAAE;QACN;YACE,IAAI,EAAE,KAAK;YACX,IAAI,EAAE,MAAM;YACZ,MAAM,EAAE,IAAI;YACZ,UAAU,EAAE,IAAI;YAChB,SAAS,EAAE,OAAO;YAClB,QAAQ,EAAE;gBACR,IAAI,EAAE,QAAQ;gBACd,KAAK,EAAE,mBAAmB;gBAC1B,aAAa,EAAE,OAAO;aACvB;SACF;QACD;YACE,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,OAAO;YACb,MAAM,EAAE,IAAI;YACZ,SAAS,EAAE,OAAO;YAClB,QAAQ,EAAE;gBACR,IAAI,EAAE,QAAQ;gBACd,KAAK,EAAE,oBAAoB;gBAC3B,aAAa,EAAE,OAAO;aACvB;SACF;QACD;YACE,IAAI,EAAE,SAAS;YACf,IAAI,EAAE,SAAS;SAChB;QACD;YACE,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,aAAa;SACpB;QACD;YACE,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,UAAU;SACjB;QACD;YACE,IAAI,EAAE,SAAS;YACf,IAAI,EAAE,SAAS;YACf,YAAY,EAAE,KAAK;SACpB;QACD;YACE,IAAI,EAAE,SAAS;YACf,IAAI,EAAE,QAAQ;YACd,YAAY,EAAE,KAAK;SACpB;QACD;YACE,IAAI,EAAE,SAAS;YACf,IAAI,EAAE,gBAAgB;SACvB;QACD;YACE,IAAI,EAAE,SAAS;YACf,IAAI,EAAE,cAAc;SACrB;QACD;YACE,IAAI,EAAE,eAAe;YACrB,IAAI,EAAE,eAAe;YACrB,MAAM,EAAE,WAAW;YACnB,SAAS,EAAE,OAAO;SACnB;QACD;YACE,IAAI,EAAE,SAAS;YACf,IAAI,EAAE,WAAW;YACjB,MAAM,EAAE,gBAAgB;YACxB,SAAS,EAAE,MAAM;YACjB,SAAS,EAAE,MAAM;SAClB;KACF;CACmB,CAAC","sourcesContent":["import { CollectionOptions } from '@nocobase/database';\n\nexport default {\n  name: 'roles',\n  title: '{{t(\"Roles\")}}',\n  autoGenId: false,\n  model: 'RoleModel',\n  filterTargetKey: 'name',\n  // targetKey: 'name',\n  sortable: true,\n  fields: [\n    {\n      type: 'uid',\n      name: 'name',\n      prefix: 'r_',\n      primaryKey: true,\n      interface: 'input',\n      uiSchema: {\n        type: 'string',\n        title: '{{t(\"Role UID\")}}',\n        'x-component': 'Input',\n      },\n    },\n    {\n      type: 'string',\n      name: 'title',\n      unique: true,\n      interface: 'input',\n      uiSchema: {\n        type: 'string',\n        title: '{{t(\"Role name\")}}',\n        'x-component': 'Input',\n      },\n    },\n    {\n      type: 'boolean',\n      name: 'default',\n    },\n    {\n      type: 'string',\n      name: 'description',\n    },\n    {\n      type: 'json',\n      name: 'strategy',\n    },\n    {\n      type: 'boolean',\n      name: 'default',\n      defaultValue: false,\n    },\n    {\n      type: 'boolean',\n      name: 'hidden',\n      defaultValue: false,\n    },\n    {\n      type: 'boolean',\n      name: 'allowConfigure',\n    },\n    {\n      type: 'boolean',\n      name: 'allowNewMenu',\n    },\n    {\n      type: 'belongsToMany',\n      name: 'menuUiSchemas',\n      target: 'uiSchemas',\n      targetKey: 'x-uid',\n    },\n    {\n      type: 'hasMany',\n      name: 'resources',\n      target: 'rolesResources',\n      sourceKey: 'name',\n      targetKey: 'name',\n    },\n  ],\n} as CollectionOptions;\n"]}

package/esm/collections/rolesResources.d.ts

@@ -1,3 +0,0 @@
-import { CollectionOptions } from '@nocobase/database';
-declare const _default: CollectionOptions;
-export default _default;

package/esm/collections/rolesResources.js

@@ -1,30 +0,0 @@
-export default {
-    name: 'rolesResources',
-    model: 'RoleResourceModel',
-    indexes: [
-        {
-            unique: true,
-            fields: ['roleName', 'name'],
-        },
-    ],
-    fields: [
-        {
-            type: 'belongsTo',
-            name: 'role',
-        },
-        {
-            type: 'string',
-            name: 'name',
-        },
-        {
-            type: 'boolean',
-            name: 'usingActionsConfig',
-        },
-        {
-            type: 'hasMany',
-            name: 'actions',
-            target: 'rolesResourcesActions',
-        },
-    ],
-};
-//# sourceMappingURL=rolesResources.js.map

package/esm/collections/rolesResources.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"rolesResources.js","sourceRoot":"","sources":["../../src/collections/rolesResources.ts"],"names":[],"mappings":"AAEA,eAAe;IACb,IAAI,EAAE,gBAAgB;IACtB,KAAK,EAAE,mBAAmB;IAC1B,OAAO,EAAE;QACP;YACE,MAAM,EAAE,IAAI;YACZ,MAAM,EAAE,CAAC,UAAU,EAAE,MAAM,CAAC;SAC7B;KACF;IACD,MAAM,EAAE;QACN;YACE,IAAI,EAAE,WAAW;YACjB,IAAI,EAAE,MAAM;SACb;QACD;YACE,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,MAAM;SACb;QACD;YACE,IAAI,EAAE,SAAS;YACf,IAAI,EAAE,oBAAoB;SAC3B;QACD;YACE,IAAI,EAAE,SAAS;YACf,IAAI,EAAE,SAAS;YACf,MAAM,EAAE,uBAAuB;SAChC;KACF;CACmB,CAAC","sourcesContent":["import { CollectionOptions } from '@nocobase/database';\n\nexport default {\n  name: 'rolesResources',\n  model: 'RoleResourceModel',\n  indexes: [\n    {\n      unique: true,\n      fields: ['roleName', 'name'],\n    },\n  ],\n  fields: [\n    {\n      type: 'belongsTo',\n      name: 'role',\n    },\n    {\n      type: 'string',\n      name: 'name',\n    },\n    {\n      type: 'boolean',\n      name: 'usingActionsConfig',\n    },\n    {\n      type: 'hasMany',\n      name: 'actions',\n      target: 'rolesResourcesActions',\n    },\n  ],\n} as CollectionOptions;\n"]}

package/esm/collections/rolesResourcesActions.d.ts

@@ -1,3 +0,0 @@
-import { CollectionOptions } from '@nocobase/database';
-declare const _default: CollectionOptions;
-export default _default;

package/esm/collections/rolesResourcesActions.js

@@ -1,27 +0,0 @@
-export default {
-    name: 'rolesResourcesActions',
-    model: 'RoleResourceActionModel',
-    fields: [
-        {
-            type: 'belongsTo',
-            name: 'resource',
-            foreignKey: 'rolesResourceId',
-            target: 'rolesResources',
-        },
-        {
-            type: 'string',
-            name: 'name',
-        },
-        {
-            type: 'array',
-            name: 'fields',
-            defaultValue: [],
-        },
-        {
-            type: 'belongsTo',
-            name: 'scope',
-            target: 'rolesResourcesScopes',
-        },
-    ],
-};
-//# sourceMappingURL=rolesResourcesActions.js.map

package/esm/collections/rolesResourcesActions.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"rolesResourcesActions.js","sourceRoot":"","sources":["../../src/collections/rolesResourcesActions.ts"],"names":[],"mappings":"AAEA,eAAe;IACb,IAAI,EAAE,uBAAuB;IAC7B,KAAK,EAAE,yBAAyB;IAChC,MAAM,EAAE;QACN;YACE,IAAI,EAAE,WAAW;YACjB,IAAI,EAAE,UAAU;YAChB,UAAU,EAAE,iBAAiB;YAC7B,MAAM,EAAE,gBAAgB;SACzB;QACD;YACE,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,MAAM;SACb;QACD;YACE,IAAI,EAAE,OAAO;YACb,IAAI,EAAE,QAAQ;YACd,YAAY,EAAE,EAAE;SACjB;QACD;YACE,IAAI,EAAE,WAAW;YACjB,IAAI,EAAE,OAAO;YACb,MAAM,EAAE,sBAAsB;SAC/B;KACF;CACmB,CAAC","sourcesContent":["import { CollectionOptions } from '@nocobase/database';\n\nexport default {\n  name: 'rolesResourcesActions',\n  model: 'RoleResourceActionModel',\n  fields: [\n    {\n      type: 'belongsTo',\n      name: 'resource',\n      foreignKey: 'rolesResourceId',\n      target: 'rolesResources',\n    },\n    {\n      type: 'string',\n      name: 'name',\n    },\n    {\n      type: 'array',\n      name: 'fields',\n      defaultValue: [],\n    },\n    {\n      type: 'belongsTo',\n      name: 'scope',\n      target: 'rolesResourcesScopes',\n    },\n  ],\n} as CollectionOptions;\n"]}

package/esm/collections/rolesResourcesScopes.d.ts

@@ -1,3 +0,0 @@
-import { CollectionOptions } from '@nocobase/database';
-declare const _default: CollectionOptions;
-export default _default;

package/esm/collections/rolesResourcesScopes.js

@@ -1,22 +0,0 @@
-export default {
-    name: 'rolesResourcesScopes',
-    fields: [
-        {
-            type: 'uid',
-            name: 'key',
-        },
-        {
-            type: 'string',
-            name: 'name',
-        },
-        {
-            type: 'string',
-            name: 'resourceName',
-        },
-        {
-            type: 'json',
-            name: 'scope',
-        },
-    ],
-};
-//# sourceMappingURL=rolesResourcesScopes.js.map

package/esm/collections/rolesResourcesScopes.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"rolesResourcesScopes.js","sourceRoot":"","sources":["../../src/collections/rolesResourcesScopes.ts"],"names":[],"mappings":"AAEA,eAAe;IACb,IAAI,EAAE,sBAAsB;IAC5B,MAAM,EAAE;QACN;YACE,IAAI,EAAE,KAAK;YACX,IAAI,EAAE,KAAK;SACZ;QACD;YACE,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,MAAM;SACb;QACD;YACE,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,cAAc;SACrB;QACD;YACE,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,OAAO;SACd;KACF;CACmB,CAAC","sourcesContent":["import { CollectionOptions } from '@nocobase/database';\n\nexport default {\n  name: 'rolesResourcesScopes',\n  fields: [\n    {\n      type: 'uid',\n      name: 'key',\n    },\n    {\n      type: 'string',\n      name: 'name',\n    },\n    {\n      type: 'string',\n      name: 'resourceName',\n    },\n    {\n      type: 'json',\n      name: 'scope',\n    },\n  ],\n} as CollectionOptions;\n"]}

package/esm/index.d.ts

@@ -1 +0,0 @@
-export { default } from './server';

package/esm/index.js

@@ -1,2 +0,0 @@
-export { default } from './server';
-//# sourceMappingURL=index.js.map

package/esm/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC","sourcesContent":["export { default } from './server';\n\n"]}