@evara-group/guard 3.0.8 → 3.0.10

package/dist/core/enums/user-permission.d.ts

@@ -14,19 +14,21 @@ export declare enum UserPermissionEnum {
     ORGANIZATION_SETTINGS_PERMISSION_READ = "ORGANIZATION_SETTINGS_PERMISSION_READ",
     ORGANIZATION_SETTINGS_PERMISSION_UPDATE = "ORGANIZATION_SETTINGS_PERMISSION_UPDATE",
     ORGANIZATION_SETTINGS_PERMISSION_DELETE = "ORGANIZATION_SETTINGS_PERMISSION_DELETE",
-    ORGANIZATION_SETTINGS_MINISTRIES_LIST = "ORGANIZATION_SETTINGS_MINISTRIES_LIST",
-    ORGANIZATION_SETTINGS_MINISTRIES_CREATE = "ORGANIZATION_SETTINGS_MINISTRIES_CREATE",
-    ORGANIZATION_SETTINGS_MINISTRIES_READ = "ORGANIZATION_SETTINGS_MINISTRIES_READ",
-    ORGANIZATION_SETTINGS_MINISTRIES_UPDATE = "ORGANIZATION_SETTINGS_MINISTRIES_UPDATE",
-    ORGANIZATION_SETTINGS_MINISTRIES_DELETE = "ORGANIZATION_SETTINGS_MINISTRIES_DELETE",
-    ORGANIZATION_SETTINGS_DEPARTMENTS_LIST = "ORGANIZATION_SETTINGS_DEPARTMENTS_LIST",
-    ORGANIZATION_SETTINGS_DEPARTMENTS_CREATE = "ORGANIZATION_SETTINGS_DEPARTMENTS_CREATE",
-    ORGANIZATION_SETTINGS_DEPARTMENTS_READ = "ORGANIZATION_SETTINGS_DEPARTMENTS_READ",
-    ORGANIZATION_SETTINGS_DEPARTMENTS_UPDATE = "ORGANIZATION_SETTINGS_DEPARTMENTS_UPDATE",
-    ORGANIZATION_SETTINGS_DEPARTMENTS_DELETE = "ORGANIZATION_SETTINGS_DEPARTMENTS_DELETE",
-    ORGANIZATION_SETTINGS_AGENCIES_LIST = "ORGANIZATION_SETTINGS_AGENCIES_LIST",
-    ORGANIZATION_SETTINGS_AGENCIES_CREATE = "ORGANIZATION_SETTINGS_AGENCIES_CREATE",
-    ORGANIZATION_SETTINGS_AGENCIES_READ = "ORGANIZATION_SETTINGS_AGENCIES_READ",
-    ORGANIZATION_SETTINGS_AGENCIES_UPDATE = "ORGANIZATION_SETTINGS_AGENCIES_UPDATE",
-    ORGANIZATION_SETTINGS_AGENCIES_DELETE = "ORGANIZATION_SETTINGS_AGENCIES_DELETE"
+    ORGANIZATION_SETTINGS_MINISTRY_LIST = "ORGANIZATION_SETTINGS_MINISTRY_LIST",
+    ORGANIZATION_SETTINGS_MINISTRY_CREATE = "ORGANIZATION_SETTINGS_MINISTRY_CREATE",
+    ORGANIZATION_SETTINGS_MINISTRY_READ = "ORGANIZATION_SETTINGS_MINISTRY_READ",
+    ORGANIZATION_SETTINGS_MINISTRY_UPDATE = "ORGANIZATION_SETTINGS_MINISTRY_UPDATE",
+    ORGANIZATION_SETTINGS_MINISTRY_DELETE = "ORGANIZATION_SETTINGS_MINISTRY_DELETE",
+    ORGANIZATION_SETTINGS_DEPARTMENT_LIST = "ORGANIZATION_SETTINGS_DEPARTMENT_LIST",
+    ORGANIZATION_SETTINGS_DEPARTMENT_CREATE = "ORGANIZATION_SETTINGS_DEPARTMENT_CREATE",
+    ORGANIZATION_SETTINGS_DEPARTMENT_READ = "ORGANIZATION_SETTINGS_DEPARTMENT_READ",
+    ORGANIZATION_SETTINGS_DEPARTMENT_UPDATE = "ORGANIZATION_SETTINGS_DEPARTMENT_UPDATE",
+    ORGANIZATION_SETTINGS_DEPARTMENT_DELETE = "ORGANIZATION_SETTINGS_DEPARTMENT_DELETE",
+    ORGANIZATION_SETTINGS_AGENCY_LIST = "ORGANIZATION_SETTINGS_AGENCY_LIST",
+    ORGANIZATION_SETTINGS_AGENCY_CREATE = "ORGANIZATION_SETTINGS_AGENCY_CREATE",
+    ORGANIZATION_SETTINGS_AGENCY_READ = "ORGANIZATION_SETTINGS_AGENCY_READ",
+    ORGANIZATION_SETTINGS_AGENCY_UPDATE = "ORGANIZATION_SETTINGS_AGENCY_UPDATE",
+    ORGANIZATION_SETTINGS_AGENCY_DELETE = "ORGANIZATION_SETTINGS_AGENCY_DELETE",
+    ORGANIZATION_SETTINGS_MODULE_LIST = "ORGANIZATION_SETTINGS_MODULE_LIST",
+    ORGANIZATION_SETTINGS_MODULE_READ = "ORGANIZATION_SETTINGS_MODULE_READ"
 }

package/dist/core/enums/user-permission.js

@@ -18,20 +18,22 @@ var UserPermissionEnum;
     UserPermissionEnum["ORGANIZATION_SETTINGS_PERMISSION_READ"] = "ORGANIZATION_SETTINGS_PERMISSION_READ";
     UserPermissionEnum["ORGANIZATION_SETTINGS_PERMISSION_UPDATE"] = "ORGANIZATION_SETTINGS_PERMISSION_UPDATE";
     UserPermissionEnum["ORGANIZATION_SETTINGS_PERMISSION_DELETE"] = "ORGANIZATION_SETTINGS_PERMISSION_DELETE";
