@comasoft/nestjs 0.1.65 → 0.1.71

package/dist/events/services/token.service.d.ts

@@ -1,14 +1,12 @@
-import { ConfigService } from '@nestjs/config';
 import { JwtService } from '@nestjs/jwt';
 import { RedisService } from '../../redis';
 export declare class TokenService {
     private readonly redis;
     private jwtService;
-    private configService;
-    constructor(redis: RedisService, jwtService: JwtService, configService: ConfigService);
+    constructor(redis: RedisService, jwtService: JwtService);
     private generateOpaqueToken;
     private storeRefreshToken;
-    generateTokens(payload: any, user_uid: string, user_agent: string): Promise<{
+    generateTokens(payload: any, user_uid: string, user_agent: string, refresh_token_expiration: string): Promise<{
         access_token: string;
         refresh_token: string;
         expires_in: number;

package/dist/events/services/token.service.js

@@ -1 +1 @@
-var e=this&&this.__decorate||function(e,t,r,i){var n,s=arguments.length,o=s<3?t:null===i?i=Object.getOwnPropertyDescriptor(t,r):i;if("object"==typeof Reflect&&"function"==typeof Reflect.decorate)o=Reflect.decorate(e,t,r,i);else for(var c=e.length-1;c>=0;c--)(n=e[c])&&(o=(s<3?n(o):s>3?n(t,r,o):n(t,r))||o);return s>3&&o&&Object.defineProperty(t,r,o),o},t=this&&this.__metadata||function(e,t){if("object"==typeof Reflect&&"function"==typeof Reflect.metadata)return Reflect.metadata(e,t)},r=this&&this.__awaiter||function(e,t,r,i){return new(r||(r=Promise))(function(n,s){function fulfilled(e){try{step(i.next(e))}catch(e){s(e)}}function rejected(e){try{step(i.throw(e))}catch(e){s(e)}}function step(e){e.done?n(e.value):function adopt(e){return e instanceof r?e:new r(function(t){t(e)})}(e.value).then(fulfilled,rejected)}step((i=i.apply(e,t||[])).next())})};Object.defineProperty(exports,"__esModule",{value:!0}),exports.TokenService=void 0;const i=require("@nestjs/common"),n=require("@nestjs/config"),s=require("@nestjs/jwt"),o=require("crypto"),c=require("../../redis"),f=require("../../utils");let u=class TokenService{constructor(e,t,r){this.redis=e,this.jwtService=t,this.configService=r}generateOpaqueToken(){return(0,o.randomBytes)(32).toString("base64url")}storeRefreshToken(e,t,i){return r(this,void 0,void 0,function*(){const r=Math.floor(Date.now()/1e3),n=(0,f.convertExpirationToSeconds)(this.configService.get("REFRESH_TOKEN_EXPIRATION"));return yield this.redis.set(`refresh_token:${t}`,JSON.stringify({uid:e,iat:r,exp:n}),n),yield this.redis.set(`user_devices:${e}:${t}`,JSON.stringify({user_agent:i,lastLogin:(new Date).toISOString()}),n),{exp:n}})}generateTokens(e,t,i){return r(this,void 0,void 0,function*(){const r=this.jwtService.sign(e),n=this.jwtService.decode(r),s=this.generateOpaqueToken(),o=yield this.storeRefreshToken(t,s,i);return{access_token:r,refresh_token:s,expires_in:n.exp-n.iat,refresh_expires_in:o.exp}})}removeRefreshToken(e){return r(this,void 0,void 0,function*(){const t=yield this.redis.get(`refresh_token:${e}`);if(!t)return null;const{uid:r}=JSON.parse(t);yield this.redis.del(`refresh_token:${e}`),yield this.redis.del(`user_devices:${r}:${e}`)})}getStoredRefreshToken(e){return r(this,void 0,void 0,function*(){const t=yield this.redis.get(`refresh_token:${e}`);return t?JSON.parse(t):null})}};exports.TokenService=u,exports.TokenService=u=e([(0,i.Injectable)(),t("design:paramtypes",[c.RedisService,s.JwtService,n.ConfigService])],u);
+var e=this&&this.__decorate||function(e,t,r,i){var n,s=arguments.length,o=s<3?t:null===i?i=Object.getOwnPropertyDescriptor(t,r):i;if("object"==typeof Reflect&&"function"==typeof Reflect.decorate)o=Reflect.decorate(e,t,r,i);else for(var c=e.length-1;c>=0;c--)(n=e[c])&&(o=(s<3?n(o):s>3?n(t,r,o):n(t,r))||o);return s>3&&o&&Object.defineProperty(t,r,o),o},t=this&&this.__metadata||function(e,t){if("object"==typeof Reflect&&"function"==typeof Reflect.metadata)return Reflect.metadata(e,t)},r=this&&this.__awaiter||function(e,t,r,i){return new(r||(r=Promise))(function(n,s){function fulfilled(e){try{step(i.next(e))}catch(e){s(e)}}function rejected(e){try{step(i.throw(e))}catch(e){s(e)}}function step(e){e.done?n(e.value):function adopt(e){return e instanceof r?e:new r(function(t){t(e)})}(e.value).then(fulfilled,rejected)}step((i=i.apply(e,t||[])).next())})};Object.defineProperty(exports,"__esModule",{value:!0}),exports.TokenService=void 0;const i=require("@nestjs/common"),n=require("@nestjs/jwt"),s=require("crypto"),o=require("../../redis"),c=require("../../utils");let d=class TokenService{constructor(e,t){this.redis=e,this.jwtService=t}generateOpaqueToken(){return(0,s.randomBytes)(32).toString("base64url")}storeRefreshToken(e,t,i,n){return r(this,void 0,void 0,function*(){const r=Math.floor(Date.now()/1e3),s=(0,c.convertExpirationToSeconds)(n);return yield this.redis.set(`refresh_token:${t}`,JSON.stringify({uid:e,iat:r,exp:s}),s),yield this.redis.set(`user_devices:${e}:${t}`,JSON.stringify({user_agent:i,lastLogin:(new Date).toISOString()}),s),{exp:s}})}generateTokens(e,t,i,n){return r(this,void 0,void 0,function*(){const r=this.jwtService.sign(e),s=this.jwtService.decode(r),o=this.generateOpaqueToken(),c=yield this.storeRefreshToken(t,o,i,n);return{access_token:r,refresh_token:o,expires_in:s.exp-s.iat,refresh_expires_in:c.exp}})}removeRefreshToken(e){return r(this,void 0,void 0,function*(){const t=yield this.redis.get(`refresh_token:${e}`);if(!t)return null;const{uid:r}=JSON.parse(t);yield this.redis.del(`refresh_token:${e}`),yield this.redis.del(`user_devices:${r}:${e}`)})}getStoredRefreshToken(e){return r(this,void 0,void 0,function*(){const t=yield this.redis.get(`refresh_token:${e}`);return t?JSON.parse(t):null})}};exports.TokenService=d,exports.TokenService=d=e([(0,i.Injectable)(),t("design:paramtypes",[o.RedisService,n.JwtService])],d);

package/dist/filters/http-exception.filter.d.ts

@@ -1,8 +1,8 @@
-import { ArgumentsHost, ExceptionFilter, HttpException } from '@nestjs/common';
+import { ArgumentsHost, ExceptionFilter } from '@nestjs/common';
 import { EventEmitter2 } from '@nestjs/event-emitter';
 export declare class HttpExceptionFilter implements ExceptionFilter {
     private readonly eventEmitter;
     constructor(eventEmitter: EventEmitter2);
     private readonly logger;
-    catch(exception: HttpException, host: ArgumentsHost): void;
+    catch(exception: any, host: ArgumentsHost): void;
 }

package/dist/filters/http-exception.filter.js

@@ -1 +1 @@
-var e,t=this&&this.__decorate||function(e,t,r,o){var n,s=arguments.length,i=s<3?t:null===o?o=Object.getOwnPropertyDescriptor(t,r):o;if("object"==typeof Reflect&&"function"==typeof Reflect.decorate)i=Reflect.decorate(e,t,r,o);else for(var a=e.length-1;a>=0;a--)(n=e[a])&&(i=(s<3?n(i):s>3?n(t,r,i):n(t,r))||i);return s>3&&i&&Object.defineProperty(t,r,i),i},r=this&&this.__metadata||function(e,t){if("object"==typeof Reflect&&"function"==typeof Reflect.metadata)return Reflect.metadata(e,t)};Object.defineProperty(exports,"__esModule",{value:!0}),exports.HttpExceptionFilter=void 0;const o=require("@nestjs/common"),n=require("@nestjs/event-emitter");let s=e=class HttpExceptionFilter{constructor(t){this.eventEmitter=t,this.logger=new o.Logger(e.name)}catch(e,t){var r,n,s;const i=t.switchToHttp(),a=i.getResponse(),c=i.getRequest();o.ForbiddenException;let l=e instanceof o.HttpException?e.getStatus():o.HttpStatus.INTERNAL_SERVER_ERROR,p={};if(e instanceof o.HttpException?p=e.getResponse():(this.logger.error(`Unhandled exception: ${c.method} ${c.url}`),"TokenError"===(null==e?void 0:e.name)?(l=o.HttpStatus.UNAUTHORIZED,p={error:"Unauthorized"}):p={error:"Internal Server Error",message:"An unexpected error occurred."}),"string"==typeof p)a.status(l).json({success:!1,code:l,timestamp:(new Date).toISOString(),path:c.url,message:p});else{let e=null!==(r=p.message)&&void 0!==r?r:p.error;Array.isArray(e)&&e.length>0&&"object"==typeof e[0]&&(e=e.map(e=>e.constraints?Object.values(e.constraints):"Invalid input").flat()),a.status(l).json({success:!1,status:l,path:c.url,message:e,code:null!==(n=p.code)&&void 0!==n?n:void 0,meta:null!==(s=p.meta)&&void 0!==s?s:void 0})}}};exports.HttpExceptionFilter=s,exports.HttpExceptionFilter=s=e=t([(0,o.Catch)(),r("design:paramtypes",[n.EventEmitter2])],s);
+var t,e=this&&this.__decorate||function(t,e,r,o){var s,n=arguments.length,i=n<3?e:null===o?o=Object.getOwnPropertyDescriptor(e,r):o;if("object"==typeof Reflect&&"function"==typeof Reflect.decorate)i=Reflect.decorate(t,e,r,o);else for(var a=t.length-1;a>=0;a--)(s=t[a])&&(i=(n<3?s(i):n>3?s(e,r,i):s(e,r))||i);return n>3&&i&&Object.defineProperty(e,r,i),i},r=this&&this.__metadata||function(t,e){if("object"==typeof Reflect&&"function"==typeof Reflect.metadata)return Reflect.metadata(t,e)};Object.defineProperty(exports,"__esModule",{value:!0}),exports.HttpExceptionFilter=void 0;const o=require("@nestjs/common"),s=require("@nestjs/event-emitter");let n=t=class HttpExceptionFilter{constructor(e){this.eventEmitter=e,this.logger=new o.Logger(t.name)}catch(t,e){var r,s,n;const i=e.switchToHttp(),a=i.getResponse(),c=i.getRequest();o.ForbiddenException;let l=t instanceof o.HttpException?t.getStatus():o.HttpStatus.INTERNAL_SERVER_ERROR,p={};if(t instanceof o.HttpException?p=t.getResponse():(this.logger.error(`Unhandled exception: ${c.method} ${c.url}`),this.logger.error(t),"TokenError"===(null==t?void 0:t.name)?(l=o.HttpStatus.UNAUTHORIZED,p={error:"Unauthorized"}):(l=o.HttpStatus.INTERNAL_SERVER_ERROR,p={error:"Internal Server Error",message:"An unexpected error occurred."})),"string"==typeof p)a.status(l).json({success:!1,code:l,timestamp:(new Date).toISOString(),path:c.url,message:p});else{let t=null!==(r=p.message)&&void 0!==r?r:p.error;Array.isArray(t)&&t.length>0&&"object"==typeof t[0]&&(t=t.map(t=>t.constraints?Object.values(t.constraints):"Invalid input").flat()),a.status(l).json({success:!1,status:l,path:c.url,message:t,code:null!==(s=p.code)&&void 0!==s?s:void 0,meta:null!==(n=p.meta)&&void 0!==n?n:void 0})}}};exports.HttpExceptionFilter=n,exports.HttpExceptionFilter=n=t=e([(0,o.Catch)(),r("design:paramtypes",[s.EventEmitter2])],n);

package/dist/guards/index.d.ts

@@ -1,2 +1,3 @@
-export * from './auth.guard';
+export * from './permission.guard';
+export * from './role.guard';
 export * from './jwt.guard';

package/dist/guards/index.js

@@ -1 +1 @@
-var e=this&&this.__createBinding||(Object.create?function(e,t,r,i){void 0===i&&(i=r);var o=Object.getOwnPropertyDescriptor(t,r);o&&!("get"in o?!t.__esModule:o.writable||o.configurable)||(o={enumerable:!0,get:function(){return t[r]}}),Object.defineProperty(e,i,o)}:function(e,t,r,i){void 0===i&&(i=r),e[i]=t[r]}),t=this&&this.__exportStar||function(t,r){for(var i in t)"default"===i||Object.prototype.hasOwnProperty.call(r,i)||e(r,t,i)};Object.defineProperty(exports,"__esModule",{value:!0}),t(require("./auth.guard"),exports),t(require("./jwt.guard"),exports);
+var e=this&&this.__createBinding||(Object.create?function(e,r,t,i){void 0===i&&(i=t);var o=Object.getOwnPropertyDescriptor(r,t);o&&!("get"in o?!r.__esModule:o.writable||o.configurable)||(o={enumerable:!0,get:function(){return r[t]}}),Object.defineProperty(e,i,o)}:function(e,r,t,i){void 0===i&&(i=t),e[i]=r[t]}),r=this&&this.__exportStar||function(r,t){for(var i in r)"default"===i||Object.prototype.hasOwnProperty.call(t,i)||e(t,r,i)};Object.defineProperty(exports,"__esModule",{value:!0}),r(require("./permission.guard"),exports),r(require("./role.guard"),exports),r(require("./jwt.guard"),exports);

package/dist/guards/permission.guard.d.ts

@@ -0,0 +1,10 @@
+import { CanActivate, ExecutionContext } from '@nestjs/common';
+import { Reflector } from '@nestjs/core';
+import { Observable } from 'rxjs';
+import { PermissionCheckerService } from '../services/permission-checker.service';
+export declare class PermissionGuard implements CanActivate {
+    private reflector;
+    private permissionChecker;
+    constructor(reflector: Reflector, permissionChecker: PermissionCheckerService);
+    canActivate(ctx: ExecutionContext): boolean | Promise<boolean> | Observable<boolean>;
+}

package/dist/guards/permission.guard.js

@@ -0,0 +1 @@
+var e=this&&this.__decorate||function(e,t,r,s){var i,o=arguments.length,n=o<3?t:null===s?s=Object.getOwnPropertyDescriptor(t,r):s;if("object"==typeof Reflect&&"function"==typeof Reflect.decorate)n=Reflect.decorate(e,t,r,s);else for(var c=e.length-1;c>=0;c--)(i=e[c])&&(n=(o<3?i(n):o>3?i(t,r,n):i(t,r))||n);return o>3&&n&&Object.defineProperty(t,r,n),n},t=this&&this.__metadata||function(e,t){if("object"==typeof Reflect&&"function"==typeof Reflect.metadata)return Reflect.metadata(e,t)};Object.defineProperty(exports,"__esModule",{value:!0}),exports.PermissionGuard=void 0;const r=require("@nestjs/common"),s=require("@nestjs/core"),i=require("../services/permission-checker.service");let o=class PermissionGuard{constructor(e,t){this.reflector=e,this.permissionChecker=t}canActivate(e){const t=e.switchToHttp().getRequest().user;if(!t)throw new r.UnauthorizedException("User not found");const s=this.reflector.getAllAndOverride("permissions",[e.getHandler(),e.getClass()]);if(null==s?void 0:s.length){if(this.permissionChecker.hasAnyPermission(t,s))return!0;throw new r.ForbiddenException("Insufficient permissions")}return!0}};exports.PermissionGuard=o,exports.PermissionGuard=o=e([(0,r.Injectable)(),t("design:paramtypes",[s.Reflector,i.PermissionCheckerService])],o);

package/dist/guards/role.guard.d.ts

@@ -0,0 +1,8 @@
+import { CanActivate, ExecutionContext } from '@nestjs/common';
+import { Reflector } from '@nestjs/core';
+import { Observable } from 'rxjs';
+export declare class RoleGuard implements CanActivate {
+    private reflector;
+    constructor(reflector: Reflector);
+    canActivate(ctx: ExecutionContext): boolean | Promise<boolean> | Observable<boolean>;
+}

package/dist/guards/role.guard.js

@@ -0,0 +1 @@
+var e=this&&this.__decorate||function(e,t,r,o){var n,c=arguments.length,l=c<3?t:null===o?o=Object.getOwnPropertyDescriptor(t,r):o;if("object"==typeof Reflect&&"function"==typeof Reflect.decorate)l=Reflect.decorate(e,t,r,o);else for(var i=e.length-1;i>=0;i--)(n=e[i])&&(l=(c<3?n(l):c>3?n(t,r,l):n(t,r))||l);return c>3&&l&&Object.defineProperty(t,r,l),l},t=this&&this.__metadata||function(e,t){if("object"==typeof Reflect&&"function"==typeof Reflect.metadata)return Reflect.metadata(e,t)};Object.defineProperty(exports,"__esModule",{value:!0}),exports.RoleGuard=void 0;const r=require("@nestjs/common"),o=require("@nestjs/core");let n=class RoleGuard{constructor(e){this.reflector=e}canActivate(e){const t=e.switchToHttp().getRequest(),o=t.user;if(!o)throw new r.UnauthorizedException("User not found");const n=this.reflector.getAllAndOverride("roles",[e.getHandler(),e.getClass()]);if(null==n?void 0:n.length){if(n.includes(o.role))return!0;throw t.audit={roles:n.join(","),user_role:o.role},new r.ForbiddenException("Insufficient role privileges")}return!0}};exports.RoleGuard=n,exports.RoleGuard=n=e([(0,r.Injectable)(),t("design:paramtypes",[o.Reflector])],n);

package/dist/role/role.service.d.ts

@@ -13,7 +13,7 @@ export declare class RoleService {
         name: string;
         description: string;
         permissions: string[];
-        sort: number;
+        sort: any;
     } & Role>;
     findAll(c_params: CustomParamsDto): Promise<{
         items: Role[];

package/dist/role/role.service.js

@@ -1 +1 @@
-var e=this&&this.__decorate||function(e,t,i,o){var r,n=arguments.length,s=n<3?t:null===o?o=Object.getOwnPropertyDescriptor(t,i):o;if("object"==typeof Reflect&&"function"==typeof Reflect.decorate)s=Reflect.decorate(e,t,i,o);else for(var d=e.length-1;d>=0;d--)(r=e[d])&&(s=(n<3?r(s):n>3?r(t,i,s):r(t,i))||s);return n>3&&s&&Object.defineProperty(t,i,s),s},t=this&&this.__metadata||function(e,t){if("object"==typeof Reflect&&"function"==typeof Reflect.metadata)return Reflect.metadata(e,t)},i=this&&this.__param||function(e,t){return function(i,o){t(i,o,e)}},o=this&&this.__awaiter||function(e,t,i,o){return new(i||(i=Promise))(function(r,n){function fulfilled(e){try{step(o.next(e))}catch(e){n(e)}}function rejected(e){try{step(o.throw(e))}catch(e){n(e)}}function step(e){e.done?r(e.value):function adopt(e){return e instanceof i?e:new i(function(t){t(e)})}(e.value).then(fulfilled,rejected)}step((o=o.apply(e,t||[])).next())})};Object.defineProperty(exports,"__esModule",{value:!0}),exports.RoleService=void 0;const r=require("@nestjs/common"),n=require("@nestjs/typeorm"),s=require("typeorm"),d=require("../database/entities"),a=require("../utils");let c=class RoleService{constructor(e,t){this.repository=e,this.dataSource=t}validatePermissions(e){throw new r.BadRequestException("validatePermissions must be implemented in app service")}validateRoleLimit(){return o(this,void 0,void 0,function*(){throw new r.BadRequestException("validateRoleLimit must be implemented in app service")})}checkRoleUsage(e){return o(this,void 0,void 0,function*(){throw new r.BadRequestException("checkRoleUsage must be implemented in app service")})}create(e){return o(this,void 0,void 0,function*(){if(!e.permissions||0===e.permissions.length)throw new r.BadRequestException("Permissions are required");yield this.validateRoleLimit();if(yield this.repository.findOne({where:{name:e.name}}))throw new r.ConflictException("Role name already exists");this.validatePermissions(e.permissions);const t=(yield this.repository.count())+1;return yield this.repository.save({name:e.name,description:e.description,permissions:e.permissions,sort:t})})}findAll(e){return o(this,void 0,void 0,function*(){const{_page:t,_limit:i,_keyword:o,_group:r,_sort:n}=e;let s=this.repository.createQueryBuilder("roles").select(["roles"]).orderBy("roles.sort","ASC");s=(0,a.applyFiltersAndSorting)(s,{_keyword:o,_group:r,_sort:n,keywordFields:["name"],aliasName:"roles"});return yield(0,a.paginate)(s,{page:t,limit:i})})}findOne(e){return o(this,void 0,void 0,function*(){const t=yield this.repository.findOne({where:{id:e}});if(!t)throw new r.NotFoundException(`Role with ID ${e} not found`);return t})}update(e,t){return o(this,void 0,void 0,function*(){const i=yield this.repository.findOne({where:{id:e}});if(!i)throw new r.NotFoundException(`Role with ID ${e} not found`);if(i.is_system)throw new r.BadRequestException("Cannot update system role");t.permissions&&this.validatePermissions(t.permissions),yield this.repository.update(e,{name:t.name,description:t.description,permissions:t.permissions||void 0});return yield this.repository.findOne({where:{id:e}})})}remove(e){return o(this,void 0,void 0,function*(){const t=yield this.repository.findOne({where:{id:e}});if(!t)throw new r.NotFoundException(`Role with ID ${e} not found`);if(t.is_system||t.is_default)throw new r.BadRequestException("Cannot delete system or default role");return yield this.checkRoleUsage(e),yield this.repository.delete(e),t})}};exports.RoleService=c,exports.RoleService=c=e([(0,r.Injectable)(),i(0,(0,n.InjectRepository)(d.Role)),t("design:paramtypes",[s.Repository,s.DataSource])],c);
+var e=this&&this.__decorate||function(e,t,i,o){var r,n=arguments.length,s=n<3?t:null===o?o=Object.getOwnPropertyDescriptor(t,i):o;if("object"==typeof Reflect&&"function"==typeof Reflect.decorate)s=Reflect.decorate(e,t,i,o);else for(var d=e.length-1;d>=0;d--)(r=e[d])&&(s=(n<3?r(s):n>3?r(t,i,s):r(t,i))||s);return n>3&&s&&Object.defineProperty(t,i,s),s},t=this&&this.__metadata||function(e,t){if("object"==typeof Reflect&&"function"==typeof Reflect.metadata)return Reflect.metadata(e,t)},i=this&&this.__param||function(e,t){return function(i,o){t(i,o,e)}},o=this&&this.__awaiter||function(e,t,i,o){return new(i||(i=Promise))(function(r,n){function fulfilled(e){try{step(o.next(e))}catch(e){n(e)}}function rejected(e){try{step(o.throw(e))}catch(e){n(e)}}function step(e){e.done?r(e.value):function adopt(e){return e instanceof i?e:new i(function(t){t(e)})}(e.value).then(fulfilled,rejected)}step((o=o.apply(e,t||[])).next())})};Object.defineProperty(exports,"__esModule",{value:!0}),exports.RoleService=void 0;const r=require("@nestjs/common"),n=require("@nestjs/typeorm"),s=require("typeorm"),d=require("../database/entities"),a=require("../utils");let l=class RoleService{constructor(e,t){this.repository=e,this.dataSource=t}validatePermissions(e){throw new r.BadRequestException("validatePermissions must be implemented in app service")}validateRoleLimit(){return o(this,void 0,void 0,function*(){throw new r.BadRequestException("validateRoleLimit must be implemented in app service")})}checkRoleUsage(e){return o(this,void 0,void 0,function*(){throw new r.BadRequestException("checkRoleUsage must be implemented in app service")})}create(e){return o(this,void 0,void 0,function*(){if(!e.permissions||0===e.permissions.length)throw new r.BadRequestException("Permissions are required");yield this.validateRoleLimit();if(yield this.repository.findOne({where:{name:e.name}}))throw new r.ConflictException("Role name already exists");this.validatePermissions(e.permissions);const t=yield this.repository.createQueryBuilder("role").select("MAX(role.sort)","max").getRawOne(),i=((null==t?void 0:t.max)||0)+1;return yield this.repository.save({name:e.name,description:e.description,permissions:e.permissions,sort:i})})}findAll(e){return o(this,void 0,void 0,function*(){const{_page:t,_limit:i,_keyword:o,_group:r,_sort:n}=e;let s=this.repository.createQueryBuilder("roles").select(["roles"]).orderBy("roles.sort","ASC");s=(0,a.applyFiltersAndSorting)(s,{_keyword:o,_group:r,_sort:n,keywordFields:["name"],aliasName:"roles"});return yield(0,a.paginate)(s,{page:t,limit:i})})}findOne(e){return o(this,void 0,void 0,function*(){const t=yield this.repository.findOne({where:{id:e}});if(!t)throw new r.NotFoundException(`Role with ID ${e} not found`);return t})}update(e,t){return o(this,void 0,void 0,function*(){const i=yield this.repository.findOne({where:{id:e}});if(!i)throw new r.NotFoundException(`Role with ID ${e} not found`);if(i.is_system)throw new r.BadRequestException("Cannot update system role");if(yield this.repository.findOne({where:{id:(0,s.Not)(e),name:t.name}}))throw new r.ConflictException("Role name already exists");t.permissions&&this.validatePermissions(t.permissions),yield this.repository.update(e,{name:t.name,description:t.description,permissions:t.permissions||void 0});return yield this.repository.findOne({where:{id:e}})})}remove(e){return o(this,void 0,void 0,function*(){const t=yield this.repository.findOne({where:{id:e}});if(!t)throw new r.NotFoundException(`Role with ID ${e} not found`);if(t.is_system||t.is_default)throw new r.BadRequestException("Cannot delete system or default role");return yield this.checkRoleUsage(e),yield this.repository.delete(e),t})}};exports.RoleService=l,exports.RoleService=l=e([(0,r.Injectable)(),i(0,(0,n.InjectRepository)(d.Role)),t("design:paramtypes",[s.Repository,s.DataSource])],l);

package/dist/utils/pagination.utils.js

@@ -1 +1 @@
-var t=this&&this.__awaiter||function(t,e,n,i){return new(n||(n=Promise))(function(o,a){function fulfilled(t){try{step(i.next(t))}catch(t){a(t)}}function rejected(t){try{step(i.throw(t))}catch(t){a(t)}}function step(t){t.done?o(t.value):function adopt(t){return t instanceof n?t:new n(function(e){e(t)})}(t.value).then(fulfilled,rejected)}step((i=i.apply(t,e||[])).next())})};Object.defineProperty(exports,"__esModule",{value:!0}),exports.paginate=function paginate(e,n){return t(this,void 0,void 0,function*(){const{page:t,limit:i}=n,[o,a]=yield e.skip((t-1)*i).take(i).getManyAndCount(),u=Math.ceil(a/i);return{items:o,pagination:{page:t,limit:i,count:o.length,count_total:a,count_page:u}}})};
+var e=this&&this.__awaiter||function(e,t,n,i){return new(n||(n=Promise))(function(a,o){function fulfilled(e){try{step(i.next(e))}catch(e){o(e)}}function rejected(e){try{step(i.throw(e))}catch(e){o(e)}}function step(e){e.done?a(e.value):function adopt(e){return e instanceof n?e:new n(function(t){t(e)})}(e.value).then(fulfilled,rejected)}step((i=i.apply(e,t||[])).next())})};Object.defineProperty(exports,"__esModule",{value:!0}),exports.paginate=function paginate(t,n){return e(this,void 0,void 0,function*(){const{page:e,limit:i}=n,a=t.connection.createQueryBuilder().select("COUNT(*)","count").from(`(${t.getQuery()})`,"subquery").setParameters(t.getParameters()),[o,r]=yield Promise.all([t.skip((e-1)*i).take(i).getMany(),a.getRawOne().then(e=>parseInt(e.count))]),u=Math.ceil(r/i);return{items:o,pagination:{page:e,limit:i,count:o.length,count_total:r,count_page:u}}})};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@comasoft/nestjs",
-  "version": "0.1.65",
+  "version": "0.1.71",
   "description": "",
   "private": false,
   "exports": {