@aldb2b/common 1.0.633 → 1.0.634
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.
|
@@ -27,8 +27,6 @@ let AuthorizerMiddleware = class AuthorizerMiddleware {
|
|
|
27
27
|
async use(request, response, next) {
|
|
28
28
|
let cognitoUserId = (0, getHeaderParam_1.getHeaderParam)(request.headers, 'x-cognito-userid');
|
|
29
29
|
console.log('cognitoUserId: ', cognitoUserId);
|
|
30
|
-
console.log('request.method: ', request.method);
|
|
31
|
-
console.log('request.route.path: ', request.route.path);
|
|
32
30
|
if (cognitoUserId && cognitoUserId.includes(',')) {
|
|
33
31
|
cognitoUserId = cognitoUserId.split(',');
|
|
34
32
|
cognitoUserId = cognitoUserId[cognitoUserId.length - 1].trim();
|
|
@@ -44,10 +42,12 @@ let AuthorizerMiddleware = class AuthorizerMiddleware {
|
|
|
44
42
|
let resp;
|
|
45
43
|
if (redisResponse) {
|
|
46
44
|
resp = JSON.parse(redisResponse);
|
|
45
|
+
console.log('redisResponse:', resp);
|
|
47
46
|
await this.isPermitted(resp.type, resp.role, request.method, request.route.path);
|
|
48
47
|
}
|
|
49
48
|
else {
|
|
50
49
|
resp = await (0, rxjs_1.firstValueFrom)(this.client.send(user.subject, user.data));
|
|
50
|
+
console.log('UserRpcData:', resp);
|
|
51
51
|
if (resp.isAuthorized === false) {
|
|
52
52
|
throw new common_1.ForbiddenException('Un-authorized Forbidden');
|
|
53
53
|
}
|
|
@@ -70,9 +70,12 @@ let AuthorizerMiddleware = class AuthorizerMiddleware {
|
|
|
70
70
|
}
|
|
71
71
|
async isPermitted(type, role, method, path) {
|
|
72
72
|
const permissions = await this.getUserPermissions(type, role);
|
|
73
|
+
console.log('permissions: ', JSON.stringify(permissions));
|
|
74
|
+
console.log('method: ', method, path);
|
|
73
75
|
const permission = permissions.find(item => {
|
|
74
76
|
return item.type === method && item.route === path;
|
|
75
77
|
});
|
|
78
|
+
console.log('permission: ', permission);
|
|
76
79
|
if (!permission || !permission.isAllowed) {
|
|
77
80
|
throw new common_1.ForbiddenException('Permission Forbidden');
|
|
78
81
|
}
|
|
@@ -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;AAC7C,wDAAmD;AACnD,4DAAwD;AAKjD,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;IAE/B,YAAqD,MAAmB;QAAnB,WAAM,GAAN,MAAM,CAAa;QACtE,IAAI,CAAC,WAAW,GAAG,IAAI,0BAAW,EAAE,CAAA;IACtC,CAAC;IAED,KAAK,CAAC,GAAG,CACP,OAAgB,EAChB,QAAkB,EAClB,IAAkB;QAElB,IAAI,aAAa,GAAQ,IAAA,+BAAc,EAAC,OAAO,CAAC,OAAO,EAAE,kBAAkB,CAAC,CAAA;QAC5E,OAAO,CAAC,GAAG,CAAC,iBAAiB,EAAE,aAAa,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"authorizer.middleware.js","sourceRoot":"","sources":["../../src/middlewares/authorizer.middleware.ts"],"names":[],"mappings":"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"}
|