fiscalia_bo-nest-helpers 1.1.18 → 1.1.20
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/README.md +1 -1
- package/dist/modules/ms-redis/datapass.interceptor.js +1 -1
- package/dist/modules/ms-redis/datapass.interceptor.js.map +1 -1
- package/dist/modules/ms-redis/ms-redis.service.d.ts +1 -1
- package/dist/modules/ms-redis/ms-redis.service.js.map +1 -1
- package/dist/modules/ms-redis/services/base.service.d.ts +1 -1
- package/dist/modules/ms-redis/services/base.service.js.map +1 -1
- package/dist/modules/ms-redis/services/grpc-client-redis.service.d.ts +1 -1
- package/dist/modules/ms-redis/services/grpc-client-redis.service.js +14 -1
- package/dist/modules/ms-redis/services/grpc-client-redis.service.js.map +1 -1
- package/dist/modules/ms-redis/services/tcp-client-redis.service.d.ts +1 -1
- package/dist/modules/ms-redis/services/tcp-client-redis.service.js +18 -5
- package/dist/modules/ms-redis/services/tcp-client-redis.service.js.map +1 -1
- package/dist/modules/ms-seguridad/guards/permision.guard.d.ts +4 -1
- package/dist/modules/ms-seguridad/guards/permision.guard.js +17 -4
- package/dist/modules/ms-seguridad/guards/permision.guard.js.map +1 -1
- package/dist/modules/ms-seguridad/guards/token-auth.guard.d.ts +4 -1
- package/dist/modules/ms-seguridad/guards/token-auth.guard.js +21 -5
- package/dist/modules/ms-seguridad/guards/token-auth.guard.js.map +1 -1
- package/dist/modules/ms-seguridad/ms-seguridad.http.service.d.ts +15 -0
- package/dist/modules/ms-seguridad/ms-seguridad.http.service.js +84 -0
- package/dist/modules/ms-seguridad/ms-seguridad.http.service.js.map +1 -0
- package/dist/modules/ms-seguridad/ms-seguridad.module.d.ts +5 -0
- package/dist/modules/ms-seguridad/ms-seguridad.module.js +27 -3
- package/dist/modules/ms-seguridad/ms-seguridad.module.js.map +1 -1
- package/package.json +1 -1
package/README.md
CHANGED
@@ -97,7 +97,7 @@ let DatapassInterceptor = class DatapassInterceptor {
|
|
97
97
|
return next.handle().pipe((0, operators_1.switchMap)(async (data) => {
|
98
98
|
const dataResponse = data;
|
99
99
|
try {
|
100
|
-
await this.msRedisService.SetCache(KEY,
|
100
|
+
await this.msRedisService.SetCache(KEY, data, dataCache.ttl, dataCache.db || 0);
|
101
101
|
const resp = parseResponseReturn(dataCache.responseHttp, response, dataCache, dataResponse);
|
102
102
|
if (resp) {
|
103
103
|
return resp;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"datapass.interceptor.js","sourceRoot":"","sources":["../../../src/modules/ms-redis/datapass.interceptor.ts"],"names":[],"mappings":"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
|
1
|
+
{"version":3,"file":"datapass.interceptor.js","sourceRoot":"","sources":["../../../src/modules/ms-redis/datapass.interceptor.ts"],"names":[],"mappings":"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"}
|
@@ -3,7 +3,7 @@ import { BaseClientRedisService } from './services/base.service';
|
|
3
3
|
export declare class MsRedisService {
|
4
4
|
private readonly baseClient;
|
5
5
|
constructor(baseClient: BaseClientRedisService);
|
6
|
-
SetCache(key: string, value:
|
6
|
+
SetCache(key: string, value: any, ttl: number, db?: number): Promise<import("../../dto").ResponseDTO<string>>;
|
7
7
|
getCache<T>(key: string, db?: number): Promise<IResponseCache<T>>;
|
8
8
|
DeleteCache(key: string, db?: number): Promise<import("../../dto").ResponseDTO<number>>;
|
9
9
|
DeleteCacheInBlock(key: string, db?: number): Promise<import("../../dto").ResponseDTO<number>>;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"ms-redis.service.js","sourceRoot":"","sources":["../../../src/modules/ms-redis/ms-redis.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAoD;AAEpD,0DAAiE;AAG1D,IAAM,cAAc,GAApB,MAAM,cAAc;IACzB,YAAkD,UAAkC;QAAlC,eAAU,GAAV,UAAU,CAAwB;IAAG,CAAC;IAExF,KAAK,CAAC,QAAQ,CAAC,GAAW,EAAE,
|
1
|
+
{"version":3,"file":"ms-redis.service.js","sourceRoot":"","sources":["../../../src/modules/ms-redis/ms-redis.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAoD;AAEpD,0DAAiE;AAG1D,IAAM,cAAc,GAApB,MAAM,cAAc;IACzB,YAAkD,UAAkC;QAAlC,eAAU,GAAV,UAAU,CAAwB;IAAG,CAAC;IAExF,KAAK,CAAC,QAAQ,CAAC,GAAW,EAAE,KAAU,EAAE,GAAW,EAAE,EAAE,GAAG,CAAC;QACzD,OAAO,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;IACvD,CAAC;IAED,KAAK,CAAC,QAAQ,CAAI,GAAW,EAAE,EAAE,GAAG,CAAC;QACnC,OAAO,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;IAC3C,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,GAAW,EAAE,EAAE,GAAG,CAAC;QACnC,OAAO,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;IAC9C,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,GAAW,EAAE,EAAE,GAAG,CAAC;QAC1C,OAAO,IAAI,CAAC,UAAU,CAAC,kBAAkB,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;IACrD,CAAC;CACF,CAAA;AAlBY,wCAAc;yBAAd,cAAc;IAD1B,IAAA,mBAAU,GAAE;IAEE,WAAA,IAAA,eAAM,EAAC,WAAW,CAAC,CAAA;qCAA8B,qCAAsB;GADzE,cAAc,CAkB1B"}
|
@@ -1,7 +1,7 @@
|
|
1
1
|
import { ResponseDTO } from 'src/dto';
|
2
2
|
import { IResponseCache } from '../dto/types';
|
3
3
|
export declare abstract class BaseClientRedisService {
|
4
|
-
abstract SetCache(key: string, value:
|
4
|
+
abstract SetCache(key: string, value: any, ttl: number, db: number): Promise<ResponseDTO<string>>;
|
5
5
|
abstract getCache<T>(key: string, db: number): Promise<IResponseCache<T>>;
|
6
6
|
abstract DeleteCache(key: string, db: number): Promise<ResponseDTO<number>>;
|
7
7
|
abstract DeleteCacheInBlock(key: string, db: number): Promise<ResponseDTO<number>>;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"base.service.js","sourceRoot":"","sources":["../../../../src/modules/ms-redis/services/base.service.ts"],"names":[],"mappings":";;;AAGA,MAAsB,sBAAsB;
|
1
|
+
{"version":3,"file":"base.service.js","sourceRoot":"","sources":["../../../../src/modules/ms-redis/services/base.service.ts"],"names":[],"mappings":";;;AAGA,MAAsB,sBAAsB;CAY3C;AAZD,wDAYC"}
|
@@ -5,7 +5,7 @@ import { BaseClientRedisService } from './base.service';
|
|
5
5
|
export declare class GrpcClientRedisService extends BaseClientRedisService {
|
6
6
|
private cacheService;
|
7
7
|
constructor(options: RedisModuleOptions);
|
8
|
-
SetCache(key: string, value:
|
8
|
+
SetCache(key: string, value: any, ttl: number, db?: number): Promise<ResponseDTO<null>>;
|
9
9
|
getCache<T>(key: string, db?: number): Promise<IResponseCache<T>>;
|
10
10
|
DeleteCache(key: string, db?: number): Promise<ResponseDTO<number>>;
|
11
11
|
DeleteCacheInBlock(key: string, db?: number): Promise<ResponseDTO<number>>;
|
@@ -58,11 +58,24 @@ let GrpcClientRedisService = class GrpcClientRedisService extends base_service_1
|
|
58
58
|
.then((resp) => {
|
59
59
|
var _a;
|
60
60
|
const dataResp = JSON.parse(resp.response);
|
61
|
+
let respData = null;
|
62
|
+
if (dataResp.foundCache) {
|
63
|
+
if (typeof dataResp.response === 'string') {
|
64
|
+
try {
|
65
|
+
respData = JSON.parse(dataResp.response);
|
66
|
+
}
|
67
|
+
catch (error) {
|
68
|
+
respData = dataResp.response;
|
69
|
+
}
|
70
|
+
}
|
71
|
+
else
|
72
|
+
respData = dataResp.response;
|
73
|
+
}
|
61
74
|
return {
|
62
75
|
error: !dataResp.foundCache,
|
63
76
|
status: dataResp.foundCache ? 200 : 404,
|
64
77
|
cache: (_a = dataResp.foundCache) !== null && _a !== void 0 ? _a : false,
|
65
|
-
response:
|
78
|
+
response: respData,
|
66
79
|
};
|
67
80
|
})
|
68
81
|
.catch((err) => {
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"grpc-client-redis.service.js","sourceRoot":"","sources":["../../../../src/modules/ms-redis/services/grpc-client-redis.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,yDAAsE;AACtE,+BAAkD;AAClD,4DAA2F;AAE3F,kFAAqE;AACrE,+BAA4B;AAE5B,iDAAwD;AAWjD,IAAM,sBAAsB,GAA5B,MAAM,sBAAuB,SAAQ,qCAAsB;IAEhE,YAAY,OAA2B;;QACrC,KAAK,EAAE,CAAC;QACR,MAAM,MAAM,GAAG,kCAAkB,CAAC,MAAM,CAAC;YACvC,SAAS,EAAE,yBAAS,CAAC,IAAI;YACzB,OAAO,EAAE;gBACP,GAAG,EAAE,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC,IAAI,EAAE;gBACrC,OAAO,EAAE,SAAS;gBAClB,SAAS,EAAE,IAAA,WAAI,EAAC,SAAS,EAAE,mBAAmB,CAAC;gBAC/C,MAAM,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE;gBAC1B,SAAS,EAAE;oBACT,eAAe,EAAE,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,eAAe,mCAAI,SAAS;oBACtD,kBAAkB,EAAE,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,kBAAkB,mCAAI,SAAS;iBAC7D;aACF;SACF,CAAC,CAAC;QAEH,IAAI,CAAC,YAAY,GAAG,MAAM,CAAC,UAAU,CAAwB,gBAAgB,CAAC,CAAC;IACjF,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,GAAW,EAAE,
|
1
|
+
{"version":3,"file":"grpc-client-redis.service.js","sourceRoot":"","sources":["../../../../src/modules/ms-redis/services/grpc-client-redis.service.ts"],"names":[],"mappings":"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"}
|
@@ -8,7 +8,7 @@ export declare class TcpClientRedisService extends BaseClientRedisService implem
|
|
8
8
|
client: ClientProxy;
|
9
9
|
constructor(options: RedisModuleOptions);
|
10
10
|
onApplicationBootstrap(): Promise<void>;
|
11
|
-
SetCache(key: string, value:
|
11
|
+
SetCache(key: string, value: any, ttl: number, db: number): Promise<ResponseDTO<string>>;
|
12
12
|
getCache<T>(key: string, db: number): Promise<IResponseCache<T>>;
|
13
13
|
DeleteCache(key: string, db: number): Promise<ResponseDTO<number>>;
|
14
14
|
DeleteCacheInBlock(key: string, db: number): Promise<ResponseDTO<any>>;
|
@@ -36,7 +36,7 @@ let TcpClientRedisService = class TcpClientRedisService extends base_service_1.B
|
|
36
36
|
return (0, dto_1.dataResponseSuccess)({ data: resp.response }, { status: 200 });
|
37
37
|
})
|
38
38
|
.catch((err) => {
|
39
|
-
console.
|
39
|
+
console.error('Error de ms-redis por TCP: ', err);
|
40
40
|
return (0, dto_1.dataResponseError)(err.message, { status: 500 });
|
41
41
|
});
|
42
42
|
return resp;
|
@@ -45,15 +45,28 @@ let TcpClientRedisService = class TcpClientRedisService extends base_service_1.B
|
|
45
45
|
const resp = await (0, rxjs_1.firstValueFrom)(this.client.send({ cmd: 'GetCache' }, { key, db }))
|
46
46
|
.then((resp) => {
|
47
47
|
var _a;
|
48
|
+
let respData = null;
|
49
|
+
if (resp.foundCache) {
|
50
|
+
if (typeof resp.response === 'string') {
|
51
|
+
try {
|
52
|
+
respData = JSON.parse(resp.response);
|
53
|
+
}
|
54
|
+
catch (error) {
|
55
|
+
respData = resp.response;
|
56
|
+
}
|
57
|
+
}
|
58
|
+
else
|
59
|
+
respData = resp.response;
|
60
|
+
}
|
48
61
|
return {
|
49
62
|
error: !resp.foundCache,
|
50
63
|
status: resp.foundCache ? 200 : 404,
|
51
64
|
cache: (_a = resp.foundCache) !== null && _a !== void 0 ? _a : false,
|
52
|
-
response:
|
65
|
+
response: respData,
|
53
66
|
};
|
54
67
|
})
|
55
68
|
.catch((err) => {
|
56
|
-
console.
|
69
|
+
console.error('Error de ms-redis por TCP: ', err);
|
57
70
|
return {
|
58
71
|
error: true,
|
59
72
|
message: `MS-REDIS ${err.message}`,
|
@@ -70,7 +83,7 @@ let TcpClientRedisService = class TcpClientRedisService extends base_service_1.B
|
|
70
83
|
return (0, dto_1.dataResponseSuccess)({ data: resp.response });
|
71
84
|
})
|
72
85
|
.catch((err) => {
|
73
|
-
console.
|
86
|
+
console.error('Error de ms-redis por TCP: ', err);
|
74
87
|
return (0, dto_1.dataResponseError)(err.message, { status: 500 });
|
75
88
|
});
|
76
89
|
return resp;
|
@@ -81,7 +94,7 @@ let TcpClientRedisService = class TcpClientRedisService extends base_service_1.B
|
|
81
94
|
return (0, dto_1.dataResponseSuccess)({ data: resp.response });
|
82
95
|
})
|
83
96
|
.catch((err) => {
|
84
|
-
console.
|
97
|
+
console.error('Error de ms-redis por TCP: ', err);
|
85
98
|
return (0, dto_1.dataResponseError)(err.message, { status: 500 });
|
86
99
|
});
|
87
100
|
return resp;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"tcp-client-redis.service.js","sourceRoot":"","sources":["../../../../src/modules/ms-redis/services/tcp-client-redis.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAoE;AACpE,iDAAwD;AACxD,sCAA8E;AAC9E,yDAAmF;AACnF,+BAAsC;AAK/B,IAAM,qBAAqB,GAA3B,MAAM,qBACX,SAAQ,qCAAsB;IAK9B,YAAY,OAA2B;QACrC,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,MAAM,GAAG,kCAAkB,CAAC,MAAM,CAAC;YACtC,SAAS,EAAE,yBAAS,CAAC,GAAG;YACxB,OAAO,EAAE;gBACP,IAAI,EAAE,OAAO,CAAC,cAAc;gBAC5B,IAAI,EAAE,OAAO,CAAC,cAAc;aAC7B;SACF,CAAC,CAAC;QAEH,IAAI,CAAC,sBAAsB,EAAE,CAAC;IAChC,CAAC;IAED,KAAK,CAAC,sBAAsB;QAC1B,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;IAC9B,CAAC;IAED,KAAK,CAAC,QAAQ,
|
1
|
+
{"version":3,"file":"tcp-client-redis.service.js","sourceRoot":"","sources":["../../../../src/modules/ms-redis/services/tcp-client-redis.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAoE;AACpE,iDAAwD;AACxD,sCAA8E;AAC9E,yDAAmF;AACnF,+BAAsC;AAK/B,IAAM,qBAAqB,GAA3B,MAAM,qBACX,SAAQ,qCAAsB;IAK9B,YAAY,OAA2B;QACrC,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,MAAM,GAAG,kCAAkB,CAAC,MAAM,CAAC;YACtC,SAAS,EAAE,yBAAS,CAAC,GAAG;YACxB,OAAO,EAAE;gBACP,IAAI,EAAE,OAAO,CAAC,cAAc;gBAC5B,IAAI,EAAE,OAAO,CAAC,cAAc;aAC7B;SACF,CAAC,CAAC;QAEH,IAAI,CAAC,sBAAsB,EAAE,CAAC;IAChC,CAAC;IAED,KAAK,CAAC,sBAAsB;QAC1B,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;IAC9B,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,GAAW,EAAE,KAAU,EAAE,GAAW,EAAE,EAAU;QAC7D,MAAM,IAAI,GAAG,MAAM,IAAA,qBAAc,EAC/B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,UAAU,EAAE,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,CAC/D;aACE,IAAI,CAAC,CAAC,IAA0B,EAAE,EAAE;YACnC,OAAO,IAAA,yBAAmB,EAAS,EAAE,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC;QAC/E,CAAC,CAAC;aACD,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;YACb,OAAO,CAAC,KAAK,CAAC,6BAA6B,EAAE,GAAG,CAAC,CAAC;YAClD,OAAO,IAAA,uBAAiB,EAAS,GAAG,CAAC,OAAO,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC;QACjE,CAAC,CAAC,CAAC;QACL,OAAO,IAAI,CAAC;IACd,CAAC;IAED,KAAK,CAAC,QAAQ,CAAI,GAAW,EAAE,EAAU;QACvC,MAAM,IAAI,GAAG,MAAM,IAAA,qBAAc,EAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,UAAU,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,CAAC;aAClF,IAAI,CAAC,CAAC,IAA+C,EAAE,EAAE;;YACxD,IAAI,QAAQ,GAAG,IAAI,CAAC;YACpB,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;gBACpB,IAAI,OAAO,IAAI,CAAC,QAAQ,KAAK,QAAQ,EAAE,CAAC;oBACtC,IAAI,CAAC;wBACH,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;oBACvC,CAAC;oBAAC,OAAO,KAAK,EAAE,CAAC;wBACf,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;oBAC3B,CAAC;gBACH,CAAC;;oBAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;YAClC,CAAC;YACD,OAAO;gBACL,KAAK,EAAE,CAAC,IAAI,CAAC,UAAU;gBACvB,MAAM,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG;gBACnC,KAAK,EAAE,MAAA,IAAI,CAAC,UAAU,mCAAI,KAAK;gBAC/B,QAAQ,EAAE,QAAQ;aACE,CAAC;QACzB,CAAC,CAAC;aACD,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;YACb,OAAO,CAAC,KAAK,CAAC,6BAA6B,EAAE,GAAG,CAAC,CAAC;YAClD,OAAO;gBACL,KAAK,EAAE,IAAI;gBACX,OAAO,EAAE,YAAY,GAAG,CAAC,OAAO,EAAE;gBAClC,MAAM,EAAE,GAAG;gBACX,KAAK,EAAE,KAAK;gBACZ,QAAQ,EAAE,IAAI;aACM,CAAC;QACzB,CAAC,CAAC,CAAC;QACL,OAAO,IAAI,CAAC;IACd,CAAC;IAKD,KAAK,CAAC,WAAW,CAAC,GAAW,EAAE,EAAU;QACvC,MAAM,IAAI,GAAG,MAAM,IAAA,qBAAc,EAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,aAAa,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,CAAC;aACrF,IAAI,CAAC,CAAC,IAA0B,EAAE,EAAE;YACnC,OAAO,IAAA,yBAAmB,EAAC,EAAE,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;QACtD,CAAC,CAAC;aACD,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;YACb,OAAO,CAAC,KAAK,CAAC,6BAA6B,EAAE,GAAG,CAAC,CAAC;YAClD,OAAO,IAAA,uBAAiB,EAAO,GAAG,CAAC,OAAO,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC;QAC/D,CAAC,CAAC,CAAC;QACL,OAAO,IAAI,CAAC;IACd,CAAC;IACD,KAAK,CAAC,kBAAkB,CAAC,GAAW,EAAE,EAAU;QAC9C,MAAM,IAAI,GAAG,MAAM,IAAA,qBAAc,EAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,oBAAoB,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,CAAC;aAC5F,IAAI,CAAC,CAAC,IAA0B,EAAE,EAAE;YACnC,OAAO,IAAA,yBAAmB,EAAC,EAAE,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;QACtD,CAAC,CAAC;aACD,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;YACb,OAAO,CAAC,KAAK,CAAC,6BAA6B,EAAE,GAAG,CAAC,CAAC;YAClD,OAAO,IAAA,uBAAiB,EAAO,GAAG,CAAC,OAAO,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC;QAC/D,CAAC,CAAC,CAAC;QACL,OAAO,IAAI,CAAC;IACd,CAAC;CACF,CAAA;AA/FY,sDAAqB;gCAArB,qBAAqB;IADjC,IAAA,mBAAU,GAAE;;GACA,qBAAqB,CA+FjC"}
|
@@ -1,9 +1,12 @@
|
|
1
1
|
import { CanActivate, ExecutionContext } from '@nestjs/common';
|
2
2
|
import { MsSeguridadService } from '../ms-seguridad.service';
|
3
|
+
import { MsSeguridadHttpService } from '../ms-seguridad.http.service';
|
3
4
|
export declare const RequiredPermissions: (...permissions: string[]) => import("@nestjs/common").CustomDecorator<string>;
|
4
5
|
export declare class PermissionsGuard implements CanActivate {
|
5
6
|
private readonly seguridadService;
|
6
|
-
|
7
|
+
private readonly useHttpService;
|
8
|
+
private readonly seguridadHttpService;
|
9
|
+
constructor(seguridadService: MsSeguridadService, useHttpService: boolean, seguridadHttpService: MsSeguridadHttpService);
|
7
10
|
canActivate(context: ExecutionContext): Promise<boolean>;
|
8
11
|
private getRequiredPermissions;
|
9
12
|
private hasPermission;
|
@@ -8,25 +8,33 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
8
8
|
var __metadata = (this && this.__metadata) || function (k, v) {
|
9
9
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
10
10
|
};
|
11
|
+
var __param = (this && this.__param) || function (paramIndex, decorator) {
|
12
|
+
return function (target, key) { decorator(target, key, paramIndex); }
|
13
|
+
};
|
11
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
12
15
|
exports.PermissionsGuard = exports.RequiredPermissions = void 0;
|
13
16
|
const common_1 = require("@nestjs/common");
|
14
17
|
const ms_seguridad_service_1 = require("../ms-seguridad.service");
|
15
18
|
const global_exception_filter_1 = require("../../../helpers/global-exception.filter");
|
16
19
|
const http_service_1 = require("../../../http-service");
|
20
|
+
const ms_seguridad_http_service_1 = require("../ms-seguridad.http.service");
|
17
21
|
const PERMISSIONS_KEY = 'permissions_headers_key';
|
18
22
|
const RequiredPermissions = (...permissions) => (0, common_1.SetMetadata)(PERMISSIONS_KEY, permissions);
|
19
23
|
exports.RequiredPermissions = RequiredPermissions;
|
20
24
|
let PermissionsGuard = class PermissionsGuard {
|
21
|
-
constructor(seguridadService) {
|
25
|
+
constructor(seguridadService, useHttpService, seguridadHttpService) {
|
22
26
|
this.seguridadService = seguridadService;
|
27
|
+
this.useHttpService = useHttpService;
|
28
|
+
this.seguridadHttpService = seguridadHttpService;
|
23
29
|
}
|
24
30
|
async canActivate(context) {
|
25
31
|
var _a, _b, _c;
|
26
32
|
const request = context.switchToHttp().getRequest();
|
27
33
|
const token = request.headers.authorization.split(' ')[1];
|
28
34
|
const requiredPermissions = this.getRequiredPermissions(context);
|
29
|
-
const response =
|
35
|
+
const response = this.useHttpService
|
36
|
+
? await this.seguridadHttpService.userListPermissions(request.userHeader, { token })
|
37
|
+
: await this.seguridadService.userListPermissions(request.userHeader, { token });
|
30
38
|
if (!(response === null || response === void 0 ? void 0 : response.data)) {
|
31
39
|
console.info('---------------------------------------------------------------');
|
32
40
|
console.info(request === null || request === void 0 ? void 0 : request.userHeader);
|
@@ -44,7 +52,11 @@ let PermissionsGuard = class PermissionsGuard {
|
|
44
52
|
const response = process.env.ENV_DEBUG_SERVER === 'true' || process.env.ENV_DEBUG_FRONT === 'true'
|
45
53
|
? { ci: (_c = request === null || request === void 0 ? void 0 : request.userHeader) === null || _c === void 0 ? void 0 : _c.ci, method, url, query }
|
46
54
|
: null;
|
47
|
-
throw new global_exception_filter_1.MsSeguridadHttpError('No tiene los permisos necesarios', 403, response
|
55
|
+
throw new global_exception_filter_1.MsSeguridadHttpError('No tiene los permisos necesarios', 403, response, true, {
|
56
|
+
code: 'PERMISSIONS_REQUIRED',
|
57
|
+
stacktrace: [],
|
58
|
+
statusCode: 403,
|
59
|
+
});
|
48
60
|
}
|
49
61
|
return true;
|
50
62
|
}
|
@@ -58,6 +70,7 @@ let PermissionsGuard = class PermissionsGuard {
|
|
58
70
|
exports.PermissionsGuard = PermissionsGuard;
|
59
71
|
exports.PermissionsGuard = PermissionsGuard = __decorate([
|
60
72
|
(0, common_1.Injectable)(),
|
61
|
-
|
73
|
+
__param(1, (0, common_1.Inject)('PROVIDER_USE_HTTP_SERVICE')),
|
74
|
+
__metadata("design:paramtypes", [ms_seguridad_service_1.MsSeguridadService, Boolean, ms_seguridad_http_service_1.MsSeguridadHttpService])
|
62
75
|
], PermissionsGuard);
|
63
76
|
//# sourceMappingURL=permision.guard.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"permision.guard.js","sourceRoot":"","sources":["../../../../src/modules/ms-seguridad/guards/permision.guard.ts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"permision.guard.js","sourceRoot":"","sources":["../../../../src/modules/ms-seguridad/guards/permision.guard.ts"],"names":[],"mappings":"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"}
|
@@ -1,5 +1,6 @@
|
|
1
1
|
import { CanActivate, ExecutionContext } from '@nestjs/common';
|
2
2
|
import { MsSeguridadService } from '../ms-seguridad.service';
|
3
|
+
import { MsSeguridadHttpService } from '../ms-seguridad.http.service';
|
3
4
|
export interface ValidateTokenOptions {
|
4
5
|
validateToken?: boolean;
|
5
6
|
applications?: string[];
|
@@ -7,8 +8,10 @@ export interface ValidateTokenOptions {
|
|
7
8
|
export declare const validateAppToken: (options: ValidateTokenOptions) => import("@nestjs/common").CustomDecorator<string>;
|
8
9
|
export declare class TokenAuthGuard implements CanActivate {
|
9
10
|
private readonly aplicationTag;
|
11
|
+
private readonly useHttpService;
|
10
12
|
private readonly seguridadService;
|
11
|
-
|
13
|
+
private readonly seguridadHttpService;
|
14
|
+
constructor(aplicationTag: string, useHttpService: boolean, seguridadService: MsSeguridadService, seguridadHttpService: MsSeguridadHttpService);
|
12
15
|
canActivate(context: ExecutionContext): Promise<boolean>;
|
13
16
|
private getValidateValue;
|
14
17
|
}
|
@@ -16,6 +16,7 @@ exports.TokenAuthGuard = exports.validateAppToken = void 0;
|
|
16
16
|
const common_1 = require("@nestjs/common");
|
17
17
|
const ms_seguridad_service_1 = require("../ms-seguridad.service");
|
18
18
|
const global_exception_filter_1 = require("../../../helpers/global-exception.filter");
|
19
|
+
const ms_seguridad_http_service_1 = require("../ms-seguridad.http.service");
|
19
20
|
const VALIDATE_TOKEN_VALUES = 'validate_token_extra_values';
|
20
21
|
const validateAppToken = (options) => {
|
21
22
|
const defaultValues = Object.assign({ validateToken: true, applications: [] }, options);
|
@@ -23,9 +24,11 @@ const validateAppToken = (options) => {
|
|
23
24
|
};
|
24
25
|
exports.validateAppToken = validateAppToken;
|
25
26
|
let TokenAuthGuard = class TokenAuthGuard {
|
26
|
-
constructor(aplicationTag, seguridadService) {
|
27
|
+
constructor(aplicationTag, useHttpService, seguridadService, seguridadHttpService) {
|
27
28
|
this.aplicationTag = aplicationTag;
|
29
|
+
this.useHttpService = useHttpService;
|
28
30
|
this.seguridadService = seguridadService;
|
31
|
+
this.seguridadHttpService = seguridadHttpService;
|
29
32
|
}
|
30
33
|
async canActivate(context) {
|
31
34
|
const request = context.switchToHttp().getRequest();
|
@@ -38,13 +41,20 @@ let TokenAuthGuard = class TokenAuthGuard {
|
|
38
41
|
if (`${bearer}`.toLowerCase() !== 'bearer' || !token) {
|
39
42
|
throw new global_exception_filter_1.MsSeguridadHttpError('la peticion debe contener un jwt de autorización válido', 401);
|
40
43
|
}
|
41
|
-
const
|
44
|
+
const result = this.useHttpService
|
45
|
+
? await this.seguridadHttpService.userData({ token })
|
46
|
+
: await this.seguridadService.userData({ token });
|
47
|
+
const { error, response, message, status } = result;
|
42
48
|
if (error) {
|
43
49
|
throw new global_exception_filter_1.MsSeguridadHttpError(message !== null && message !== void 0 ? message : 'el token no es válido', status);
|
44
50
|
}
|
45
51
|
if (validateToken && applications.length) {
|
46
52
|
if (!applications.includes(response.aplicacionTag)) {
|
47
|
-
throw new global_exception_filter_1.MsSeguridadHttpError('el token no pertenece a ninguna de los aplicaciones', 403
|
53
|
+
throw new global_exception_filter_1.MsSeguridadHttpError('el token no pertenece a ninguna de los aplicaciones', 403, null, true, {
|
54
|
+
code: 'PERMISSIONS_REQUIRED',
|
55
|
+
stacktrace: [],
|
56
|
+
statusCode: 403,
|
57
|
+
});
|
48
58
|
}
|
49
59
|
request.userHeader = response;
|
50
60
|
return true;
|
@@ -53,7 +63,11 @@ let TokenAuthGuard = class TokenAuthGuard {
|
|
53
63
|
const aplicationTag = this.aplicationTag;
|
54
64
|
if (aplicationTag &&
|
55
65
|
aplicationTag.toLowerCase() != `${response.aplicacionTag}`.toLowerCase()) {
|
56
|
-
throw new global_exception_filter_1.MsSeguridadHttpError('el token no es del aplicativo correcto', 403
|
66
|
+
throw new global_exception_filter_1.MsSeguridadHttpError('el token no es del aplicativo correcto', 403, null, true, {
|
67
|
+
code: 'PERMISSIONS_REQUIRED',
|
68
|
+
stacktrace: [],
|
69
|
+
statusCode: 403,
|
70
|
+
});
|
57
71
|
}
|
58
72
|
}
|
59
73
|
request.userHeader = response;
|
@@ -67,6 +81,8 @@ exports.TokenAuthGuard = TokenAuthGuard;
|
|
67
81
|
exports.TokenAuthGuard = TokenAuthGuard = __decorate([
|
68
82
|
(0, common_1.Injectable)(),
|
69
83
|
__param(0, (0, common_1.Inject)('APPLICATION_CODE_TAG')),
|
70
|
-
|
84
|
+
__param(1, (0, common_1.Inject)('PROVIDER_USE_HTTP_SERVICE')),
|
85
|
+
__metadata("design:paramtypes", [String, Boolean, ms_seguridad_service_1.MsSeguridadService,
|
86
|
+
ms_seguridad_http_service_1.MsSeguridadHttpService])
|
71
87
|
], TokenAuthGuard);
|
72
88
|
//# sourceMappingURL=token-auth.guard.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"token-auth.guard.js","sourceRoot":"","sources":["../../../../src/modules/ms-seguridad/guards/token-auth.guard.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAgG;AAChG,kEAA6D;AAC7D,sFAA2E;
|
1
|
+
{"version":3,"file":"token-auth.guard.js","sourceRoot":"","sources":["../../../../src/modules/ms-seguridad/guards/token-auth.guard.ts"],"names":[],"mappings":"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"}
|
@@ -0,0 +1,15 @@
|
|
1
|
+
import { HttpService } from '@nestjs/axios';
|
2
|
+
import { ResponseListPermissions_ResponseListPermisoMsn, ResponseUserData_UserPayload, TokenBody } from './types/seguridad.pb';
|
3
|
+
import { IResponseDTO } from 'src/dto';
|
4
|
+
import { UserPayload } from './ms-seguridad.decorator';
|
5
|
+
import { MsRedisService } from '../ms-redis';
|
6
|
+
export declare class MsSeguridadHttpService {
|
7
|
+
private readonly httpService;
|
8
|
+
private readonly msRedisService;
|
9
|
+
private requestHttpService;
|
10
|
+
constructor(httpService: HttpService, msRedisService: MsRedisService);
|
11
|
+
userData(data: TokenBody): Promise<IResponseDTO<ResponseUserData_UserPayload>>;
|
12
|
+
userListPermissions(user: UserPayload, tokenBody: TokenBody): Promise<ResponseListPermissions_ResponseListPermisoMsn>;
|
13
|
+
private listPermissions;
|
14
|
+
private saveInRedisCache;
|
15
|
+
}
|
@@ -0,0 +1,84 @@
|
|
1
|
+
"use strict";
|
2
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
3
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
4
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
5
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
6
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
7
|
+
};
|
8
|
+
var __metadata = (this && this.__metadata) || function (k, v) {
|
9
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
10
|
+
};
|
11
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
12
|
+
exports.MsSeguridadHttpService = void 0;
|
13
|
+
const axios_1 = require("@nestjs/axios");
|
14
|
+
const common_1 = require("@nestjs/common");
|
15
|
+
const http_service_1 = require("../../http-service");
|
16
|
+
const helpers_1 = require("../../helpers");
|
17
|
+
const ms_redis_1 = require("../ms-redis");
|
18
|
+
let MsSeguridadHttpService = class MsSeguridadHttpService {
|
19
|
+
constructor(httpService, msRedisService) {
|
20
|
+
this.httpService = httpService;
|
21
|
+
this.msRedisService = msRedisService;
|
22
|
+
this.requestHttpService = (0, http_service_1.newHttpServiceRequest)(httpService);
|
23
|
+
}
|
24
|
+
userData(data) {
|
25
|
+
return this.requestHttpService({
|
26
|
+
url: '/api/seguridad/userdata/bytoken',
|
27
|
+
method: 'post',
|
28
|
+
data,
|
29
|
+
});
|
30
|
+
}
|
31
|
+
async userListPermissions(user, tokenBody) {
|
32
|
+
if (!user) {
|
33
|
+
throw new helpers_1.MsSeguridadHttpError('usuario no logueado', 401);
|
34
|
+
}
|
35
|
+
const keyCache = `cache_user_permissions_${user.usuarioId}_app_${user.aplicacionId}`;
|
36
|
+
null;
|
37
|
+
try {
|
38
|
+
const resultCache = await this.msRedisService.getCache(keyCache);
|
39
|
+
if (resultCache &&
|
40
|
+
!resultCache.error &&
|
41
|
+
resultCache.cache &&
|
42
|
+
(resultCache === null || resultCache === void 0 ? void 0 : resultCache.response) !== null) {
|
43
|
+
return resultCache.response;
|
44
|
+
}
|
45
|
+
}
|
46
|
+
catch (error) {
|
47
|
+
console.error(error);
|
48
|
+
}
|
49
|
+
const resultGrpc = await this.listPermissions(tokenBody);
|
50
|
+
const { error, message, response, status } = resultGrpc;
|
51
|
+
if (error) {
|
52
|
+
this.msRedisService.DeleteCache(keyCache);
|
53
|
+
throw new helpers_1.MsSeguridadHttpError(message, status, response, error);
|
54
|
+
}
|
55
|
+
return this.saveInRedisCache(resultGrpc === null || resultGrpc === void 0 ? void 0 : resultGrpc.response, keyCache);
|
56
|
+
}
|
57
|
+
listPermissions(inputDto) {
|
58
|
+
return this.requestHttpService({
|
59
|
+
url: '/api/seguridad/list/permissions',
|
60
|
+
method: 'post',
|
61
|
+
data: inputDto,
|
62
|
+
});
|
63
|
+
}
|
64
|
+
saveInRedisCache(response, keyCache) {
|
65
|
+
var _a, _b;
|
66
|
+
try {
|
67
|
+
if (response && ((_b = (_a = response === null || response === void 0 ? void 0 : response.data) === null || _a === void 0 ? void 0 : _a.permisos) === null || _b === void 0 ? void 0 : _b.length) > 0) {
|
68
|
+
this.msRedisService.SetCache(keyCache, JSON.stringify(response), 30);
|
69
|
+
}
|
70
|
+
else {
|
71
|
+
this.msRedisService.DeleteCache(keyCache);
|
72
|
+
}
|
73
|
+
}
|
74
|
+
catch (error) { }
|
75
|
+
return response;
|
76
|
+
}
|
77
|
+
};
|
78
|
+
exports.MsSeguridadHttpService = MsSeguridadHttpService;
|
79
|
+
exports.MsSeguridadHttpService = MsSeguridadHttpService = __decorate([
|
80
|
+
(0, common_1.Injectable)(),
|
81
|
+
__metadata("design:paramtypes", [axios_1.HttpService,
|
82
|
+
ms_redis_1.MsRedisService])
|
83
|
+
], MsSeguridadHttpService);
|
84
|
+
//# sourceMappingURL=ms-seguridad.http.service.js.map
|
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"file":"ms-seguridad.http.service.js","sourceRoot":"","sources":["../../../src/modules/ms-seguridad/ms-seguridad.http.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yCAA4C;AAC5C,2CAA4C;AAC5C,qDAAyD;AASzD,2CAAmD;AACnD,0CAA6C;AAGtC,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IAEjC,YACmB,WAAwB,EACxB,cAA8B;QAD9B,gBAAW,GAAX,WAAW,CAAa;QACxB,mBAAc,GAAd,cAAc,CAAgB;QAE/C,IAAI,CAAC,kBAAkB,GAAG,IAAA,oCAAqB,EAAC,WAAW,CAAC,CAAC;IAC/D,CAAC;IAQD,QAAQ,CAAC,IAAe;QACtB,OAAO,IAAI,CAAC,kBAAkB,CAAC;YAC7B,GAAG,EAAE,iCAAiC;YACtC,MAAM,EAAE,MAAM;YACd,IAAI;SACL,CAAC,CAAC;IACL,CAAC;IAUD,KAAK,CAAC,mBAAmB,CACvB,IAAiB,EACjB,SAAoB;QAEpB,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,MAAM,IAAI,8BAAoB,CAAC,qBAAqB,EAAE,GAAG,CAAC,CAAC;QAC7D,CAAC;QACD,MAAM,QAAQ,GAAG,0BAA0B,IAAI,CAAC,SAAS,QAAQ,IAAI,CAAC,YAAY,EAAE,CAAC;QACrF,IAAI,CAAC;QACL,IAAI,CAAC;YAEH,MAAM,WAAW,GACf,MAAM,IAAI,CAAC,cAAc,CAAC,QAAQ,CAChC,QAAQ,CACT,CAAC;YACJ,IACE,WAAW;gBACX,CAAC,WAAW,CAAC,KAAK;gBAClB,WAAW,CAAC,KAAK;gBACjB,CAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,QAAQ,MAAK,IAAI,EAC9B,CAAC;gBACD,OAAO,WAAW,CAAC,QAAQ,CAAC;YAC9B,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACvB,CAAC;QAGD,MAAM,UAAU,GAA4B,MAAM,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;QAElF,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC;QAExD,IAAI,KAAK,EAAE,CAAC;YACV,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;YAC1C,MAAM,IAAI,8BAAoB,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC;QACnE,CAAC;QACD,OAAO,IAAI,CAAC,gBAAgB,CAAC,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;IAC/D,CAAC;IAEO,eAAe,CAAC,QAAmB;QACzC,OAAO,IAAI,CAAC,kBAAkB,CAAC;YAC7B,GAAG,EAAE,iCAAiC;YACtC,MAAM,EAAE,MAAM;YACd,IAAI,EAAE,QAAQ;SACf,CAAC,CAAC;IACL,CAAC;IAIO,gBAAgB,CACtB,QAAwD,EACxD,QAAgB;;QAGhB,IAAI,CAAC;YACH,IAAI,QAAQ,IAAI,CAAA,MAAA,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,IAAI,0CAAE,QAAQ,0CAAE,MAAM,IAAG,CAAC,EAAE,CAAC;gBACrD,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC,CAAC;YACvE,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;YAC5C,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC,CAAA,CAAC;QAClB,OAAO,QAAQ,CAAC;IAClB,CAAC;CACF,CAAA;AA9FY,wDAAsB;iCAAtB,sBAAsB;IADlC,IAAA,mBAAU,GAAE;qCAIqB,mBAAW;QACR,yBAAc;GAJtC,sBAAsB,CA8FlC"}
|
@@ -10,6 +10,11 @@ type SeguridadModuleOptions = {
|
|
10
10
|
loadRoute?: boolean;
|
11
11
|
keepaliveTimeMs?: number;
|
12
12
|
keepaliveTimeoutMs?: number;
|
13
|
+
useHttp?: boolean;
|
14
|
+
urlHttps?: string;
|
15
|
+
maxBodyLength?: number;
|
16
|
+
timeout?: number;
|
17
|
+
maxContentLength?: number;
|
13
18
|
};
|
14
19
|
export declare class MsSeguridadModule {
|
15
20
|
static client: ClientProxy;
|
@@ -18,9 +18,11 @@ const core_1 = require("@nestjs/core");
|
|
18
18
|
const ms_seguridad_controller_1 = require("./ms-seguridad.controller");
|
19
19
|
const rpa_agetic_service_1 = require("./rpa-agetic/rpa-agetic.service");
|
20
20
|
const seguridad_pb_1 = require("./types/seguridad.pb");
|
21
|
+
const ms_seguridad_http_service_1 = require("./ms-seguridad.http.service");
|
22
|
+
const axios_1 = require("@nestjs/axios");
|
21
23
|
let MsSeguridadModule = MsSeguridadModule_1 = class MsSeguridadModule {
|
22
24
|
static register(options) {
|
23
|
-
var _a, _b, _c;
|
25
|
+
var _a, _b, _c, _d;
|
24
26
|
const urlSeguridad = options === null || options === void 0 ? void 0 : options.urlGrpcSeguridad;
|
25
27
|
if (!urlSeguridad) {
|
26
28
|
if (!urlSeguridad)
|
@@ -49,24 +51,35 @@ let MsSeguridadModule = MsSeguridadModule_1 = class MsSeguridadModule {
|
|
49
51
|
tcpHostMsRedis: options.tcpHostMsRedis,
|
50
52
|
tcpPortMsRedis: options.tcpPortMsRedis,
|
51
53
|
}),
|
54
|
+
axios_1.HttpModule.register({
|
55
|
+
baseURL: options.urlHttps,
|
56
|
+
timeout: options.timeout || 5000,
|
57
|
+
maxRedirects: 5,
|
58
|
+
maxBodyLength: options.maxBodyLength,
|
59
|
+
maxContentLength: options.maxContentLength,
|
60
|
+
}),
|
52
61
|
],
|
53
62
|
controllers: (options === null || options === void 0 ? void 0 : options.loadRoute) && options.loadRoute == true ? [ms_seguridad_controller_1.MsSeguridadController] : [],
|
54
63
|
providers: [
|
55
64
|
{ provide: 'PROVIDER_NAME_MS_SEGURIDAD', useValue: this.client },
|
56
65
|
{ provide: 'APPLICATION_CODE_TAG', useValue: (_c = options.applicationCodeTag) !== null && _c !== void 0 ? _c : null },
|
66
|
+
{ provide: 'PROVIDER_USE_HTTP_SERVICE', useValue: (_d = options.useHttp) !== null && _d !== void 0 ? _d : false },
|
57
67
|
ms_seguridad_service_1.MsSeguridadService,
|
68
|
+
ms_seguridad_http_service_1.MsSeguridadHttpService,
|
58
69
|
rpa_agetic_service_1.RpaAgeticService,
|
59
70
|
],
|
60
71
|
exports: [
|
61
72
|
ms_seguridad_service_1.MsSeguridadService,
|
73
|
+
ms_seguridad_http_service_1.MsSeguridadHttpService,
|
62
74
|
'PROVIDER_NAME_MS_SEGURIDAD',
|
63
75
|
'APPLICATION_CODE_TAG',
|
76
|
+
'PROVIDER_USE_HTTP_SERVICE',
|
64
77
|
rpa_agetic_service_1.RpaAgeticService,
|
65
78
|
],
|
66
79
|
};
|
67
80
|
}
|
68
81
|
static async registerAsync(options) {
|
69
|
-
var _a, _b, _c;
|
82
|
+
var _a, _b, _c, _d;
|
70
83
|
const urlSeguridad = options === null || options === void 0 ? void 0 : options.urlGrpcSeguridad;
|
71
84
|
if (!urlSeguridad) {
|
72
85
|
if (!urlSeguridad)
|
@@ -94,18 +107,29 @@ let MsSeguridadModule = MsSeguridadModule_1 = class MsSeguridadModule {
|
|
94
107
|
tcpHostMsRedis: options.tcpHostMsRedis,
|
95
108
|
tcpPortMsRedis: options.tcpPortMsRedis,
|
96
109
|
}),
|
110
|
+
axios_1.HttpModule.register({
|
111
|
+
baseURL: options.urlHttps,
|
112
|
+
timeout: options.timeout || 5000,
|
113
|
+
maxRedirects: 5,
|
114
|
+
maxBodyLength: options.maxBodyLength,
|
115
|
+
maxContentLength: options.maxContentLength,
|
116
|
+
}),
|
97
117
|
],
|
98
118
|
controllers: (options === null || options === void 0 ? void 0 : options.loadRoute) && options.loadRoute == true ? [ms_seguridad_controller_1.MsSeguridadController] : [],
|
99
119
|
providers: [
|
100
120
|
{ provide: 'PROVIDER_NAME_MS_SEGURIDAD', useValue: this.client },
|
101
121
|
{ provide: 'APPLICATION_CODE_TAG', useValue: (_c = options.applicationCodeTag) !== null && _c !== void 0 ? _c : null },
|
122
|
+
{ provide: 'PROVIDER_USE_HTTP_SERVICE', useValue: (_d = options.useHttp) !== null && _d !== void 0 ? _d : false },
|
102
123
|
ms_seguridad_service_1.MsSeguridadService,
|
124
|
+
ms_seguridad_http_service_1.MsSeguridadHttpService,
|
103
125
|
rpa_agetic_service_1.RpaAgeticService,
|
104
126
|
],
|
105
127
|
exports: [
|
106
128
|
ms_seguridad_service_1.MsSeguridadService,
|
129
|
+
ms_seguridad_http_service_1.MsSeguridadHttpService,
|
107
130
|
'PROVIDER_NAME_MS_SEGURIDAD',
|
108
131
|
'APPLICATION_CODE_TAG',
|
132
|
+
'PROVIDER_USE_HTTP_SERVICE',
|
109
133
|
rpa_agetic_service_1.RpaAgeticService,
|
110
134
|
],
|
111
135
|
};
|
@@ -117,7 +141,7 @@ let MsSeguridadModule = MsSeguridadModule_1 = class MsSeguridadModule {
|
|
117
141
|
exports.MsSeguridadModule = MsSeguridadModule;
|
118
142
|
exports.MsSeguridadModule = MsSeguridadModule = MsSeguridadModule_1 = __decorate([
|
119
143
|
(0, common_1.Module)({
|
120
|
-
providers: [ms_seguridad_service_1.MsSeguridadService, rpa_agetic_service_1.RpaAgeticService, core_1.Reflector],
|
144
|
+
providers: [ms_seguridad_service_1.MsSeguridadService, ms_seguridad_http_service_1.MsSeguridadHttpService, rpa_agetic_service_1.RpaAgeticService, core_1.Reflector],
|
121
145
|
})
|
122
146
|
], MsSeguridadModule);
|
123
147
|
//# sourceMappingURL=ms-seguridad.module.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"ms-seguridad.module.js","sourceRoot":"","sources":["../../../src/modules/ms-seguridad/ms-seguridad.module.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,2CAAuD;AACvD,yDAAmF;AACnF,iEAA4D;AAC5D,iEAAqE;AACrE,+BAA4B;AAC5B,iCAA6B;AAC7B,uCAAyC;AACzC,uEAAkE;AAClE,wEAAmE;AACnE,uDAAuE;
|
1
|
+
{"version":3,"file":"ms-seguridad.module.js","sourceRoot":"","sources":["../../../src/modules/ms-seguridad/ms-seguridad.module.ts"],"names":[],"mappings":"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"}
|