@flusys/nestjs-iam 5.3.0 → 5.4.0

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)[];

package/entities/permission-base.entity.d.ts

@@ -1,16 +1,4 @@
 import { Identity } from '@flusys/nestjs-shared';
-export declare enum IamPermissionType {
-    USER_ROLE = "user_role",
-    ROLE_ACTION = "role_action",
-    USER_ACTION = "user_action",
-    COMPANY_ACTION = "company_action"
-}
-export declare enum IamEntityType {
-    USER = "user",
-    ROLE = "role",
-    ACTION = "action",
-    COMPANY = "company"
-}
 export declare abstract class PermissionBase extends Identity {
     permissionType: string;
     sourceType: string;

package/entities/user-iam-permission.entity.d.ts

@@ -1,4 +1,3 @@
 import { PermissionBase } from './permission-base.entity';
 export declare class UserIamPermission extends PermissionBase {
 }
-export { IamPermissionType, IamEntityType } from './permission-base.entity';

package/enums/iam-entity-type.enum.d.ts

@@ -0,0 +1,6 @@
+export declare enum IamEntityType {
+    USER = "user",
+    ROLE = "role",
+    ACTION = "action",
+    COMPANY = "company"
+}

package/enums/iam-permission-type.enum.d.ts

@@ -0,0 +1,6 @@
+export declare enum IamPermissionType {
+    USER_ROLE = "user_role",
+    ROLE_ACTION = "role_action",
+    USER_ACTION = "user_action",
+    COMPANY_ACTION = "company_action"
+}

package/enums/index.d.ts

@@ -1,2 +1,4 @@
 export * from './action-type.enum';
+export * from './iam-entity-type.enum';
+export * from './iam-permission-type.enum';
 export * from './permission-type.enum';

package/fesm/entities/action.entity.js

@@ -1,13 +1,123 @@
+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;
 }
