@aldb2b/common 1.0.534 → 1.0.537
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/enums/term-type.enum.d.ts +2 -2
- package/build/enums/term-type.enum.js +2 -2
- package/build/enums/term-type.enum.js.map +1 -1
- package/build/middlewares/subscription-validator.middleware.js +4 -11
- package/build/middlewares/subscription-validator.middleware.js.map +1 -1
- package/build/middlewares/term.middleware.js +5 -5
- package/build/middlewares/term.middleware.js.map +1 -1
- package/build/tsconfig.tsbuildinfo +1 -1
- package/build/utils/getEndpoint.js +2 -1
- package/build/utils/getEndpoint.js.map +1 -1
- package/build/utils/terms.js +1 -1
- package/build/utils/terms.js.map +1 -1
- package/package.json +1 -1
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.TermType = void 0;
|
|
4
4
|
var TermType;
|
|
5
5
|
(function (TermType) {
|
|
6
|
-
TermType["
|
|
7
|
-
TermType["
|
|
6
|
+
TermType["MEETING_HUB"] = "MeetingHub";
|
|
7
|
+
TermType["EVENT_HUB"] = "EventHub";
|
|
8
8
|
})(TermType || (exports.TermType = TermType = {}));
|
|
9
9
|
//# sourceMappingURL=term-type.enum.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"term-type.enum.js","sourceRoot":"","sources":["../../src/enums/term-type.enum.ts"],"names":[],"mappings":";;;AAAA,IAAY,QAGX;AAHD,WAAY,QAAQ;IAClB
|
|
1
|
+
{"version":3,"file":"term-type.enum.js","sourceRoot":"","sources":["../../src/enums/term-type.enum.ts"],"names":[],"mappings":";;;AAAA,IAAY,QAGX;AAHD,WAAY,QAAQ;IAClB,sCAA0B,CAAA;IAC1B,kCAAsB,CAAA;AACxB,CAAC,EAHW,QAAQ,wBAAR,QAAQ,QAGnB"}
|
|
@@ -27,7 +27,6 @@ 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 VALIDATOR MIDDLEWARE');
|
|
31
30
|
if (request['validateSubscription'] === false) {
|
|
32
31
|
return next();
|
|
33
32
|
}
|
|
@@ -41,40 +40,34 @@ let SubscriptionValidatorMiddleware = class SubscriptionValidatorMiddleware {
|
|
|
41
40
|
};
|
|
42
41
|
const redisKey = JSON.stringify({
|
|
43
42
|
user: (0, getHeaderParam_1.getHeaderParam)(request.headers, 'id'),
|
|
44
|
-
eventId: (0, getHeaderParam_1.getHeaderParam)(request.headers, 'event-id')
|
|
43
|
+
eventId: (0, getHeaderParam_1.getHeaderParam)(request.headers, 'event-id'),
|
|
45
44
|
});
|
|
46
45
|
const redisResponse = undefined;
|
|
47
46
|
let resp;
|
|
48
47
|
if (redisResponse) {
|
|
49
48
|
resp = JSON.parse(redisResponse);
|
|
50
|
-
console.log('INSIDE REDIS: ', JSON.stringify(resp));
|
|
51
49
|
await this.isPermitted(resp, request.method, request.route.path);
|
|
52
50
|
}
|
|
53
51
|
else {
|
|
54
52
|
resp = await (0, rxjs_1.firstValueFrom)(this.client.send(user.subject, user.data));
|
|
55
|
-
console.log('INSIDE MESSAGE BROKER: ', JSON.stringify(resp));
|
|
56
53
|
if ((resp === null || resp === void 0 ? void 0 : resp.hasSubscription) === false) {
|
|
57
54
|
throw new common_1.ForbiddenException('Subscription is required');
|
|
58
55
|
}
|
|
59
56
|
else {
|
|
60
57
|
await this.cachManager.setData(redisKey, JSON.stringify(resp), 60);
|
|
61
|
-
console.log('AFTER REDIS SET: ');
|
|
62
58
|
await this.isPermitted(resp, request.method, request.route.path);
|
|
63
59
|
}
|
|
64
60
|
}
|
|
65
|
-
|
|
66
|
-
next();
|
|
61
|
+
return next();
|
|
67
62
|
}
|
|
68
63
|
async isPermitted(subscription, method, path) {
|
|
69
64
|
const { features, remainingPoints } = subscription;
|
|
70
|
-
console.log('
|
|
71
|
-
console.log('isPermittedRemainingPoints: ', remainingPoints);
|
|
65
|
+
console.log('before getEndpoint');
|
|
72
66
|
const { endpoint } = (0, getEndpoint_1.getEndpoint)(features, method, path);
|
|
73
|
-
console.log('
|
|
67
|
+
console.log('after getEndpoint');
|
|
74
68
|
if (!endpoint || (endpoint === null || endpoint === void 0 ? void 0 : endpoint.isFree)) {
|
|
75
69
|
return true;
|
|
76
70
|
}
|
|
77
|
-
console.log('endpoint.endpointType: ', endpoint.endpointType);
|
|
78
71
|
if (endpoint.endpointType === endpoint_type_enum_1.EndpointType.BINARY && !endpoint.isFree) {
|
|
79
72
|
throw new common_1.ForbiddenException({
|
|
80
73
|
statusCode: 403,
|
|
@@ -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;AAG5C,IAAM,+BAA+B,GAArC,MAAM,+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,
|
|
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;AAG5C,IAAM,+BAA+B,GAArC,MAAM,+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,IAAI,OAAO,CAAC,sBAAsB,CAAC,KAAK,KAAK,EAAE,CAAC;YAC9C,OAAO,IAAI,EAAE,CAAA;QACf,CAAC;QACD,MAAM,IAAI,GAAG;YACX,OAAO,EAAE,mBAAQ,CAAC,eAAe;YACjC,IAAI,EAAE;gBACJ,IAAI,EAAE,IAAA,+BAAc,EAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC;gBAC3C,OAAO,EAAE,IAAA,+BAAc,EAAC,OAAO,CAAC,OAAO,EAAE,SAAS,CAAC;gBACnD,OAAO,EAAE,IAAA,+BAAc,EAAC,OAAO,CAAC,OAAO,EAAE,UAAU,CAAC;aACrD;SACF,CAAA;QACD,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC;YAC9B,IAAI,EAAE,IAAA,+BAAc,EAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC;YAC3C,OAAO,EAAE,IAAA,+BAAc,EAAC,OAAO,CAAC,OAAO,EAAE,UAAU,CAAC;SACrD,CAAC,CAAA;QAEF,MAAM,aAAa,GAAG,SAAS,CAAA;QAE/B,IAAI,IAAI,CAAA;QACR,IAAI,aAAa,EAAE,CAAC;YAClB,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAA;YAChC,MAAM,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;QAClE,CAAC;aAAM,CAAC;YACN,IAAI,GAAG,MAAM,IAAA,qBAAc,EAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;YACtE,IAAI,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,eAAe,MAAK,KAAK,EAAE,CAAC;gBACpC,MAAM,IAAI,2BAAkB,CAAC,0BAA0B,CAAC,CAAA;YAC1D,CAAC;iBAAM,CAAC;gBACN,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,CAAA;gBAElE,MAAM,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;YAClE,CAAC;QACH,CAAC;QAED,OAAO,IAAI,EAAE,CAAA;IACf,CAAC;IAEO,KAAK,CAAC,WAAW,CAAC,YAAY,EAAE,MAAc,EAAE,IAAY;QAClE,MAAM,EAAE,QAAQ,EAAE,eAAe,EAAE,GAAG,YAAY,CAAA;QAElD,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAA;QACjC,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAA,yBAAW,EAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;QACxD,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAA;QAEhC,IAAI,CAAC,QAAQ,KAAI,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,MAAM,CAAA,EAAE,CAAC;YAClC,OAAO,IAAI,CAAA;QACb,CAAC;QAED,IAAI,QAAQ,CAAC,YAAY,KAAK,iCAAY,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;YAKtE,MAAM,IAAI,2BAAkB,CAAC;gBAC3B,UAAU,EAAE,GAAG;gBACf,OAAO,EAAE,kCAAkC;gBAC3C,KAAK,EAAE,WAAW;gBAClB,WAAW,EAAE,kCAAkC;aAChD,CAAC,CAAA;QACJ,CAAC;aAAM,IACL,QAAQ,CAAC,YAAY,KAAK,iCAAY,CAAC,KAAK;YAC5C,QAAQ,CAAC,KAAK,KAAK,CAAC,EACpB,CAAC;YAID,MAAM,IAAI,2BAAkB,CAAC;gBAC3B,UAAU,EAAE,GAAG;gBACf,OAAO,EAAE,iBAAiB;gBAC1B,KAAK,EAAE,WAAW;gBAClB,WAAW,EACT,sEAAsE;aACzE,CAAC,CAAA;QACJ,CAAC;aAAM,IACL,QAAQ,CAAC,YAAY,KAAK,iCAAY,CAAC,MAAM;YAC7C,eAAe,GAAG,QAAQ,CAAC,KAAK,EAChC,CAAC;YAID,MAAM,IAAI,2BAAkB,CAAC;gBAC3B,UAAU,EAAE,GAAG;gBACf,OAAO,EAAE,qBAAqB;gBAC9B,KAAK,EAAE,WAAW;gBAClB,WAAW,EACT,2EAA2E;aAC9E,CAAC,CAAA;QACJ,CAAC;IACH,CAAC;CACF,CAAA;AArGY,0EAA+B;0CAA/B,+BAA+B;IAD3C,IAAA,mBAAU,GAAE;IAIR,WAAA,IAAA,eAAM,EAAC,sBAAsB,CAAC,CAAA;qCAA0B,2BAAW;GAH3D,+BAA+B,CAqG3C"}
|
|
@@ -33,13 +33,13 @@ let TermMiddleware = class TermMiddleware {
|
|
|
33
33
|
const userId = (0, getHeaderParam_1.getHeaderParam)(request.headers, 'id');
|
|
34
34
|
const meetingHubEvent = (0, getHeaderParam_1.getHeaderParam)(request.headers, 'meetingHubEvent');
|
|
35
35
|
const termType = meetingHubEvent == true || meetingHubEvent == 'true'
|
|
36
|
-
? term_type_enum_1.TermType.
|
|
37
|
-
: term_type_enum_1.TermType.
|
|
36
|
+
? term_type_enum_1.TermType.MEETING_HUB
|
|
37
|
+
: term_type_enum_1.TermType.EVENT_HUB;
|
|
38
38
|
const userTermKey = terms_1.Terms.userTermKey(userId, termType);
|
|
39
|
-
let currentTermValue = termType === term_type_enum_1.TermType.
|
|
39
|
+
let currentTermValue = termType === term_type_enum_1.TermType.MEETING_HUB
|
|
40
40
|
? await this.cachManager.getData(terms_1.Terms.MeetingTermKey)
|
|
41
41
|
: await this.cachManager.getData(terms_1.Terms.EventTermKey);
|
|
42
|
-
let noTermValue = termType === term_type_enum_1.TermType.
|
|
42
|
+
let noTermValue = termType === term_type_enum_1.TermType.MEETING_HUB
|
|
43
43
|
? terms_1.Terms.NoMeetingTermValue
|
|
44
44
|
: terms_1.Terms.NoEventTermValue;
|
|
45
45
|
if (currentTermValue == noTermValue) {
|
|
@@ -52,7 +52,7 @@ let TermMiddleware = class TermMiddleware {
|
|
|
52
52
|
}
|
|
53
53
|
}
|
|
54
54
|
else if (!currentTermValue) {
|
|
55
|
-
const termKey = termType === term_type_enum_1.TermType.
|
|
55
|
+
const termKey = termType === term_type_enum_1.TermType.MEETING_HUB
|
|
56
56
|
? terms_1.Terms.MeetingTermKey
|
|
57
57
|
: terms_1.Terms.EventTermKey;
|
|
58
58
|
const response = await (0, rxjs_1.firstValueFrom)(this.client.send(subjects_1.Subjects.GetCurrentTerm, { termType: termType }));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"term.middleware.js","sourceRoot":"","sources":["../../src/middlewares/term.middleware.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA+E;AAC/E,yDAAmD;AAEnD,+BAAqC;AACrC,iDAA6C;AAC7C,wDAAmD;AACnD,4DAAwD;AAExD,2CAA0C;AAC1C,0CAAsC;AACtC,4DAAkD;AAG3C,IAAM,cAAc,GAApB,MAAM,cAAc;IAIzB,YAAqD,MAAmB;QAAnB,WAAM,GAAN,MAAM,CAAa;QACtE,IAAI,CAAC,WAAW,GAAG,IAAI,0BAAW,EAAE,CAAA;QACpC,IAAI,CAAC,SAAS,GAAG,IAAI,kBAAS,CAC5B,OAAO,CAAC,GAAG,CAAC,8BAA8B,CAC3C,CAAA;IACH,CAAC;IAED,KAAK,CAAC,GAAG,CACP,OAAgB,EAChB,QAAkB,EAClB,IAAkB;QAElB,IAAI,UAAU,GAAG,IAAI,CAAA;QACrB,MAAM,MAAM,GAAQ,IAAA,+BAAc,EAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,CAAA;QACzD,MAAM,eAAe,GAAQ,IAAA,+BAAc,EACzC,OAAO,CAAC,OAAO,EACf,iBAAiB,CAClB,CAAA;QACD,MAAM,QAAQ,GACZ,eAAe,IAAI,IAAI,IAAI,eAAe,IAAI,MAAM;YAClD,CAAC,CAAC,yBAAQ,CAAC,
|
|
1
|
+
{"version":3,"file":"term.middleware.js","sourceRoot":"","sources":["../../src/middlewares/term.middleware.ts"],"names":[],"mappings":"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"}
|