@aldb2b/common 1.0.190 → 1.0.192
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.
|
@@ -18,7 +18,7 @@ const microservices_1 = require("@nestjs/microservices");
|
|
|
18
18
|
const rxjs_1 = require("rxjs");
|
|
19
19
|
const subjects_1 = require("../events/subjects");
|
|
20
20
|
const redis_client_1 = require("../utils/redis-client");
|
|
21
|
-
const getHeaderParam_1 = require("
|
|
21
|
+
const getHeaderParam_1 = require("../utils/getHeaderParam");
|
|
22
22
|
let AuthorizerMiddleware = class AuthorizerMiddleware {
|
|
23
23
|
constructor(client) {
|
|
24
24
|
this.client = client;
|
|
@@ -33,15 +33,17 @@ let AuthorizerMiddleware = class AuthorizerMiddleware {
|
|
|
33
33
|
},
|
|
34
34
|
};
|
|
35
35
|
const redisResponse = await this.cachManager.getData(JSON.stringify(user.data));
|
|
36
|
+
console.log('AuthorizerMiddlewareMethod: ', request.method);
|
|
37
|
+
console.log('AuthorizerMiddlewarePath: ', request.route.path);
|
|
36
38
|
let resp;
|
|
37
39
|
if (redisResponse) {
|
|
38
40
|
resp = JSON.parse(redisResponse);
|
|
39
|
-
console.log('
|
|
41
|
+
console.log('AuthorizerMiddlewareRespIf', resp);
|
|
40
42
|
await this.isPermitted(resp.type, resp.role, request.method, request.route.path);
|
|
41
43
|
}
|
|
42
44
|
else {
|
|
43
45
|
resp = await rxjs_1.firstValueFrom(this.client.send(user.subject, user.data));
|
|
44
|
-
console.log('
|
|
46
|
+
console.log('AuthorizerMiddlewareRespElse', resp);
|
|
45
47
|
if (resp.isAuthorized === false) {
|
|
46
48
|
throw new common_1.UnauthorizedException();
|
|
47
49
|
}
|
|
@@ -61,6 +63,7 @@ let AuthorizerMiddleware = class AuthorizerMiddleware {
|
|
|
61
63
|
async isPermitted(type, role, method, path) {
|
|
62
64
|
const permissions = await this.getUserPermissions(type, role);
|
|
63
65
|
const permission = permissions.find(item => item.type === method && item.route === path);
|
|
66
|
+
console.log('isPermittedPermission: ', permission);
|
|
64
67
|
if (!permission || !permission.isAllowed) {
|
|
65
68
|
throw new common_1.UnauthorizedException();
|
|
66
69
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authorizer.middleware.js","sourceRoot":"","sources":["../../src/middlewares/authorizer.middleware.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAKuB;AACvB,yDAAmD;AAEnD,+BAAqC;AACrC,iDAA6C;AAG7C,wDAAmD;AACnD,
|
|
1
|
+
{"version":3,"file":"authorizer.middleware.js","sourceRoot":"","sources":["../../src/middlewares/authorizer.middleware.ts"],"names":[],"mappings":"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"}
|
|
@@ -6317,7 +6317,7 @@
|
|
|
6317
6317
|
"affectsGlobalScope": false
|
|
6318
6318
|
},
|
|
6319
6319
|
"../src/middlewares/authorizer.middleware.ts": {
|
|
6320
|
-
"version": "
|
|
6320
|
+
"version": "4cd254e15e949188b458381280ce524bf5d0ed8aabd970fefb342e6c136e1613",
|
|
6321
6321
|
"signature": "38d177f40d2e7334397b4f5774856ecce47e764752c0b42eae6e215809f81c71",
|
|
6322
6322
|
"affectsGlobalScope": false
|
|
6323
6323
|
},
|