@nocobase/plugin-acl 0.7.4-alpha.4 → 0.7.5-alpha.1

package/lib/server.js

@@ -656,7 +656,8 @@ class PluginACL extends _server().Plugin {
       yield User.repository.update({
         values: {
           roles: ['root', 'admin', 'member']
-        }
+        },
+        forceUpdate: true
       });
 
       const RolesUsers = _this5.db.getCollection('rolesUsers');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-acl",
-  "version": "0.7.4-alpha.4",
+  "version": "0.7.5-alpha.1",
   "description": "",
   "license": "Apache-2.0",
   "licenses": [
@@ -12,15 +12,15 @@
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "dependencies": {
-    "@nocobase/acl": "0.7.4-alpha.4",
-    "@nocobase/database": "0.7.4-alpha.4",
-    "@nocobase/plugin-users": "0.7.4-alpha.4",
-    "@nocobase/server": "0.7.4-alpha.4"
+    "@nocobase/acl": "0.7.5-alpha.1",
+    "@nocobase/database": "0.7.5-alpha.1",
+    "@nocobase/plugin-users": "0.7.5-alpha.1",
+    "@nocobase/server": "0.7.5-alpha.1"
   },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/plugins/acl"
   },
-  "gitHead": "726c06b721b217a6aa5c1421b899d1315e552b57"
+  "gitHead": "f6eb27b68185bb0c0b4c2cfca1df84205a9b9173"
 }

package/src/__tests__/acl.test.ts

@@ -26,14 +26,18 @@ describe('acl', () => {
     const UserRepo = db.getCollection('users').repository;
     admin = await UserRepo.create({
       values: {
-        roles: ['admin']
-      }
+        roles: ['admin'],
+      },
     });
 
     const userPlugin = app.getPlugin('@nocobase/plugin-users') as UsersPlugin;
-    adminAgent = app.agent().auth(userPlugin.jwtService.sign({
-      userId: admin.get('id'),
-    }), { type: 'bearer' });
+
+    adminAgent = app.agent().auth(
+      userPlugin.jwtService.sign({
+        userId: admin.get('id'),
+      }),
+      { type: 'bearer' },
+    );
 
     uiSchemaRepository = db.getRepository('uiSchemas');
   });