-    UserPermissionEnum["ORGANIZATION_SETTINGS_MINISTRIES_LIST"] = "ORGANIZATION_SETTINGS_MINISTRIES_LIST";
-    UserPermissionEnum["ORGANIZATION_SETTINGS_MINISTRIES_CREATE"] = "ORGANIZATION_SETTINGS_MINISTRIES_CREATE";
-    UserPermissionEnum["ORGANIZATION_SETTINGS_MINISTRIES_READ"] = "ORGANIZATION_SETTINGS_MINISTRIES_READ";
-    UserPermissionEnum["ORGANIZATION_SETTINGS_MINISTRIES_UPDATE"] = "ORGANIZATION_SETTINGS_MINISTRIES_UPDATE";
-    UserPermissionEnum["ORGANIZATION_SETTINGS_MINISTRIES_DELETE"] = "ORGANIZATION_SETTINGS_MINISTRIES_DELETE";
-    UserPermissionEnum["ORGANIZATION_SETTINGS_DEPARTMENTS_LIST"] = "ORGANIZATION_SETTINGS_DEPARTMENTS_LIST";
-    UserPermissionEnum["ORGANIZATION_SETTINGS_DEPARTMENTS_CREATE"] = "ORGANIZATION_SETTINGS_DEPARTMENTS_CREATE";
-    UserPermissionEnum["ORGANIZATION_SETTINGS_DEPARTMENTS_READ"] = "ORGANIZATION_SETTINGS_DEPARTMENTS_READ";
-    UserPermissionEnum["ORGANIZATION_SETTINGS_DEPARTMENTS_UPDATE"] = "ORGANIZATION_SETTINGS_DEPARTMENTS_UPDATE";
-    UserPermissionEnum["ORGANIZATION_SETTINGS_DEPARTMENTS_DELETE"] = "ORGANIZATION_SETTINGS_DEPARTMENTS_DELETE";
-    UserPermissionEnum["ORGANIZATION_SETTINGS_AGENCIES_LIST"] = "ORGANIZATION_SETTINGS_AGENCIES_LIST";
-    UserPermissionEnum["ORGANIZATION_SETTINGS_AGENCIES_CREATE"] = "ORGANIZATION_SETTINGS_AGENCIES_CREATE";
-    UserPermissionEnum["ORGANIZATION_SETTINGS_AGENCIES_READ"] = "ORGANIZATION_SETTINGS_AGENCIES_READ";
-    UserPermissionEnum["ORGANIZATION_SETTINGS_AGENCIES_UPDATE"] = "ORGANIZATION_SETTINGS_AGENCIES_UPDATE";
-    UserPermissionEnum["ORGANIZATION_SETTINGS_AGENCIES_DELETE"] = "ORGANIZATION_SETTINGS_AGENCIES_DELETE";
+    UserPermissionEnum["ORGANIZATION_SETTINGS_MINISTRY_LIST"] = "ORGANIZATION_SETTINGS_MINISTRY_LIST";
+    UserPermissionEnum["ORGANIZATION_SETTINGS_MINISTRY_CREATE"] = "ORGANIZATION_SETTINGS_MINISTRY_CREATE";
+    UserPermissionEnum["ORGANIZATION_SETTINGS_MINISTRY_READ"] = "ORGANIZATION_SETTINGS_MINISTRY_READ";
+    UserPermissionEnum["ORGANIZATION_SETTINGS_MINISTRY_UPDATE"] = "ORGANIZATION_SETTINGS_MINISTRY_UPDATE";
+    UserPermissionEnum["ORGANIZATION_SETTINGS_MINISTRY_DELETE"] = "ORGANIZATION_SETTINGS_MINISTRY_DELETE";
+    UserPermissionEnum["ORGANIZATION_SETTINGS_DEPARTMENT_LIST"] = "ORGANIZATION_SETTINGS_DEPARTMENT_LIST";
+    UserPermissionEnum["ORGANIZATION_SETTINGS_DEPARTMENT_CREATE"] = "ORGANIZATION_SETTINGS_DEPARTMENT_CREATE";
+    UserPermissionEnum["ORGANIZATION_SETTINGS_DEPARTMENT_READ"] = "ORGANIZATION_SETTINGS_DEPARTMENT_READ";
+    UserPermissionEnum["ORGANIZATION_SETTINGS_DEPARTMENT_UPDATE"] = "ORGANIZATION_SETTINGS_DEPARTMENT_UPDATE";
+    UserPermissionEnum["ORGANIZATION_SETTINGS_DEPARTMENT_DELETE"] = "ORGANIZATION_SETTINGS_DEPARTMENT_DELETE";
+    UserPermissionEnum["ORGANIZATION_SETTINGS_AGENCY_LIST"] = "ORGANIZATION_SETTINGS_AGENCY_LIST";
+    UserPermissionEnum["ORGANIZATION_SETTINGS_AGENCY_CREATE"] = "ORGANIZATION_SETTINGS_AGENCY_CREATE";
+    UserPermissionEnum["ORGANIZATION_SETTINGS_AGENCY_READ"] = "ORGANIZATION_SETTINGS_AGENCY_READ";
+    UserPermissionEnum["ORGANIZATION_SETTINGS_AGENCY_UPDATE"] = "ORGANIZATION_SETTINGS_AGENCY_UPDATE";
+    UserPermissionEnum["ORGANIZATION_SETTINGS_AGENCY_DELETE"] = "ORGANIZATION_SETTINGS_AGENCY_DELETE";
+    UserPermissionEnum["ORGANIZATION_SETTINGS_MODULE_LIST"] = "ORGANIZATION_SETTINGS_MODULE_LIST";
+    UserPermissionEnum["ORGANIZATION_SETTINGS_MODULE_READ"] = "ORGANIZATION_SETTINGS_MODULE_READ";
 })(UserPermissionEnum || (exports.UserPermissionEnum = UserPermissionEnum = {}));
 //# sourceMappingURL=user-permission.js.map

package/dist/core/enums/user-permission.js.map

