fiscalia_bo-nest-helpers 1.1.25 → 1.1.27
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/modules/ms-seguridad/guards/permision.guard.d.ts +3 -1
- package/dist/modules/ms-seguridad/guards/permision.guard.js +14 -4
- package/dist/modules/ms-seguridad/guards/permision.guard.js.map +1 -1
- package/dist/modules/ms-seguridad/ms-seguridad.controller.js +1 -2
- package/dist/modules/ms-seguridad/ms-seguridad.controller.js.map +1 -1
- package/dist/modules/ms-seguridad/ms-seguridad.http.service.d.ts +5 -3
- package/dist/modules/ms-seguridad/ms-seguridad.http.service.js +40 -10
- package/dist/modules/ms-seguridad/ms-seguridad.http.service.js.map +1 -1
- package/dist/modules/ms-seguridad/ms-seguridad.service.d.ts +4 -1
- package/dist/modules/ms-seguridad/ms-seguridad.service.js +14 -3
- package/dist/modules/ms-seguridad/ms-seguridad.service.js.map +1 -1
- package/package.json +1 -1
|
@@ -4,10 +4,12 @@ import { MsSeguridadHttpService } from '../ms-seguridad.http.service';
|
|
|
4
4
|
export declare const RequiredPermissions: (...permissions: string[]) => import("@nestjs/common").CustomDecorator<string>;
|
|
5
5
|
export declare class PermissionsGuard implements CanActivate {
|
|
6
6
|
private readonly seguridadService;
|
|
7
|
+
private readonly aplicationTag;
|
|
7
8
|
private readonly useHttpService;
|
|
8
9
|
private readonly seguridadHttpService;
|
|
9
|
-
constructor(seguridadService: MsSeguridadService, useHttpService: boolean, seguridadHttpService: MsSeguridadHttpService);
|
|
10
|
+
constructor(seguridadService: MsSeguridadService, aplicationTag: string, useHttpService: boolean, seguridadHttpService: MsSeguridadHttpService);
|
|
10
11
|
canActivate(context: ExecutionContext): Promise<boolean>;
|
|
11
12
|
private getRequiredPermissions;
|
|
13
|
+
private getAplications;
|
|
12
14
|
private hasPermission;
|
|
13
15
|
}
|
|
@@ -22,8 +22,9 @@ const PERMISSIONS_KEY = 'permissions_headers_key';
|
|
|
22
22
|
const RequiredPermissions = (...permissions) => (0, common_1.SetMetadata)(PERMISSIONS_KEY, permissions);
|
|
23
23
|
exports.RequiredPermissions = RequiredPermissions;
|
|
24
24
|
let PermissionsGuard = class PermissionsGuard {
|
|
25
|
-
constructor(seguridadService, useHttpService, seguridadHttpService) {
|
|
25
|
+
constructor(seguridadService, aplicationTag, useHttpService, seguridadHttpService) {
|
|
26
26
|
this.seguridadService = seguridadService;
|
|
27
|
+
this.aplicationTag = aplicationTag;
|
|
27
28
|
this.useHttpService = useHttpService;
|
|
28
29
|
this.seguridadHttpService = seguridadHttpService;
|
|
29
30
|
}
|
|
@@ -32,8 +33,9 @@ let PermissionsGuard = class PermissionsGuard {
|
|
|
32
33
|
const request = context.switchToHttp().getRequest();
|
|
33
34
|
const token = request.headers.authorization.split(' ')[1];
|
|
34
35
|
const requiredPermissions = this.getRequiredPermissions(context);
|
|
36
|
+
const allpermissions = this.getAplications(context);
|
|
35
37
|
const response = this.useHttpService
|
|
36
|
-
? await this.seguridadHttpService.userListPermissions(request.userHeader, { token })
|
|
38
|
+
? await this.seguridadHttpService.userListPermissions(request.userHeader, { token }, allpermissions)
|
|
37
39
|
: await this.seguridadService.userListPermissions(request.userHeader, { token });
|
|
38
40
|
if (!(response === null || response === void 0 ? void 0 : response.data)) {
|
|
39
41
|
console.info('---------------------------------------------------------------');
|
|
@@ -63,6 +65,13 @@ let PermissionsGuard = class PermissionsGuard {
|
|
|
63
65
|
getRequiredPermissions(context) {
|
|
64
66
|
return Reflect.getMetadata(PERMISSIONS_KEY, context.getHandler());
|
|
65
67
|
}
|
|
68
|
+
getAplications(context) {
|
|
69
|
+
const options = Reflect.getMetadata('validate_token_extra_values', context.getHandler());
|
|
70
|
+
const aplications = (options === null || options === void 0 ? void 0 : options.applications) && options.applications.length
|
|
71
|
+
? [...new Set([...options.applications, this.aplicationTag])]
|
|
72
|
+
: [];
|
|
73
|
+
return aplications;
|
|
74
|
+
}
|
|
66
75
|
hasPermission(userPermissions, requiredPermissions) {
|
|
67
76
|
return requiredPermissions.some((permission) => userPermissions.includes(permission));
|
|
68
77
|
}
|
|
@@ -70,7 +79,8 @@ let PermissionsGuard = class PermissionsGuard {
|
|
|
70
79
|
exports.PermissionsGuard = PermissionsGuard;
|
|
71
80
|
exports.PermissionsGuard = PermissionsGuard = __decorate([
|
|
72
81
|
(0, common_1.Injectable)(),
|
|
73
|
-
__param(1, (0, common_1.Inject)('
|
|
74
|
-
|
|
82
|
+
__param(1, (0, common_1.Inject)('APPLICATION_CODE_TAG')),
|
|
83
|
+
__param(2, (0, common_1.Inject)('PROVIDER_USE_HTTP_SERVICE')),
|
|
84
|
+
__metadata("design:paramtypes", [ms_seguridad_service_1.MsSeguridadService, String, Boolean, ms_seguridad_http_service_1.MsSeguridadHttpService])
|
|
75
85
|
], PermissionsGuard);
|
|
76
86
|
//# 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":";;;;;;;;;;;;;;;AAAA,2CAAgG;AAChG,kEAA6D;AAC7D,sFAA2E;AAC3E,wDAAqD;AACrD,4EAAsE;AAEtE,MAAM,eAAe,GAAG,yBAAyB,CAAC;AAC3C,MAAM,mBAAmB,GAAG,CAAC,GAAG,WAAqB,EAAE,EAAE,CAC9D,IAAA,oBAAW,EAAC,eAAe,EAAE,WAAW,CAAC,CAAC;AAD/B,QAAA,mBAAmB,uBACY;AAGrC,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;IAC3B,YACmB,gBAAoC,
|
|
1
|
+
{"version":3,"file":"permision.guard.js","sourceRoot":"","sources":["../../../../src/modules/ms-seguridad/guards/permision.guard.ts"],"names":[],"mappings":"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"}
|
|
@@ -73,8 +73,7 @@ __decorate([
|
|
|
73
73
|
__decorate([
|
|
74
74
|
(0, common_1.Get)('information'),
|
|
75
75
|
(0, ms_seguridad_decorator_1.BearerAuthPermision)(),
|
|
76
|
-
(0,
|
|
77
|
-
(0, swagger_1.ApiOperation)({ summary: 'Servicio obtener la información de token.' }),
|
|
76
|
+
(0, controller_decorator_1.VersionDescription)('1', 'Servicio obtener la información de token.'),
|
|
78
77
|
__param(0, (0, ms_seguridad_decorator_2.AuthToken)()),
|
|
79
78
|
__metadata("design:type", Function),
|
|
80
79
|
__metadata("design:paramtypes", [String]),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ms-seguridad.controller.js","sourceRoot":"","sources":["../../../src/modules/ms-seguridad/ms-seguridad.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAUwB;AACxB,6CAAwD;AACxD,qEAA+D;AAC/D,qEAAqD;AACrD,iEAA4D;AAC5D,yCAAyC;AACzC,mFAA2E;AAC3E,gFAAyE;AACzE,mEAAuE;AAIhE,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;IAChC,YAA6B,gBAAoC;QAApC,qBAAgB,GAAhB,gBAAgB,CAAoB;IAAG,CAAC;IAU/D,AAAN,KAAK,CAAC,KAAK,CAAQ,GAAY,EAAQ,EAAE,EAAU,IAAc;QAC/D,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC;YAC5B,MAAM,KAAK,GAAG,IAAI,QAAQ,CAAC,GAAG,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;YACvD,MAAM,SAAS,GAAG,KAAK,CAAC,SAAS,EAAE,CAAC;YACpC,OAAO,IAAI,CAAC,gBAAgB,CAAC,KAAK,iCAAM,IAAI,KAAE,EAAE,EAAE,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,IAAG,CAAC;QAC5F,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,IAAI,8CAAoB,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAC9C,CAAC;IACH,CAAC;
|
|
1
|
+
{"version":3,"file":"ms-seguridad.controller.js","sourceRoot":"","sources":["../../../src/modules/ms-seguridad/ms-seguridad.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,9 +12,11 @@ export declare class MsSeguridadHttpService {
|
|
|
12
12
|
userData(data: TokenBody): Promise<IResponseDTO<ResponseUserData_UserPayload>>;
|
|
13
13
|
validToken(data: TokenBody): Promise<ResponseValidToken>;
|
|
14
14
|
getTokenInformation(data: TokenBody): Promise<LoginResponse>;
|
|
15
|
-
registerUser(data: RegisterUserRequest): Promise<RegisterUserResponse>;
|
|
16
|
-
updateRoleAplication(data: UpdateRoleAppRequest): Promise<UpdateRoleAppResponse>;
|
|
17
|
-
userListPermissions(user: UserPayload, tokenBody: TokenBody): Promise<ResponseListPermissions_ResponseListPermisoMsn>;
|
|
15
|
+
registerUser(data: RegisterUserRequest, token: string): Promise<RegisterUserResponse>;
|
|
16
|
+
updateRoleAplication(data: UpdateRoleAppRequest, token: string): Promise<UpdateRoleAppResponse>;
|
|
17
|
+
userListPermissions(user: UserPayload, tokenBody: TokenBody, aplications?: string[]): Promise<ResponseListPermissions_ResponseListPermisoMsn>;
|
|
18
|
+
private loadPermisionByApps;
|
|
19
|
+
private listPermissionsByApps;
|
|
18
20
|
private listPermissions;
|
|
19
21
|
private saveInRedisCache;
|
|
20
22
|
}
|
|
@@ -26,42 +26,44 @@ let MsSeguridadHttpService = class MsSeguridadHttpService {
|
|
|
26
26
|
url: '/api/seguridad/userdata/bytoken',
|
|
27
27
|
method: 'post',
|
|
28
28
|
data,
|
|
29
|
-
});
|
|
29
|
+
}, { Authorization: `bearer ${data.token}` });
|
|
30
30
|
}
|
|
31
31
|
validToken(data) {
|
|
32
32
|
return this.requestHttpService({
|
|
33
33
|
url: '/api/seguridad/validate/token',
|
|
34
34
|
method: 'post',
|
|
35
35
|
data,
|
|
36
|
-
});
|
|
36
|
+
}, { Authorization: `bearer ${data.token}` });
|
|
37
37
|
}
|
|
38
38
|
getTokenInformation(data) {
|
|
39
39
|
return this.requestHttpService({
|
|
40
40
|
url: '/api/seguridad/token/information',
|
|
41
41
|
method: 'post',
|
|
42
42
|
data,
|
|
43
|
-
});
|
|
43
|
+
}, { Authorization: `bearer ${data.token}` });
|
|
44
44
|
}
|
|
45
|
-
registerUser(data) {
|
|
45
|
+
registerUser(data, token) {
|
|
46
46
|
return this.requestHttpService({
|
|
47
47
|
url: '/api/seguridad/register/user',
|
|
48
48
|
method: 'post',
|
|
49
49
|
data,
|
|
50
|
-
});
|
|
50
|
+
}, { Authorization: `bearer ${token}` });
|
|
51
51
|
}
|
|
52
|
-
updateRoleAplication(data) {
|
|
52
|
+
updateRoleAplication(data, token) {
|
|
53
53
|
return this.requestHttpService({
|
|
54
54
|
url: '/api/seguridad/update/roles/app',
|
|
55
55
|
method: 'post',
|
|
56
56
|
data,
|
|
57
|
-
});
|
|
57
|
+
}, { Authorization: `bearer ${token}` });
|
|
58
58
|
}
|
|
59
|
-
async userListPermissions(user, tokenBody) {
|
|
59
|
+
async userListPermissions(user, tokenBody, aplications = []) {
|
|
60
60
|
if (!user) {
|
|
61
61
|
throw new helpers_1.MsSeguridadHttpError('usuario no logueado', 401);
|
|
62
62
|
}
|
|
63
|
+
if (aplications.length > 0) {
|
|
64
|
+
return await this.loadPermisionByApps(user, tokenBody.token, aplications);
|
|
65
|
+
}
|
|
63
66
|
const keyCache = `cache_user_permissions_${user.usuarioId}_app_${user.aplicacionId}`;
|
|
64
|
-
null;
|
|
65
67
|
try {
|
|
66
68
|
const resultCache = await this.msRedisService.getCache(keyCache);
|
|
67
69
|
if (resultCache &&
|
|
@@ -82,12 +84,40 @@ let MsSeguridadHttpService = class MsSeguridadHttpService {
|
|
|
82
84
|
}
|
|
83
85
|
return this.saveInRedisCache(resultGrpc === null || resultGrpc === void 0 ? void 0 : resultGrpc.response, keyCache);
|
|
84
86
|
}
|
|
87
|
+
async loadPermisionByApps(user, token, applications) {
|
|
88
|
+
const keyCache = `cache_user_permissions_${user.usuarioId}_apps_${applications.join()}`;
|
|
89
|
+
try {
|
|
90
|
+
const resultCache = await this.msRedisService.getCache(keyCache);
|
|
91
|
+
if (resultCache &&
|
|
92
|
+
!resultCache.error &&
|
|
93
|
+
resultCache.cache &&
|
|
94
|
+
(resultCache === null || resultCache === void 0 ? void 0 : resultCache.response) !== null) {
|
|
95
|
+
return resultCache.response;
|
|
96
|
+
}
|
|
97
|
+
}
|
|
98
|
+
catch (error) {
|
|
99
|
+
console.error(error);
|
|
100
|
+
}
|
|
101
|
+
const resultGrpc = await this.listPermissionsByApps({
|
|
102
|
+
applications,
|
|
103
|
+
token,
|
|
104
|
+
});
|
|
105
|
+
const { error, message, response, status } = resultGrpc;
|
|
106
|
+
if (error) {
|
|
107
|
+
this.msRedisService.DeleteCache(keyCache);
|
|
108
|
+
throw new helpers_1.MsSeguridadHttpError(message, status, response, error);
|
|
109
|
+
}
|
|
110
|
+
return this.saveInRedisCache(resultGrpc === null || resultGrpc === void 0 ? void 0 : resultGrpc.response, keyCache);
|
|
111
|
+
}
|
|
112
|
+
listPermissionsByApps(inputDto) {
|
|
113
|
+
return this.requestHttpService({ url: '/api/seguridad/permissions/by/apps', method: 'post', data: inputDto }, { Authorization: `bearer ${inputDto.token}` });
|
|
114
|
+
}
|
|
85
115
|
listPermissions(inputDto) {
|
|
86
116
|
return this.requestHttpService({
|
|
87
117
|
url: '/api/seguridad/list/permissions',
|
|
88
118
|
method: 'post',
|
|
89
119
|
data: inputDto,
|
|
90
|
-
});
|
|
120
|
+
}, { Authorization: `bearer ${inputDto.token}` });
|
|
91
121
|
}
|
|
92
122
|
saveInRedisCache(response, keyCache) {
|
|
93
123
|
var _a, _b;
|
|
@@ -1 +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;AAczD,2CAAmD;AACnD,0CAA6C;AAItC,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,KAAK,CAAC,QAAQ,CAAC,IAAe;QAC5B,OAAO,IAAI,CAAC,kBAAkB,
|
|
1
|
+
{"version":3,"file":"ms-seguridad.http.service.js","sourceRoot":"","sources":["../../../src/modules/ms-seguridad/ms-seguridad.http.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,11 +2,14 @@ import { ClientGrpc } from '@nestjs/microservices';
|
|
|
2
2
|
import { LoginCDRequest, LoginRequest, LoginResponse, NumDocInput, RefreshTokenRequest, RegisterUserRequest, ResponseListPermissions_ResponseListPermisoMsn, TokenBody, UpdateRoleAppRequest, UserInfoInput, UserPersonaResponse } from './types/seguridad.pb';
|
|
3
3
|
import { UserPayload } from './ms-seguridad.decorator';
|
|
4
4
|
import { MsRedisService } from 'src/modules/ms-redis/ms-redis.service';
|
|
5
|
+
import { MsSeguridadHttpService } from './ms-seguridad.http.service';
|
|
5
6
|
export declare class MsSeguridadService {
|
|
6
7
|
private readonly client;
|
|
8
|
+
private readonly useHttpService;
|
|
9
|
+
private readonly seguridadHttpService;
|
|
7
10
|
private readonly msRedisService;
|
|
8
11
|
private seguridadService;
|
|
9
|
-
constructor(client: ClientGrpc, msRedisService: MsRedisService);
|
|
12
|
+
constructor(client: ClientGrpc, useHttpService: boolean, seguridadHttpService: MsSeguridadHttpService, msRedisService: MsRedisService);
|
|
10
13
|
private onModuleInit;
|
|
11
14
|
userListPermissions(user: UserPayload, tokenBody: TokenBody): Promise<ResponseListPermissions_ResponseListPermisoMsn>;
|
|
12
15
|
validToken(tokenBody: TokenBody): Promise<import("./types/seguridad.pb").ResponseValidToken | import("../../dto").IResponseDTO<any>>;
|
|
@@ -19,9 +19,12 @@ 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
21
|
const grpc_exception_filter_1 = require("../../helpers/grpc-exception.filter");
|
|
22
|
+
const ms_seguridad_http_service_1 = require("./ms-seguridad.http.service");
|
|
22
23
|
let MsSeguridadService = class MsSeguridadService {
|
|
23
|
-
constructor(client, msRedisService) {
|
|
24
|
+
constructor(client, useHttpService, seguridadHttpService, msRedisService) {
|
|
24
25
|
this.client = client;
|
|
26
|
+
this.useHttpService = useHttpService;
|
|
27
|
+
this.seguridadHttpService = seguridadHttpService;
|
|
25
28
|
this.msRedisService = msRedisService;
|
|
26
29
|
}
|
|
27
30
|
onModuleInit() {
|
|
@@ -63,7 +66,13 @@ let MsSeguridadService = class MsSeguridadService {
|
|
|
63
66
|
return (0, rxjs_1.firstValueFrom)(this.seguridadService.login(inputDto)).catch((anyError) => (0, grpc_exception_filter_1.grpcHandlerError)(this.constructor.name, anyError, 'login'));
|
|
64
67
|
}
|
|
65
68
|
getTokenInformation(tokenBody) {
|
|
66
|
-
|
|
69
|
+
if (this.useHttpService) {
|
|
70
|
+
return this.seguridadHttpService.getTokenInformation(tokenBody);
|
|
71
|
+
}
|
|
72
|
+
else {
|
|
73
|
+
const response = (0, rxjs_1.firstValueFrom)(this.seguridadService.tokenInformation(tokenBody)).catch((anyError) => (0, grpc_exception_filter_1.grpcHandlerError)(this.constructor.name, anyError, 'getTokenInformation'));
|
|
74
|
+
return response;
|
|
75
|
+
}
|
|
67
76
|
}
|
|
68
77
|
getUserPersonInfo(inputDto) {
|
|
69
78
|
const defaultValues = Object.assign({ includeFunc: false, includePerson: false }, inputDto);
|
|
@@ -105,6 +114,8 @@ exports.MsSeguridadService = MsSeguridadService;
|
|
|
105
114
|
exports.MsSeguridadService = MsSeguridadService = __decorate([
|
|
106
115
|
(0, common_1.Injectable)(),
|
|
107
116
|
__param(0, (0, common_1.Inject)('PROVIDER_NAME_MS_SEGURIDAD')),
|
|
108
|
-
|
|
117
|
+
__param(1, (0, common_1.Inject)('PROVIDER_USE_HTTP_SERVICE')),
|
|
118
|
+
__metadata("design:paramtypes", [Object, Boolean, ms_seguridad_http_service_1.MsSeguridadHttpService,
|
|
119
|
+
ms_redis_service_1.MsRedisService])
|
|
109
120
|
], MsSeguridadService);
|
|
110
121
|
//# sourceMappingURL=ms-seguridad.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ms-seguridad.service.js","sourceRoot":"","sources":["../../../src/modules/ms-seguridad/ms-seguridad.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAoD;AAEpD,uDAe8B;AAC9B,+BAAsC;AAEtC,mEAAuE;AACvE,mFAA2E;AAC3E,+EAAqE;AAM9D,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAG7B,YACyD,MAAkB,
|
|
1
|
+
{"version":3,"file":"ms-seguridad.service.js","sourceRoot":"","sources":["../../../src/modules/ms-seguridad/ms-seguridad.service.ts"],"names":[],"mappings":"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"}
|