@aldb2b/common 1.0.305 → 1.0.306
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,7 +27,7 @@ let SubscriptionValidatorMiddleware = class SubscriptionValidatorMiddleware {
|
|
|
27
27
|
this.cachManager = new redis_client_1.RedisClient();
|
|
28
28
|
}
|
|
29
29
|
async use(request, response, next) {
|
|
30
|
-
console.log('INSIDE
|
|
30
|
+
console.log('INSIDE VALIDATOR MIDDLEWARE');
|
|
31
31
|
if (request['validateSubscription'] === false) {
|
|
32
32
|
return next();
|
|
33
33
|
}
|
|
@@ -43,12 +43,12 @@ let SubscriptionValidatorMiddleware = class SubscriptionValidatorMiddleware {
|
|
|
43
43
|
let resp;
|
|
44
44
|
if (redisResponse) {
|
|
45
45
|
resp = JSON.parse(redisResponse);
|
|
46
|
-
console.log('
|
|
46
|
+
console.log('INSIDE REDIS: ', JSON.stringify(resp));
|
|
47
47
|
await this.isPermitted(resp, request.method, request.route.path);
|
|
48
48
|
}
|
|
49
49
|
else {
|
|
50
50
|
resp = await rxjs_1.firstValueFrom(this.client.send(user.subject, user.data));
|
|
51
|
-
console.log('
|
|
51
|
+
console.log('INSIDE MESSAGE BROKER: ', JSON.stringify(resp));
|
|
52
52
|
if (resp.hasSubscription === false) {
|
|
53
53
|
throw new common_1.ForbiddenException('Subscription is required');
|
|
54
54
|
}
|
|
@@ -62,9 +62,11 @@ let SubscriptionValidatorMiddleware = class SubscriptionValidatorMiddleware {
|
|
|
62
62
|
async isPermitted(subscription, method, path) {
|
|
63
63
|
const { features, remainingPoints } = subscription;
|
|
64
64
|
const { endpoint } = getEndpoint_1.getEndpoint(features, method, path);
|
|
65
|
+
console.log('endpoint: ', endpoint);
|
|
65
66
|
if (!endpoint || (endpoint === null || endpoint === void 0 ? void 0 : endpoint.isFree)) {
|
|
66
67
|
return true;
|
|
67
68
|
}
|
|
69
|
+
console.log('endpoint.endpointType: ', endpoint.endpointType);
|
|
68
70
|
if (endpoint.endpointType === endpoint_type_enum_1.EndpointType.BINARY && !endpoint.isFree) {
|
|
69
71
|
throw new common_1.ForbiddenException('Please upgrade your subscription');
|
|
70
72
|
}
|
|
@@ -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,
|
|
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,6BAA6B,CAAC,CAAC;QAC3C,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,gBAAgB,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;YACpD,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,yBAAyB,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAA;YAC5D,IAAI,IAAI,CAAC,eAAe,KAAK,KAAK,EAAE;gBAClC,MAAM,IAAI,2BAAkB,CAAC,0BAA0B,CAAC,CAAA;aACzD;iBAAM;gBACL,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,CAAA;gBAClE,MAAM,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;aACjE;SACF;QAED,IAAI,EAAE,CAAA;IACR,CAAC;IAEO,KAAK,CAAC,WAAW,CAAC,YAAY,EAAE,MAAc,EAAE,IAAY;QAClE,MAAM,EAAE,QAAQ,EAAE,eAAe,EAAE,GAAG,YAAY,CAAA;QAClD,MAAM,EAAE,QAAQ,EAAE,GAAG,yBAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;QACxD,OAAO,CAAC,GAAG,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;QACpC,IAAI,CAAC,QAAQ,KAAI,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,MAAM,CAAA,EAAE;YACjC,OAAO,IAAI,CAAA;SACZ;QAED,OAAO,CAAC,GAAG,CAAC,yBAAyB,EAAE,QAAQ,CAAC,YAAY,CAAC,CAAC;QAE9D,IAAI,QAAQ,CAAC,YAAY,KAAK,iCAAY,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE;YACrE,MAAM,IAAI,2BAAkB,CAAC,kCAAkC,CAAC,CAAA;SACjE;aAAM,IAAI,QAAQ,CAAC,YAAY,KAAK,iCAAY,CAAC,KAAK,IAAI,QAAQ,CAAC,KAAK,KAAK,CAAC,EAAE;YAC/E,MAAM,IAAI,2BAAkB,CAAC,iBAAiB,CAAC,CAAA;SAChD;aAAM,IACL,QAAQ,CAAC,YAAY,KAAK,iCAAY,CAAC,MAAM;YAC7C,eAAe,GAAG,QAAQ,CAAC,KAAK,EAChC;YACA,MAAM,IAAI,2BAAkB,CAAC,qBAAqB,CAAC,CAAA;SACpD;IACH,CAAC;CACF,CAAA;AAnEY,+BAA+B;IAD3C,mBAAU,EAAE;IAIR,WAAA,eAAM,CAAC,sBAAsB,CAAC,CAAA;qCAA0B,2BAAW;GAH3D,+BAA+B,CAmE3C;AAnEY,0EAA+B"}
|
|
@@ -6492,7 +6492,7 @@
|
|
|
6492
6492
|
"affectsGlobalScope": false
|
|
6493
6493
|
},
|
|
6494
6494
|
"../src/utils/getEndpoint.ts": {
|
|
6495
|
-
"version": "
|
|
6495
|
+
"version": "30f9a4a0c0023f2452f46ce40c52a90254d49054ccc4bcac5fbe3497072fc6f0",
|
|
6496
6496
|
"signature": "6b4e74c1a317373040f9e8cf0368c5a418e401c2632c41cb617965b9a0bda20f",
|
|
6497
6497
|
"affectsGlobalScope": false
|
|
6498
6498
|
},
|
|
@@ -6502,7 +6502,7 @@
|
|
|
6502
6502
|
"affectsGlobalScope": false
|
|
6503
6503
|
},
|
|
6504
6504
|
"../src/middlewares/subscription-validator.middleware.ts": {
|
|
6505
|
-
"version": "
|
|
6505
|
+
"version": "4abe04fdb3410e2e09ddcd0f168cc21e5806f303317b628f545c3e050ea0eab2",
|
|
6506
6506
|
"signature": "a7aab6356d4f7ceeafd6caf4446b8dd21651443bb023c14279cc2b583332146d",
|
|
6507
6507
|
"affectsGlobalScope": false
|
|
6508
6508
|
},
|
|
@@ -15,6 +15,9 @@ function getEndpoint(features, method, path) {
|
|
|
15
15
|
if (feature.isActive === false) {
|
|
16
16
|
throw new common_1.ForbiddenException('Inactive feature');
|
|
17
17
|
}
|
|
18
|
+
console.log('feature: ', feature);
|
|
19
|
+
console.log('method: ', method);
|
|
20
|
+
console.log('path: ', path);
|
|
18
21
|
const endpoint = feature.endpoints.find((endpoint) => {
|
|
19
22
|
return endpoint.method === method && path.endsWith(endpoint.path);
|
|
20
23
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getEndpoint.js","sourceRoot":"","sources":["../../src/utils/getEndpoint.ts"],"names":[],"mappings":";;;AAAA,2CAAmD;AAEnD,gEAA0D;AAE1D,SAAgB,WAAW,CAAC,QAAmB,EAAE,MAAc,EAAE,IAAY;IAC3E,MAAM,OAAO,GAAG,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE;QACtC,MAAM,eAAe,GAAG,iCAAc,CAAC,OAAO,CAAC,WAAW,CAAC,CAAA;QAC3D,MAAM,OAAO,GAAG,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,SAAS,CAAC,OAAO,CAAC,EAAE,CACnD,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CACvB,CAAA;QACD,OAAO,OAAO,KAAK,CAAC,CAAC,CAAA;IACvB,CAAC,CAAC,CAAA;IAEF,IAAI,CAAC,OAAO,EAAE;QACZ,MAAM,IAAI,2BAAkB,CAAC,mBAAmB,CAAC,CAAA;KAClD;IAED,IAAI,OAAO,CAAC,QAAQ,KAAK,KAAK,EAAE;QAC9B,MAAM,IAAI,2BAAkB,CAAC,kBAAkB,CAAC,CAAA;KACjD;IAED,MAAM,QAAQ,GAAG,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE;QACnD,OAAO,QAAQ,CAAC,MAAM,KAAK,MAAM,IAAI,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IACpE,CAAC,CAAC,CAAC;IACH,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAA;AAC9B,CAAC;
|
|
1
|
+
{"version":3,"file":"getEndpoint.js","sourceRoot":"","sources":["../../src/utils/getEndpoint.ts"],"names":[],"mappings":";;;AAAA,2CAAmD;AAEnD,gEAA0D;AAE1D,SAAgB,WAAW,CAAC,QAAmB,EAAE,MAAc,EAAE,IAAY;IAC3E,MAAM,OAAO,GAAG,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE;QACtC,MAAM,eAAe,GAAG,iCAAc,CAAC,OAAO,CAAC,WAAW,CAAC,CAAA;QAC3D,MAAM,OAAO,GAAG,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,SAAS,CAAC,OAAO,CAAC,EAAE,CACnD,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CACvB,CAAA;QACD,OAAO,OAAO,KAAK,CAAC,CAAC,CAAA;IACvB,CAAC,CAAC,CAAA;IAEF,IAAI,CAAC,OAAO,EAAE;QACZ,MAAM,IAAI,2BAAkB,CAAC,mBAAmB,CAAC,CAAA;KAClD;IAED,IAAI,OAAO,CAAC,QAAQ,KAAK,KAAK,EAAE;QAC9B,MAAM,IAAI,2BAAkB,CAAC,kBAAkB,CAAC,CAAA;KACjD;IAED,OAAO,CAAC,GAAG,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;IAClC,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;IAChC,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;IAE5B,MAAM,QAAQ,GAAG,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE;QACnD,OAAO,QAAQ,CAAC,MAAM,KAAK,MAAM,IAAI,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IACpE,CAAC,CAAC,CAAC;IACH,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAA;AAC9B,CAAC;AAzBD,kCAyBC"}
|