@fabx.vn/core 1.0.0 → 1.0.2

package/README.md

@@ -1,26 +1,13 @@
-# @package-core
+# @fabx.vn/core
 
 Shared core module for all ERP services. Contains reusable core functionality including JWT handling, session management, authentication guards, interceptors, and common utilities.
 
-## Installation
-
-### 1. Update `tsconfig.json` in your service:
-
-```json
-{
-  "compilerOptions": {
-    "paths": {
-      "@package-core": ["../package-core/src"],
-      "@package-core/*": ["../package-core/src/*"]
-    }
-  }
-}
-```
+**📦 Published on npm:** https://www.npmjs.com/package/@fabx.vn/core
 
-### 2. Import in your service:
+## Installation
 
-```typescript
-import { CoreModule } from "@package-core";
+```bash
+npm install @fabx.vn/core@latest
 ```
 
 ## Quick Start
@@ -29,15 +16,15 @@ import { CoreModule } from "@package-core";
 
 ```typescript
 import { Module } from "@nestjs/common";
-import { CoreModule } from "@package-core";
+import { CoreModule } from "@fabx.vn/core";
 
 @Module({
-  imports: [CoreModule], // @Global() - available everywhere after import
+  imports: [CoreModule], // @Global() - available everywhere
 })
 export class AppModule {}
 ```
 
-### 2. Use Guards
+### 2. Use Guards & Decorators
 
 ```typescript
 import { Controller, Get, UseGuards } from "@nestjs/common";