-import { Entity, Index } from 'typeorm';
-import { ActionBase } from './action-base.entity';
-export class Action extends ActionBase {
+function _ts_metadata(k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+}
+import { Identity, getJsonColumnType } from '@flusys/nestjs-shared';
+import { Column, Entity, Index, JoinColumn, ManyToOne, OneToMany } from 'typeorm';
+import { ActionType } from '../enums';
+export class Action extends 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([
+    Column({
+        type: 'boolean',
+        nullable: false,
+        default: false,
+        name: 'read_only'
+    }),
+    _ts_metadata("design:type", Boolean)
+], Action.prototype, "readOnly", void 0);
+_ts_decorate([
+    Column({
+        type: 'varchar',
+        length: 255,
+        nullable: false
+    }),
+    _ts_metadata("design:type", String)
+], Action.prototype, "name", void 0);
+_ts_decorate([
+    Column({
+        type: 'varchar',
+        length: 500,
+        nullable: true
+    }),
+    _ts_metadata("design:type", Object)
+], Action.prototype, "description", void 0);
+_ts_decorate([
+    Column({
+        type: 'varchar',
+        length: 255,
+        nullable: true,
+        unique: true
+    }),
+    _ts_metadata("design:type", Object)
+], Action.prototype, "code", void 0);
+_ts_decorate([
+    Column({
+        type: 'varchar',
+        length: 50,
+        nullable: false,
+        default: 'BACKEND',
+        name: 'action_type'
+    }),
+    _ts_metadata("design:type", typeof ActionType === "undefined" ? Object : ActionType)
+], Action.prototype, "actionType", void 0);
+_ts_decorate([
+    Column({
+        type: getJsonColumnType(),
+        nullable: true,
+        name: 'permission_logic'
+    }),
+    _ts_metadata("design:type", Object)
+], Action.prototype, "permissionLogic", void 0);
+_ts_decorate([
+    Column({
+        type: 'int',
+        nullable: true
+    }),
+    _ts_metadata("design:type", Object)
+], Action.prototype, "serial", void 0);
+_ts_decorate([
+    Column({
+        type: 'boolean',
+        nullable: false,
+        default: true,
+        name: 'is_active'
+    }),
+    _ts_metadata("design:type", Boolean)
+], Action.prototype, "isActive", void 0);
+_ts_decorate([
+    ManyToOne('Action', 'children', {
+        nullable: true,
+        onDelete: 'CASCADE'
+    }),
+    JoinColumn({
+        name: 'parent_id'
+    }),
+    _ts_metadata("design:type", Object)
+], Action.prototype, "parent", void 0);
+_ts_decorate([
+    Column({
+        type: 'uuid',
+        nullable: true,
+        name: 'parent_id'
+    }),
+    _ts_metadata("design:type", Object)
+], Action.prototype, "parentId", void 0);
+_ts_decorate([
+    OneToMany('Action', 'parent'),
+    _ts_metadata("design:type", Array)
+], Action.prototype, "children", void 0);
 Action = _ts_decorate([
     Entity({
         name: 'action'

package/fesm/entities/index.js

@@ -1,16 +1,15 @@
-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 { Action } from './action.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';
 // Core entities (no company feature)
 export const IAMCoreEntities = [
     Action,

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

@@ -22,20 +22,6 @@ function _ts_metadata(k, v) {
 }
 import { Identity } from '@flusys/nestjs-shared';
 import { Column } from 'typeorm';
-export 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;
-}({});
-export var IamEntityType = /*#__PURE__*/ function(IamEntityType) {
-    IamEntityType["USER"] = "user";
-    IamEntityType["ROLE"] = "role";
-    IamEntityType["ACTION"] = "action";
-    IamEntityType["COMPANY"] = "company";
-    return IamEntityType;
-}({});
 /**
  * Permission Base Entity
  * Core permission fields - always included regardless of company feature
@@ -67,7 +53,8 @@ _ts_decorate([
 ], PermissionBase.prototype, "sourceType", void 0);
 _ts_decorate([
     Column({
-        type: 'uuid',
+        type: 'varchar',
+        length: 150,
         name: 'source_id'
     }),
     _ts_metadata("design:type", String)
@@ -82,14 +69,16 @@ _ts_decorate([
 ], PermissionBase.prototype, "targetType", void 0);
 _ts_decorate([
     Column({
-        type: 'uuid',
+        type: 'varchar',
+        length: 150,
         name: 'target_id'
     }),
     _ts_metadata("design:type", String)
 ], PermissionBase.prototype, "targetId", void 0);
 _ts_decorate([
     Column({
-        type: 'uuid',
+        type: 'varchar',
+        length: 150,
         nullable: true,
         name: 'user_id'
     }),

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

@@ -37,7 +37,8 @@ export class UserIamPermissionWithCompany extends PermissionBase {
 }
 _ts_decorate([
     Column({
-        type: 'uuid',
+        type: 'varchar',
+        length: 150,
         nullable: true,
         name: 'company_id'
     }),
@@ -45,7 +46,8 @@ _ts_decorate([
 ], UserIamPermissionWithCompany.prototype, "companyId", void 0);
 _ts_decorate([
     Column({
-        type: 'uuid',
+        type: 'varchar',
+        length: 150,
         nullable: true,
         name: 'branch_id'
     }),

package/fesm/entities/role-base.entity.js

@@ -22,10 +22,7 @@ function _ts_metadata(k, v) {
 }
 import { Identity } from '@flusys/nestjs-shared';
 import { Column } from 'typeorm';
-/**
- * Role Base Entity
- * Core role fields - always included regardless of company feature
- */ export class RoleBase extends Identity {
+export class RoleBase extends 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, "isActive", void 0), _define_property(this, "serial", void 0);
     }

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

@@ -34,5 +34,3 @@ UserIamPermission = _ts_decorate([
         'userId'
     ])
 ], UserIamPermission);
-// Re-export enums for backward compatibility
-export { IamPermissionType, IamEntityType } from './permission-base.entity';

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

@@ -0,0 +1,7 @@
+export var IamEntityType = /*#__PURE__*/ function(IamEntityType) {
+    IamEntityType["USER"] = "user";
+    IamEntityType["ROLE"] = "role";
+    IamEntityType["ACTION"] = "action";
+    IamEntityType["COMPANY"] = "company";
+    return IamEntityType;
+}({});

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

@@ -0,0 +1,7 @@
+export 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/fesm/enums/index.js

@@ -1,2 +1,4 @@
 export * from './action-type.enum';
+export * from './iam-entity-type.enum';
+export * from './iam-permission-type.enum';
 export * from './permission-type.enum';

package/fesm/services/action.service.js

@@ -25,7 +25,7 @@ function _ts_param(paramIndex, decorator) {
         decorator(target, key, paramIndex);
     };
 }
-import { HybridCache, ApiService } from '@flusys/nestjs-shared/classes';
+import { ApiService, HybridCache } from '@flusys/nestjs-shared/classes';
 import { UtilsService } from '@flusys/nestjs-shared/modules';
 import { BadRequestException, Inject, Injectable, Scope } from '@nestjs/common';
 import { In } from 'typeorm';

package/fesm/services/permission.service.js

@@ -34,7 +34,9 @@ import { Action } from '../entities/action.entity';
 import { UserIamPermissionWithCompany } from '../entities/permission-with-company.entity';
 import { RoleWithCompany } from '../entities/role-with-company.entity';
 import { Role } from '../entities/role.entity';
-import { IamEntityType, IamPermissionType, UserIamPermission } from '../entities/user-iam-permission.entity';
+import { UserIamPermission } from '../entities/user-iam-permission.entity';
+import { IamEntityType } from '../enums/iam-entity-type.enum';
+import { IamPermissionType } from '../enums/iam-permission-type.enum';
 import { ActionType } from '../enums/action-type.enum';
 import { IAMPermissionMode } from '../enums/permission-type.enum';
 import { IAMConfigService } from './iam-config.service';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flusys/nestjs-iam",
-  "version": "5.3.0",
+  "version": "5.4.0",
   "description": "Identity and Access Management (IAM) module for NestJS applications",
   "main": "cjs/index.js",
   "module": "fesm/index.js",
@@ -90,7 +90,7 @@
     "express": "^4.18.0 || ^5.0.0"
   },
   "dependencies": {
-    "@flusys/nestjs-core": "5.3.0",
-    "@flusys/nestjs-shared": "5.3.0"
+    "@flusys/nestjs-core": "5.4.0",
+    "@flusys/nestjs-shared": "5.4.0"
   }
 }