@@ -41,7 +45,7 @@ describe('acl', () => {
   it('should works with universal actions', async () => {
     await db.getRepository('roles').create({
       values: {
-        name: 'new'
+        name: 'new',
       },
     });
 
@@ -54,16 +58,15 @@ describe('acl', () => {
     ).toBeNull();
 
     // grant universal action
-    await adminAgent
-      .resource('roles')
-      .update({
-        resourceIndex: 'new',
-        values: {
-          strategy: {
-            actions: ['create'],
-          },
+    await adminAgent.resource('roles').update({
+      resourceIndex: 'new',
+      values: {
+        strategy: {
+          actions: ['create'],
         },
-      });
+      },
+      forceUpdate: true,
+    });
 
     expect(
       acl.can({
@@ -104,15 +107,13 @@ describe('acl', () => {
       },
     });
 
-    await adminAgent
-      .resource('roles.resources', 'new')
-      .create({
-        values: {
-          name: 'c1',
-          usingActionsConfig: true,
-          actions: [],
-        },
-      });
+    await adminAgent.resource('roles.resources', 'new').create({
+      values: {
+        name: 'c1',
+        usingActionsConfig: true,
+        actions: [],
+      },
+    });
 
     expect(
       acl.can({
@@ -150,39 +151,37 @@ describe('acl', () => {
     });
 
     // create c1 published scope
-    const { body: { data: publishedScope } } = await adminAgent
-      .resource('rolesResourcesScopes')
-      .create({
-        values: {
-          resourceName: 'c1',
-          name: 'published',
-          scope: {
-            published: true,
-          },
+    const {
+      body: { data: publishedScope },
+    } = await adminAgent.resource('rolesResourcesScopes').create({
+      values: {
+        resourceName: 'c1',
+        name: 'published',
+        scope: {
+          published: true,
         },
-      });
+      },
+    });
 
     // await db.getRepository('rolesResourcesScopes').findOne();
 
     // set admin resources
-    await adminAgent
-      .resource('roles.resources', 'new')
-      .create({
-        values: {
-          name: 'c1',
-          usingActionsConfig: true,
-          actions: [
-            {
-              name: 'create',
-              scope: publishedScope.id,
-            },
-            {
-              name: 'view',
-              fields: ['title', 'age'],
-            },
-          ],
-        },
-      });
+    await adminAgent.resource('roles.resources', 'new').create({
+      values: {
+        name: 'c1',
+        usingActionsConfig: true,
+        actions: [
+          {
+            name: 'create',
+            scope: publishedScope.id,
+          },
+          {
+            name: 'view',
+            fields: ['title', 'age'],
+          },
+        ],
+      },
+    });
 
     expect(
       acl.can({
@@ -215,32 +214,28 @@ describe('acl', () => {
     });
 
     // revoke action
-    const response = await adminAgent
-      .resource('roles.resources', role.get('name'))
-      .list({
-        appends: ['actions'],
-      });
+    const response = await adminAgent.resource('roles.resources', role.get('name')).list({
+      appends: ['actions'],
+    });
 
     expect(response.statusCode).toEqual(200);
 
     const actions = response.body.data[0].actions;
     const collectionName = response.body.data[0].name;
 
-    await adminAgent
-      .resource('roles.resources', role.get('name'))
-      .update({
-        filterByTk: collectionName,
-        values: {
-          name: 'c1',
-          usingActionsConfig: true,
-          actions: [
-            {
-              name: 'view',
-              fields: ['title', 'age'],
-            },
-          ],
-        },
-      });
+    await adminAgent.resource('roles.resources', role.get('name')).update({
+      filterByTk: collectionName,
+      values: {
+        name: 'c1',
+        usingActionsConfig: true,
+        actions: [
+          {
+            name: 'view',
+            fields: ['title', 'age'],
+          },
+        ],
+      },
+    });
 
     expect(
       acl.can({
@@ -254,7 +249,7 @@ describe('acl', () => {
   it('should revoke resource when collection destroy', async () => {
     await db.getRepository('roles').create({
       values: {
-        name: 'new'
+        name: 'new',
       },
     });
 
@@ -272,21 +267,19 @@ describe('acl', () => {
       },
     });
 
-    await adminAgent
-      .resource('roles.resources')
-      .create({
-        associatedIndex: 'new',
-        values: {
-          name: 'posts',
-          usingActionsConfig: true,
-          actions: [
-            {
-              name: 'view',
-              fields: ['title'],
-            },
-          ],
-        },
-      });
+    await adminAgent.resource('roles.resources').create({
+      associatedIndex: 'new',
+      values: {
+        name: 'posts',
+        usingActionsConfig: true,
+        actions: [
+          {
+            name: 'view',
+            fields: ['title'],
+          },
+        ],
+      },
+    });
 
     expect(
       acl.can({
@@ -314,7 +307,7 @@ describe('acl', () => {
   it('should revoke actions when not using actions config', async () => {
     await db.getRepository('roles').create({
       values: {
-        name: 'new'
+        name: 'new',
       },
     });
 
@@ -325,20 +318,18 @@ describe('acl', () => {
       },
     });
 
-    await adminAgent
-      .resource('roles.resources')
-      .create({
-        associatedIndex: 'new',
-        values: {
-          name: 'posts',
-          usingActionsConfig: true,
-          actions: [
-            {
-              name: 'create',
-            },
-          ],
-        },
-      });
+    await adminAgent.resource('roles.resources').create({
+      associatedIndex: 'new',
+      values: {
+        name: 'posts',
+        usingActionsConfig: true,
+        actions: [
+          {
+            name: 'create',
+          },
+        ],
+      },
+    });
 
     expect(
       acl.can({
@@ -352,21 +343,19 @@ describe('acl', () => {
       action: 'create',
     });
 
-    await adminAgent
-      .resource('roles.resources', 'new')
-      .update({
-        filterByTk: (
-          await db.getRepository('rolesResources').findOne({
-            filter: {
-              name: 'posts',
-              roleName: 'new',
-            },
-          })
-        ).get('name') as string,
-        values: {
-          usingActionsConfig: false,
-        },
-      });
+    await adminAgent.resource('roles.resources', 'new').update({
+      filterByTk: (
+        await db.getRepository('rolesResources').findOne({
+          filter: {
+            name: 'posts',
+            roleName: 'new',
+          },
+        })
+      ).get('name') as string,
+      values: {
+        usingActionsConfig: false,
+      },
+    });
 
     expect(
       acl.can({
@@ -376,21 +365,19 @@ describe('acl', () => {
       }),
     ).toBeNull();
 
-    await adminAgent
-      .resource('roles.resources', 'new')
-      .update({
-        filterByTk: (
-          await db.getRepository('rolesResources').findOne({
-            filter: {
-              name: 'posts',
-              roleName: 'new',
-            },
-          })
-        ).get('name') as string,
-        values: {
-          usingActionsConfig: true,
-        },
-      });
+    await adminAgent.resource('roles.resources', 'new').update({
+      filterByTk: (
+        await db.getRepository('rolesResources').findOne({
+          filter: {
+            name: 'posts',
+            roleName: 'new',
+          },
+        })
+      ).get('name') as string,
+      values: {
+        usingActionsConfig: true,
+      },
+    });
 
     expect(
       acl.can({
@@ -408,7 +395,7 @@ describe('acl', () => {
   it('should add fields when field created', async () => {
     await db.getRepository('roles').create({
       values: {
-        name: 'new'
+        name: 'new',
       },
     });
 
@@ -426,21 +413,19 @@ describe('acl', () => {
       },
     });
 
-    await adminAgent
-      .resource('roles.resources')
-      .create({
-        associatedIndex: 'new',
-        values: {
-          name: 'posts',
-          usingActionsConfig: true,
-          actions: [
-            {
-              name: 'view',
-              fields: ['title'],
-            },
-          ],
-        },
-      });
+    await adminAgent.resource('roles.resources').create({
+      associatedIndex: 'new',
+      values: {
+        name: 'posts',
+        usingActionsConfig: true,
+        actions: [
+          {
+            name: 'view',
+            fields: ['title'],
+          },
+        ],
+      },
+    });
 
     const allowFields = acl.can({
       role: 'new',
@@ -494,14 +479,17 @@ describe('acl', () => {
     const UserRepo = db.getCollection('users').repository;
     const user = await UserRepo.create({
       values: {
-        roles: ['new']
-      }
+        roles: ['new'],
+      },
     });
 
     const userPlugin = app.getPlugin('@nocobase/plugin-users') as UsersPlugin;
-    const userAgent = app.agent().auth(userPlugin.jwtService.sign({
-      userId: user.get('id'),
-    }), { type: 'bearer' });
+    const userAgent = app.agent().auth(
+      userPlugin.jwtService.sign({
+        userId: user.get('id'),
+      }),
+      { type: 'bearer' },
+    );
 
     const schema = {
       'x-uid': 'test',

package/src/__tests__/prepare.ts

@@ -1,11 +1,10 @@
 import PluginUsers from '@nocobase/plugin-users';
+import PluginErrorHandler from '@nocobase/plugin-error-handler';
 import PluginCollectionManager from '@nocobase/plugin-collection-manager';
 import PluginUiSchema from '@nocobase/plugin-ui-schema-storage';
 import { mockServer } from '@nocobase/test';
 import PluginACL from '../server';
 
-
-
 export async function prepareApp() {
   const app = mockServer({
     registerActions: true,
@@ -15,8 +14,8 @@ export async function prepareApp() {
 
   app.plugin(PluginUsers);
   app.plugin(PluginUiSchema);
+  app.plugin(PluginErrorHandler);
   app.plugin(PluginCollectionManager);
-
   app.plugin(PluginACL);
   await app.loadAndInstall();
 

package/src/__tests__/role.test.ts

@@ -32,14 +32,17 @@ describe('role api', () => {
       const UserRepo = db.getCollection('users').repository;
       admin = await UserRepo.create({
         values: {
-          roles: ['admin']
-        }
+          roles: ['admin'],
+        },
       });
 
       const userPlugin = app.getPlugin('@nocobase/plugin-users') as UsersPlugin;
-      adminAgent = app.agent().auth(userPlugin.jwtService.sign({
-        userId: admin.get('id'),
-      }), { type: 'bearer' });
+      adminAgent = app.agent().auth(
+        userPlugin.jwtService.sign({
+          userId: admin.get('id'),
+        }),
+        { type: 'bearer' },
+      );
     });
 
     it('should list actions', async () => {
@@ -49,15 +52,14 @@ describe('role api', () => {
 
     it('should grant universal role actions', async () => {
       // grant role actions
-      const response = await adminAgent
-        .resource('roles')
-        .update({
-          values: {
-            strategy: {
-              actions: ['create:all', 'view:own'],
-            },
+      const response = await adminAgent.resource('roles').update({
+        forceUpdate: true,
+        values: {
+          strategy: {
+            actions: ['create:all', 'view:own'],
           },
-        });
+        },
+      });
 
       expect(response.statusCode).toEqual(200);
 

package/src/__tests__/users.test.ts

@@ -0,0 +1,52 @@
+import Database from '@nocobase/database';
+import { MockServer } from '@nocobase/test';
+import { prepareApp } from './prepare';
+
+describe('actions', () => {
+  let app: MockServer;
+  let db: Database;
+  let adminUser;
+  let agent;
+  let adminAgent;
+  let pluginUser;
+
+  beforeEach(async () => {
+    process.env.INIT_ROOT_EMAIL = 'test@nocobase.com';
+    process.env.INIT_ROOT_PASSWORD = '123456';
+    process.env.INIT_ROOT_NICKNAME = 'Test';
+
+    app = await prepareApp();
+    db = app.db;
+
+    pluginUser = app.getPlugin('@nocobase/plugin-users');
+    adminUser = await db.getRepository('users').findOne({
+      filter: {
+        email: process.env.INIT_ROOT_EMAIL
+      },
+      appends: ['roles']
+    });
+
+    agent = app.agent();
+    adminAgent = app.agent().auth(
+      pluginUser.jwtService.sign({
+        userId: adminUser.get('id'),
+      }),
+      { type: 'bearer' },
+    );
+  });
+
+  afterEach(async () => {
+    await db.close();
+  });
+
+  it('update profile with roles', async () => {
+    const res2 = await adminAgent.resource('users').updateProfile({
+      filterByTk: adminUser.id,
+      values: {
+        nickname: 'a',
+        roles: adminUser.roles
+      }
+    });
+    expect(res2.status).toBe(200);
+  });
+});

package/src/server.ts

@@ -418,21 +418,23 @@ export class PluginACL extends Plugin {
     }
 
     const User = this.db.getCollection('users');
+
     await User.repository.update({
       values: {
-        roles: ['root', 'admin', 'member']
-      }
+        roles: ['root', 'admin', 'member'],
+      },
+      forceUpdate: true,
     });
 
     const RolesUsers = this.db.getCollection('rolesUsers');
     await RolesUsers.repository.update({
       filter: {
         userId: 1,
-        roleName: 'root'
+        roleName: 'root',
       },
       values: {
-        default: true
-      }
+        default: true,
+      },
     });
   }