@@ -46,7 +33,7 @@ import {
   CurrentUser,
   CurrentUserDto,
   Public,
-} from "@package-core";
+} from "@fabx.vn/core";
 
 @Controller("api")
 export class MyController {
@@ -64,42 +51,23 @@ export class MyController {
 }
 ```
 
-### 3. Use Permission Guard
-
-```typescript
-import { Controller, Get, UseGuards } from "@nestjs/common";
-import { PermissionGuard, RequirePermissions } from "@package-core";
-
-@Controller("admin")
-@UseGuards(PermissionGuard)
-export class AdminController {
-  @Get("users")
-  @RequirePermissions("user:read", "user:list")
-  getUsers() {
-    return { users: [] };
-  }
-}
-```
-
-### 4. Use Services
+### 3. Use Services
 
 ```typescript
 import { Injectable } from "@nestjs/common";
 import {
   CoreJwtService,
   SessionService,
-  CacheService,
-  CookieService,
+  RedisService,
   RabbitMQPublisher,
   RABBITMQ_ROUTING_KEYS,
-} from "@package-core";
+} from "@fabx.vn/core";
 
 @Injectable()
 export class MyService {
   constructor(
     private coreJwtService: CoreJwtService,
-    private sessionService: SessionService,
-    private cacheService: CacheService,
+    private redisService: RedisService,
     private rabbitmqPublisher: RabbitMQPublisher
   ) {}
 
@@ -107,14 +75,6 @@ export class MyService {
     return await this.coreJwtService.signToken({ sub: userId });
   }
 
-  async setSession(sessionId: string, userData: CurrentUserDto) {
-    await this.sessionService.setSession(sessionId, userData);
-  }
-
-  async cacheData(key: string, value: string, ttl: number = 3600) {
-    await this.cacheService.set(key, value, ttl);
-  }
-
   async publishEvent(data: any) {
     this.rabbitmqPublisher.publish(
       RABBITMQ_ROUTING_KEYS.AUTH_USER_CREATED,
@@ -124,80 +84,61 @@ export class MyService {
 }
 ```
 
-### 5. Use Constants
-
-```typescript
-import { MESSAGES, ERROR_MESSAGES, SUCCESS_MESSAGES } from "@package-core";
-import { BadRequestException } from "@nestjs/common";
-
-throw new BadRequestException(MESSAGES.AUTH.INVALID_CREDENTIALS);
-throw new BadRequestException(MESSAGES.VALIDATION.EMAIL_REQUIRED);
-```
-
 ## Available Exports
 
 ### Core Module
 
-- **`CoreModule`** - Main module (marked as `@Global()`)
+- `CoreModule` - Global module (import once in AppModule)
 
 ### Services
 
-- **`CoreJwtService`** - JWT token creation, validation, session management
-- **`SessionService`** - Redis-based session management
-- **`CacheService`** - Redis cache operations
-- **`CookieService`** - Cookie handling for authentication tokens
-- **`RabbitMQPublisher`** - RabbitMQ message publishing
-- **`RequestContextService`** - Request context management (AsyncLocalStorage)
-- **`RequestInfoService`** - Extract request information (IP, user agent)
+- `CoreJwtService` - JWT token creation, validation
+- `SessionService` - Redis-based session management
+- `RedisService` - Redis operations
+- `CookieService` - Cookie handling
+- `RabbitMQPublisher` - RabbitMQ message publishing
+- `RequestContextService` - Request context management
+- `RequestInfoService` - Extract request info (IP, user agent)
+- `PermissionService` - Permission management
 
 ### Guards
 
-- **`JwtAuthGuard`** - JWT authentication guard (extracts token from cookies)
-- **`InternalAuthGuard`** - Internal service-to-service authentication
-- **`PermissionGuard`** - Permission-based access control
+- `JwtAuthGuard` - JWT authentication guard
+- `InternalAuthGuard` - Internal service-to-service auth
+- `PermissionGuard` - Permission-based access control
 
 ### Decorators
 
-- **`@CurrentUser()`** - Extract current user from request
-- **`@Public()`** - Mark route as public (skip authentication)
-- **`@RequirePermissions(...permissions)`** - Require ALL specified permissions
-- **`@RequireAnyPermission(...permissions)`** - Require ANY of specified permissions
+- `@CurrentUser()` - Extract current user from request
+- `@Public()` - Mark route as public
+- `@RequirePermissions(...permissions)` - Require ALL permissions
+- `@RequireAnyPermission(...permissions)` - Require ANY permission
 
 ### DTOs & Types
 
-- **`CurrentUserDto`** - Current user data structure
-- **`ApiResponseDto<T>`** - Standardized API response
-- **`PaginationDto`** - Pagination query parameters
-- **`PaginationResponseDto<T>`** - Paginated response structure
-- **`JwtTokenData`** - JWT token payload structure
-- **`JwtValidationResult`** - JWT validation result
+- `CurrentUserDto`, `ApiResponseDto<T>`, `PaginationDto`, `PaginationResponseDto<T>`, `PaginationMetaDto`
+- `JwtTokenData`, `JwtValidationResult`
 
 ### Filters & Interceptors
 
-- **`HttpExceptionFilter`** - Global exception filter
-- **`RequestContextInterceptor`** - Request context interceptor (auto-registered)
+- `HttpExceptionFilter` - Global exception filter
+- `RequestContextInterceptor` - Auto-registered interceptor
 
 ### Config
 
-- **`jwtConfig`** - JWT configuration
-- **`redisConfig`** - Redis configuration
-- **`rabbitmqConfig`** - RabbitMQ configuration
-- **`RABBITMQ_ROUTING_KEYS`** - RabbitMQ routing keys constants
-- **`cookieConfig`** - Cookie configuration
-- **`internalConfig`** - Internal service configuration
-- **`corsConfig`** - CORS configuration
-- **`googleOAuthConfig`** - Google OAuth configuration
+- `jwtConfig`, `redisConfig`, `databaseConfig`, `rabbitmqConfig`, `RABBITMQ_ROUTING_KEYS`
+- `cookieConfig`, `internalConfig`, `corsConfig`, `googleOAuthConfig`
 
 ### Constants
 
-- **`MESSAGES`** - Vietnamese user-facing messages (AUTH, VALIDATION, etc.)
-- **`ERROR_MESSAGES`** - Error message constants
-- **`SUCCESS_MESSAGES`** - Success message constants
+- `MESSAGES` - Vietnamese messages (AUTH, VALIDATION, API, etc.)
+- `ERROR_MESSAGES`, `ERROR_RESPONSES`, `SUCCESS_MESSAGES`, `SUCCESS_RESPONSES`
+- `PERMISSION_QUERIES` - SQL queries for permissions
 
 ### Utils & Libs
 
-- **`DateUtils`** - Date utility functions
-- **`AxiosClient`**, **`apiClient`**, **`createServiceClient`** - Axios client utilities
+- `DateUtils` - Date utilities
+- `AxiosClient`, `apiClient`, `createServiceClient` - Axios utilities
 
 ## Environment Variables
 
@@ -206,7 +147,6 @@ throw new BadRequestException(MESSAGES.VALIDATION.EMAIL_REQUIRED);
 JWT_SECRET=your-jwt-secret
 JWT_EXPIRES_IN=15m
 JWT_REFRESH_EXPIRES_IN=7d
-JWT_SESSION_EXPIRES_IN=24h
 
 # Redis
 SHARED_REDIS_HOST=localhost
@@ -227,44 +167,41 @@ AUTH_COOKIE_NAME=auth_tokens
 
 # Internal Service
 INTERNAL_SECRET=internal-secret
-USER_MANAGEMENT_SERVICE_URL=http://service-user-management:3002
 ```
 
-## Package Structure
+## Publishing
 
-```
-package-core/
-├── src/
-│   ├── index.ts                    # Main export file
-│   ├── core/
-│   │   ├── core.module.ts         # Core module
-│   │   ├── services/              # 7 services
-│   │   ├── guards/                # 3 guards
-│   │   ├── decorators/            # 3 decorators
-│   │   ├── dtos/                  # 2 DTOs
-│   │   ├── filters/               # 1 filter
-│   │   ├── interceptors/          # 1 interceptor
-│   │   ├── strategies/            # 1 strategy
-│   │   └── subscribers/           # 1 subscriber
-│   ├── config/                    # 8 config files
-│   ├── constants/                 # 2 constant files
-│   ├── utils/                     # 1 util file
-│   └── libs/                      # 1 lib (axios)
-├── package.json
-├── tsconfig.json
-└── README.md
+```bash
+npm login                    # First time only
+npm run build                # Build package
+npm run publish:npm          # Publish to npm
+
+# Version management
+npm version patch            # 1.0.0 → 1.0.1
+npm version minor            # 1.0.0 → 1.1.0
+npm version major            # 1.0.0 → 2.0.0
 ```
 
-## Building
+## Docker Build
 
-```bash
-cd package-core
-npm run build
+**Không cần token!** Package public trên npmjs.com:
+
+```dockerfile
+FROM node:18-alpine
+WORKDIR /usr/src/app
+COPY package*.json ./
+RUN npm install  # Tự động lấy @fabx.vn/core từ npmjs.com
+COPY . .
+RUN npm run build
 ```
 
 ## Notes
 
-- **Global Module**: `CoreModule` is marked as `@Global()`, import once in `AppModule` and use everywhere
-- **Request Context**: `RequestContextInterceptor` is auto-registered via `APP_INTERCEPTOR`
-- **Internal Imports**: Package uses alias imports internally (`@core`, `@config`, `@constants`, etc.)
-- **Type Safety**: All exports are fully typed with TypeScript
+- **Global Module**: `CoreModule` is `@Global()`, import once in `AppModule`
+- **Request Context**: `RequestContextInterceptor` auto-registered via `APP_INTERCEPTOR`
+- **Type Safety**: All exports fully typed with TypeScript
+- **Public Package**: Published on npmjs.com, no token required to install
+
+## License
+
+MIT

package/dist/core/core.module.js

@@ -11,17 +11,17 @@ const common_1 = require("@nestjs/common");
 const passport_1 = require("@nestjs/passport");
 const jwt_1 = require("@nestjs/jwt");
 const core_1 = require("@nestjs/core");
-const jwt_config_1 = require("@config/jwt.config");
-const request_info_service_1 = require("@core/services/request-info.service");
-const jwt_service_1 = require("@core/services/jwt.service");
-const session_service_1 = require("@core/services/session.service");
-const redis_service_1 = require("@core/services/redis.service");
-const rabbitmq_publisher_service_1 = require("@core/services/rabbitmq-publisher.service");
-const jwt_strategy_1 = require("@core/strategies/jwt.strategy");
-const jwt_auth_guard_1 = require("@core/guards/jwt-auth.guard");
-const internal_auth_guard_1 = require("@core/guards/internal-auth.guard");
-const request_context_interceptor_1 = require("@core/interceptors/request-context.interceptor");
-const audit_subscriber_1 = require("@core/subscribers/audit.subscriber");
+const jwt_config_1 = require("../config/jwt.config");
+const request_info_service_1 = require("./services/request-info.service");
+const jwt_service_1 = require("./services/jwt.service");
+const session_service_1 = require("./services/session.service");
+const redis_service_1 = require("./services/redis.service");
+const rabbitmq_publisher_service_1 = require("./services/rabbitmq-publisher.service");
+const jwt_strategy_1 = require("./strategies/jwt.strategy");
+const jwt_auth_guard_1 = require("./guards/jwt-auth.guard");
+const internal_auth_guard_1 = require("./guards/internal-auth.guard");
+const request_context_interceptor_1 = require("./interceptors/request-context.interceptor");
+const audit_subscriber_1 = require("./subscribers/audit.subscriber");
 let CoreModule = class CoreModule {
 };
 exports.CoreModule = CoreModule;

package/dist/core/dtos/api-response.dto.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ApiResponseDto = void 0;
 const common_1 = require("@nestjs/common");
-const messages_constants_1 = require("@constants/messages.constants");
+const messages_constants_1 = require("../../constants/messages.constants");
 class ApiResponseDto {
     constructor(success, message, data, statusCode = common_1.HttpStatus.OK) {
         this.success = success;

package/dist/core/dtos/pagination.dto.js

@@ -12,7 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.PaginationResponseDto = exports.PaginationMetaDto = exports.PaginationDto = void 0;
 const class_validator_1 = require("class-validator");
 const class_transformer_1 = require("class-transformer");
-const messages_constants_1 = require("@constants/messages.constants");
+const messages_constants_1 = require("../../constants/messages.constants");
 class PaginationDto {
     constructor() {
         this.page = 1;

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

@@ -9,8 +9,8 @@ var HttpExceptionFilter_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HttpExceptionFilter = void 0;
 const common_1 = require("@nestjs/common");
-const api_response_dto_1 = require("@core/dtos/api-response.dto");
-const messages_constants_1 = require("@constants/messages.constants");
+const api_response_dto_1 = require("../dtos/api-response.dto");
+const messages_constants_1 = require("../../constants/messages.constants");
 let HttpExceptionFilter = HttpExceptionFilter_1 = class HttpExceptionFilter {
     constructor() {
         this.logger = new common_1.Logger(HttpExceptionFilter_1.name);

package/dist/core/guards/internal-auth.guard.d.ts

@@ -1,5 +1,5 @@
 import { CanActivate, ExecutionContext } from "@nestjs/common";
-import { CoreJwtService } from "@core/services/jwt.service";
+import { CoreJwtService } from "../services/jwt.service";
 export declare class InternalAuthGuard implements CanActivate {
     private readonly coreJwtService;
     constructor(coreJwtService: CoreJwtService);

package/dist/core/guards/internal-auth.guard.js

@@ -11,8 +11,8 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.InternalAuthGuard = void 0;
 const common_1 = require("@nestjs/common");
-const jwt_service_1 = require("@core/services/jwt.service");
-const messages_constants_1 = require("@constants/messages.constants");
+const jwt_service_1 = require("../services/jwt.service");
+const messages_constants_1 = require("../../constants/messages.constants");
 let InternalAuthGuard = class InternalAuthGuard {
     constructor(coreJwtService) {
         this.coreJwtService = coreJwtService;

package/dist/core/guards/jwt-auth.guard.d.ts

@@ -1,10 +1,11 @@
 import { ExecutionContext } from "@nestjs/common";
 import { Reflector } from "@nestjs/core";
-import { CoreJwtService } from "@core/services/jwt.service";
+import { CoreJwtService } from "../services/jwt.service";
 declare const JwtAuthGuard_base: import("@nestjs/passport").Type<import("@nestjs/passport").IAuthGuard>;
 export declare class JwtAuthGuard extends JwtAuthGuard_base {
     private reflector;
     private coreJwtService;
+    private readonly logger;
     constructor(reflector: Reflector, coreJwtService: CoreJwtService);
     canActivate(context: ExecutionContext): Promise<boolean>;
     handleRequest(err: any, user: any, info: any): any;

package/dist/core/guards/jwt-auth.guard.js

@@ -8,22 +8,25 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+var JwtAuthGuard_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.JwtAuthGuard = void 0;
 const common_1 = require("@nestjs/common");
 const passport_1 = require("@nestjs/passport");
 const core_1 = require("@nestjs/core");
-const jwt_service_1 = require("@core/services/jwt.service");
-const cookie_service_1 = require("@core/services/cookie.service");
-const messages_constants_1 = require("@constants/messages.constants");
-let JwtAuthGuard = class JwtAuthGuard extends (0, passport_1.AuthGuard)("jwt") {
+const jwt_service_1 = require("../services/jwt.service");
+const cookie_service_1 = require("../services/cookie.service");
+const messages_constants_1 = require("../../constants/messages.constants");
+const public_decorator_1 = require("../decorators/public.decorator");
+let JwtAuthGuard = JwtAuthGuard_1 = class JwtAuthGuard extends (0, passport_1.AuthGuard)("jwt") {
     constructor(reflector, coreJwtService) {
         super();
         this.reflector = reflector;
         this.coreJwtService = coreJwtService;
+        this.logger = new common_1.Logger(JwtAuthGuard_1.name);
     }
     async canActivate(context) {
-        const isPublic = this.reflector.getAllAndOverride("isPublic", [
+        const isPublic = this.reflector.getAllAndOverride(public_decorator_1.IS_PUBLIC_KEY, [
             context.getHandler(),
             context.getClass(),
         ]);
@@ -31,10 +34,12 @@ let JwtAuthGuard = class JwtAuthGuard extends (0, passport_1.AuthGuard)("jwt") {
             return true;
         const request = context.switchToHttp().getRequest();
         const tokens = cookie_service_1.CookieService.extractTokensFromCookie(request);
+        this.logger.log(`Access token: ${tokens?.accessToken}`);
         if (!tokens?.accessToken) {
             throw new common_1.UnauthorizedException(messages_constants_1.MESSAGES.AUTH.NO_TOKEN);
         }
         const currentUser = await this.coreJwtService.getCurrentUser(tokens.accessToken);
+        this.logger.log(`Current user: ${currentUser}`);
         if (!currentUser) {
             throw new common_1.UnauthorizedException(messages_constants_1.MESSAGES.AUTH.INVALID_TOKEN);
         }
@@ -42,13 +47,14 @@ let JwtAuthGuard = class JwtAuthGuard extends (0, passport_1.AuthGuard)("jwt") {
         return true;
     }
     handleRequest(err, user, info) {
+        this.logger.log(`Error: ${err}`);
         if (err || !user)
             new common_1.UnauthorizedException(messages_constants_1.MESSAGES.AUTH.INVALID_TOKEN);
         return user;
     }
 };
 exports.JwtAuthGuard = JwtAuthGuard;
-exports.JwtAuthGuard = JwtAuthGuard = __decorate([
+exports.JwtAuthGuard = JwtAuthGuard = JwtAuthGuard_1 = __decorate([
     (0, common_1.Injectable)(),
     __metadata("design:paramtypes", [core_1.Reflector,
         jwt_service_1.CoreJwtService])

package/dist/core/guards/jwt-auth.guard.js.map

@@ -1 +1 @@
-{"version":3,"file":"jwt-auth.guard.js","sourceRoot":"","sources":["../../../src/core/guards/jwt-auth.guard.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAIwB;AACxB,+CAA6C;AAC7C,uCAAyC;AACzC,4DAA4D;AAC5D,kEAA8D;AAC9D,sEAAyD;AAGlD,IAAM,YAAY,GAAlB,MAAM,YAAa,SAAQ,IAAA,oBAAS,EAAC,KAAK,CAAC;IAChD,YACU,SAAoB,EACpB,cAA8B;QAEtC,KAAK,EAAE,CAAC;QAHA,cAAS,GAAT,SAAS,CAAW;QACpB,mBAAc,GAAd,cAAc,CAAgB;IAGxC,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,OAAyB;QAEzC,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAAU,UAAU,EAAE;YACrE,OAAO,CAAC,UAAU,EAAE;YACpB,OAAO,CAAC,QAAQ,EAAE;SACnB,CAAC,CAAC;QAEH,IAAI,QAAQ;YAAE,OAAO,IAAI,CAAC;QAE1B,MAAM,OAAO,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC,UAAU,EAAE,CAAC;QACpD,MAAM,MAAM,GAAG,8BAAa,CAAC,uBAAuB,CAAC,OAAO,CAAC,CAAC;QAE9D,IAAI,CAAC,MAAM,EAAE,WAAW,EAAE,CAAC;YACzB,MAAM,IAAI,8BAAqB,CAAC,6BAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC1D,CAAC;QAED,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,cAAc,CAC1D,MAAM,CAAC,WAAW,CACnB,CAAC;QAEF,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,MAAM,IAAI,8BAAqB,CAAC,6BAAQ,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QAC/D,CAAC;QAGD,OAAO,CAAC,IAAI,GAAG,WAAW,CAAC;QAE3B,OAAO,IAAI,CAAC;IACd,CAAC;IAED,aAAa,CAAC,GAAQ,EAAE,IAAS,EAAE,IAAS;QAC1C,IAAI,GAAG,IAAI,CAAC,IAAI;YAAE,IAAI,8BAAqB,CAAC,6BAAQ,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QACzE,OAAO,IAAI,CAAC;IACd,CAAC;CACF,CAAA;AA1CY,oCAAY;uBAAZ,YAAY;IADxB,IAAA,mBAAU,GAAE;qCAGU,gBAAS;QACJ,4BAAc;GAH7B,YAAY,CA0CxB"}
+{"version":3,"file":"jwt-auth.guard.js","sourceRoot":"","sources":["../../../src/core/guards/jwt-auth.guard.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,2CAKwB;AACxB,+CAA6C;AAC7C,uCAAyC;AACzC,4DAA4D;AAC5D,kEAA8D;AAC9D,sEAAyD;AACzD,wEAAkE;AAG3D,IAAM,YAAY,oBAAlB,MAAM,YAAa,SAAQ,IAAA,oBAAS,EAAC,KAAK,CAAC;IAGhD,YACU,SAAoB,EACpB,cAA8B;QAEtC,KAAK,EAAE,CAAC;QAHA,cAAS,GAAT,SAAS,CAAW;QACpB,mBAAc,GAAd,cAAc,CAAgB;QAJvB,WAAM,GAAG,IAAI,eAAM,CAAC,cAAY,CAAC,IAAI,CAAC,CAAC;IAOxD,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,OAAyB;QAEzC,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAAU,gCAAa,EAAE;YACxE,OAAO,CAAC,UAAU,EAAE;YACpB,OAAO,CAAC,QAAQ,EAAE;SACnB,CAAC,CAAC;QAEH,IAAI,QAAQ;YAAE,OAAO,IAAI,CAAC;QAE1B,MAAM,OAAO,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC,UAAU,EAAE,CAAC;QACpD,MAAM,MAAM,GAAG,8BAAa,CAAC,uBAAuB,CAAC,OAAO,CAAC,CAAC;QAE9D,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,iBAAiB,MAAM,EAAE,WAAW,EAAE,CAAC,CAAC;QACxD,IAAI,CAAC,MAAM,EAAE,WAAW,EAAE,CAAC;YACzB,MAAM,IAAI,8BAAqB,CAAC,6BAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC1D,CAAC;QAED,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,cAAc,CAC1D,MAAM,CAAC,WAAW,CACnB,CAAC;QAEF,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,iBAAiB,WAAW,EAAE,CAAC,CAAC;QAChD,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,MAAM,IAAI,8BAAqB,CAAC,6BAAQ,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QAC/D,CAAC;QAED,OAAO,CAAC,IAAI,GAAG,WAAW,CAAC;QAE3B,OAAO,IAAI,CAAC;IACd,CAAC;IAED,aAAa,CAAC,GAAQ,EAAE,IAAS,EAAE,IAAS;QAC1C,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,GAAG,EAAE,CAAC,CAAC;QACjC,IAAI,GAAG,IAAI,CAAC,IAAI;YAAE,IAAI,8BAAqB,CAAC,6BAAQ,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QACzE,OAAO,IAAI,CAAC;IACd,CAAC;CACF,CAAA;AA9CY,oCAAY;uBAAZ,YAAY;IADxB,IAAA,mBAAU,GAAE;qCAKU,gBAAS;QACJ,4BAAc;GAL7B,YAAY,CA8CxB"}

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

@@ -1,6 +1,6 @@
 import { CanActivate, ExecutionContext } from "@nestjs/common";
 import { Reflector } from "@nestjs/core";
-import { CoreJwtService } from "@core/services/jwt.service";
+import { CoreJwtService } from "../services/jwt.service";
 export declare class PermissionGuard implements CanActivate {
     private reflector;
     private coreJwtService;

package/dist/core/guards/permission.guard.js

@@ -12,11 +12,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.PermissionGuard = void 0;
 const common_1 = require("@nestjs/common");
 const core_1 = require("@nestjs/core");
-const require_permissions_decorator_1 = require("@core/decorators/require-permissions.decorator");
-const public_decorator_1 = require("@core/decorators/public.decorator");
-const jwt_service_1 = require("@core/services/jwt.service");
-const cookie_service_1 = require("@core/services/cookie.service");
-const messages_constants_1 = require("@constants/messages.constants");
+const require_permissions_decorator_1 = require("../decorators/require-permissions.decorator");
+const public_decorator_1 = require("../decorators/public.decorator");
+const jwt_service_1 = require("../services/jwt.service");
+const cookie_service_1 = require("../services/cookie.service");
+const messages_constants_1 = require("../../constants/messages.constants");
 let PermissionGuard = class PermissionGuard {
     constructor(reflector, coreJwtService) {
         this.reflector = reflector;

package/dist/core/interceptors/request-context.interceptor.d.ts

@@ -1,6 +1,6 @@
 import { NestInterceptor, ExecutionContext, CallHandler } from "@nestjs/common";
 import { Observable } from "rxjs";
-import { RequestInfoService } from "@core/services/request-info.service";
+import { RequestInfoService } from "../services/request-info.service";
 export declare class RequestContextInterceptor implements NestInterceptor {
     private requestInfoService;
     constructor(requestInfoService: RequestInfoService);

package/dist/core/interceptors/request-context.interceptor.js

@@ -11,8 +11,8 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RequestContextInterceptor = void 0;
 const common_1 = require("@nestjs/common");
-const request_context_service_1 = require("@core/services/request-context.service");
-const request_info_service_1 = require("@core/services/request-info.service");
+const request_context_service_1 = require("../services/request-context.service");
+const request_info_service_1 = require("../services/request-info.service");
 let RequestContextInterceptor = class RequestContextInterceptor {
     constructor(requestInfoService) {
         this.requestInfoService = requestInfoService;

package/dist/core/services/cache.service.js

@@ -9,7 +9,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CacheService = void 0;
 const common_1 = require("@nestjs/common");
 const ioredis_1 = require("ioredis");
-const redis_config_1 = require("@config/redis.config");
+const redis_config_1 = require("../../config/redis.config");
 let CacheService = class CacheService {
     async onModuleInit() {
         this.redis = new ioredis_1.default(redis_config_1.redisConfig);

package/dist/core/services/cookie.service.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CookieService = void 0;
-const cookie_config_1 = require("@config/cookie.config");
+const cookie_config_1 = require("../../config/cookie.config");
 class CookieService {
     static setAuthCookies(res, accessToken, refreshToken, refreshTokenExpiresAt) {
         const authData = {

package/dist/core/services/jwt.service.d.ts

@@ -1,5 +1,5 @@
 import { JwtService } from "@nestjs/jwt";
-import { SessionService, CurrentUserDto } from "@core/services/session.service";
+import { SessionService, CurrentUserDto } from "../services/session.service";
 export interface JwtTokenData {
     sub: string | number;
     sessionId?: string;
@@ -13,6 +13,7 @@ export interface JwtValidationResult {
 export declare class CoreJwtService {
     private readonly jwtService;
     private readonly sessionService;
+    private readonly logger;
     constructor(jwtService: JwtService, sessionService: SessionService);
     createAccessToken(sessionData: CurrentUserDto): Promise<string>;
     createSimpleAccessToken(userId: string | number, email: string): string;

package/dist/core/services/jwt.service.js

@@ -8,19 +8,21 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+var CoreJwtService_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CoreJwtService = void 0;
 const common_1 = require("@nestjs/common");
 const jwt_1 = require("@nestjs/jwt");
-const session_service_1 = require("@core/services/session.service");
-const date_utils_1 = require("@utils/date.utils");
-const jwt_config_1 = require("@config/jwt.config");
-const internal_config_1 = require("@config/internal.config");
-const messages_constants_1 = require("@constants/messages.constants");
-let CoreJwtService = class CoreJwtService {
+const session_service_1 = require("../services/session.service");
+const date_utils_1 = require("../../utils/date.utils");
+const jwt_config_1 = require("../../config/jwt.config");
+const internal_config_1 = require("../../config/internal.config");
+const messages_constants_1 = require("../../constants/messages.constants");
+let CoreJwtService = CoreJwtService_1 = class CoreJwtService {
     constructor(jwtService, sessionService) {
         this.jwtService = jwtService;
         this.sessionService = sessionService;
+        this.logger = new common_1.Logger(CoreJwtService_1.name);
     }
     async createAccessToken(sessionData) {
         const ttlSec = date_utils_1.DateUtils.parseExpirationTime(jwt_config_1.jwtConfig.expiresIn);
@@ -164,9 +166,11 @@ let CoreJwtService = class CoreJwtService {
     async getCurrentUser(accessToken) {
         try {
             const payload = this.decodeToken(accessToken);
+            this.logger.log(`Payload: ${JSON.stringify(payload)}`);
             if (!payload?.sessionId)
                 return null;
             const sessionData = await this.sessionService.getSession(payload.sessionId);
+            this.logger.log(`Session data: ${JSON.stringify(sessionData)}`);
             return sessionData;
         }
         catch (error) {
@@ -179,7 +183,7 @@ let CoreJwtService = class CoreJwtService {
     }
 };
 exports.CoreJwtService = CoreJwtService;
-exports.CoreJwtService = CoreJwtService = __decorate([
+exports.CoreJwtService = CoreJwtService = CoreJwtService_1 = __decorate([
     (0, common_1.Injectable)(),
     __metadata("design:paramtypes", [jwt_1.JwtService,
         session_service_1.SessionService])

package/dist/core/services/jwt.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"jwt.service.js","sourceRoot":"","sources":["../../../src/core/services/jwt.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"jwt.service.js","sourceRoot":"","sources":["../../../src/core/services/jwt.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,2CAAoD;AACpD,qCAAyC;AACzC,oEAAgF;AAChF,kDAA8C;AAC9C,mDAA+C;AAC/C,6DAAyD;AACzD,sEAAyD;AAelD,IAAM,cAAc,sBAApB,MAAM,cAAc;IAGzB,YACmB,UAAsB,EACtB,cAA8B;QAD9B,eAAU,GAAV,UAAU,CAAY;QACtB,mBAAc,GAAd,cAAc,CAAgB;QAJhC,WAAM,GAAG,IAAI,eAAM,CAAC,gBAAc,CAAC,IAAI,CAAC,CAAC;IAKvD,CAAC;IAMJ,KAAK,CAAC,iBAAiB,CAAC,WAA2B;QACjD,MAAM,MAAM,GAAG,sBAAS,CAAC,mBAAmB,CAAC,sBAAS,CAAC,SAAS,CAAC,CAAC;QAClE,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,aAAa,CACvD,WAAW,EACX,MAAM,CACP,CAAC;QACF,MAAM,OAAO,GAAiB;YAC5B,GAAG,EAAE,WAAW,CAAC,MAAM;YACvB,SAAS,EAAE,SAAS;YACpB,KAAK,EAAE,WAAW,CAAC,KAAK;SACzB,CAAC;QACF,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACvC,CAAC;IAMD,uBAAuB,CAAC,MAAuB,EAAE,KAAa;QAC5D,MAAM,OAAO,GAAiB;YAC5B,GAAG,EAAE,MAAM;YACX,KAAK,EAAE,KAAK;SACb,CAAC;QACF,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACvC,CAAC;IAKD,WAAW,CAAC,KAAa;QACvB,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,CAAiB,CAAC;YAC9D,OAAO,OAAO,CAAC;QACjB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;IAKD,WAAW,CAAC,KAAa;QACvB,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,CAAiB,CAAC;YAC9D,OAAO,OAAO,CAAC;QACjB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;IAKD,sBAAsB,CAAC,KAAa;QAClC,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;YACxC,IAAI,CAAC,OAAO,EAAE,CAAC;gBACb,OAAO;oBACL,OAAO,EAAE,KAAK;oBACd,KAAK,EAAE,6BAAQ,CAAC,GAAG,CAAC,uBAAuB;iBAC5C,CAAC;YACJ,CAAC;YAED,OAAO;gBACL,OAAO,EAAE,IAAI;gBACb,OAAO;aACR,CAAC;QACJ,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,KAAK,EAAE,6BAAQ,CAAC,GAAG,CAAC,uBAAuB;aAC5C,CAAC;QACJ,CAAC;IACH,CAAC;IAKD,qBAAqB,CAAC,KAAa;QACjC,MAAM,MAAM,GAAG,IAAI,CAAC,sBAAsB,CAAC,KAAK,CAAC,CAAC;QAClD,OAAO,MAAM,CAAC,OAAO,CAAC;IACxB,CAAC;IAKD,kBAAkB,CAAC,KAAa;QAC9B,MAAM,OAAO,GAAG,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QACxC,OAAO,OAAO,EAAE,GAAG,IAAI,IAAI,CAAC;IAC9B,CAAC;IAKD,qBAAqB,CAAC,KAAa;QACjC,MAAM,OAAO,GAAG,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QACxC,OAAO,OAAO,EAAE,SAAS,IAAI,IAAI,CAAC;IACpC,CAAC;IAKD,KAAK,CAAC,sBAAsB,CAAC,KAAa;QACxC,MAAM,SAAS,GAAG,IAAI,CAAC,qBAAqB,CAAC,KAAK,CAAC,CAAC;QACpD,IAAI,SAAS,EAAE,CAAC;YACd,MAAM,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;YACnD,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAKD,sBAAsB,CAAC,OAAY;QACjC,IAAI,CAAC;YACH,MAAM,UAAU,GAAG,OAAO,CAAC,OAAO,EAAE,aAAa,CAAC;YAClD,IAAI,CAAC,UAAU,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;gBACrD,OAAO,IAAI,CAAC;YACd,CAAC;YAED,OAAO,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;QACjC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;IAKD,sBAAsB,CAAC,KAAa;QAClC,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;YACxC,IAAI,CAAC,OAAO;gBAAE,OAAO,IAAI,CAAC;YAG1B,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,CAAQ,CAAC;YACrD,IAAI,CAAC,OAAO,EAAE,GAAG;gBAAE,OAAO,IAAI,CAAC;YAE/B,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC;YAC9D,OAAO,SAAS,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC;QAC1C,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;IAKD,cAAc,CAAC,KAAa;QAC1B,MAAM,cAAc,GAAG,IAAI,CAAC,sBAAsB,CAAC,KAAK,CAAC,CAAC;QAC1D,OAAO,cAAc,KAAK,IAAI,IAAI,cAAc,IAAI,CAAC,CAAC;IACxD,CAAC;IAKD,kBAAkB,CAChB,MAAuB,EACvB,SAAkB,EAClB,KAAc;QAEd,MAAM,OAAO,GAAiB;YAC5B,GAAG,EAAE,MAAM;SACZ,CAAC;QACF,IAAI,SAAS,EAAE,CAAC;YACd,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;QAChC,CAAC;QACD,IAAI,KAAK,EAAE,CAAC;YACV,OAAO,CAAC,KAAK,GAAG,KAAK,CAAC;QACxB,CAAC;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;IAKD,SAAS,CAAC,OAAqB;QAC7B,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACvC,CAAC;IAMD,mBAAmB,CAAC,OAAe;QACjC,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,CACzB,EAAE,OAAO,EAAE,EACX;YACE,MAAM,EAAE,gCAAc,CAAC,cAAc;YACrC,SAAS,EAAE,IAAI;SAChB,CACF,CAAC;IACJ,CAAC;IAMD,mBAAmB,CAAC,KAAa;QAC/B,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,EAAE;gBAC5C,MAAM,EAAE,gCAAc,CAAC,cAAc;aACtC,CAEA,CAAC;YACF,OAAO,OAAO,CAAC;QACjB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;IAOD,KAAK,CAAC,cAAc,CAAC,WAAmB;QACtC,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;YAC9C,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,YAAY,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;YACvD,IAAI,CAAC,OAAO,EAAE,SAAS;gBAAE,OAAO,IAAI,CAAC;YAErC,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,UAAU,CACtD,OAAO,CAAC,SAAS,CAClB,CAAC;YACF,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,iBAAiB,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;YAChE,OAAO,WAAW,CAAC;QACrB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;IAKD,iBAAiB,CAAC,KAAa;QAC7B,MAAM,OAAO,GAAG,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QACxC,OAAO,OAAO,EAAE,KAAK,IAAI,IAAI,CAAC;IAChC,CAAC;CACF,CAAA;AA5PY,wCAAc;yBAAd,cAAc;IAD1B,IAAA,mBAAU,GAAE;qCAKoB,gBAAU;QACN,gCAAc;GALtC,cAAc,CA4P1B"}