@@ -1 +1 @@
-{"version":3,"file":"user-permission.js","sourceRoot":"","sources":["../../../src/core/enums/user-permission.ts"],"names":[],"mappings":";;;AAAA,IAAY,kBAkCX;AAlCD,WAAY,kBAAkB;IAC5B,yFAAmE,CAAA;IACnE,6FAAuE,CAAA;IACvE,yFAAmE,CAAA;IACnE,6FAAuE,CAAA;IACvE,6FAAuE,CAAA;IACvE,yFAAmE,CAAA;IACnE,6FAAuE,CAAA;IACvE,yFAAmE,CAAA;IACnE,6FAAuE,CAAA;IACvE,6FAAuE,CAAA;IACvE,qGAA+E,CAAA;IAC/E,yGAAmF,CAAA;IACnF,qGAA+E,CAAA;IAC/E,yGAAmF,CAAA;IACnF,yGAAmF,CAAA;IAEnF,qGAA+E,CAAA;IAC/E,yGAAmF,CAAA;IACnF,qGAA+E,CAAA;IAC/E,yGAAmF,CAAA;IACnF,yGAAmF,CAAA;IAEnF,uGAAiF,CAAA;IACjF,2GAAqF,CAAA;IACrF,uGAAiF,CAAA;IACjF,2GAAqF,CAAA;IACrF,2GAAqF,CAAA;IAErF,iGAA2E,CAAA;IAC3E,qGAA+E,CAAA;IAC/E,iGAA2E,CAAA;IAC3E,qGAA+E,CAAA;IAC/E,qGAA+E,CAAA;AACjF,CAAC,EAlCW,kBAAkB,kCAAlB,kBAAkB,QAkC7B"}
+{"version":3,"file":"user-permission.js","sourceRoot":"","sources":["../../../src/core/enums/user-permission.ts"],"names":[],"mappings":";;;AAAA,IAAY,kBAuCX;AAvCD,WAAY,kBAAkB;IAC5B,yFAAmE,CAAA;IACnE,6FAAuE,CAAA;IACvE,yFAAmE,CAAA;IACnE,6FAAuE,CAAA;IACvE,6FAAuE,CAAA;IAEvE,yFAAmE,CAAA;IACnE,6FAAuE,CAAA;IACvE,yFAAmE,CAAA;IACnE,6FAAuE,CAAA;IACvE,6FAAuE,CAAA;IAEvE,qGAA+E,CAAA;IAC/E,yGAAmF,CAAA;IACnF,qGAA+E,CAAA;IAC/E,yGAAmF,CAAA;IACnF,yGAAmF,CAAA;IAEnF,iGAA2E,CAAA;IAC3E,qGAA+E,CAAA;IAC/E,iGAA2E,CAAA;IAC3E,qGAA+E,CAAA;IAC/E,qGAA+E,CAAA;IAE/E,qGAA+E,CAAA;IAC/E,yGAAmF,CAAA;IACnF,qGAA+E,CAAA;IAC/E,yGAAmF,CAAA;IACnF,yGAAmF,CAAA;IAEnF,6FAAuE,CAAA;IACvE,iGAA2E,CAAA;IAC3E,6FAAuE,CAAA;IACvE,iGAA2E,CAAA;IAC3E,iGAA2E,CAAA;IAE3E,6FAAuE,CAAA;IACvE,6FAAuE,CAAA;AACzE,CAAC,EAvCW,kBAAkB,kCAAlB,kBAAkB,QAuC7B"}

package/dist/database/seeders/permissions.seeder.js

