@flusys/nestjs-iam 5.3.1 → 5.4.1

package/cjs/entities/action.entity.js

@@ -8,16 +8,126 @@ Object.defineProperty(exports, "Action", {
         return Action;
     }
 });
+const _nestjsshared = require("@flusys/nestjs-shared");
 const _typeorm = require("typeorm");
-const _actionbaseentity = require("./action-base.entity");
+const _enums = require("../enums");
+function _define_property(obj, key, value) {
+    if (key in obj) {
+        Object.defineProperty(obj, key, {
+            value: value,
+            enumerable: true,
+            configurable: true,
+            writable: true
+        });
+    } else {
+        obj[key] = value;
+    }
+    return obj;
+}
 function _ts_decorate(decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
     else for(var i = decorators.length - 1; i >= 0; i--)if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-let Action = class Action extends _actionbaseentity.ActionBase {
+function _ts_metadata(k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+}
+let Action = class Action extends _nestjsshared.Identity {
+    constructor(...args){
+        super(...args), _define_property(this, "readOnly", void 0), _define_property(this, "name", void 0), _define_property(this, "description", void 0), _define_property(this, "code", void 0), _define_property(this, "actionType", void 0), _define_property(this, "permissionLogic", void 0), _define_property(this, "serial", void 0), _define_property(this, "isActive", void 0), _define_property(this, "parent", void 0), _define_property(this, "parentId", void 0), _define_property(this, "children", void 0);
+    }
 };
+_ts_decorate([
+    (0, _typeorm.Column)({
+        type: 'boolean',
+        nullable: false,
+        default: false,
+        name: 'read_only'
+    }),
+    _ts_metadata("design:type", Boolean)
+], Action.prototype, "readOnly", void 0);
+_ts_decorate([
+    (0, _typeorm.Column)({
+        type: 'varchar',
+        length: 255,
+        nullable: false
+    }),
+    _ts_metadata("design:type", String)
+], Action.prototype, "name", void 0);
+_ts_decorate([
+    (0, _typeorm.Column)({
+        type: 'varchar',
+        length: 500,
+        nullable: true
+    }),
+    _ts_metadata("design:type", Object)
+], Action.prototype, "description", void 0);
+_ts_decorate([
+    (0, _typeorm.Column)({
+        type: 'varchar',
+        length: 255,
+        nullable: true,
+        unique: true
+    }),
+    _ts_metadata("design:type", Object)
+], Action.prototype, "code", void 0);
+_ts_decorate([
+    (0, _typeorm.Column)({
+        type: 'varchar',
+        length: 50,
+        nullable: false,
+        default: 'BACKEND',
+        name: 'action_type'
+    }),
+    _ts_metadata("design:type", typeof _enums.ActionType === "undefined" ? Object : _enums.ActionType)
+], Action.prototype, "actionType", void 0);
+_ts_decorate([
+    (0, _typeorm.Column)({
+        type: (0, _nestjsshared.getJsonColumnType)(),
+        nullable: true,
+        name: 'permission_logic'
+    }),
+    _ts_metadata("design:type", Object)
+], Action.prototype, "permissionLogic", void 0);
+_ts_decorate([
+    (0, _typeorm.Column)({
+        type: 'int',
+        nullable: true
+    }),
+    _ts_metadata("design:type", Object)
+], Action.prototype, "serial", void 0);
+_ts_decorate([
+    (0, _typeorm.Column)({
+        type: 'boolean',
+        nullable: false,
+        default: true,
+        name: 'is_active'
+    }),
+    _ts_metadata("design:type", Boolean)
+], Action.prototype, "isActive", void 0);
+_ts_decorate([
+    (0, _typeorm.ManyToOne)('Action', 'children', {
+        nullable: true,
+        onDelete: 'CASCADE'
+    }),
+    (0, _typeorm.JoinColumn)({
+        name: 'parent_id'
+    }),
+    _ts_metadata("design:type", Object)
+], Action.prototype, "parent", void 0);
+_ts_decorate([
+    (0, _typeorm.Column)({
+        type: 'uuid',
+        nullable: true,
+        name: 'parent_id'
+    }),
+    _ts_metadata("design:type", Object)
+], Action.prototype, "parentId", void 0);
+_ts_decorate([
+    (0, _typeorm.OneToMany)('Action', 'parent'),
+    _ts_metadata("design:type", Array)
+], Action.prototype, "children", void 0);
 Action = _ts_decorate([
     (0, _typeorm.Entity)({
         name: 'action'

package/cjs/entities/index.js

@@ -22,11 +22,10 @@ _export(exports, {
         return getIAMEntitiesByConfig;
     }
 });
-_export_star(require("./action-base.entity"), exports);
 const _actionentity = _export_star(require("./action.entity"), exports);
 _export_star(require("./permission-base.entity"), exports);
-const _permissionwithcompanyentity = _export_star(require("./permission-with-company.entity"), exports);
 _export_star(require("./role-base.entity"), exports);
+const _permissionwithcompanyentity = _export_star(require("./permission-with-company.entity"), exports);
 const _rolewithcompanyentity = _export_star(require("./role-with-company.entity"), exports);
 const _roleentity = _export_star(require("./role.entity"), exports);
 const _useriampermissionentity = _export_star(require("./user-iam-permission.entity"), exports);

package/cjs/entities/permission-base.entity.js

@@ -2,20 +2,9 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-function _export(target, all) {
-    for(var name in all)Object.defineProperty(target, name, {
-        enumerable: true,
-        get: Object.getOwnPropertyDescriptor(all, name).get
-    });
-}
-_export(exports, {
-    get IamEntityType () {
-        return IamEntityType;
-    },
-    get IamPermissionType () {
-        return IamPermissionType;
-    },
-    get PermissionBase () {
+Object.defineProperty(exports, "PermissionBase", {
+    enumerable: true,
+    get: function() {
         return PermissionBase;
     }
 });
@@ -43,20 +32,6 @@ function _ts_decorate(decorators, target, key, desc) {
 function _ts_metadata(k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 }
-var IamPermissionType = /*#__PURE__*/ function(IamPermissionType) {
-    IamPermissionType["USER_ROLE"] = "user_role";
-    IamPermissionType["ROLE_ACTION"] = "role_action";
-    IamPermissionType["USER_ACTION"] = "user_action";
-    IamPermissionType["COMPANY_ACTION"] = "company_action";
-    return IamPermissionType;
-}({});
-var IamEntityType = /*#__PURE__*/ function(IamEntityType) {
-    IamEntityType["USER"] = "user";
-    IamEntityType["ROLE"] = "role";
-    IamEntityType["ACTION"] = "action";
-    IamEntityType["COMPANY"] = "company";
-    return IamEntityType;
-}({});
 let PermissionBase = class PermissionBase extends _nestjsshared.Identity {
     isValid(now = new Date()) {
         if (this.validFrom && now < this.validFrom) return false;
@@ -85,7 +60,7 @@ _ts_decorate([
 ], PermissionBase.prototype, "sourceType", void 0);
 _ts_decorate([
     (0, _typeorm.Column)({
-        type: 'uuid',
+        type: 'varchar',
         length: 150,
         name: 'source_id'
     }),
@@ -101,7 +76,7 @@ _ts_decorate([
 ], PermissionBase.prototype, "targetType", void 0);
 _ts_decorate([
     (0, _typeorm.Column)({
-        type: 'uuid',
+        type: 'varchar',
         length: 150,
         name: 'target_id'
     }),
@@ -109,7 +84,7 @@ _ts_decorate([
 ], PermissionBase.prototype, "targetId", void 0);
 _ts_decorate([
     (0, _typeorm.Column)({
-        type: 'uuid',
+        type: 'varchar',
         length: 150,
         nullable: true,
         name: 'user_id'

package/cjs/entities/permission-with-company.entity.js

@@ -47,7 +47,7 @@ let UserIamPermissionWithCompany = class UserIamPermissionWithCompany extends _p
 };
 _ts_decorate([
     (0, _typeorm.Column)({
-        type: 'uuid',
+        type: 'varchar',
         length: 150,
         nullable: true,
         name: 'company_id'
@@ -56,7 +56,7 @@ _ts_decorate([
 ], UserIamPermissionWithCompany.prototype, "companyId", void 0);
 _ts_decorate([
     (0, _typeorm.Column)({
-        type: 'uuid',
+        type: 'varchar',
         length: 150,
         nullable: true,
         name: 'branch_id'

package/cjs/entities/user-iam-permission.entity.js

@@ -2,20 +2,9 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-function _export(target, all) {
-    for(var name in all)Object.defineProperty(target, name, {
-        enumerable: true,
-        get: Object.getOwnPropertyDescriptor(all, name).get
-    });
-}
-_export(exports, {
-    get IamEntityType () {
-        return _permissionbaseentity.IamEntityType;
-    },
-    get IamPermissionType () {
-        return _permissionbaseentity.IamPermissionType;
-    },
-    get UserIamPermission () {
+Object.defineProperty(exports, "UserIamPermission", {
+    enumerable: true,
+    get: function() {
         return UserIamPermission;
     }
 });

package/cjs/enums/iam-entity-type.enum.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "IamEntityType", {
+    enumerable: true,
+    get: function() {
+        return IamEntityType;
+    }
+});
+var IamEntityType = /*#__PURE__*/ function(IamEntityType) {
+    IamEntityType["USER"] = "user";
+    IamEntityType["ROLE"] = "role";
+    IamEntityType["ACTION"] = "action";
+    IamEntityType["COMPANY"] = "company";
+    return IamEntityType;
+}({});

package/cjs/enums/iam-permission-type.enum.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "IamPermissionType", {
+    enumerable: true,
+    get: function() {
+        return IamPermissionType;
+    }
+});
+var IamPermissionType = /*#__PURE__*/ function(IamPermissionType) {
+    IamPermissionType["USER_ROLE"] = "user_role";
+    IamPermissionType["ROLE_ACTION"] = "role_action";
+    IamPermissionType["USER_ACTION"] = "user_action";
+    IamPermissionType["COMPANY_ACTION"] = "company_action";
+    return IamPermissionType;
+}({});

package/cjs/enums/index.js

@@ -3,6 +3,8 @@ Object.defineProperty(exports, "__esModule", {
     value: true
 });
 _export_star(require("./action-type.enum"), exports);
+_export_star(require("./iam-entity-type.enum"), exports);
+_export_star(require("./iam-permission-type.enum"), exports);
 _export_star(require("./permission-type.enum"), exports);
 function _export_star(from, to) {
     Object.keys(from).forEach(function(k) {

package/cjs/services/permission.service.js

@@ -18,6 +18,8 @@ const _permissionwithcompanyentity = require("../entities/permission-with-compan
 const _rolewithcompanyentity = require("../entities/role-with-company.entity");
 const _roleentity = require("../entities/role.entity");
 const _useriampermissionentity = require("../entities/user-iam-permission.entity");
+const _iamentitytypeenum = require("../enums/iam-entity-type.enum");
+const _iampermissiontypeenum = require("../enums/iam-permission-type.enum");
 const _actiontypeenum = require("../enums/action-type.enum");
 const _permissiontypeenum = require("../enums/permission-type.enum");
 const _iamconfigservice = require("./iam-config.service");
@@ -83,10 +85,10 @@ let PermissionService = class PermissionService {
         if (itemsToAdd.length > 0) {
             const actionIdsToAdd = itemsToAdd.map((item)=>item.id);
             const whereFind = {
-                permissionType: _useriampermissionentity.IamPermissionType.USER_ACTION,
-                sourceType: _useriampermissionentity.IamEntityType.USER,
+                permissionType: _iampermissiontypeenum.IamPermissionType.USER_ACTION,
+                sourceType: _iamentitytypeenum.IamEntityType.USER,
                 sourceId: dto.userId,
-                targetType: _useriampermissionentity.IamEntityType.ACTION,
+                targetType: _iamentitytypeenum.IamEntityType.ACTION,
                 targetId: (0, _typeorm.In)(actionIdsToAdd)
             };
             if (enableCompanyFeature) {
@@ -101,10 +103,10 @@ let PermissionService = class PermissionService {
             });
             const existingActionIds = new Set(existingPermissions.map((p)=>p.targetId));
             const newPermissions = itemsToAdd.filter((item)=>!existingActionIds.has(item.id)).map((item)=>({
-                    permissionType: _useriampermissionentity.IamPermissionType.USER_ACTION,
-                    sourceType: _useriampermissionentity.IamEntityType.USER,
+                    permissionType: _iampermissiontypeenum.IamPermissionType.USER_ACTION,
+                    sourceType: _iamentitytypeenum.IamEntityType.USER,
                     sourceId: dto.userId,
-                    targetType: _useriampermissionentity.IamEntityType.ACTION,
+                    targetType: _iamentitytypeenum.IamEntityType.ACTION,
                     targetId: item.id,
                     userId: dto.userId,
                     companyId: enableCompanyFeature ? companyId : null,
@@ -128,10 +130,10 @@ let PermissionService = class PermissionService {
         if (itemsToRemove.length > 0) {
             const actionIdsToRemove = itemsToRemove.map((item)=>item.id);
             const whereDelete = {
-                permissionType: _useriampermissionentity.IamPermissionType.USER_ACTION,
-                sourceType: _useriampermissionentity.IamEntityType.USER,
+                permissionType: _iampermissiontypeenum.IamPermissionType.USER_ACTION,
+                sourceType: _iamentitytypeenum.IamEntityType.USER,
                 sourceId: dto.userId,
-                targetType: _useriampermissionentity.IamEntityType.ACTION,
+                targetType: _iamentitytypeenum.IamEntityType.ACTION,
                 targetId: (0, _typeorm.In)(actionIdsToRemove)
             };
             if (enableCompanyFeature) {
@@ -149,8 +151,8 @@ let PermissionService = class PermissionService {
         const actionRepo = await this.getActionRepository();
         const enableCompanyFeature = this.iamConfigService.isCompanyFeatureEnabled();
         const where = {
-            permissionType: _useriampermissionentity.IamPermissionType.USER_ACTION,
-            sourceType: _useriampermissionentity.IamEntityType.USER,
+            permissionType: _iampermissiontypeenum.IamPermissionType.USER_ACTION,
+            sourceType: _iamentitytypeenum.IamEntityType.USER,
             sourceId: userId
         };
         if (enableCompanyFeature) {
@@ -218,10 +220,10 @@ let PermissionService = class PermissionService {
             const actionIdsToAdd = itemsToAdd.map((item)=>item.id);
             const existingPermissions = await permissionRepo.find({
                 where: {
-                    permissionType: _useriampermissionentity.IamPermissionType.ROLE_ACTION,
-                    sourceType: _useriampermissionentity.IamEntityType.ROLE,
+                    permissionType: _iampermissiontypeenum.IamPermissionType.ROLE_ACTION,
+                    sourceType: _iamentitytypeenum.IamEntityType.ROLE,
                     sourceId: dto.roleId,
-                    targetType: _useriampermissionentity.IamEntityType.ACTION,
+                    targetType: _iamentitytypeenum.IamEntityType.ACTION,
                     targetId: (0, _typeorm.In)(actionIdsToAdd)
                 },
                 select: [
@@ -230,10 +232,10 @@ let PermissionService = class PermissionService {
             });
             const existingActionIds = new Set(existingPermissions.map((p)=>p.targetId));
             const newPermissions = itemsToAdd.filter((item)=>!existingActionIds.has(item.id)).map((item)=>({
-                    permissionType: _useriampermissionentity.IamPermissionType.ROLE_ACTION,
-                    sourceType: _useriampermissionentity.IamEntityType.ROLE,
+                    permissionType: _iampermissiontypeenum.IamPermissionType.ROLE_ACTION,
+                    sourceType: _iamentitytypeenum.IamEntityType.ROLE,
                     sourceId: dto.roleId,
-                    targetType: _useriampermissionentity.IamEntityType.ACTION,
+                    targetType: _iamentitytypeenum.IamEntityType.ACTION,
                     targetId: item.id,
                     userId: null,
                     companyId: enableCompanyFeature ? roleCompanyId : null,
@@ -257,10 +259,10 @@ let PermissionService = class PermissionService {
         if (itemsToRemove.length > 0) {
             const actionIdsToRemove = itemsToRemove.map((item)=>item.id);
             const result = await permissionRepo.delete({
-                permissionType: _useriampermissionentity.IamPermissionType.ROLE_ACTION,
-                sourceType: _useriampermissionentity.IamEntityType.ROLE,
+                permissionType: _iampermissiontypeenum.IamPermissionType.ROLE_ACTION,
+                sourceType: _iamentitytypeenum.IamEntityType.ROLE,
                 sourceId: dto.roleId,
-                targetType: _useriampermissionentity.IamEntityType.ACTION,
+                targetType: _iamentitytypeenum.IamEntityType.ACTION,
                 targetId: (0, _typeorm.In)(actionIdsToRemove)
             });
             removed = result.affected || 0;
@@ -273,8 +275,8 @@ let PermissionService = class PermissionService {
         const actionRepo = await this.getActionRepository();
         const permissions = await permissionRepo.find({
             where: {
-                permissionType: _useriampermissionentity.IamPermissionType.ROLE_ACTION,
-                sourceType: _useriampermissionentity.IamEntityType.ROLE,
+                permissionType: _iampermissiontypeenum.IamPermissionType.ROLE_ACTION,
+                sourceType: _iamentitytypeenum.IamEntityType.ROLE,
                 sourceId: roleId
             }
         });
@@ -328,10 +330,10 @@ let PermissionService = class PermissionService {
     async addCompanyActions(permissionRepo, companyId, actionIds) {
         const existingPermissions = await permissionRepo.find({
             where: {
-                permissionType: _useriampermissionentity.IamPermissionType.COMPANY_ACTION,
-                sourceType: _useriampermissionentity.IamEntityType.COMPANY,
+                permissionType: _iampermissiontypeenum.IamPermissionType.COMPANY_ACTION,
+                sourceType: _iamentitytypeenum.IamEntityType.COMPANY,
                 sourceId: companyId,
-                targetType: _useriampermissionentity.IamEntityType.ACTION,
+                targetType: _iamentitytypeenum.IamEntityType.ACTION,
                 targetId: (0, _typeorm.In)(actionIds)
             },
             select: [
@@ -344,10 +346,10 @@ let PermissionService = class PermissionService {
             return 0;
         }
         const newPermissions = newActionIds.map((actionId)=>permissionRepo.create({
-                permissionType: _useriampermissionentity.IamPermissionType.COMPANY_ACTION,
-                sourceType: _useriampermissionentity.IamEntityType.COMPANY,
+                permissionType: _iampermissiontypeenum.IamPermissionType.COMPANY_ACTION,
+                sourceType: _iamentitytypeenum.IamEntityType.COMPANY,
                 sourceId: companyId,
-                targetType: _useriampermissionentity.IamEntityType.ACTION,
+                targetType: _iamentitytypeenum.IamEntityType.ACTION,
                 targetId: actionId,
                 userId: null
             }));
@@ -358,10 +360,10 @@ let PermissionService = class PermissionService {
         const permissionEntity = this.iamConfigService.isCompanyFeatureEnabled() ? _permissionwithcompanyentity.UserIamPermissionWithCompany : _useriampermissionentity.UserIamPermission;
         const permissionRepo = manager.getRepository(permissionEntity);
         const companyResult = await permissionRepo.delete({
-            permissionType: _useriampermissionentity.IamPermissionType.COMPANY_ACTION,
-            sourceType: _useriampermissionentity.IamEntityType.COMPANY,
+            permissionType: _iampermissiontypeenum.IamPermissionType.COMPANY_ACTION,
+            sourceType: _iamentitytypeenum.IamEntityType.COMPANY,
             sourceId: companyId,
-            targetType: _useriampermissionentity.IamEntityType.ACTION,
+            targetType: _iamentitytypeenum.IamEntityType.ACTION,
             targetId: (0, _typeorm.In)(actionIds)
         });
         const roleEntity = this.iamConfigService.isCompanyFeatureEnabled() ? _rolewithcompanyentity.RoleWithCompany : _roleentity.Role;
@@ -380,19 +382,19 @@ let PermissionService = class PermissionService {
         if (companyRoles.length > 0) {
             const roleIds = companyRoles.map((role)=>role.id);
             const roleResult = await permissionRepo.delete({
-                permissionType: _useriampermissionentity.IamPermissionType.ROLE_ACTION,
-                sourceType: _useriampermissionentity.IamEntityType.ROLE,
+                permissionType: _iampermissiontypeenum.IamPermissionType.ROLE_ACTION,
+                sourceType: _iamentitytypeenum.IamEntityType.ROLE,
                 sourceId: (0, _typeorm.In)(roleIds),
-                targetType: _useriampermissionentity.IamEntityType.ACTION,
+                targetType: _iamentitytypeenum.IamEntityType.ACTION,
                 targetId: (0, _typeorm.In)(actionIds)
             });
             removedRoleActions = roleResult.affected || 0;
         }
         if (this.iamConfigService.isCompanyFeatureEnabled()) {
             const userResult = await permissionRepo.delete({
-                permissionType: _useriampermissionentity.IamPermissionType.USER_ACTION,
+                permissionType: _iampermissiontypeenum.IamPermissionType.USER_ACTION,
                 companyId,
-                targetType: _useriampermissionentity.IamEntityType.ACTION,
+                targetType: _iamentitytypeenum.IamEntityType.ACTION,
                 targetId: (0, _typeorm.In)(actionIds)
             });
             removedUserActions = userResult.affected || 0;
@@ -408,8 +410,8 @@ let PermissionService = class PermissionService {
         const actionRepo = await this.getActionRepository();
         const permissions = await permissionRepo.find({
             where: {
-                permissionType: _useriampermissionentity.IamPermissionType.COMPANY_ACTION,
-                sourceType: _useriampermissionentity.IamEntityType.COMPANY,
+                permissionType: _iampermissiontypeenum.IamPermissionType.COMPANY_ACTION,
+                sourceType: _iamentitytypeenum.IamEntityType.COMPANY,
                 sourceId: companyId
             }
         });
@@ -442,8 +444,8 @@ let PermissionService = class PermissionService {
         const permissionRepo = await this.getPermissionRepository();
         const permissions = await permissionRepo.find({
             where: {
-                permissionType: _useriampermissionentity.IamPermissionType.COMPANY_ACTION,
-                sourceType: _useriampermissionentity.IamEntityType.COMPANY,
+                permissionType: _iampermissiontypeenum.IamPermissionType.COMPANY_ACTION,
+                sourceType: _iamentitytypeenum.IamEntityType.COMPANY,
                 sourceId: companyId
             },
             select: [
@@ -470,10 +472,10 @@ let PermissionService = class PermissionService {
         if (itemsToAdd.length > 0) {
             const roleIdsToAdd = itemsToAdd.map((item)=>item.id);
             const whereFind = {
-                permissionType: _useriampermissionentity.IamPermissionType.USER_ROLE,
-                sourceType: _useriampermissionentity.IamEntityType.USER,
+                permissionType: _iampermissiontypeenum.IamPermissionType.USER_ROLE,
+                sourceType: _iamentitytypeenum.IamEntityType.USER,
                 sourceId: dto.userId,
-                targetType: _useriampermissionentity.IamEntityType.ROLE,
+                targetType: _iamentitytypeenum.IamEntityType.ROLE,
                 targetId: (0, _typeorm.In)(roleIdsToAdd)
             };
             if (enableCompanyFeature) {
@@ -488,10 +490,10 @@ let PermissionService = class PermissionService {
             });
             const existingRoleIds = new Set(existingPermissions.map((p)=>p.targetId));
             const newPermissions = itemsToAdd.filter((item)=>!existingRoleIds.has(item.id)).map((item)=>({
-                    permissionType: _useriampermissionentity.IamPermissionType.USER_ROLE,
-                    sourceType: _useriampermissionentity.IamEntityType.USER,
+                    permissionType: _iampermissiontypeenum.IamPermissionType.USER_ROLE,
+                    sourceType: _iamentitytypeenum.IamEntityType.USER,
                     sourceId: dto.userId,
-                    targetType: _useriampermissionentity.IamEntityType.ROLE,
+                    targetType: _iamentitytypeenum.IamEntityType.ROLE,
                     targetId: item.id,
                     userId: dto.userId,
                     companyId: enableCompanyFeature ? companyId : null,
@@ -515,10 +517,10 @@ let PermissionService = class PermissionService {
         if (itemsToRemove.length > 0) {
             const roleIdsToRemove = itemsToRemove.map((item)=>item.id);
             const whereDelete = {
-                permissionType: _useriampermissionentity.IamPermissionType.USER_ROLE,
-                sourceType: _useriampermissionentity.IamEntityType.USER,
+                permissionType: _iampermissiontypeenum.IamPermissionType.USER_ROLE,
+                sourceType: _iamentitytypeenum.IamEntityType.USER,
                 sourceId: dto.userId,
-                targetType: _useriampermissionentity.IamEntityType.ROLE,
+                targetType: _iamentitytypeenum.IamEntityType.ROLE,
                 targetId: (0, _typeorm.In)(roleIdsToRemove)
             };
             if (enableCompanyFeature) {
@@ -536,8 +538,8 @@ let PermissionService = class PermissionService {
         const roleRepo = await this.getRoleRepository();
         const enableCompanyFeature = this.iamConfigService.isCompanyFeatureEnabled();
         const where = {
-            permissionType: _useriampermissionentity.IamPermissionType.USER_ROLE,
-            sourceType: _useriampermissionentity.IamEntityType.USER,
+            permissionType: _iampermissiontypeenum.IamPermissionType.USER_ROLE,
+            sourceType: _iamentitytypeenum.IamEntityType.USER,
             sourceId: userId
         };
         if (enableCompanyFeature) {
@@ -740,8 +742,8 @@ let PermissionService = class PermissionService {
         if (!enableCompanyFeature) {
             const permissions = await permissionRepo.find({
                 where: {
-                    permissionType: _useriampermissionentity.IamPermissionType.USER_ROLE,
-                    sourceType: _useriampermissionentity.IamEntityType.USER,
+                    permissionType: _iampermissiontypeenum.IamPermissionType.USER_ROLE,
+                    sourceType: _iamentitytypeenum.IamEntityType.USER,
                     sourceId: userId
                 }
             });
@@ -749,8 +751,8 @@ let PermissionService = class PermissionService {
         }
         const roleIds = new Set();
         const baseWhere = {
-            permissionType: _useriampermissionentity.IamPermissionType.USER_ROLE,
-            sourceType: _useriampermissionentity.IamEntityType.USER,
+            permissionType: _iampermissiontypeenum.IamPermissionType.USER_ROLE,
+            sourceType: _iamentitytypeenum.IamEntityType.USER,
             sourceId: userId,
             companyId: companyId
         };
@@ -783,8 +785,8 @@ let PermissionService = class PermissionService {
         const permissionRepo = await this.getPermissionRepository();
         const permissions = await permissionRepo.find({
             where: {
-                permissionType: _useriampermissionentity.IamPermissionType.ROLE_ACTION,
-                sourceType: _useriampermissionentity.IamEntityType.ROLE,
+                permissionType: _iampermissiontypeenum.IamPermissionType.ROLE_ACTION,
+                sourceType: _iamentitytypeenum.IamEntityType.ROLE,
                 sourceId: (0, _typeorm.In)(roleIds)
             }
         });
@@ -796,8 +798,8 @@ let PermissionService = class PermissionService {
         if (!enableCompanyFeature) {
             const permissions = await permissionRepo.find({
                 where: {
-                    permissionType: _useriampermissionentity.IamPermissionType.USER_ACTION,
-                    sourceType: _useriampermissionentity.IamEntityType.USER,
+                    permissionType: _iampermissiontypeenum.IamPermissionType.USER_ACTION,
+                    sourceType: _iamentitytypeenum.IamEntityType.USER,
                     sourceId: userId
                 }
             });
@@ -805,8 +807,8 @@ let PermissionService = class PermissionService {
         }
         const actionIds = new Set();
         const baseWhere = {
-            permissionType: _useriampermissionentity.IamPermissionType.USER_ACTION,
-            sourceType: _useriampermissionentity.IamEntityType.USER,
+            permissionType: _iampermissiontypeenum.IamPermissionType.USER_ACTION,
+            sourceType: _iamentitytypeenum.IamEntityType.USER,
             sourceId: userId
         };
         if (companyId) {
@@ -851,9 +853,9 @@ let PermissionService = class PermissionService {
         const enableCompanyFeature = this.iamConfigService.isCompanyFeatureEnabled();
         const userRoles = await permissionRepo.find({
             where: {
-                permissionType: _useriampermissionentity.IamPermissionType.USER_ROLE,
-                sourceType: _useriampermissionentity.IamEntityType.USER,
-                targetType: _useriampermissionentity.IamEntityType.ROLE,
+                permissionType: _iampermissiontypeenum.IamPermissionType.USER_ROLE,
+                sourceType: _iamentitytypeenum.IamEntityType.USER,
+                targetType: _iamentitytypeenum.IamEntityType.ROLE,
                 targetId: roleId
             }
         });

package/entities/action.entity.d.ts

@@ -1,3 +1,16 @@
-import { ActionBase } from './action-base.entity';
-export declare class Action extends ActionBase {
+import { Identity } from '@flusys/nestjs-shared';
+import { ActionType } from '../enums';
+import { LogicNode } from '../types';
+export declare class Action extends Identity {
+    readOnly: boolean;
+    name: string;
+    description: string | null;
+    code: string | null;
+    actionType: ActionType;
+    permissionLogic: LogicNode | null;
+    serial: number | null;
+    isActive: boolean;
+    parent: Action | null;
+    parentId: string | null;
+    children: Action[];
 }

package/entities/index.d.ts

@@ -1,15 +1,14 @@
-export * from './action-base.entity';
 export * from './action.entity';
 export * from './permission-base.entity';
-export * from './permission-with-company.entity';
 export * from './role-base.entity';
+export * from './permission-with-company.entity';
 export * from './role-with-company.entity';
 export * from './role.entity';
 export * from './user-iam-permission.entity';
-import { Role } from './role.entity';
+import { UserIamPermissionWithCompany } from './permission-with-company.entity';
 import { RoleWithCompany } from './role-with-company.entity';
+import { Role } from './role.entity';
 import { UserIamPermission } from './user-iam-permission.entity';
-import { UserIamPermissionWithCompany } from './permission-with-company.entity';
 export declare const IAMCoreEntities: (typeof Role | typeof UserIamPermission)[];
 export declare const IAMCompanyEntities: (typeof UserIamPermissionWithCompany | typeof RoleWithCompany)[];
 export declare const IAMAllEntities: (typeof Role | typeof UserIamPermission)[];