@fabx.vn/core 1.1.23 → 1.1.25
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/core/core.module.js +0 -3
- package/dist/core/core.module.js.map +1 -1
- package/dist/core/decorators/current-user.decorator.js +20 -5
- package/dist/core/decorators/current-user.decorator.js.map +1 -1
- package/dist/core/services/base-pagination.service.js +5 -2
- package/dist/core/services/base-pagination.service.js.map +1 -1
- package/dist/core/services/session.service.d.ts +19 -5
- package/dist/core/services/session.service.js.map +1 -1
- package/dist/core/subscribers/audit.subscriber.js +2 -5
- package/dist/core/subscribers/audit.subscriber.js.map +1 -1
- package/dist/index.d.ts +1 -3
- package/dist/index.js +1 -6
- package/dist/index.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
package/dist/core/core.module.js
CHANGED
|
@@ -18,7 +18,6 @@ const session_service_1 = require("./services/session.service");
|
|
|
18
18
|
const redis_service_1 = require("./services/redis.service");
|
|
19
19
|
const redis_cache_service_1 = require("./services/redis-cache.service");
|
|
20
20
|
const rabbitmq_publisher_service_1 = require("./services/rabbitmq-publisher.service");
|
|
21
|
-
const repository_wrapper_service_1 = require("./services/repository-wrapper.service");
|
|
22
21
|
const jwt_strategy_1 = require("./strategies/jwt.strategy");
|
|
23
22
|
const jwt_auth_guard_1 = require("./guards/jwt-auth.guard");
|
|
24
23
|
const internal_auth_guard_1 = require("./guards/internal-auth.guard");
|
|
@@ -49,7 +48,6 @@ exports.CoreModule = CoreModule = __decorate([
|
|
|
49
48
|
jwt_service_1.CoreJwtService,
|
|
50
49
|
session_service_1.SessionService,
|
|
51
50
|
rabbitmq_publisher_service_1.RabbitMQPublisher,
|
|
52
|
-
repository_wrapper_service_1.RepositoryWrapperService,
|
|
53
51
|
jwt_strategy_1.JwtStrategy,
|
|
54
52
|
jwt_auth_guard_1.JwtAuthGuard,
|
|
55
53
|
internal_auth_guard_1.InternalAuthGuard,
|
|
@@ -67,7 +65,6 @@ exports.CoreModule = CoreModule = __decorate([
|
|
|
67
65
|
redis_service_1.RedisService,
|
|
68
66
|
redis_cache_service_1.RedisCacheService,
|
|
69
67
|
rabbitmq_publisher_service_1.RabbitMQPublisher,
|
|
70
|
-
repository_wrapper_service_1.RepositoryWrapperService,
|
|
71
68
|
jwt_strategy_1.JwtStrategy,
|
|
72
69
|
jwt_auth_guard_1.JwtAuthGuard,
|
|
73
70
|
internal_auth_guard_1.InternalAuthGuard,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"core.module.js","sourceRoot":"","sources":["../../src/core/core.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAgD;AAChD,+CAAkD;AAClD,qCAAwC;AACxC,uCAA+C;AAC/C,mDAA+C;AAG/C,8EAAyE;AACzE,4DAA4D;AAC5D,oEAAgE;AAChE,gEAA4D;AAC5D,4EAAuE;AACvE,0FAA8E;
|
|
1
|
+
{"version":3,"file":"core.module.js","sourceRoot":"","sources":["../../src/core/core.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAgD;AAChD,+CAAkD;AAClD,qCAAwC;AACxC,uCAA+C;AAC/C,mDAA+C;AAG/C,8EAAyE;AACzE,4DAA4D;AAC5D,oEAAgE;AAChE,gEAA4D;AAC5D,4EAAuE;AACvE,0FAA8E;AAG9E,gEAA4D;AAG5D,gEAA2D;AAC3D,0EAAqE;AAGrE,gGAA2F;AAG3F,yEAAqE;AAuD9D,IAAM,UAAU,GAAhB,MAAM,UAAU;CAAG,CAAA;AAAb,gCAAU;qBAAV,UAAU;IArDtB,IAAA,eAAM,GAAE;IACR,IAAA,eAAM,EAAC;QACN,OAAO,EAAE;YACP,yBAAc;YACd,eAAS,CAAC,aAAa,CAAC;gBACtB,MAAM,EAAE,IAAI;gBACZ,UAAU,EAAE,GAAG,EAAE,CAAC,CAAC;oBACjB,MAAM,EAAE,sBAAS,CAAC,MAAM;oBACxB,WAAW,EAAE;wBACX,SAAS,EAAE,sBAAS,CAAC,SAAS;qBAC/B;iBACF,CAAC;aACH,CAAC;SACH;QACD,SAAS,EAAE;YAET,4BAAY;YACZ,uCAAiB;YACjB,yCAAkB;YAClB,4BAAc;YACd,gCAAc;YACd,8CAAiB;YAEjB,0BAAW;YAEX,6BAAY;YACZ,uCAAiB;YAEjB,uDAAyB;YACzB;gBACE,OAAO,EAAE,sBAAe;gBACxB,QAAQ,EAAE,uDAAyB;aACpC;YAED,kCAAe;SAChB;QACD,OAAO,EAAE;YAEP,yCAAkB;YAClB,4BAAc;YACd,gCAAc;YACd,4BAAY;YACZ,uCAAiB;YACjB,8CAAiB;YAEjB,0BAAW;YAEX,6BAAY;YACZ,uCAAiB;YAEjB,uDAAyB;SAC1B;KACF,CAAC;GACW,UAAU,CAAG"}
|
|
@@ -9,16 +9,31 @@ exports.CurrentUser = (0, common_1.createParamDecorator)((data, ctx) => {
|
|
|
9
9
|
if (!user) {
|
|
10
10
|
throw new common_1.UnauthorizedException(messages_constants_1.MESSAGES.AUTH.INVALID_TOKEN);
|
|
11
11
|
}
|
|
12
|
+
const orgUnits = (user.orgUnits || []).map((org) => ({
|
|
13
|
+
orgUnitId: org.orgUnitId || 0,
|
|
14
|
+
isDefault: org.isDefault || false,
|
|
15
|
+
dataScope: org.dataScope || "ALL",
|
|
16
|
+
orgUnitCode: org.orgUnitCode,
|
|
17
|
+
orgUnitName: org.orgUnitName,
|
|
18
|
+
}));
|
|
19
|
+
const defaultOrgUnit = orgUnits.find((org) => org.isDefault) || null;
|
|
12
20
|
return {
|
|
13
|
-
|
|
21
|
+
tenantId: parseInt(user.tenantId || "0"),
|
|
14
22
|
uuid: user.uuid || "",
|
|
15
23
|
userId: parseInt(user.userId || "0"),
|
|
16
|
-
orgUnitId: parseInt(user.orgUnitId || "0"),
|
|
17
24
|
email: user.email || "",
|
|
25
|
+
employeeCode: user.employeeCode,
|
|
26
|
+
firstName: user.firstName,
|
|
27
|
+
lastName: user.lastName,
|
|
28
|
+
phoneNumber: user.phoneNumber,
|
|
29
|
+
address: user.address,
|
|
30
|
+
jobTitle: user.jobTitle,
|
|
31
|
+
avatarUrl: user.avatarUrl,
|
|
32
|
+
language: user.language || "vi",
|
|
33
|
+
meta: user.meta,
|
|
18
34
|
fullName: user.fullName || "",
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
dataScope: user.dataScope || "",
|
|
35
|
+
orgUnits,
|
|
36
|
+
orgUnit: defaultOrgUnit,
|
|
22
37
|
permissions: user.permissions || [],
|
|
23
38
|
};
|
|
24
39
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"current-user.decorator.js","sourceRoot":"","sources":["../../../src/core/decorators/current-user.decorator.ts"],"names":[],"mappings":";;;AAAA,sEAAyD;AAEzD,2CAIwB;AAEX,QAAA,WAAW,GAAG,IAAA,6BAAoB,EAC7C,CAAC,IAAa,EAAE,GAAqB,EAAkB,EAAE;IACvD,MAAM,OAAO,GAAG,GAAG,CAAC,YAAY,EAAE,CAAC,UAAU,EAAE,CAAC;IAChD,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAC1B,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,MAAM,IAAI,8BAAqB,CAAC,6BAAQ,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IAC/D,CAAC;
|
|
1
|
+
{"version":3,"file":"current-user.decorator.js","sourceRoot":"","sources":["../../../src/core/decorators/current-user.decorator.ts"],"names":[],"mappings":";;;AAAA,sEAAyD;AAEzD,2CAIwB;AAEX,QAAA,WAAW,GAAG,IAAA,6BAAoB,EAC7C,CAAC,IAAa,EAAE,GAAqB,EAAkB,EAAE;IACvD,MAAM,OAAO,GAAG,GAAG,CAAC,YAAY,EAAE,CAAC,UAAU,EAAE,CAAC;IAChD,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAC1B,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,MAAM,IAAI,8BAAqB,CAAC,6BAAQ,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IAC/D,CAAC;IAGD,MAAM,QAAQ,GAAqB,CAAC,IAAI,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,GAAG,CAC1D,CAAC,GAAQ,EAAE,EAAE,CAAC,CAAC;QACb,SAAS,EAAE,GAAG,CAAC,SAAS,IAAI,CAAC;QAC7B,SAAS,EAAE,GAAG,CAAC,SAAS,IAAI,KAAK;QACjC,SAAS,EAAE,GAAG,CAAC,SAAS,IAAI,KAAK;QACjC,WAAW,EAAE,GAAG,CAAC,WAAW;QAC5B,WAAW,EAAE,GAAG,CAAC,WAAW;KAC7B,CAAC,CACH,CAAC;IAGF,MAAM,cAAc,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,IAAI,CAAC;IAErE,OAAO;QACL,QAAQ,EAAE,QAAQ,CAAC,IAAI,CAAC,QAAQ,IAAI,GAAG,CAAC;QACxC,IAAI,EAAE,IAAI,CAAC,IAAI,IAAI,EAAE;QACrB,MAAM,EAAE,QAAQ,CAAC,IAAI,CAAC,MAAM,IAAI,GAAG,CAAC;QACpC,KAAK,EAAE,IAAI,CAAC,KAAK,IAAI,EAAE;QACvB,YAAY,EAAE,IAAI,CAAC,YAAY;QAC/B,SAAS,EAAE,IAAI,CAAC,SAAS;QACzB,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACvB,WAAW,EAAE,IAAI,CAAC,WAAW;QAC7B,OAAO,EAAE,IAAI,CAAC,OAAO;QACrB,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACvB,SAAS,EAAE,IAAI,CAAC,SAAS;QACzB,QAAQ,EAAE,IAAI,CAAC,QAAQ,IAAI,IAAI;QAC/B,IAAI,EAAE,IAAI,CAAC,IAAI;QACf,QAAQ,EAAE,IAAI,CAAC,QAAQ,IAAI,EAAE;QAC7B,QAAQ;QACR,OAAO,EAAE,cAAc;QACvB,WAAW,EAAE,IAAI,CAAC,WAAW,IAAI,EAAE;KACpC,CAAC;AACJ,CAAC,CACF,CAAC"}
|
|
@@ -106,11 +106,14 @@ class BasePaginationService {
|
|
|
106
106
|
const selectExpression = isDateColumn
|
|
107
107
|
? `DATE(${entityAlias}.${dbField}) AS value`
|
|
108
108
|
: `COALESCE(${entityAlias}.${dbField}, 'null') AS value`;
|
|
109
|
+
const groupByExpression = isDateColumn
|
|
110
|
+
? `DATE(${entityAlias}.${dbField})`
|
|
111
|
+
: `COALESCE(${entityAlias}.${dbField}, 'null')`;
|
|
109
112
|
const searchCondition = `value LIKE :search`;
|
|
110
113
|
const baseQuery = this.repository
|
|
111
114
|
.createQueryBuilder(entityAlias)
|
|
112
115
|
.select(selectExpression)
|
|
113
|
-
.groupBy(
|
|
116
|
+
.groupBy(groupByExpression);
|
|
114
117
|
const deletedAtField = this.getDeletedAtField();
|
|
115
118
|
if (deletedAtField) {
|
|
116
119
|
baseQuery.where(`${entityAlias}.${deletedAtField} IS NULL`);
|
|
@@ -126,7 +129,7 @@ class BasePaginationService {
|
|
|
126
129
|
.createQueryBuilder(entityAlias)
|
|
127
130
|
.select(selectExpression)
|
|
128
131
|
.addSelect("COUNT(*) AS count")
|
|
129
|
-
.groupBy(
|
|
132
|
+
.groupBy(groupByExpression)
|
|
130
133
|
.orderBy("value", "ASC")
|
|
131
134
|
.skip((page - 1) * limit)
|
|
132
135
|
.take(limit);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base-pagination.service.js","sourceRoot":"","sources":["../../../src/core/services/base-pagination.service.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"base-pagination.service.js","sourceRoot":"","sources":["../../../src/core/services/base-pagination.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,14 +1,28 @@
|
|
|
1
1
|
import { RedisService } from "../services/redis.service";
|
|
2
|
+
export interface OrgUnitInfoDto {
|
|
3
|
+
orgUnitId: number;
|
|
4
|
+
isDefault: boolean;
|
|
5
|
+
dataScope: string;
|
|
6
|
+
orgUnitCode?: string;
|
|
7
|
+
orgUnitName?: string;
|
|
8
|
+
}
|
|
2
9
|
export interface CurrentUserDto {
|
|
3
|
-
|
|
10
|
+
tenantId: number;
|
|
4
11
|
uuid: string;
|
|
5
12
|
userId: number;
|
|
6
|
-
orgUnitId: number;
|
|
7
13
|
email: string;
|
|
14
|
+
employeeCode?: string;
|
|
15
|
+
firstName?: string;
|
|
16
|
+
lastName?: string;
|
|
17
|
+
phoneNumber?: string;
|
|
18
|
+
address?: string;
|
|
19
|
+
jobTitle?: string;
|
|
20
|
+
avatarUrl?: string;
|
|
21
|
+
language: string;
|
|
22
|
+
meta?: Record<string, any>;
|
|
8
23
|
fullName: string;
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
dataScope: string;
|
|
24
|
+
orgUnits: OrgUnitInfoDto[];
|
|
25
|
+
orgUnit: OrgUnitInfoDto | null;
|
|
12
26
|
permissions: string[];
|
|
13
27
|
}
|
|
14
28
|
export declare class SessionService {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.service.js","sourceRoot":"","sources":["../../../src/core/services/session.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,mCAAoC;AACpC,gEAA4D;
|
|
1
|
+
{"version":3,"file":"session.service.js","sourceRoot":"","sources":["../../../src/core/services/session.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -48,11 +48,8 @@ let AuditSubscriber = class AuditSubscriber {
|
|
|
48
48
|
const user = request_context_service_1.RequestContextService.getCurrentUser();
|
|
49
49
|
if (user?.userId) {
|
|
50
50
|
this.safeSetProperty(event.entity, "createdBy", user.userId, event.metadata);
|
|
51
|
-
if (user.orgUnitId) {
|
|
52
|
-
this.safeSetProperty(event.entity, "createdOrg", user.orgUnitId, event.metadata);
|
|
53
|
-
}
|
|
54
|
-
if (user.companyId) {
|
|
55
|
-
this.safeSetProperty(event.entity, "companyId", user.companyId, event.metadata);
|
|
51
|
+
if (user.orgUnit?.orgUnitId) {
|
|
52
|
+
this.safeSetProperty(event.entity, "createdOrg", user.orgUnit?.orgUnitId, event.metadata);
|
|
56
53
|
}
|
|
57
54
|
}
|
|
58
55
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"audit.subscriber.js","sourceRoot":"","sources":["../../../src/core/subscribers/audit.subscriber.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAQiB;AACjB,2CAA4C;AAC5C,oFAA+E;AAIxE,IAAM,eAAe,GAArB,MAAM,eAAe;IAC1B,YAAoB,UAAsB;QAAtB,eAAU,GAAV,UAAU,CAAY;QACxC,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACzC,CAAC;IAMO,eAAe,CACrB,MAAW,EACX,QAAgB,EAChB,KAAU,EACV,QAAc;QAEd,IAAI,CAAC,MAAM;YAAE,OAAO;QAEpB,IAAI,CAAC;YAEH,IAAI,cAAc,GAAG,QAAQ,CAAC;YAE9B,IAAI,CAAC,cAAc,IAAI,MAAM,CAAC,WAAW,EAAE,CAAC;gBAC1C,cAAc,GAAG,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC,IAAI,CACnD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,KAAK,MAAM,CAAC,WAAW,CAC7C,CAAC;YACJ,CAAC;YAED,IAAI,cAAc,EAAE,CAAC;gBAEnB,MAAM,WAAW,GAAG,cAAc,CAAC,OAAO,CAAC,IAAI,CAC7C,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,YAAY,KAAK,QAAQ,CAC7C,CAAC;gBAEF,IAAI,WAAW,EAAE,CAAC;oBAChB,MAAM,CAAC,QAAQ,CAAC,GAAG,KAAK,CAAC;gBAC3B,CAAC;YAEH,CAAC;iBAAM,CAAC;gBAGN,IACE,QAAQ,IAAI,MAAM;oBAClB,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,EACtD,CAAC;oBACD,MAAM,CAAC,QAAQ,CAAC,GAAG,KAAK,CAAC;gBAC3B,CAAC;YACH,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;QAGjB,CAAC;IACH,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,KAAuB;QACxC,IAAI,CAAC,KAAK,CAAC,MAAM;YAAE,OAAO;QAE1B,MAAM,IAAI,GAAG,+CAAqB,CAAC,cAAc,EAAE,CAAC;QACpD,IAAI,IAAI,EAAE,MAAM,EAAE,CAAC;YACjB,IAAI,CAAC,eAAe,CAClB,KAAK,CAAC,MAAM,EACZ,WAAW,EACX,IAAI,CAAC,MAAM,EACX,KAAK,CAAC,QAAQ,CACf,CAAC;YACF,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"audit.subscriber.js","sourceRoot":"","sources":["../../../src/core/subscribers/audit.subscriber.ts"],"names":[],"mappings":"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"}
|
package/dist/index.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
export { CoreModule } from "./core/core.module";
|
|
2
2
|
export { CoreJwtService } from "./core/services/jwt.service";
|
|
3
|
-
export { SessionService, CurrentUserDto } from "./core/services/session.service";
|
|
3
|
+
export { SessionService, CurrentUserDto, OrgUnitInfoDto, } from "./core/services/session.service";
|
|
4
4
|
export { RedisService } from "./core/services/redis.service";
|
|
5
5
|
export { RedisCacheService } from "./core/services/redis-cache.service";
|
|
6
6
|
export { CookieService, ExtractedTokensDto, } from "./core/services/cookie.service";
|
|
@@ -8,8 +8,6 @@ export { RabbitMQPublisher } from "./core/services/rabbitmq-publisher.service";
|
|
|
8
8
|
export { RequestContextService, RequestContext, } from "./core/services/request-context.service";
|
|
9
9
|
export { RequestInfoService } from "./core/services/request-info.service";
|
|
10
10
|
export { BasePaginationService } from "./core/services/base-pagination.service";
|
|
11
|
-
export { RepositoryWrapperService } from "./core/services/repository-wrapper.service";
|
|
12
|
-
export { TypeOrmFilterModule } from "./core/modules/typeorm-filter.module";
|
|
13
11
|
export { JwtAuthGuard } from "./core/guards/jwt-auth.guard";
|
|
14
12
|
export { InternalAuthGuard } from "./core/guards/internal-auth.guard";
|
|
15
13
|
export { PermissionGuard } from "./core/guards/permission.guard";
|
package/dist/index.js
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.AxiosClient = exports.DateUtils = exports.ObjectType = exports.SUCCESS_RESPONSES = exports.SUCCESS_MESSAGES = exports.ERROR_RESPONSES = exports.ERROR_MESSAGES = exports.MESSAGES = exports.corsConfig = exports.internalConfig = exports.cookieConfig = exports.RABBITMQ_ROUTING_KEYS = exports.rabbitmqConfig = exports.databaseConfig = exports.redisCacheConfig = exports.redisConfig = exports.jwtConfig = exports.BaseEntity = exports.AuditSubscriber = exports.JwtStrategy = exports.RequestContextInterceptor = exports.HttpExceptionFilter = exports.GetFilterValuesDto = exports.FindAllWithFiltersDto = exports.PaginationMetaDto = exports.PaginationResponseDto = exports.PaginationDto = exports.ApiResponseDto = exports.ANY_PERMISSIONS_KEY = exports.PERMISSIONS_KEY = exports.RequireAnyPermission = exports.RequirePermissions = exports.IS_PUBLIC_KEY = exports.Public = exports.CurrentUser = exports.PermissionGuard = exports.InternalAuthGuard = exports.JwtAuthGuard = exports.
|
|
4
|
-
exports.createServiceClient = exports.apiClient = void 0;
|
|
3
|
+
exports.createServiceClient = exports.apiClient = exports.AxiosClient = exports.DateUtils = exports.ObjectType = exports.SUCCESS_RESPONSES = exports.SUCCESS_MESSAGES = exports.ERROR_RESPONSES = exports.ERROR_MESSAGES = exports.MESSAGES = exports.corsConfig = exports.internalConfig = exports.cookieConfig = exports.RABBITMQ_ROUTING_KEYS = exports.rabbitmqConfig = exports.databaseConfig = exports.redisCacheConfig = exports.redisConfig = exports.jwtConfig = exports.BaseEntity = exports.AuditSubscriber = exports.JwtStrategy = exports.RequestContextInterceptor = exports.HttpExceptionFilter = exports.GetFilterValuesDto = exports.FindAllWithFiltersDto = exports.PaginationMetaDto = exports.PaginationResponseDto = exports.PaginationDto = exports.ApiResponseDto = exports.ANY_PERMISSIONS_KEY = exports.PERMISSIONS_KEY = exports.RequireAnyPermission = exports.RequirePermissions = exports.IS_PUBLIC_KEY = exports.Public = exports.CurrentUser = exports.PermissionGuard = exports.InternalAuthGuard = exports.JwtAuthGuard = exports.BasePaginationService = exports.RequestInfoService = exports.RequestContextService = exports.RabbitMQPublisher = exports.CookieService = exports.RedisCacheService = exports.RedisService = exports.SessionService = exports.CoreJwtService = exports.CoreModule = void 0;
|
|
5
4
|
var core_module_1 = require("./core/core.module");
|
|
6
5
|
Object.defineProperty(exports, "CoreModule", { enumerable: true, get: function () { return core_module_1.CoreModule; } });
|
|
7
6
|
var jwt_service_1 = require("./core/services/jwt.service");
|
|
@@ -22,10 +21,6 @@ var request_info_service_1 = require("./core/services/request-info.service");
|
|
|
22
21
|
Object.defineProperty(exports, "RequestInfoService", { enumerable: true, get: function () { return request_info_service_1.RequestInfoService; } });
|
|
23
22
|
var base_pagination_service_1 = require("./core/services/base-pagination.service");
|
|
24
23
|
Object.defineProperty(exports, "BasePaginationService", { enumerable: true, get: function () { return base_pagination_service_1.BasePaginationService; } });
|
|
25
|
-
var repository_wrapper_service_1 = require("./core/services/repository-wrapper.service");
|
|
26
|
-
Object.defineProperty(exports, "RepositoryWrapperService", { enumerable: true, get: function () { return repository_wrapper_service_1.RepositoryWrapperService; } });
|
|
27
|
-
var typeorm_filter_module_1 = require("./core/modules/typeorm-filter.module");
|
|
28
|
-
Object.defineProperty(exports, "TypeOrmFilterModule", { enumerable: true, get: function () { return typeorm_filter_module_1.TypeOrmFilterModule; } });
|
|
29
24
|
var jwt_auth_guard_1 = require("./core/guards/jwt-auth.guard");
|
|
30
25
|
Object.defineProperty(exports, "JwtAuthGuard", { enumerable: true, get: function () { return jwt_auth_guard_1.JwtAuthGuard; } });
|
|
31
26
|
var internal_auth_guard_1 = require("./core/guards/internal-auth.guard");
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAYA,iDAA+C;AAAtC,yGAAA,UAAU,OAAA;AAGnB,0DAA4D;AAAnD,6GAAA,cAAc,OAAA;AACvB,kEAIwC;AAHtC,iHAAA,cAAc,OAAA;AAIhB,8DAA4D;AAAnD,6GAAA,YAAY,OAAA;AACrB,0EAAuE;AAA9D,wHAAA,iBAAiB,OAAA;AAC1B,gEAGuC;AAFrC,+GAAA,aAAa,OAAA;AAGf,wFAA8E;AAArE,+HAAA,iBAAiB,OAAA;AAC1B,kFAGgD;AAF9C,gIAAA,qBAAqB,OAAA;AAGvB,4EAAyE;AAAhE,0HAAA,kBAAkB,OAAA;AAC3B,kFAA+E;AAAtE,gIAAA,qBAAqB,OAAA;AAG9B,8DAA2D;AAAlD,8GAAA,YAAY,OAAA;AACrB,wEAAqE;AAA5D,wHAAA,iBAAiB,OAAA;AAC1B,kEAAgE;AAAvD,mHAAA,eAAe,OAAA;AAGxB,kFAAsE;AAA7D,qHAAA,WAAW,OAAA;AACpB,sEAA0E;AAAjE,0GAAA,MAAM,OAAA;AAAE,iHAAA,aAAa,OAAA;AAC9B,gGAKwD;AAJtD,mIAAA,kBAAkB,OAAA;AAClB,qIAAA,oBAAoB,OAAA;AACpB,gIAAA,eAAe,OAAA;AACf,oIAAA,mBAAmB,OAAA;AAIrB,gEAA6D;AAApD,kHAAA,cAAc,OAAA;AACvB,4DAOmC;AANjC,+GAAA,aAAa,OAAA;AACb,uHAAA,qBAAqB,OAAA;AACrB,mHAAA,iBAAiB,OAAA;AACjB,uHAAA,qBAAqB,OAAA;AAErB,oHAAA,kBAAkB,OAAA;AAIpB,6EAA0E;AAAjE,4HAAA,mBAAmB,OAAA;AAG5B,8FAA2F;AAAlF,wIAAA,yBAAyB,OAAA;AAGlC,8DAA4D;AAAnD,2GAAA,WAAW,OAAA;AAGpB,uEAAqE;AAA5D,mHAAA,eAAe,OAAA;AAGxB,0DAAwD;AAA/C,yGAAA,UAAU,OAAA;AAGnB,iDAA+C;AAAtC,uGAAA,SAAS,OAAA;AAClB,qDAAmD;AAA1C,2GAAA,WAAW,OAAA;AACpB,iEAA8D;AAArD,sHAAA,gBAAgB,OAAA;AACzB,2DAAyD;AAAhD,iHAAA,cAAc,OAAA;AACvB,2DAAgF;AAAvE,iHAAA,cAAc,OAAA;AAAE,wHAAA,qBAAqB,OAAA;AAC9C,uDAAqD;AAA5C,6GAAA,YAAY,OAAA;AACrB,2DAAyD;AAAhD,iHAAA,cAAc,OAAA;AACvB,mDAAiD;AAAxC,yGAAA,UAAU,OAAA;AAGnB,oEAAyD;AAAhD,8GAAA,QAAQ,OAAA;AACjB,0EAK0C;AAJxC,uHAAA,cAAc,OAAA;AACd,wHAAA,eAAe,OAAA;AACf,yHAAA,gBAAgB,OAAA;AAChB,0HAAA,iBAAiB,OAAA;AAInB,4DAAqD;AAA5C,8GAAA,UAAU,OAAA;AAGnB,gDAA8C;AAArC,uGAAA,SAAS,OAAA;AAGlB,qCAA0E;AAAjE,oGAAA,WAAW,OAAA;AAAE,kGAAA,SAAS,OAAA;AAAE,4GAAA,mBAAmB,OAAA"}
|