@@ -22,6 +22,7 @@ class PermissionsSeeder {
                     { en: "USER", ar: "مستخدم" },
                     { en: "ROLE", ar: "دور" },
                     { en: "PERMISSION", ar: "صلاحية" },
+                    { en: "MODULE", ar: "وحدة" },
                 ];
                 const ops = [
                     { en: "LIST", ar: "عرض جميع السجلات" },
@@ -32,6 +33,10 @@ class PermissionsSeeder {
                 ];
                 for (const entity of entities) {
                     for (const op of ops) {
+                        if (entity.en === "MODULE" &&
+                            (op.en === "CREATE" || op.en === "UPDATE" || op.en === "DELETE")) {
+                            continue;
+                        }
                         perms.push({
                             code: `ORGANIZATION_SETTINGS_${entity.en}_${op.en}`,
                             nameAr: `${op.ar} ${entity.ar}`,

package/dist/database/seeders/permissions.seeder.js.map

@@ -1 +1 @@
-{"version":3,"file":"permissions.seeder.js","sourceRoot":"","sources":["../../../src/database/seeders/permissions.seeder.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"permissions.seeder.js","sourceRoot":"","sources":["../../../src/database/seeders/permissions.seeder.ts"],"names":[],"mappings":";;;AACA,kFAAwE;AACxE,sEAAkE;AAElE,MAAa,iBAAiB;IAC5B,YAA6B,UAAsB;QAAtB,eAAU,GAAV,UAAU,CAAY;IAAG,CAAC;IAEvD,KAAK,CAAC,GAAG;QACP,MAAM,IAAI,GAAG,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,8BAAU,CAAC,CAAC;QACvD,MAAM,WAAW,GAAG,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,4BAAY,CAAC,CAAC;QAChE,MAAM,OAAO,GAAG,MAAM,WAAW,CAAC,IAAI,EAAE,CAAC;QACzC,MAAM,SAAS,GAAU,EAAE,CAAC;QAE5B,KAAK,MAAM,CAAC,IAAI,OAAO,EAAE,CAAC;YACxB,IAAI,KAAK,GAKH,EAAE,CAAC;YAET,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC,KAAK,uBAAuB,EAAE,CAAC;gBAC/C,MAAM,QAAQ,GAAG;oBACf,EAAE,EAAE,EAAE,YAAY,EAAE,EAAE,EAAE,UAAU,EAAE;oBACpC,EAAE,EAAE,EAAE,aAAa,EAAE,EAAE,EAAE,UAAU,EAAE;oBACrC,EAAE,EAAE,EAAE,UAAU,EAAE,EAAE,EAAE,SAAS,EAAE;oBACjC,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,QAAQ,EAAE;oBAC5B,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE;oBACzB,EAAE,EAAE,EAAE,YAAY,EAAE,EAAE,EAAE,QAAQ,EAAE;oBAClC,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE;iBAC7B,CAAC;gBACF,MAAM,GAAG,GAAG;oBACV,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,kBAAkB,EAAE;oBACtC,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,YAAY,EAAE;oBAClC,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,cAAc,EAAE;oBAClC,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,WAAW,EAAE;oBACjC,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,SAAS,EAAE;iBAChC,CAAC;gBACF,KAAK,MAAM,MAAM,IAAI,QAAQ,EAAE,CAAC;oBAC9B,KAAK,MAAM,EAAE,IAAI,GAAG,EAAE,CAAC;wBACrB,IACE,MAAM,CAAC,EAAE,KAAK,QAAQ;4BACtB,CAAC,EAAE,CAAC,EAAE,KAAK,QAAQ,IAAI,EAAE,CAAC,EAAE,KAAK,QAAQ,IAAI,EAAE,CAAC,EAAE,KAAK,QAAQ,CAAC,EAChE,CAAC;4BAED,SAAS;wBACX,CAAC;wBACD,KAAK,CAAC,IAAI,CAAC;4BACT,IAAI,EAAE,yBAAyB,MAAM,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,EAAE;4BACnD,MAAM,EAAE,GAAG,EAAE,CAAC,EAAE,IAAI,MAAM,CAAC,EAAE,EAAE;4BAC/B,MAAM,EAAE,GAAG,EAAE,CAAC,EAAE,IAAI,MAAM,CAAC,EAAE,EAAE;4BAC/B,aAAa,EAAE,GAAG,EAAE,CAAC,EAAE,IAAI,MAAM,CAAC,EAAE,EAAE;yBACvC,CAAC,CAAC;oBACL,CAAC;gBACH,CAAC;YACH,CAAC;iBAAM,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC,KAAK,KAAK,EAAE,CAAC;gBACpC,MAAM,QAAQ,GAAG,CAAC,EAAE,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC;gBACtD,MAAM,GAAG,GAAG;oBACV,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,kBAAkB,EAAE;oBACtC,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,YAAY,EAAE;oBAClC,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,cAAc,EAAE;oBAClC,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,WAAW,EAAE;oBACjC,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,SAAS,EAAE;iBAChC,CAAC;gBACF,KAAK,MAAM,MAAM,IAAI,QAAQ,EAAE,CAAC;oBAC9B,KAAK,MAAM,EAAE,IAAI,GAAG,EAAE,CAAC;wBACrB,KAAK,CAAC,IAAI,CAAC;4BACT,IAAI,EAAE,OAAO,MAAM,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,EAAE;4BACjC,MAAM,EAAE,GAAG,EAAE,CAAC,EAAE,IAAI,MAAM,CAAC,EAAE,EAAE;4BAC/B,MAAM,EAAE,GAAG,EAAE,CAAC,EAAE,IAAI,MAAM,CAAC,EAAE,EAAE;4BAC/B,aAAa,EAAE,GAAG,EAAE,CAAC,EAAE,IAAI,MAAM,CAAC,EAAE,EAAE;yBACvC,CAAC,CAAC;oBACL,CAAC;gBACH,CAAC;YACH,CAAC;YAED,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;gBACzB,SAAS,CAAC,IAAI,CAAC;oBACb,IAAI,EAAE,IAAI,CAAC,IAAI;oBACf,MAAM,EAAE,IAAI,CAAC,MAAM;oBACnB,MAAM,EAAE,IAAI,CAAC,MAAM;oBACnB,aAAa,EAAE,IAAI,CAAC,aAAa;oBACjC,QAAQ,EAAE,IAAI;oBACd,MAAM,EAAE,CAAC;iBACV,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QAED,IAAI,OAAO,GAAG,CAAC,CAAC;QAChB,KAAK,MAAM,CAAC,IAAI,SAAS,EAAE,CAAC;YAE1B,IAAI,QAAQ,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YAC/D,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACd,QAAQ,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;YACjE,CAAC;YAED,IAAI,QAAQ,EAAE,CAAC;gBAEb,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;gBAC3B,MAAM,IAAI,CAAC,IAAI,CAAC,QAAe,CAAC,CAAC;YACnC,CAAC;iBAAM,CAAC;gBACN,MAAM,IAAI,CAAC,IAAI,CAAC,CAAQ,CAAC,CAAC;gBAC1B,OAAO,EAAE,CAAC;YACZ,CAAC;QACH,CAAC;QAED,IAAI,OAAO,GAAG,CAAC,EAAE,CAAC;YAChB,OAAO,CAAC,GAAG,CAAC,eAAe,OAAO,kBAAkB,CAAC,CAAC;QACxD,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,GAAG,CACT,0EAA0E,CAC3E,CAAC;QACJ,CAAC;IACH,CAAC;CACF;AA9GD,8CA8GC"}

package/dist/index.d.ts

@@ -42,10 +42,6 @@ export * from "./modules/role-permission/dtos/role-permission.dto";
 export * from "./modules/role-permission/dtos/create-role-permission.dto";
 export * from "./modules/role-permission/dtos/update-role-permission.dto";
 export * from "./modules/role-permission/dtos/role-permission-query.dto";
-export * from "./modules/user-role/dtos/user-role.dto";
-export * from "./modules/user-role/dtos/create-user-role.dto";
-export * from "./modules/user-role/dtos/update-user-role.dto";
-export * from "./modules/user-role/dtos/user-role-query.dto";
 export * from "./modules/user-permission/user-permission.module";
 export * from "./modules/user-permission/user-permission.service";
 export * from "./modules/user-permission/user-permission.entity";
@@ -55,9 +51,8 @@ export * from "./modules/user-permission/dtos/create-user-permission.dto";
 export * from "./modules/user-permission/dtos/update-user-permission.dto";
 export * from "./modules/user-permission/dtos/user-permission-query.dto";
 export * from "./security/guards/jwt-auth.guard";
-export * from "./security/guards/roles.guard";
+export * from "./security/guards/permission.guard";
 export * from "./security/decorators/auth-user.decorator";
-export * from "./security/decorators/roles.decorator";
 export * from "./security/decorators/permissions.decorator";
 export * from "./security/interfaces/jwt-payload.interface";
 export * from "./security/interfaces/token.interface";

package/dist/index.js

@@ -59,10 +59,6 @@ __exportStar(require("./modules/role-permission/dtos/role-permission.dto"), expo
 __exportStar(require("./modules/role-permission/dtos/create-role-permission.dto"), exports);
 __exportStar(require("./modules/role-permission/dtos/update-role-permission.dto"), exports);
 __exportStar(require("./modules/role-permission/dtos/role-permission-query.dto"), exports);
-__exportStar(require("./modules/user-role/dtos/user-role.dto"), exports);
-__exportStar(require("./modules/user-role/dtos/create-user-role.dto"), exports);
-__exportStar(require("./modules/user-role/dtos/update-user-role.dto"), exports);
-__exportStar(require("./modules/user-role/dtos/user-role-query.dto"), exports);
 __exportStar(require("./modules/user-permission/user-permission.module"), exports);
 __exportStar(require("./modules/user-permission/user-permission.service"), exports);
 __exportStar(require("./modules/user-permission/user-permission.entity"), exports);
@@ -72,9 +68,8 @@ __exportStar(require("./modules/user-permission/dtos/create-user-permission.dto"
 __exportStar(require("./modules/user-permission/dtos/update-user-permission.dto"), exports);
 __exportStar(require("./modules/user-permission/dtos/user-permission-query.dto"), exports);
 __exportStar(require("./security/guards/jwt-auth.guard"), exports);
-__exportStar(require("./security/guards/roles.guard"), exports);
+__exportStar(require("./security/guards/permission.guard"), exports);
 __exportStar(require("./security/decorators/auth-user.decorator"), exports);
-__exportStar(require("./security/decorators/roles.decorator"), exports);
 __exportStar(require("./security/decorators/permissions.decorator"), exports);
 __exportStar(require("./security/interfaces/jwt-payload.interface"), exports);
 __exportStar(require("./security/interfaces/token.interface"), exports);

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,4BAA0B;AAE1B,uDAAqC;AAGrC,6DAA2C;AAC3C,8DAA4C;AAC5C,8DAA4C;AAC5C,oEAAkD;AAGlD,6DAA2C;AAC3C,8DAA4C;AAC5C,6DAA2C;AAC3C,6DAA2C;AAC3C,+DAA6C;AAC7C,sEAAoD;AACpD,qEAAmD;AAGnD,iEAA+C;AAC/C,kEAAgD;AAChD,iEAA+C;AAC/C,iEAA+C;AAC/C,mEAAiD;AACjD,0EAAwD;AACxD,0EAAwD;AACxD,yEAAuD;AAGvD,yEAAuD;AACvD,0EAAwD;AACxD,yEAAuD;AACvD,2EAAyD;AACzD,kFAAgE;AAChE,kFAAgE;AAChE,iFAA+D;AAG/D,6DAA2C;AAC3C,8DAA4C;AAC5C,6DAA2C;AAC3C,6DAA2C;AAC3C,+DAA6C;AAC7C,sEAAoD;AACpD,sEAAoD;AACpD,qEAAmD;AAGnD,mFAAiE;AACjE,oFAAkE;AAClE,mFAAiE;AACjE,mFAAiE;AACjE,qFAAmE;AACnE,4FAA0E;AAC1E,4FAA0E;AAC1E,2FAAyE;AAOzE,yEAAuD;AACvD,gFAA8D;AAC9D,gFAA8D;AAC9D,+EAA6D;AAG7D,mFAAiE;AACjE,oFAAkE;AAClE,mFAAiE;AACjE,mFAAiE;AACjE,qFAAmE;AACnE,4FAA0E;AAC1E,4FAA0E;AAC1E,2FAAyE;AAGzE,mEAAiD;AACjD,gEAA8C;AAC9C,4EAA0D;AAC1D,wEAAsD;AACtD,8EAA4D;AAG5D,8EAA4D;AAC5D,wEAAsD;AAGtD,yDAAuC;AACvC,sDAAoC;AACpC,wDAAsC;AACtC,2DAAyC;AACzC,iEAA+C;AAC/C,4DAA0C;AAC1C,2DAAyC;AACzC,uDAAqC;AACrC,oEAAkD;AAClD,6DAA2C;AAE3C,gEAAkE;AAAzD,qHAAA,kBAAkB,OAAA;AAG3B,mCAAoD;AAA3C,kHAAA,wBAAwB,OAAA;AAEjC,wDAA4E;AAAnE,iHAAA,iBAAiB,OAAA;AAAE,8GAAA,cAAc,OAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,4BAA0B;AAE1B,uDAAqC;AAGrC,6DAA2C;AAC3C,8DAA4C;AAC5C,8DAA4C;AAC5C,oEAAkD;AAGlD,6DAA2C;AAC3C,8DAA4C;AAC5C,6DAA2C;AAC3C,6DAA2C;AAC3C,+DAA6C;AAC7C,sEAAoD;AACpD,qEAAmD;AAGnD,iEAA+C;AAC/C,kEAAgD;AAChD,iEAA+C;AAC/C,iEAA+C;AAC/C,mEAAiD;AACjD,0EAAwD;AACxD,0EAAwD;AACxD,yEAAuD;AAGvD,yEAAuD;AACvD,0EAAwD;AACxD,yEAAuD;AACvD,2EAAyD;AACzD,kFAAgE;AAChE,kFAAgE;AAChE,iFAA+D;AAG/D,6DAA2C;AAC3C,8DAA4C;AAC5C,6DAA2C;AAC3C,6DAA2C;AAC3C,+DAA6C;AAC7C,sEAAoD;AACpD,sEAAoD;AACpD,qEAAmD;AAGnD,mFAAiE;AACjE,oFAAkE;AAClE,mFAAiE;AACjE,mFAAiE;AACjE,qFAAmE;AACnE,4FAA0E;AAC1E,4FAA0E;AAC1E,2FAAyE;AAGzE,mFAAiE;AACjE,oFAAkE;AAClE,mFAAiE;AACjE,mFAAiE;AACjE,qFAAmE;AACnE,4FAA0E;AAC1E,4FAA0E;AAC1E,2FAAyE;AAGzE,mEAAiD;AACjD,qEAAmD;AACnD,4EAA0D;AAC1D,8EAA4D;AAG5D,8EAA4D;AAC5D,wEAAsD;AAGtD,yDAAuC;AACvC,sDAAoC;AACpC,wDAAsC;AACtC,2DAAyC;AACzC,iEAA+C;AAC/C,4DAA0C;AAC1C,2DAAyC;AACzC,uDAAqC;AACrC,oEAAkD;AAClD,6DAA2C;AAE3C,gEAAkE;AAAzD,qHAAA,kBAAkB,OAAA;AAG3B,mCAAoD;AAA3C,kHAAA,wBAAwB,OAAA;AAEjC,wDAA4E;AAAnE,iHAAA,iBAAiB,OAAA;AAAE,8GAAA,cAAc,OAAA"}

package/dist/modules/module/module.controller.d.ts

@@ -7,6 +7,7 @@ export declare class ModuleController {
     private readonly moduleService;
     logger: Logger;
     constructor(moduleService: ModuleService);
+    getAll(req: Request, query: ModuleQueryDTO): Promise<Partial<ModuleDTO>[]>;
     getAllModules(req: Request, query: ModuleQueryDTO): Promise<Partial<ModuleDTO>[]>;
     getModuleById(id: number): Promise<ModuleDTO>;
 }

package/dist/modules/module/module.controller.js

@@ -15,26 +15,49 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ModuleController = void 0;
 const common_1 = require("@nestjs/common");
 const swagger_1 = require("@nestjs/swagger");
-const user_role_1 = require("../../core/enums/user-role");
 const pagination_entity_1 = require("../../core/utils/pagination.entity");
 const module_service_1 = require("./module.service");
 const module_dto_1 = require("./dtos/module.dto");
 const module_query_dto_1 = require("./dtos/module-query.dto");
 const module_mapper_1 = require("./module.mapper");
 const jwt_auth_guard_1 = require("../../security/guards/jwt-auth.guard");
-const roles_guard_1 = require("../../security/guards/roles.guard");
-const roles_decorator_1 = require("../../security/decorators/roles.decorator");
+const permission_guard_1 = require("../../security/guards/permission.guard");
+const permissions_decorator_1 = require("../../security/decorators/permissions.decorator");
+const user_permission_1 = require("../../core/enums/user-permission");
 let ModuleController = class ModuleController {
     constructor(moduleService) {
         this.moduleService = moduleService;
         this.logger = new common_1.Logger("ModuleController");
     }
-    async getAllModules(req, query) {
+    async getAll(req, query) {
         const pageRequest = new pagination_entity_1.PageRequest(+(query.page ?? 1), +(query.pageSize ?? 10), query.sortField ? `${query.sortField},${query.sortOrder || "ASC"}` : "");
         const [results, count] = await this.moduleService.findAndCount({
             skip: +pageRequest.page * pageRequest.size,
             take: +pageRequest.size,
             order: pageRequest.sort.asOrder(),
+        });
+        const moduleDtos = (0, module_mapper_1.mapModuleToModuleDtoSelective)(results, [
+            "id",
+            "nameAr",
+            "nameEn",
+            "descriptionAr",
+            "descriptionEn",
+            "permissions",
+            "isActive",
+            "createdAt",
+            "createdBy",
+        ]);
+        req.res.setHeader("X-Total-Count", count);
+        req.res.setHeader("X-Page", pageRequest.page);
+        req.res.setHeader("X-Has-Next-Page", count > pageRequest.page * pageRequest.size ? "true" : "false");
+        return moduleDtos;
+    }
+    async getAllModules(req, query) {
+        const pageRequest = new pagination_entity_1.PageRequest(+(query.page ?? 1), +(query.pageSize ?? 10), query.sortField ? `${query.sortField},${query.sortOrder || "ASC"}` : "");
+        const [results, count] = await this.moduleService.findAndCount({
+            skip: pageRequest.page * pageRequest.size,
+            take: pageRequest.size,
+            order: pageRequest.sort.asOrder(),
             relations: ["permissions"],
         });
         const moduleDtos = (0, module_mapper_1.mapModuleToModuleDtoSelective)(results, [
@@ -58,8 +81,9 @@ let ModuleController = class ModuleController {
             where: { id },
             relations: ["permissions"],
         });
-        if (!found)
+        if (!found) {
             throw new common_1.NotFoundException(`Module with id ${id} not found`);
+        }
         return (0, module_mapper_1.mapModuleToModuleDtoSelective)(found, [
             "id",
             "nameAr",
@@ -78,7 +102,23 @@ let ModuleController = class ModuleController {
 exports.ModuleController = ModuleController;
 __decorate([
     (0, common_1.Get)("/"),
-    (0, roles_decorator_1.Roles)(user_role_1.UserRole.ADMIN, user_role_1.UserRole.USER),
+    (0, permissions_decorator_1.Permissions)(user_permission_1.UserPermissionEnum.ORGANIZATION_SETTINGS_MODULE_LIST),
+    (0, swagger_1.ApiOperation)({ summary: "Get list of modules (paginated)" }),
+    (0, swagger_1.ApiResponse)({
+        status: 200,
+        description: "List all modules",
+        type: module_dto_1.ModuleDTO,
+        isArray: true,
+    }),
+    __param(0, (0, common_1.Req)()),
+    __param(1, (0, common_1.Query)()),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, module_query_dto_1.ModuleQueryDTO]),
+    __metadata("design:returntype", Promise)
+], ModuleController.prototype, "getAll", null);
+__decorate([
+    (0, common_1.Get)("tree"),
+    (0, permissions_decorator_1.Permissions)(user_permission_1.UserPermissionEnum.ORGANIZATION_SETTINGS_MODULE_LIST),
     (0, swagger_1.ApiOperation)({ summary: "Get list of modules (paginated)" }),
     (0, swagger_1.ApiResponse)({
         status: 200,
@@ -93,8 +133,8 @@ __decorate([
     __metadata("design:returntype", Promise)
 ], ModuleController.prototype, "getAllModules", null);
 __decorate([
-    (0, common_1.Get)("/:id"),
-    (0, roles_decorator_1.Roles)(user_role_1.UserRole.ADMIN, user_role_1.UserRole.USER),
+    (0, common_1.Get)(":id"),
+    (0, permissions_decorator_1.Permissions)(user_permission_1.UserPermissionEnum.ORGANIZATION_SETTINGS_MODULE_READ),
     (0, swagger_1.ApiOperation)({ summary: "Get module by ID" }),
     (0, swagger_1.ApiResponse)({ status: 200, description: "Module found", type: module_dto_1.ModuleDTO }),
     __param(0, (0, common_1.Param)("id", common_1.ParseIntPipe)),
@@ -105,8 +145,7 @@ __decorate([
 exports.ModuleController = ModuleController = __decorate([
     (0, common_1.Controller)("api/v1/modules"),
     (0, swagger_1.ApiBearerAuth)(),
-    (0, common_1.UseGuards)(jwt_auth_guard_1.AuthGuard, roles_guard_1.RolesGuard),
-    (0, roles_decorator_1.Roles)(user_role_1.UserRole.ADMIN),
+    (0, common_1.UseGuards)(jwt_auth_guard_1.AuthGuard, permission_guard_1.PermissionsGuard),
     (0, swagger_1.ApiTags)("modules-module"),
     __metadata("design:paramtypes", [module_service_1.ModuleService])
 ], ModuleController);

package/dist/modules/module/module.controller.js.map

@@ -1 +1 @@
-{"version":3,"file":"module.controller.js","sourceRoot":"","sources":["../../../src/modules/module/module.controller.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"module.controller.js","sourceRoot":"","sources":["../../../src/modules/module/module.controller.ts"],"names":[],"mappings":"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"}

package/dist/modules/module/module.service.js

@@ -54,6 +54,7 @@ let ModuleService = class ModuleService {
         qb.leftJoin("roles", "role", 'role.id = rp."role_id"');
         qb.addSelect("module.id", "id");
         qb.addSelect('module."name_Ar"', "nameAr");
+        qb.addSelect('module."name_En"', "nameEn");
         qb.addSelect("module.code", "code");
         qb.addSelect('module."description_Ar"', "descriptionAr");
         qb.addSelect('module."description_En"', "descriptionEn");

package/dist/modules/module/module.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"module.service.js","sourceRoot":"","sources":["../../../src/modules/module/module.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"module.service.js","sourceRoot":"","sources":["../../../src/modules/module/module.service.ts"],"names":[],"mappings":"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"}

package/dist/modules/permission/permission.controller.js

@@ -19,14 +19,12 @@ const swagger_1 = require("@nestjs/swagger");
 const permission_service_1 = require("./permission.service");
 const pagination_entity_1 = require("../../core/utils/pagination.entity");
 const header_util_1 = require("../../core/utils/header-util");
-const roles_guard_1 = require("../../security/guards/roles.guard");
 const jwt_auth_guard_1 = require("../../security/guards/jwt-auth.guard");
-const roles_decorator_1 = require("../../security/decorators/roles.decorator");
-const user_role_1 = require("../../core/enums/user-role");
 const permission_query_dto_1 = require("./dtos/permission-query.dto");
 const permissions_decorator_1 = require("../../security/decorators/permissions.decorator");
 const user_permission_1 = require("../../core/enums/user-permission");
 const permission_mapper_1 = require("./permission.mapper");
+const permission_guard_1 = require("../../security/guards/permission.guard");
 let PermissionController = PermissionController_1 = class PermissionController {
     constructor(permissionService) {
         this.permissionService = permissionService;
@@ -84,7 +82,6 @@ exports.PermissionController = PermissionController;
 __decorate([
     (0, common_1.Get)("/"),
     (0, permissions_decorator_1.Permissions)(user_permission_1.UserPermissionEnum.ORGANIZATION_SETTINGS_PERMISSION_LIST),
-    (0, roles_decorator_1.Roles)(user_role_1.UserRole.ADMIN, user_role_1.UserRole.USER),
     (0, swagger_1.ApiOperation)({ summary: "Get paginated list of permissions" }),
     __param(0, (0, common_1.Req)()),
     __param(1, (0, common_1.Query)()),
@@ -95,7 +92,6 @@ __decorate([
 __decorate([
     (0, common_1.Get)("/:id"),
     (0, permissions_decorator_1.Permissions)(user_permission_1.UserPermissionEnum.ORGANIZATION_SETTINGS_PERMISSION_READ),
-    (0, roles_decorator_1.Roles)(user_role_1.UserRole.ADMIN, user_role_1.UserRole.USER),
     (0, swagger_1.ApiOperation)({ summary: "Get permission by ID" }),
     __param(0, (0, common_1.Param)("id")),
     __metadata("design:type", Function),
@@ -105,8 +101,7 @@ __decorate([
 exports.PermissionController = PermissionController = PermissionController_1 = __decorate([
     (0, common_1.Controller)("api/v1/permissions"),
     (0, swagger_1.ApiBearerAuth)(),
-    (0, common_1.UseGuards)(jwt_auth_guard_1.AuthGuard, roles_guard_1.RolesGuard),
-    (0, roles_decorator_1.Roles)(user_role_1.UserRole.ADMIN),
+    (0, common_1.UseGuards)(jwt_auth_guard_1.AuthGuard, permission_guard_1.PermissionsGuard),
     (0, swagger_1.ApiTags)("permissions"),
     __metadata("design:paramtypes", [permission_service_1.PermissionService])
 ], PermissionController);

package/dist/modules/permission/permission.controller.js.map

@@ -1 +1 @@
-{"version":3,"file":"permission.controller.js","sourceRoot":"","sources":["../../../src/modules/permission/permission.controller.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"permission.controller.js","sourceRoot":"","sources":["../../../src/modules/permission/permission.controller.ts"],"names":[],"mappings":"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"}

package/dist/modules/role/role.controller.d.ts

@@ -13,7 +13,8 @@ export declare class RoleController {
     private readonly moduleService;
     private readonly logger;
     constructor(roleService: RoleService, permissionService: PermissionService, moduleService: ModuleService);
-    getAll(req: Request, query: RoleQueryDTO): Promise<Partial<ModuleDTO>[]>;
+    getAll(req: Request, query: RoleQueryDTO): Promise<Partial<RoleDTO>[]>;
+    getAllWithRoles(req: Request, query: RoleQueryDTO): Promise<Partial<ModuleDTO>[]>;
     getById(id: number): Promise<Partial<RoleDTO>>;
     create(dto: CreateRoleDTO, user: any): Promise<RoleDTO>;
     update(id: number, dto: UpdateRoleDTO, user: any): Promise<RoleDTO>;

package/dist/modules/role/role.controller.js

@@ -27,15 +27,13 @@ const create_role_dto_1 = require("./dtos/create-role.dto");
 const update_role_dto_1 = require("./dtos/update-role.dto");
 const role_query_dto_1 = require("./dtos/role-query.dto");
 const role_mapper_1 = require("./role.mapper");
-const roles_guard_1 = require("../../security/guards/roles.guard");
 const jwt_auth_guard_1 = require("../../security/guards/jwt-auth.guard");
-const roles_decorator_1 = require("../../security/decorators/roles.decorator");
 const auth_user_decorator_1 = require("../../security/decorators/auth-user.decorator");
 const permissions_decorator_1 = require("../../security/decorators/permissions.decorator");
-const user_role_1 = require("../../core/enums/user-role");
 const user_permission_1 = require("../../core/enums/user-permission");
 const module_service_1 = require("../module/module.service");
 const module_mapper_1 = require("../module/module.mapper");
+const permission_guard_1 = require("../../security/guards/permission.guard");
 let RoleController = RoleController_1 = class RoleController {
     constructor(roleService, permissionService, moduleService) {
         this.roleService = roleService;
@@ -45,13 +43,24 @@ let RoleController = RoleController_1 = class RoleController {
     }
     async getAll(req, query) {
         const pageRequest = new pagination_entity_1.PageRequest(+(query.page ?? 1), +(query.pageSize ?? 10), query.sortField ? `${query.sortField},${query.sortOrder || "ASC"}` : "");
-        let moduleCode = undefined;
-        if (query.moduleId !== undefined) {
-            const module = await this.moduleService.findById(query.moduleId);
-            if (module) {
-                moduleCode = module.code;
-            }
-        }
+        const [results, count] = await this.roleService.findAndCount(query, pageRequest);
+        const rolesDtos = (0, role_mapper_1.mapRoleToRoleDtoSelective)(results, [
+            "id",
+            "nameAr",
+            "nameEn",
+            "descriptionAr",
+            "descriptionEn",
+            "isSystemRole",
+            "createdAt",
+            "createdBy",
+            "updatedAt",
+            "updatedBy",
+        ]);
+        header_util_1.HeaderUtil.addPaginationHeaders(req.res, count, pageRequest.page, count > (pageRequest.page + 1) * pageRequest.size);
+        return rolesDtos;
+    }
+    async getAllWithRoles(req, query) {
+        const pageRequest = new pagination_entity_1.PageRequest(+(query.page ?? 1), +(query.pageSize ?? 10), query.sortField ? `${query.sortField},${query.sortOrder || "ASC"}` : "");
         const [results, count] = await this.moduleService.findAndCountwithRoles(query, pageRequest);
         const moduleDtos = (0, module_mapper_1.mapModuleToModuleDtoSelective)(results, [
             "id",
@@ -170,7 +179,6 @@ exports.RoleController = RoleController;
 __decorate([
     (0, common_1.Get)("/"),
     (0, permissions_decorator_1.Permissions)(user_permission_1.UserPermissionEnum.ORGANIZATION_SETTINGS_ROLE_LIST),
-    (0, roles_decorator_1.Roles)(user_role_1.UserRole.ADMIN, user_role_1.UserRole.USER),
     (0, swagger_1.ApiOperation)({ summary: "Get paginated list of roles" }),
     (0, swagger_1.ApiResponse)({
         status: 200,
@@ -185,11 +193,19 @@ __decorate([
     __metadata("design:returntype", Promise)
 ], RoleController.prototype, "getAll", null);
 __decorate([
-    (0, common_1.Get)("/:id"),
+    (0, common_1.Get)("tree"),
+    (0, permissions_decorator_1.Permissions)(user_permission_1.UserPermissionEnum.ORGANIZATION_SETTINGS_ROLE_LIST),
+    (0, swagger_1.ApiOperation)({ summary: "Get paginated list of roles with modules" }),
+    __param(0, (0, common_1.Req)()),
+    __param(1, (0, common_1.Query)()),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, role_query_dto_1.RoleQueryDTO]),
+    __metadata("design:returntype", Promise)
+], RoleController.prototype, "getAllWithRoles", null);
+__decorate([
+    (0, common_1.Get)(":id"),
     (0, permissions_decorator_1.Permissions)(user_permission_1.UserPermissionEnum.ORGANIZATION_SETTINGS_ROLE_READ),
-    (0, roles_decorator_1.Roles)(user_role_1.UserRole.ADMIN, user_role_1.UserRole.USER),
     (0, swagger_1.ApiOperation)({ summary: "Get role by ID" }),
-    (0, swagger_1.ApiResponse)({ status: 200, description: "Role found", type: role_dto_1.RoleDTO }),
     __param(0, (0, common_1.Param)("id", common_1.ParseIntPipe)),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Number]),
@@ -198,7 +214,6 @@ __decorate([
 __decorate([
     (0, common_1.Post)("/"),
     (0, permissions_decorator_1.Permissions)(user_permission_1.UserPermissionEnum.ORGANIZATION_SETTINGS_ROLE_CREATE),
-    (0, roles_decorator_1.Roles)(user_role_1.UserRole.ADMIN),
     (0, swagger_1.ApiOperation)({ summary: "Create new role" }),
     (0, swagger_1.ApiResponse)({ status: 201, description: "Role created", type: role_dto_1.RoleDTO }),
     __param(0, (0, common_1.Body)()),
@@ -210,7 +225,6 @@ __decorate([
 __decorate([
     (0, common_1.Put)("/:id"),
     (0, permissions_decorator_1.Permissions)(user_permission_1.UserPermissionEnum.ORGANIZATION_SETTINGS_ROLE_UPDATE),
-    (0, roles_decorator_1.Roles)(user_role_1.UserRole.ADMIN),
     (0, swagger_1.ApiOperation)({ summary: "Update role" }),
     (0, swagger_1.ApiResponse)({ status: 200, description: "Role updated", type: role_dto_1.RoleDTO }),
     __param(0, (0, common_1.Param)("id", common_1.ParseIntPipe)),
@@ -223,7 +237,6 @@ __decorate([
 __decorate([
     (0, common_1.Delete)("/:id"),
     (0, permissions_decorator_1.Permissions)(user_permission_1.UserPermissionEnum.ORGANIZATION_SETTINGS_ROLE_DELETE),
-    (0, roles_decorator_1.Roles)(user_role_1.UserRole.ADMIN),
     (0, swagger_1.ApiOperation)({ summary: "Delete role" }),
     (0, swagger_1.ApiResponse)({ status: 200, description: "Role deleted successfully" }),
     __param(0, (0, common_1.Param)("id", common_1.ParseIntPipe)),
@@ -234,8 +247,8 @@ __decorate([
 exports.RoleController = RoleController = RoleController_1 = __decorate([
     (0, common_1.Controller)("api/v1/roles"),
     (0, swagger_1.ApiBearerAuth)(),
-    (0, common_1.UseGuards)(jwt_auth_guard_1.AuthGuard, roles_guard_1.RolesGuard),
-    (0, roles_decorator_1.Roles)(user_role_1.UserRole.ADMIN),
+    (0, common_1.UseGuards)(jwt_auth_guard_1.AuthGuard, permission_guard_1.PermissionsGuard),
+    (0, permissions_decorator_1.Permissions)(user_permission_1.UserPermissionEnum.ORGANIZATION_SETTINGS_ROLE_LIST),
     (0, swagger_1.ApiTags)("roles"),
     __metadata("design:paramtypes", [role_service_1.RoleService,
         permission_service_1.PermissionService,

package/dist/modules/role/role.controller.js.map

@@ -1 +1 @@
-{"version":3,"file":"role.controller.js","sourceRoot":"","sources":["../../../src/modules/role/role.controller.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"role.controller.js","sourceRoot":"","sources":["../../../src/modules/role/role.controller.ts"],"names":[],"mappings":"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"}

package/dist/modules/user/dtos/create-user.dto.d.ts

@@ -1,5 +1,5 @@
 import { UserDTO } from "./user.dto";
-declare const CreateUserDTO_base: import("@nestjs/common").Type<Omit<UserDTO, "createdAt" | "updatedAt" | "deletedAt" | "id" | "roles">>;
+declare const CreateUserDTO_base: import("@nestjs/common").Type<Omit<UserDTO, "id" | "createdAt" | "updatedAt" | "deletedAt" | "roles">>;
 export declare class CreateUserDTO extends CreateUserDTO_base {
     roles: number[];
 }

package/dist/modules/user/dtos/user.dto.d.ts

@@ -1,5 +1,4 @@
 import { BaseDTO } from "../../../core/utils/base.dto";
-import { UserRoleDTO } from "../../../modules/user-role/dtos/user-role.dto";
 import { RoleDTO } from "../../../modules/role/dtos/role.dto";
 export declare class UserDTO extends BaseDTO {
     email?: string;
@@ -13,6 +12,5 @@ export declare class UserDTO extends BaseDTO {
     activated?: boolean;
     imageUrl?: string;
     resetPasswordRequest?: boolean;
-    UserRoles?: UserRoleDTO[];
     roles?: RoleDTO[];
 }