@aldb2b/common 1.0.208 → 1.0.209
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/build/middlewares/authorizer.middleware.js +2 -2
- package/build/middlewares/authorizer.middleware.js.map +1 -1
- package/build/middlewares/subscription-validator.middleware.js +4 -4
- package/build/middlewares/subscription-validator.middleware.js.map +1 -1
- package/build/tsconfig.tsbuildinfo +2 -2
- package/package.json +1 -1
|
@@ -45,7 +45,7 @@ let AuthorizerMiddleware = class AuthorizerMiddleware {
|
|
|
45
45
|
resp = await rxjs_1.firstValueFrom(this.client.send(user.subject, user.data));
|
|
46
46
|
console.log('AuthorizerMiddlewareRespElse', resp);
|
|
47
47
|
if (resp.isAuthorized === false) {
|
|
48
|
-
throw new common_1.
|
|
48
|
+
throw new common_1.ForbiddenException();
|
|
49
49
|
}
|
|
50
50
|
else {
|
|
51
51
|
await this.cachManager.setData(JSON.stringify(user.data), JSON.stringify(resp));
|
|
@@ -66,7 +66,7 @@ let AuthorizerMiddleware = class AuthorizerMiddleware {
|
|
|
66
66
|
const permission = permissions.find(item => item.type === method && item.route === path);
|
|
67
67
|
console.log('isPermittedPermission: ', permission);
|
|
68
68
|
if (!permission || !permission.isAllowed) {
|
|
69
|
-
throw new common_1.
|
|
69
|
+
throw new common_1.ForbiddenException();
|
|
70
70
|
}
|
|
71
71
|
}
|
|
72
72
|
async getUserPermissions(type, role) {
|
|
@@ -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,4DAAwD;AAGxD,IAAa,oBAAoB,GAAjC,MAAa,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,MAAM,IAAI,GAAG;YACX,OAAO,EAAE,mBAAQ,CAAC,aAAa;YAC/B,IAAI,EAAE;gBACJ,aAAa,EAAE,+BAAc,CAAC,OAAO,CAAC,OAAO,EAAE,kBAAkB,CAAC;gBAClE,OAAO,EAAE,+BAAc,CAAC,OAAO,CAAC,OAAO,EAAE,UAAU,CAAC;aACrD;SACF,CAAA;QACD,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,CAClD,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAC1B,CAAA;QAED,OAAO,CAAC,GAAG,CAAC,8BAA8B,EAAE,OAAO,CAAC,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"authorizer.middleware.js","sourceRoot":"","sources":["../../src/middlewares/authorizer.middleware.ts"],"names":[],"mappings":"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"}
|
|
@@ -50,7 +50,7 @@ let SubscriptionValidatorMiddleware = class SubscriptionValidatorMiddleware {
|
|
|
50
50
|
resp = await rxjs_1.firstValueFrom(this.client.send(user.subject, user.data));
|
|
51
51
|
console.log('FROM MESSAGE BROKER--------------------');
|
|
52
52
|
if (resp.hasSubscription === false) {
|
|
53
|
-
throw new common_1.
|
|
53
|
+
throw new common_1.ForbiddenException('Subscription is required');
|
|
54
54
|
}
|
|
55
55
|
else {
|
|
56
56
|
await this.cachManager.setData(redisKey, JSON.stringify(resp), 60);
|
|
@@ -66,14 +66,14 @@ let SubscriptionValidatorMiddleware = class SubscriptionValidatorMiddleware {
|
|
|
66
66
|
return true;
|
|
67
67
|
}
|
|
68
68
|
if (endpoint.type === endpoint_type_enum_1.EndpointType.BINARY && !endpoint.isFree) {
|
|
69
|
-
throw new common_1.
|
|
69
|
+
throw new common_1.ForbiddenException('Please upgrade your subscription');
|
|
70
70
|
}
|
|
71
71
|
else if (endpoint.type === endpoint_type_enum_1.EndpointType.LIMIT && endpoint.limit === 0) {
|
|
72
|
-
throw new common_1.
|
|
72
|
+
throw new common_1.ForbiddenException('Limits exceeded');
|
|
73
73
|
}
|
|
74
74
|
else if (endpoint.type === endpoint_type_enum_1.EndpointType.CREDIT &&
|
|
75
75
|
remainingPoints < endpoint.point) {
|
|
76
|
-
throw new common_1.
|
|
76
|
+
throw new common_1.ForbiddenException('Insufficient credit');
|
|
77
77
|
}
|
|
78
78
|
}
|
|
79
79
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"subscription-validator.middleware.js","sourceRoot":"","sources":["../../src/middlewares/subscription-validator.middleware.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAKuB;AACvB,yDAAmD;AAEnD,+BAAqC;AACrC,sDAAkD;AAClD,iDAA6C;AAC7C,oEAA0D;AAC1D,4DAAwD;AACxD,wDAAmD;AAGnD,IAAa,+BAA+B,GAA5C,MAAa,+BAA+B;IAE1C,YACmD,MAAmB;QAAnB,WAAM,GAAN,MAAM,CAAa;QAEpE,IAAI,CAAC,WAAW,GAAG,IAAI,0BAAW,EAAE,CAAA;IACtC,CAAC;IAED,KAAK,CAAC,GAAG,CACP,OAAgB,EAChB,QAAkB,EAClB,IAAkB;QAElB,OAAO,CAAC,GAAG,CAAC,qDAAqD,CAAC,CAAA;QAClE,IAAI,OAAO,CAAC,sBAAsB,CAAC,KAAK,KAAK,EAAE;YAC7C,OAAO,IAAI,EAAE,CAAA;SACd;QACD,MAAM,IAAI,GAAG;YACX,OAAO,EAAE,mBAAQ,CAAC,eAAe;YACjC,IAAI,EAAE;gBACJ,IAAI,EAAE,+BAAc,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC;gBAC3C,OAAO,EAAE,+BAAc,CAAC,OAAO,CAAC,OAAO,EAAE,UAAU,CAAC;aACrD;SACF,CAAA;QACD,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAC1C,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;QAE9D,IAAI,IAAI,CAAA;QACR,IAAI,aAAa,EAAE;YACjB,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAA;YAChC,OAAO,CAAC,GAAG,CAAC,gCAAgC,CAAC,CAAA;YAC7C,MAAM,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;SACjE;aAAM;YACL,IAAI,GAAG,MAAM,qBAAc,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;YACtE,OAAO,CAAC,GAAG,CAAC,yCAAyC,CAAC,CAAA;YACtD,IAAI,IAAI,CAAC,eAAe,KAAK,KAAK,EAAE;gBAClC,MAAM,IAAI,
|
|
1
|
+
{"version":3,"file":"subscription-validator.middleware.js","sourceRoot":"","sources":["../../src/middlewares/subscription-validator.middleware.ts"],"names":[],"mappings":"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"}
|
|
@@ -6332,7 +6332,7 @@
|
|
|
6332
6332
|
"affectsGlobalScope": false
|
|
6333
6333
|
},
|
|
6334
6334
|
"../src/middlewares/authorizer.middleware.ts": {
|
|
6335
|
-
"version": "
|
|
6335
|
+
"version": "e02a38cd5aa1a2aa907f469e38c23738e68e442e973275999a74694bb901339e",
|
|
6336
6336
|
"signature": "38d177f40d2e7334397b4f5774856ecce47e764752c0b42eae6e215809f81c71",
|
|
6337
6337
|
"affectsGlobalScope": false
|
|
6338
6338
|
},
|
|
@@ -6347,7 +6347,7 @@
|
|
|
6347
6347
|
"affectsGlobalScope": false
|
|
6348
6348
|
},
|
|
6349
6349
|
"../src/middlewares/subscription-validator.middleware.ts": {
|
|
6350
|
-
"version": "
|
|
6350
|
+
"version": "e950ab291d8cbe481e30645db333936e1e0dc69c689c91e263439e428347f544",
|
|
6351
6351
|
"signature": "a7aab6356d4f7ceeafd6caf4446b8dd21651443bb023c14279cc2b583332146d",
|
|
6352
6352
|
"affectsGlobalScope": false
|
|
6353
6353
|
},
|