@nocobase/plugin-acl 0.7.2-alpha.7 → 0.7.4-alpha.4

package/src/__tests__/association-field.test.ts

@@ -1,5 +1,6 @@
 import { ACL } from '@nocobase/acl';
-import { Database, HasManyRepository, Model } from '@nocobase/database';
+import { Database, HasManyRepository } from '@nocobase/database';
+import UsersPlugin from '@nocobase/plugin-users';
 import { MockServer } from '@nocobase/test';
 import { prepareApp } from './prepare';
 
@@ -8,7 +9,10 @@ describe('association field acl', () => {
   let db: Database;
   let acl: ACL;
 
-  let role: Model;
+  let user;
+  let userAgent;
+  let admin;
+  let adminAgent;
 
   afterEach(async () => {
     await app.destroy();
@@ -19,20 +23,44 @@ describe('association field acl', () => {
     db = app.db;
     acl = app.acl;
 
-    role = await db.getRepository('roles').create({
+    await db.getRepository('roles').create({
       values: {
-        name: 'admin',
-        title: 'Admin User',
+        name: 'new',
         allowConfigure: true,
       },
     });
 
-    await db.getRepository('collections').create({
+    await db.getRepository('roles').create({
       values: {
-        name: 'users',
+        name: 'testAdmin',
+        allowConfigure: true,
       },
-      context: {},
     });
+    const UserRepo = db.getCollection('users').repository;
+    user = await UserRepo.create({
+      values: {
+        roles: ['new'],
+      },
+    });
+    admin = await UserRepo.create({
+      values: {
+        roles: ['testAdmin'],
+      },
+    });
+
+    const userPlugin = app.getPlugin('@nocobase/plugin-users') as UsersPlugin;
+    userAgent = app.agent().auth(
+      userPlugin.jwtService.sign({
+        userId: user.get('id'),
+      }),
+      { type: 'bearer' },
+    );
+    adminAgent = app.agent().auth(
+      userPlugin.jwtService.sign({
+        userId: admin.get('id'),
+      }),
+      { type: 'bearer' },
+    );
 
     await db.getRepository('collections').create({
       values: {
@@ -75,56 +103,48 @@ describe('association field acl', () => {
       context: {},
     });
 
-    await app
-      .agent()
-      .resource('roles.resources')
-      .create({
-        associatedIndex: 'admin',
-        values: {
-          name: 'users',
-          usingActionsConfig: true,
-          actions: [
-            {
-              name: 'create',
-              fields: ['orders'],
-            },
-            {
-              name: 'view',
-              fields: ['orders'],
-            },
-          ],
-        },
-      });
+    await adminAgent.resource('roles.resources', 'new').create({
+      values: {
+        name: 'users',
+        usingActionsConfig: true,
+        actions: [
+          {
+            name: 'create',
+            fields: ['orders'],
+          },
+          {
+            name: 'view',
+            fields: ['orders'],
+          },
+        ],
+      },
+    });
   });
 
   it('should revoke target action on association action revoke', async () => {
     expect(
       acl.can({
-        role: 'admin',
+        role: 'new',
         resource: 'orders',
         action: 'list',
       }),
     ).toMatchObject({
-      role: 'admin',
+      role: 'new',
       resource: 'orders',
       action: 'list',
     });
 
-    await app
-      .agent()
-      .resource('roles.resources')
-      .update({
-        associatedIndex: 'admin',
-        values: {
-          name: 'users',
-          usingActionsConfig: true,
-          actions: [],
-        },
-      });
+    await adminAgent.resource('roles.resources', 'new').update({
+      values: {
+        name: 'users',
+        usingActionsConfig: true,
+        actions: [],
+      },
+    });
 
     expect(
       acl.can({
-        role: 'admin',
+        role: 'new',
         resource: 'orders',
         action: 'list',
       }),
@@ -134,12 +154,12 @@ describe('association field acl', () => {
   it('should revoke association action on action revoke', async () => {
     expect(
       acl.can({
-        role: 'admin',
+        role: 'new',
         resource: 'users.orders',
         action: 'add',
       }),
     ).toMatchObject({
-      role: 'admin',
+      role: 'new',
       resource: 'users.orders',
       action: 'add',
     });
@@ -152,27 +172,23 @@ describe('association field acl', () => {
 
     const actionId = viewAction.get('id') as number;
 
-    const response = await app
-      .agent()
-      .resource('roles.resources')
-      .update({
-        associatedIndex: 'admin',
-        values: {
-          name: 'users',
-          usingActionsConfig: true,
-          actions: [
-            {
-              id: actionId,
-            },
-          ],
-        },
-      });
+    const response = await adminAgent.resource('roles.resources', 'new').update({
+      values: {
+        name: 'users',
+        usingActionsConfig: true,
+        actions: [
+          {
+            id: actionId,
+          },
+        ],
+      },
+    });
 
     expect(response.statusCode).toEqual(200);
 
     expect(
       acl.can({
-        role: 'admin',
+        role: 'new',
         resource: 'users.orders',
         action: 'add',
       }),
@@ -180,30 +196,26 @@ describe('association field acl', () => {
   });
 
   it('should revoke association action on field deleted', async () => {
-    await app
-      .agent()
-      .resource('roles.resources')
-      .update({
-        associatedIndex: 'admin',
-        values: {
-          name: 'users',
-          usingActionsConfig: true,
-          actions: [
-            {
-              name: 'create',
-              fields: ['name', 'age'],
-            },
-          ],
-        },
-      });
+    await adminAgent.resource('roles.resources', 'new').update({
+      values: {
+        name: 'users',
+        usingActionsConfig: true,
+        actions: [
+          {
+            name: 'create',
+            fields: ['name', 'age'],
+          },
+        ],
+      },
+    });
     expect(
       acl.can({
-        role: 'admin',
+        role: 'new',
         resource: 'users',
         action: 'create',
       }),
     ).toMatchObject({
-      role: 'admin',
+      role: 'new',
       resource: 'users',
       action: 'create',
       params: {
@@ -236,12 +248,12 @@ describe('association field acl', () => {
 
     expect(
       acl.can({
-        role: 'admin',
+        role: 'new',
         resource: 'users',
         action: 'create',
       }),
     ).toMatchObject({
-      role: 'admin',
+      role: 'new',
       resource: 'users',
       action: 'create',
       params: {
@@ -251,45 +263,44 @@ describe('association field acl', () => {
   });
 
   it('should allow association fields access', async () => {
-    const createResponse = await app
-      .agent()
-      .resource('users')
-      .create({
-        values: {
-          orders: [
-            {
-              content: 'apple',
-            },
-          ],
-        },
-      });
+    const createResponse = await userAgent.resource('users').create({
+      values: {
+        orders: [
+          {
+            content: 'apple',
+          },
+        ],
+      },
+    });
 
     expect(createResponse.statusCode).toEqual(200);
 
-    const user = await db.getRepository('users').findOne();
+    const user = await db.getRepository('users').findOne({
+      filterByTk: createResponse.body.data.id,
+    });
     // @ts-ignore
     expect(await user.countOrders()).toEqual(1);
 
     expect(
       acl.can({
-        role: 'admin',
+        role: 'new',
         resource: 'users.orders',
         action: 'list',
       }),
     ).toMatchObject({
-      role: 'admin',
+      role: 'new',
       resource: 'users.orders',
       action: 'list',
     });
 
     expect(
       acl.can({
-        role: 'admin',
+        role: 'new',
         resource: 'orders',
         action: 'list',
       }),
     ).toMatchObject({
-      role: 'admin',
+      role: 'new',
       resource: 'orders',
       action: 'list',
     });

package/src/__tests__/configuration.test.ts

@@ -1,15 +1,16 @@
-import { MockServer } from '@nocobase/test';
 import { Database } from '@nocobase/database';
-import { ACL } from '@nocobase/acl';
-import { UiSchemaRepository } from '@nocobase/plugin-ui-schema-storage';
-import { changeMockRole, prepareApp } from './prepare';
+import UsersPlugin from '@nocobase/plugin-users';
+import { MockServer } from '@nocobase/test';
+import { prepareApp } from './prepare';
 
 describe('configuration', () => {
   let app: MockServer;
   let db: Database;
-  let acl: ACL;
-
-  let uiSchemaRepository: UiSchemaRepository;
+  let admin;
+  let adminAgent;
+  let user;
+  let userAgent;
+  let guestAgent;
 
   afterEach(async () => {
     await app.destroy();
@@ -18,28 +19,56 @@ describe('configuration', () => {
   beforeEach(async () => {
     app = await prepareApp();
     db = app.db;
-    acl = app.acl;
-
-    uiSchemaRepository = db.getRepository('uiSchemas');
-  });
-
-  it('should list collections', async () => {
-    expect((await app.agent().resource('collections').create()).statusCode).toEqual(403);
-    expect((await app.agent().resource('collections').list()).statusCode).toEqual(200);
-  });
 
-  it('should allow when role has allowConfigure with true value', async () => {
     await db.getRepository('roles').create({
       values: {
-        name: 'admin1',
-        title: 'admin allowConfigure',
+        name: 'test1',
         allowConfigure: true,
       },
     });
 
-    changeMockRole('admin1');
+    await db.getRepository('roles').create({
+      values: {
+        name: 'test2',
+      },
+    });
+
+    const UserRepo = db.getCollection('users').repository;
+    admin = await UserRepo.create({
+      values: {
+        roles: ['test1']
+      }
+    });
+    user = await UserRepo.create({
+      values: {
+        roles: ['test2']
+      }
+    });
+
+    const userPlugin = app.getPlugin('@nocobase/plugin-users') as UsersPlugin;
+    adminAgent = app.agent().auth(userPlugin.jwtService.sign({
+      userId: admin.get('id'),
+    }), { type: 'bearer' });
+
+    userAgent = app.agent().auth(userPlugin.jwtService.sign({
+      userId: user.get('id'),
+    }), { type: 'bearer' });
+
+    guestAgent = app.agent();
+  });
+
+  it('should list collections', async () => {
+    expect((await userAgent.resource('collections').create()).statusCode).toEqual(403);
+    expect((await userAgent.resource('collections').list()).statusCode).toEqual(200);
+  });
 
-    expect((await app.agent().resource('collections').create()).statusCode).toEqual(200);
-    expect((await app.agent().resource('collections').list()).statusCode).toEqual(200);
+  it('should not create/list collections', async () => {
+    expect((await guestAgent.resource('collections').create()).statusCode).toEqual(403);
+    expect((await guestAgent.resource('collections').list()).statusCode).toEqual(403);
+  });
+
+  it('should allow when role has allowConfigure with true value', async () => {
+    expect((await adminAgent.resource('collections').create()).statusCode).toEqual(200);
+    expect((await adminAgent.resource('collections').list()).statusCode).toEqual(200);
   });
 });

package/src/__tests__/middleware.test.ts

@@ -1,33 +1,40 @@
 import { ACL } from '@nocobase/acl';
 import { Database, Model } from '@nocobase/database';
 import { MockServer } from '@nocobase/test';
-import { changeMockUser, prepareApp } from './prepare';
+import UsersPlugin from '@nocobase/plugin-users';
+import { prepareApp } from './prepare';
 
 describe('middleware', () => {
   let app: MockServer;
   let role: Model;
   let db: Database;
   let acl: ACL;
+  let admin;
+  let adminAgent;
 
   beforeEach(async () => {
     app = await prepareApp();
     db = app.db;
     acl = app.acl;
 
-    await db.getRepository('roles').create({
-      values: {
-        name: 'admin',
-        title: 'Admin User',
-        allowConfigure: true,
-      },
-    });
-
     role = await db.getRepository('roles').findOne({
       filter: {
         name: 'admin',
       },
     });
 
+    const UserRepo = db.getCollection('users').repository;
+    admin = await UserRepo.create({
+      values: {
+        roles: ['admin']
+      }
+    });
+
+    const userPlugin = app.getPlugin('@nocobase/plugin-users') as UsersPlugin;
+    adminAgent = app.agent().auth(userPlugin.jwtService.sign({
+      userId: admin.get('id'),
+    }), { type: 'bearer' });
+
     await db.getRepository('collections').create({
       values: {
         name: 'posts',
@@ -82,7 +89,7 @@ describe('middleware', () => {
       },
     });
 
-    const response = await app.agent().resource('posts').create({
+    const response = await adminAgent.resource('posts').create({
       values: {},
     });
 
@@ -90,8 +97,7 @@ describe('middleware', () => {
   });
 
   it('should limit fields on view actions', async () => {
-    await app
-      .agent()
+    await adminAgent
       .resource('roles.resources', role.get('name'))
       .create({
         values: {
@@ -110,8 +116,7 @@ describe('middleware', () => {
         },
       });
 
-    await app
-      .agent()
+    await adminAgent
       .resource('posts')
       .create({
         values: {
@@ -124,10 +129,10 @@ describe('middleware', () => {
     expect(post.get('title')).toEqual('post-title');
     expect(post.get('description')).toEqual('post-description');
 
-    const response = await app.agent().resource('posts').list({});
+    const response = await adminAgent.resource('posts').list({});
     expect(response.statusCode).toEqual(200);
 
-    const data = response.body.data[0];
+    const [data] = response.body.data;
 
     expect(data['id']).not.toBeUndefined();
     expect(data['title']).toEqual('post-title');
@@ -135,12 +140,7 @@ describe('middleware', () => {
   });
 
   it('should parse template value on action params', async () => {
-    changeMockUser({
-      id: 2,
-    });
-
-    const res = await app
-      .agent()
+    const res = await adminAgent
       .resource('rolesResourcesScopes')
       .create({
         values: {
@@ -151,8 +151,7 @@ describe('middleware', () => {
         },
       });
 
-    await app
-      .agent()
+    await adminAgent
       .resource('roles.resources', role.get('name'))
       .create({
         values: {
@@ -172,8 +171,7 @@ describe('middleware', () => {
         },
       });
 
-    await app
-      .agent()
+    await adminAgent
       .resource('posts')
       .create({
         values: {
@@ -183,8 +181,7 @@ describe('middleware', () => {
         },
       });
 
-    await app
-      .agent()
+    await adminAgent
       .resource('posts')
       .create({
         values: {
@@ -194,14 +191,13 @@ describe('middleware', () => {
         },
       });
 
-    const response = await app.agent().resource('posts').list();
+    const response = await adminAgent.resource('posts').list();
     const data = response.body.data;
     expect(data.length).toEqual(1);
   });
 
   it('should change fields params to whitelist in create action', async () => {
-    await app
-      .agent()
+    await adminAgent
       .resource('roles.resources', role.get('name'))
       .create({
         values: {
@@ -216,8 +212,7 @@ describe('middleware', () => {
         },
       });
 
-    await app
-      .agent()
+    await adminAgent
       .resource('posts')
       .create({
         values: {