fiscalia_bo-nest-helpers 0.2.5 → 0.2.7
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/ms-seguridad/dto/ms-seguridad.input.d.ts +4 -0
- package/dist/ms-seguridad/dto/ms-seguridad.input.js +22 -1
- package/dist/ms-seguridad/dto/ms-seguridad.input.js.map +1 -1
- package/dist/ms-seguridad/ms-seguridad.controller.d.ts +2 -1
- package/dist/ms-seguridad/ms-seguridad.controller.js +22 -0
- package/dist/ms-seguridad/ms-seguridad.controller.js.map +1 -1
- package/dist/ms-seguridad/ms-seguridad.service.d.ts +2 -1
- package/dist/ms-seguridad/ms-seguridad.service.js +12 -2
- package/dist/ms-seguridad/ms-seguridad.service.js.map +1 -1
- package/dist/ms-seguridad/seguridad.pb.d.ts +8 -0
- package/dist/ms-seguridad/seguridad.pb.js +1 -0
- package/dist/ms-seguridad/seguridad.pb.js.map +1 -1
- package/dist/ms-seguridad/seguridad.proto +8 -0
- package/package.json +1 -1
|
@@ -9,9 +9,11 @@ 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
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
-
exports.UpdateRoleAppRequest = exports.RegisterUserDto = exports.LoginCDRequestDto = exports.LoginDto = void 0;
|
|
12
|
+
exports.RefreshTokenDTO = exports.UpdateRoleAppRequest = exports.RegisterUserDto = exports.LoginCDRequestDto = exports.LoginDto = void 0;
|
|
13
13
|
const swagger_1 = require("@nestjs/swagger");
|
|
14
14
|
const class_validator_1 = require("class-validator");
|
|
15
|
+
const class_transformer_1 = require("class-transformer");
|
|
16
|
+
const validator_sms_1 = require("../../custom-validators/validator.sms");
|
|
15
17
|
class LoginDto {
|
|
16
18
|
}
|
|
17
19
|
__decorate([
|
|
@@ -136,4 +138,23 @@ __decorate([
|
|
|
136
138
|
__metadata("design:type", String)
|
|
137
139
|
], UpdateRoleAppRequest.prototype, "newPassword", void 0);
|
|
138
140
|
exports.UpdateRoleAppRequest = UpdateRoleAppRequest;
|
|
141
|
+
class RefreshTokenDTO {
|
|
142
|
+
}
|
|
143
|
+
__decorate([
|
|
144
|
+
(0, swagger_1.ApiProperty)(),
|
|
145
|
+
(0, class_transformer_1.Transform)(({ value }) => (value ? value.toString().trim() : value)),
|
|
146
|
+
(0, class_validator_1.IsString)({ message: (v) => (0, validator_sms_1.smsIsStringM)(v) }),
|
|
147
|
+
(0, class_validator_1.IsDefined)({ message: (v) => (0, validator_sms_1.smsNotEmptyM)(v) }),
|
|
148
|
+
(0, class_validator_1.MinLength)(1, { message: (v) => (0, validator_sms_1.smsMinLength)(v) }),
|
|
149
|
+
__metadata("design:type", String)
|
|
150
|
+
], RefreshTokenDTO.prototype, "token", void 0);
|
|
151
|
+
__decorate([
|
|
152
|
+
(0, swagger_1.ApiProperty)(),
|
|
153
|
+
(0, class_transformer_1.Transform)(({ value }) => (value ? value.toString().trim() : value)),
|
|
154
|
+
(0, class_validator_1.IsString)({ message: (v) => (0, validator_sms_1.smsIsStringM)(v, 'refresh token') }),
|
|
155
|
+
(0, class_validator_1.IsDefined)({ message: (v) => (0, validator_sms_1.smsNotEmptyM)(v, 'refresh token') }),
|
|
156
|
+
(0, class_validator_1.MinLength)(1, { message: (v) => (0, validator_sms_1.smsMinLength)(v, 'refresh token') }),
|
|
157
|
+
__metadata("design:type", String)
|
|
158
|
+
], RefreshTokenDTO.prototype, "tokenRefresh", void 0);
|
|
159
|
+
exports.RefreshTokenDTO = RefreshTokenDTO;
|
|
139
160
|
//# sourceMappingURL=ms-seguridad.input.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ms-seguridad.input.js","sourceRoot":"","sources":["../../../src/ms-seguridad/dto/ms-seguridad.input.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAA8C;AAC9C,
|
|
1
|
+
{"version":3,"file":"ms-seguridad.input.js","sourceRoot":"","sources":["../../../src/ms-seguridad/dto/ms-seguridad.input.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { MsSeguridadService } from './ms-seguridad.service';
|
|
2
|
-
import { LoginDto } from './dto/ms-seguridad.input';
|
|
2
|
+
import { LoginDto, RefreshTokenDTO } from './dto/ms-seguridad.input';
|
|
3
3
|
import { RpaAgeticService } from './rpa-agetic/rpa-agetic.service';
|
|
4
4
|
export declare class MsSeguridadController {
|
|
5
5
|
private readonly seguridadService;
|
|
@@ -7,5 +7,6 @@ export declare class MsSeguridadController {
|
|
|
7
7
|
constructor(seguridadService: MsSeguridadService, rpaAgeticService: RpaAgeticService);
|
|
8
8
|
login(req: Request, ip: any, body: LoginDto): Promise<import("./seguridad.pb").LoginResponse>;
|
|
9
9
|
token(token: string): Promise<import("./seguridad.pb").LoginResponse>;
|
|
10
|
+
refresh(req: Request, ip: any, body: RefreshTokenDTO): Promise<import("./seguridad.pb").LoginResponse>;
|
|
10
11
|
logoutV2(token: string): Promise<import("./seguridad.pb").LogoutResponse>;
|
|
11
12
|
}
|
|
@@ -22,6 +22,7 @@ const ms_seguridad_input_1 = require("./dto/ms-seguridad.input");
|
|
|
22
22
|
const uaParser = require("ua-parser-js");
|
|
23
23
|
const global_exception_filter_1 = require("../helpers/global-exception.filter");
|
|
24
24
|
const rpa_agetic_service_1 = require("./rpa-agetic/rpa-agetic.service");
|
|
25
|
+
const controller_decorator_1 = require("../decorators/controller.decorator");
|
|
25
26
|
let MsSeguridadController = class MsSeguridadController {
|
|
26
27
|
constructor(seguridadService, rpaAgeticService) {
|
|
27
28
|
this.seguridadService = seguridadService;
|
|
@@ -42,6 +43,17 @@ let MsSeguridadController = class MsSeguridadController {
|
|
|
42
43
|
const response = await this.seguridadService.getTokenInformation({ token });
|
|
43
44
|
return response;
|
|
44
45
|
}
|
|
46
|
+
async refresh(req, ip, body) {
|
|
47
|
+
try {
|
|
48
|
+
const headers = req.headers;
|
|
49
|
+
const agent = new uaParser(`${headers['user-agent']}`);
|
|
50
|
+
const userAgent = agent.getResult();
|
|
51
|
+
return this.seguridadService.refreshToken(Object.assign(Object.assign({}, body), { ip, userAgent: JSON.stringify(userAgent) }));
|
|
52
|
+
}
|
|
53
|
+
catch (err) {
|
|
54
|
+
throw new global_exception_filter_1.MsSeguridadHttpError(err.message);
|
|
55
|
+
}
|
|
56
|
+
}
|
|
45
57
|
async logoutV2(token) {
|
|
46
58
|
const response = await this.seguridadService.logout({ token });
|
|
47
59
|
return response;
|
|
@@ -69,6 +81,16 @@ __decorate([
|
|
|
69
81
|
__metadata("design:paramtypes", [String]),
|
|
70
82
|
__metadata("design:returntype", Promise)
|
|
71
83
|
], MsSeguridadController.prototype, "token", null);
|
|
84
|
+
__decorate([
|
|
85
|
+
(0, common_1.Post)('token/refresh'),
|
|
86
|
+
(0, controller_decorator_1.VersionDescription)('1', 'Servicio para refrescar token.'),
|
|
87
|
+
__param(0, (0, common_1.Req)()),
|
|
88
|
+
__param(1, (0, common_1.Ip)()),
|
|
89
|
+
__param(2, (0, common_1.Body)()),
|
|
90
|
+
__metadata("design:type", Function),
|
|
91
|
+
__metadata("design:paramtypes", [Request, Object, ms_seguridad_input_1.RefreshTokenDTO]),
|
|
92
|
+
__metadata("design:returntype", Promise)
|
|
93
|
+
], MsSeguridadController.prototype, "refresh", null);
|
|
72
94
|
__decorate([
|
|
73
95
|
(0, common_1.Post)('logout'),
|
|
74
96
|
(0, ms_seguridad_decorator_1.BearerAuthPermision)(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ms-seguridad.controller.js","sourceRoot":"","sources":["../../src/ms-seguridad/ms-seguridad.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAUwB;AACxB,6CAAwD;AACxD,qEAA+D;AAC/D,qEAAqD;AACrD,iEAA4D;AAC5D,
|
|
1
|
+
{"version":3,"file":"ms-seguridad.controller.js","sourceRoot":"","sources":["../../src/ms-seguridad/ms-seguridad.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { ClientGrpc } from '@nestjs/microservices';
|
|
2
|
-
import { LoginCDRequest, LoginRequest, NumDocInput, RegisterUserRequest, ResponseListPermissions_ResponseListPermisoMsn, TokenBody, UpdateRoleAppRequest } from './seguridad.pb';
|
|
2
|
+
import { LoginCDRequest, LoginRequest, NumDocInput, RefreshTokenRequest, RegisterUserRequest, ResponseListPermissions_ResponseListPermisoMsn, TokenBody, UpdateRoleAppRequest } from './seguridad.pb';
|
|
3
3
|
import { UserPayload } from './ms-seguridad.decorator';
|
|
4
4
|
import { MsRedisService } from 'src/ms-redis/ms-redis.service';
|
|
5
5
|
export declare class MsSeguridadService {
|
|
@@ -14,6 +14,7 @@ export declare class MsSeguridadService {
|
|
|
14
14
|
login(data: LoginRequest): Promise<import("./seguridad.pb").LoginResponse>;
|
|
15
15
|
getTokenInformation(tokenBody: TokenBody): Promise<import("./seguridad.pb").LoginResponse>;
|
|
16
16
|
logout(tokenBody: TokenBody): Promise<import("./seguridad.pb").LogoutResponse>;
|
|
17
|
+
refreshToken(tokenBody: RefreshTokenRequest): Promise<import("./seguridad.pb").LoginResponse>;
|
|
17
18
|
verificarCD(tokenBody: NumDocInput): Promise<import("./seguridad.pb").VerifyCDResponse>;
|
|
18
19
|
registerUser(body: RegisterUserRequest): Promise<import("./seguridad.pb").RegisterUserResponse>;
|
|
19
20
|
updateRoleAplication(body: UpdateRoleAppRequest): Promise<import("./seguridad.pb").UpdateRoleAppResponse>;
|
|
@@ -18,6 +18,7 @@ const seguridad_pb_1 = require("./seguridad.pb");
|
|
|
18
18
|
const rxjs_1 = require("rxjs");
|
|
19
19
|
const ms_redis_service_1 = require("../ms-redis/ms-redis.service");
|
|
20
20
|
const global_exception_filter_1 = require("../helpers/global-exception.filter");
|
|
21
|
+
const chalk_1 = require("chalk");
|
|
21
22
|
let MsSeguridadService = class MsSeguridadService {
|
|
22
23
|
constructor(client, redisCache) {
|
|
23
24
|
this.client = client;
|
|
@@ -27,10 +28,12 @@ let MsSeguridadService = class MsSeguridadService {
|
|
|
27
28
|
this.seguridadService = this.client.getService(seguridad_pb_1.SEGURIDAD_SERVICE_NAME);
|
|
28
29
|
}
|
|
29
30
|
async listPermissions(user, tokenBody) {
|
|
30
|
-
const keyCache = `cache_user_permissions_${user.usuarioId}`;
|
|
31
|
+
const keyCache = `cache_user_permissions_${user.usuarioId}_app_${user.aplicacionId}`;
|
|
31
32
|
const result = await this.redisCache.getCache(keyCache);
|
|
32
|
-
if (result && !result.error && result.cache)
|
|
33
|
+
if (result && !result.error && result.cache) {
|
|
34
|
+
console.log(chalk_1.bold.red('carga de permisos desde redisCache, total = ', result.response.length));
|
|
33
35
|
return result.response;
|
|
36
|
+
}
|
|
34
37
|
const response = await (0, rxjs_1.firstValueFrom)(this.seguridadService.listPermissions(tokenBody));
|
|
35
38
|
return this.saveInRedisCache(response, keyCache);
|
|
36
39
|
}
|
|
@@ -49,6 +52,9 @@ let MsSeguridadService = class MsSeguridadService {
|
|
|
49
52
|
logout(tokenBody) {
|
|
50
53
|
return (0, rxjs_1.firstValueFrom)(this.seguridadService.logout(tokenBody));
|
|
51
54
|
}
|
|
55
|
+
refreshToken(tokenBody) {
|
|
56
|
+
return (0, rxjs_1.firstValueFrom)(this.seguridadService.refreshToken(tokenBody));
|
|
57
|
+
}
|
|
52
58
|
verificarCD(tokenBody) {
|
|
53
59
|
return (0, rxjs_1.firstValueFrom)(this.seguridadService.verifyCd(tokenBody));
|
|
54
60
|
}
|
|
@@ -69,9 +75,13 @@ let MsSeguridadService = class MsSeguridadService {
|
|
|
69
75
|
saveInRedisCache(result, keyCache) {
|
|
70
76
|
const { message, status, response, error } = result;
|
|
71
77
|
if (error) {
|
|
78
|
+
console.log(chalk_1.bold.red('ms-seguridad:saveInRedisCache, error', error));
|
|
79
|
+
console.log(chalk_1.bold.red(message));
|
|
80
|
+
this.redisCache.DeleteCache(keyCache);
|
|
72
81
|
throw new global_exception_filter_1.MsSeguridadHttpError(message, status, response, error);
|
|
73
82
|
}
|
|
74
83
|
this.redisCache.SetCache(keyCache, JSON.stringify(response), 30);
|
|
84
|
+
console.log(chalk_1.bold.blue('ms-seguridad:saveInRedisCache, carga de permisos desde ms-seguridad = ', result.response.length));
|
|
75
85
|
return response;
|
|
76
86
|
}
|
|
77
87
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ms-seguridad.service.js","sourceRoot":"","sources":["../../src/ms-seguridad/ms-seguridad.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAoD;AAEpD,
|
|
1
|
+
{"version":3,"file":"ms-seguridad.service.js","sourceRoot":"","sources":["../../src/ms-seguridad/ms-seguridad.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -36,6 +36,12 @@ export interface LoginRequest {
|
|
|
36
36
|
codigoDispositivo?: string | undefined;
|
|
37
37
|
verificarSiFuncionario?: boolean | undefined;
|
|
38
38
|
}
|
|
39
|
+
export interface RefreshTokenRequest {
|
|
40
|
+
token: string;
|
|
41
|
+
tokenRefresh: string;
|
|
42
|
+
ip: string;
|
|
43
|
+
userAgent: string;
|
|
44
|
+
}
|
|
39
45
|
export interface LoginCDRequest {
|
|
40
46
|
numDocumento: string;
|
|
41
47
|
aplicacion: string;
|
|
@@ -322,6 +328,7 @@ export interface seguridadServiceClient {
|
|
|
322
328
|
convenioTokenServicios(request: TokenBody): Observable<ResponseServicioTokenConvenio>;
|
|
323
329
|
validToken(request: TokenBody): Observable<ResponseValidToken>;
|
|
324
330
|
login(request: LoginRequest): Observable<LoginResponse>;
|
|
331
|
+
refreshToken(request: RefreshTokenRequest): Observable<LoginResponse>;
|
|
325
332
|
loginCiudadaniaDigital(request: LoginCDRequest): Observable<LoginResponse>;
|
|
326
333
|
registerUser(request: RegisterUserRequest): Observable<RegisterUserResponse>;
|
|
327
334
|
updateRolesApp(request: UpdateRoleAppRequest): Observable<UpdateRoleAppResponse>;
|
|
@@ -343,6 +350,7 @@ export interface seguridadServiceController {
|
|
|
343
350
|
convenioTokenServicios(request: TokenBody): Promise<ResponseServicioTokenConvenio> | Observable<ResponseServicioTokenConvenio> | ResponseServicioTokenConvenio;
|
|
344
351
|
validToken(request: TokenBody): Promise<ResponseValidToken> | Observable<ResponseValidToken> | ResponseValidToken;
|
|
345
352
|
login(request: LoginRequest): Promise<LoginResponse> | Observable<LoginResponse> | LoginResponse;
|
|
353
|
+
refreshToken(request: RefreshTokenRequest): Promise<LoginResponse> | Observable<LoginResponse> | LoginResponse;
|
|
346
354
|
loginCiudadaniaDigital(request: LoginCDRequest): Promise<LoginResponse> | Observable<LoginResponse> | LoginResponse;
|
|
347
355
|
registerUser(request: RegisterUserRequest): Promise<RegisterUserResponse> | Observable<RegisterUserResponse> | RegisterUserResponse;
|
|
348
356
|
updateRolesApp(request: UpdateRoleAppRequest): Promise<UpdateRoleAppResponse> | Observable<UpdateRoleAppResponse> | UpdateRoleAppResponse;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"seguridad.pb.js","sourceRoot":"","sources":["../../src/ms-seguridad/seguridad.pb.ts"],"names":[],"mappings":";;;AACA,yDAAqE;AAGxD,QAAA,eAAe,GAAG,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"seguridad.pb.js","sourceRoot":"","sources":["../../src/ms-seguridad/seguridad.pb.ts"],"names":[],"mappings":";;;AACA,yDAAqE;AAGxD,QAAA,eAAe,GAAG,oBAAoB,CAAC;AA8WvC,QAAA,+BAA+B,GAAG,oBAAoB,CAAC;AAgHpE,SAAgB,iCAAiC;IAC/C,OAAO,UAAU,WAAqB;QACpC,MAAM,WAAW,GAAa;YAC5B,iBAAiB;YACjB,cAAc;YACd,eAAe;YACf,gBAAgB;YAChB,aAAa;YACb,0BAA0B;YAC1B,sBAAsB;YACtB,wBAAwB;YACxB,wBAAwB;YACxB,YAAY;YACZ,OAAO;YACP,cAAc;YACd,wBAAwB;YACxB,cAAc;YACd,gBAAgB;YAChB,kBAAkB;YAClB,QAAQ;YACR,iBAAiB;YACjB,YAAY;YACZ,UAAU;SACX,CAAC;QACF,KAAK,MAAM,MAAM,IAAI,WAAW,EAAE;YAChC,MAAM,UAAU,GAAQ,OAAO,CAAC,wBAAwB,CAAC,WAAW,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;YACxF,IAAA,0BAAU,EAAC,kBAAkB,EAAE,MAAM,CAAC,CAAC,WAAW,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,UAAU,CAAC,CAAC;SAC3F;QACD,MAAM,iBAAiB,GAAa,EAAE,CAAC;QACvC,KAAK,MAAM,MAAM,IAAI,iBAAiB,EAAE;YACtC,MAAM,UAAU,GAAQ,OAAO,CAAC,wBAAwB,CAAC,WAAW,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;YACxF,IAAA,gCAAgB,EAAC,kBAAkB,EAAE,MAAM,CAAC,CAAC,WAAW,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,UAAU,CAAC,CAAC;SACjG;IACH,CAAC,CAAC;AACJ,CAAC;AAlCD,8EAkCC;AAEY,QAAA,sBAAsB,GAAG,kBAAkB,CAAC"}
|
|
@@ -26,6 +26,7 @@ service seguridadService {
|
|
|
26
26
|
|
|
27
27
|
rpc ValidToken (TokenBody) returns (ResponseValidToken);
|
|
28
28
|
rpc Login (LoginRequest) returns (LoginResponse);
|
|
29
|
+
rpc RefreshToken (RefreshTokenRequest) returns (LoginResponse);
|
|
29
30
|
rpc LoginCiudadaniaDigital (LoginCDRequest) returns (LoginResponse);
|
|
30
31
|
rpc RegisterUser (RegisterUserRequest) returns (RegisterUserResponse);
|
|
31
32
|
rpc UpdateRolesApp (UpdateRoleAppRequest) returns (UpdateRoleAppResponse);
|
|
@@ -70,6 +71,13 @@ message LoginRequest {
|
|
|
70
71
|
optional bool verificarSiFuncionario = 7;
|
|
71
72
|
}
|
|
72
73
|
|
|
74
|
+
message RefreshTokenRequest {
|
|
75
|
+
string token = 1;
|
|
76
|
+
string tokenRefresh = 2;
|
|
77
|
+
string ip = 3;
|
|
78
|
+
string userAgent = 4;
|
|
79
|
+
}
|
|
80
|
+
|
|
73
81
|
message LoginCDRequest {
|
|
74
82
|
string numDocumento = 1;
|
|
75
83
|
string aplicacion = 2;
|