package/services/action.service.d.ts

@@ -1,28 +1,28 @@
-import { HybridCache, ApiService } from '@flusys/nestjs-shared/classes';
+import { ApiService, HybridCache } from '@flusys/nestjs-shared/classes';
 import { ILoggedUserInfo } from '@flusys/nestjs-shared/interfaces';
 import { UtilsService } from '@flusys/nestjs-shared/modules';
 import { SelectQueryBuilder } from 'typeorm';
 import { CreateActionDto, UpdateActionDto } from '../dtos/action.dto';
-import { ActionBase } from '../entities/action-base.entity';
+import { Action } from '../entities/action.entity';
 import { IAction, IActionTree } from '../interfaces/action.interface';
 import { IAMConfigService } from './iam-config.service';
 import { IAMDataSourceService } from './iam-datasource.service';
 import { PermissionService } from './permission.service';
-export declare class ActionService extends ApiService<CreateActionDto, UpdateActionDto, IAction, ActionBase> {
+export declare class ActionService extends ApiService<CreateActionDto, UpdateActionDto, IAction, Action> {
     protected cacheManager: HybridCache;
     protected utilsService: UtilsService;
     private readonly iamConfigService;
     private readonly permissionService;
     constructor(cacheManager: HybridCache, utilsService: UtilsService, iamConfigService: IAMConfigService, dataSourceProvider: IAMDataSourceService, permissionService: PermissionService);
-    getSelectQuery(query: SelectQueryBuilder<ActionBase>, _user: ILoggedUserInfo | null, select?: string[]): Promise<{
-        query: SelectQueryBuilder<ActionBase>;
+    getSelectQuery(query: SelectQueryBuilder<Action>, _user: ILoggedUserInfo | null, select?: string[]): Promise<{
+        query: SelectQueryBuilder<Action>;
         isRaw: boolean;
     }>;
-    protected getGlobalSearchQuery(query: SelectQueryBuilder<ActionBase>, search: string): Promise<{
-        query: SelectQueryBuilder<ActionBase>;
+    protected getGlobalSearchQuery(query: SelectQueryBuilder<Action>, search: string): Promise<{
+        query: SelectQueryBuilder<Action>;
         isRaw: boolean;
     }>;
-    protected convertEntityToResponseDto(entity: ActionBase, _isRaw: boolean): IAction;
+    protected convertEntityToResponseDto(entity: Action, _isRaw: boolean): IAction;
     private readonly actionSelectFields;
     private requireUser;
     getActionsForPermission(user: ILoggedUserInfo): Promise<IAction[]>;

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

@@ -1,130 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-    value: true
-});
-Object.defineProperty(exports, "ActionBase", {
-    enumerable: true,
-    get: function() {
-        return ActionBase;
-    }
-});
-const _nestjsshared = require("@flusys/nestjs-shared");
-const _typeorm = require("typeorm");
-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;
-}
-function _ts_metadata(k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-}
-let ActionBase = class ActionBase 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)
-], ActionBase.prototype, "readOnly", void 0);
-_ts_decorate([
-    (0, _typeorm.Column)({
-        type: 'varchar',
-        length: 255,
-        nullable: false
-    }),
-    _ts_metadata("design:type", String)
-], ActionBase.prototype, "name", void 0);
-_ts_decorate([
-    (0, _typeorm.Column)({
-        type: 'varchar',
-        length: 500,
-        nullable: true
-    }),
-    _ts_metadata("design:type", Object)
-], ActionBase.prototype, "description", void 0);
-_ts_decorate([
-    (0, _typeorm.Column)({
-        type: 'varchar',
-        length: 255,
-        nullable: true,
-        unique: true
-    }),
-    _ts_metadata("design:type", Object)
-], ActionBase.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)
-], ActionBase.prototype, "actionType", void 0);
-_ts_decorate([
-    (0, _typeorm.Column)({
-        type: (0, _nestjsshared.getJsonColumnType)(),
-        nullable: true,
-        name: 'permission_logic'
-    }),
-    _ts_metadata("design:type", Object)
-], ActionBase.prototype, "permissionLogic", void 0);
-_ts_decorate([
-    (0, _typeorm.Column)({
-        type: 'int',
-        nullable: true
-    }),
-    _ts_metadata("design:type", Object)
-], ActionBase.prototype, "serial", void 0);
-_ts_decorate([
-    (0, _typeorm.Column)({
-        type: 'boolean',
-        nullable: false,
-        default: true,
-        name: 'is_active'
-    }),
-    _ts_metadata("design:type", Boolean)
-], ActionBase.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)
-], ActionBase.prototype, "parent", void 0);
-_ts_decorate([
-    (0, _typeorm.Column)({
-        type: 'uuid',
-        nullable: true,
-        name: 'parent_id'
-    }),
-    _ts_metadata("design:type", Object)
-], ActionBase.prototype, "parentId", void 0);
-_ts_decorate([
-    (0, _typeorm.OneToMany)('Action', 'parent'),
-    _ts_metadata("design:type", Array)
-], ActionBase.prototype, "children", void 0);

package/entities/action-base.entity.d.ts

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