@nocobase/plugin-acl 2.0.0-alpha.41 → 2.0.0-alpha.43

package/dist/externalVersion.js

@@ -8,7 +8,7 @@
  */
 
 module.exports = {
-  "@nocobase/client": "2.0.0-alpha.41",
+  "@nocobase/client": "2.0.0-alpha.43",
   "antd": "5.24.2",
   "react": "18.2.0",
   "react-i18next": "11.18.6",
@@ -17,14 +17,14 @@ module.exports = {
   "@formily/react": "2.3.7",
   "@ant-design/icons": "5.6.1",
   "lodash": "4.17.21",
-  "@nocobase/utils": "2.0.0-alpha.41",
-  "@nocobase/actions": "2.0.0-alpha.41",
-  "@nocobase/cache": "2.0.0-alpha.41",
-  "@nocobase/database": "2.0.0-alpha.41",
-  "@nocobase/server": "2.0.0-alpha.41",
-  "@nocobase/test": "2.0.0-alpha.41",
+  "@nocobase/utils": "2.0.0-alpha.43",
+  "@nocobase/actions": "2.0.0-alpha.43",
+  "@nocobase/cache": "2.0.0-alpha.43",
+  "@nocobase/database": "2.0.0-alpha.43",
+  "@nocobase/server": "2.0.0-alpha.43",
+  "@nocobase/test": "2.0.0-alpha.43",
   "@formily/core": "2.3.7",
   "@formily/antd-v5": "1.2.3",
   "antd-style": "3.7.1",
-  "@nocobase/acl": "2.0.0-alpha.41"
+  "@nocobase/acl": "2.0.0-alpha.43"
 };

package/dist/locale/ru-RU.json

@@ -0,0 +1,18 @@
+{
+  "The current user has no roles. Please try another account.": "У текущего пользователя нет ролей. Попробуйте другой аккаунт.",
+  "The user role does not exist. Please try signing in again": "Роль пользователя не существует. Попробуйте войти снова.",
+  "New role": "Новая роль",
+  "Permissions": "Права доступа",
+  "Desktop menu": "Меню рабочего стола",
+  "Independent roles": "Независимые роли",
+  "Allow roles union": "Разрешить объединение ролей",
+  "Roles union only": "Только объединение ролей",
+  "Role mode": "Режим ролей",
+  "Saved successfully": "Успешно сохранено",
+  "Please select role mode": "Пожалуйста, выберите режим ролей",
+  "Full permissions": "Полные права",
+  "Role mode doc": "https://docs.nocobase.com/handbook/acl/manual",
+  "Do not use role union. Users need to switch between their roles individually.": "Не использовать объединение ролей. Пользователям нужно переключаться между ролями по отдельности.",
+  "Allow users to use role union, which means they can use permissions from all their roles simultaneously, or switch between individual roles.": "Разрешить пользователям использовать объединение ролей, то есть они могут одновременно использовать права всех своих ролей или переключаться между отдельными ролями.",
+  "Force users to use only role union. They cannot switch between individual roles.": "Принудительно использовать только объединение ролей. Переключение между отдельными ролями недоступно."
+}

package/dist/server/middlewares/check-association-operate.js

@@ -29,9 +29,10 @@ __export(check_association_operate_exports, {
   checkAssociationOperate: () => checkAssociationOperate
 });
 module.exports = __toCommonJS(check_association_operate_exports);
+var import_acl = require("@nocobase/acl");
 async function checkAssociationOperate(ctx, next) {
   var _a;
-  const { actionName, resourceName } = ctx.action;
+  const { actionName, resourceName, sourceId } = ctx.action;
   if (!(resourceName.includes(".") && ["add", "set", "remove", "toggle"].includes(actionName))) {
     return next();
   }
@@ -56,6 +57,25 @@ async function checkAssociationOperate(ctx, next) {
   if (params.whitelist && !((_a = params.whitelist) == null ? void 0 : _a.includes(association))) {
     ctx.throw(403, "No permissions");
   }
+  if (params.filter) {
+    try {
+      const filteredParams = ctx.acl.filterParams(ctx, resource, params);
+      const parsedParams = await ctx.acl.parseJsonTemplate(filteredParams, ctx);
+      const repo = ctx.db.getRepository(resource);
+      const record = await repo.findOne({
+        filterByTk: sourceId,
+        filter: parsedParams.filter
+      });
+      if (!record) {
+        ctx.throw(403, "No permissions");
+      }
+    } catch (e) {
+      if (e instanceof import_acl.NoPermissionError) {
+        ctx.throw(403, "No permissions");
+      }
+      throw e;
+    }
+  }
   ctx.permission = {
     ...ctx.permission,
     skip: true

package/dist/server/migrations/20251119225252-update-member-default-permission.d.ts

@@ -0,0 +1,14 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+import { Migration } from '@nocobase/server';
+export default class extends Migration {
+    on: string;
+    appVersion: string;
+    up(): Promise<void>;
+}

package/dist/server/migrations/20251119225252-update-member-default-permission.js

@@ -0,0 +1,59 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var update_member_default_permission_exports = {};
+__export(update_member_default_permission_exports, {
+  default: () => update_member_default_permission_default
+});
+module.exports = __toCommonJS(update_member_default_permission_exports);
+var import_server = require("@nocobase/server");
+class update_member_default_permission_default extends import_server.Migration {
+  on = "afterLoad";
+  // 'beforeLoad' or 'afterLoad'
+  appVersion = "<2.0.0";
+  async up() {
+    const repo = this.db.getRepository("roles");
+    const role = await repo.findOne({
+      filter: {
+        name: "member"
+      }
+    });
+    if (!role) {
+      return;
+    }
+    await repo.update({
+      filter: {
+        name: role.name
+      },
+      values: {
+        strategy: {
+          ...role.strategy,
+          actions: ["view:own"]
+        }
+      }
+    });
+  }
+}

package/dist/server/server.js

@@ -388,7 +388,7 @@ class PluginACLServer extends import_server.Plugin {
             name: "member",
             title: '{{t("Member")}}',
             allowNewMenu: true,
-            strategy: { actions: ["view", "update:own", "destroy:own", "create"] },
+            strategy: { actions: ["view:own"] },
             default: true,
             snippets: ["!ui.*", "!pm", "!pm.*"]
           }

package/package.json

@@ -1,13 +1,16 @@
 {
   "name": "@nocobase/plugin-acl",
   "displayName": "Access control",
+  "displayName.ru-RU": "Контроль доступа",
   "displayName.zh-CN": "权限控制",
   "description": "Based on roles, resources, and actions, access control can precisely manage interface configuration permissions, data operation permissions, menu access permissions, and plugin permissions.",
+  "description.ru-RU": "На основе ролей, ресурсов и действий система контроля доступа может точно управлять разрешениями на изменение интерфейса, работу с данными, доступ к меню и разрешениями для подключаемых модулей.",
   "description.zh-CN": "基于角色、资源和操作的权限控制，可以精确控制界面配置权限、数据操作权限、菜单访问权限、插件权限。",
-  "version": "2.0.0-alpha.41",
+  "version": "2.0.0-alpha.43",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/acl",
+  "homepage.ru-RU": "https://docs-ru.nocobase.com/handbook/acl",
   "homepage.zh-CN": "https://docs-cn.nocobase.com/handbook/acl",
   "keywords": [
     "Users & permissions"
@@ -36,5 +39,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/plugins/acl"
   },
-  "gitHead": "889e81eef0280c2e45571bd0a4b2db6aa004f8c1"
+  "gitHead": "5e1b7446db50446b80427240a38a9417f3742c05"
 }