@aldb2b/common 1.0.695 → 1.0.697
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/decrypter.middleware.d.ts +5 -2
- package/build/middlewares/decrypter.middleware.js +59 -23
- package/build/middlewares/decrypter.middleware.js.map +1 -1
- package/build/middlewares/event-profile.middleware.js +1 -1
- package/build/middlewares/event-profile.middleware.js.map +1 -1
- package/build/services/subscription-subtractor.service.js +3 -3
- package/build/services/subscription-subtractor.service.js.map +1 -1
- package/build/services/subscription-validator.service.d.ts +1 -1
- package/build/services/subscription-validator.service.js +31 -21
- package/build/services/subscription-validator.service.js.map +1 -1
- package/build/tsconfig.tsbuildinfo +1 -1
- package/build/utils/getEndpoint.d.ts +3 -2
- package/build/utils/getEndpoint.js +22 -12
- package/build/utils/getEndpoint.js.map +1 -1
- package/package.json +1 -1
|
@@ -1,10 +1,13 @@
|
|
|
1
|
-
import { ClientProxy } from
|
|
1
|
+
import { ClientProxy } from '@nestjs/microservices';
|
|
2
2
|
import { Request, Response, NextFunction } from 'express';
|
|
3
|
-
import { NestMiddleware } from
|
|
3
|
+
import { NestMiddleware } from '@nestjs/common';
|
|
4
4
|
export declare class DecrypterMiddleware implements NestMiddleware {
|
|
5
5
|
private readonly userClient;
|
|
6
6
|
private readonly contactClient;
|
|
7
7
|
private encryptor;
|
|
8
8
|
constructor(userClient: ClientProxy, contactClient: ClientProxy);
|
|
9
9
|
use(request: Request, response: Response, next: NextFunction): Promise<void>;
|
|
10
|
+
getUser(email: string): Promise<any>;
|
|
11
|
+
getContact(userId: any): Promise<any>;
|
|
12
|
+
getModel(modelName: string, connectStr: string): Promise<any>;
|
|
10
13
|
}
|
|
@@ -14,6 +14,7 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
exports.DecrypterMiddleware = void 0;
|
|
16
16
|
const rxjs_1 = require("rxjs");
|
|
17
|
+
const mongoose_1 = require("mongoose");
|
|
17
18
|
const subjects_1 = require("../events/subjects");
|
|
18
19
|
const encryptor_1 = require("../utils/encryptor");
|
|
19
20
|
const microservices_1 = require("@nestjs/microservices");
|
|
@@ -27,15 +28,48 @@ let DecrypterMiddleware = class DecrypterMiddleware {
|
|
|
27
28
|
async use(request, response, next) {
|
|
28
29
|
const decodedToken = this.encryptor.decrypt(request.params.token);
|
|
29
30
|
console.log('decodedToken: ', decodedToken);
|
|
30
|
-
const contact = await
|
|
31
|
-
_id: decodedToken.userId,
|
|
32
|
-
}));
|
|
31
|
+
const contact = await this.getContact(decodedToken.userId);
|
|
33
32
|
console.log('contact: ', contact);
|
|
34
33
|
if (contact) {
|
|
34
|
+
const user = await this.getUser(contact.email);
|
|
35
|
+
console.log('user: ', user);
|
|
36
|
+
if (user) {
|
|
37
|
+
request.headers.id = user._id;
|
|
38
|
+
request.headers.type = user.role.type;
|
|
39
|
+
request.headers.role = user.role.title;
|
|
40
|
+
request.headers.email = user.email;
|
|
41
|
+
request.headers.firstname = user?.firstname;
|
|
42
|
+
request.headers.lastname = user?.lastname;
|
|
43
|
+
request.headers.company = decodedToken.companyId;
|
|
44
|
+
request.headers.contactId = decodedToken.userId;
|
|
45
|
+
request.headers.language = user.language;
|
|
46
|
+
request.headers.eventId = decodedToken.eventId;
|
|
47
|
+
request.headers.moduleType = decodedToken.moduleType;
|
|
48
|
+
request.headers.typeId = decodedToken.id;
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
console.log('request.headers: ', request.headers);
|
|
52
|
+
next();
|
|
53
|
+
}
|
|
54
|
+
async getUser(email) {
|
|
55
|
+
if (process.env.MONGO_URI_USER || process.env.MONGO_URI.indexOf('/user?')) {
|
|
56
|
+
const userModel = await this.getModel('users', process.env.MONGO_URI_USER);
|
|
57
|
+
return userModel.findOne({ email }, {
|
|
58
|
+
projection: {
|
|
59
|
+
_id: 1,
|
|
60
|
+
firstname: 1,
|
|
61
|
+
lastname: 1,
|
|
62
|
+
email: 1,
|
|
63
|
+
language: 1,
|
|
64
|
+
role: 1,
|
|
65
|
+
},
|
|
66
|
+
});
|
|
67
|
+
}
|
|
68
|
+
else {
|
|
35
69
|
const users = await (0, rxjs_1.firstValueFrom)(this.userClient.send(subjects_1.Subjects.UsersByQuery, {
|
|
36
70
|
data: {
|
|
37
71
|
query: {
|
|
38
|
-
email
|
|
72
|
+
email,
|
|
39
73
|
},
|
|
40
74
|
necessaryProjectionArray: [
|
|
41
75
|
'_id',
|
|
@@ -49,26 +83,28 @@ let DecrypterMiddleware = class DecrypterMiddleware {
|
|
|
49
83
|
populates: [{ path: 'role', select: '_id title type' }],
|
|
50
84
|
},
|
|
51
85
|
}));
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
const user = users[0];
|
|
55
|
-
console.log('user: ', user);
|
|
56
|
-
request.headers.id = user._id;
|
|
57
|
-
request.headers.type = user.role.type;
|
|
58
|
-
request.headers.role = user.role.title;
|
|
59
|
-
request.headers.email = user.email;
|
|
60
|
-
request.headers.firstname = user?.firstname;
|
|
61
|
-
request.headers.lastname = user?.lastname;
|
|
62
|
-
request.headers.company = decodedToken.companyId;
|
|
63
|
-
request.headers.contactId = decodedToken.userId;
|
|
64
|
-
request.headers.language = user.language;
|
|
65
|
-
request.headers.eventId = decodedToken.eventId;
|
|
66
|
-
request.headers.moduleType = decodedToken.moduleType;
|
|
67
|
-
request.headers.typeId = decodedToken.id;
|
|
68
|
-
}
|
|
86
|
+
if (users.length > 0)
|
|
87
|
+
return users[0];
|
|
69
88
|
}
|
|
70
|
-
|
|
71
|
-
|
|
89
|
+
}
|
|
90
|
+
async getContact(userId) {
|
|
91
|
+
if (process.env.MONGO_URI_COMPANY ||
|
|
92
|
+
process.env.MONGO_URI.indexOf('/company?')) {
|
|
93
|
+
const contactModel = await this.getModel('contacts', process.env.MONGO_URI_COMPANY);
|
|
94
|
+
return contactModel.findOne({ _id: userId }, {
|
|
95
|
+
projection: { _id: 1, email: 1 },
|
|
96
|
+
});
|
|
97
|
+
}
|
|
98
|
+
else {
|
|
99
|
+
return (0, rxjs_1.firstValueFrom)(this.contactClient.send(subjects_1.Subjects.GetUserByEmail, {
|
|
100
|
+
_id: userId,
|
|
101
|
+
}));
|
|
102
|
+
}
|
|
103
|
+
}
|
|
104
|
+
async getModel(modelName, connectStr) {
|
|
105
|
+
const connectionStr = process.env.MONGO_URI ?? connectStr;
|
|
106
|
+
const connection = (0, mongoose_1.createConnection)(connectionStr);
|
|
107
|
+
return connection.db.collection(modelName);
|
|
72
108
|
}
|
|
73
109
|
};
|
|
74
110
|
exports.DecrypterMiddleware = DecrypterMiddleware;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"decrypter.middleware.js","sourceRoot":"","sources":["../../src/middlewares/decrypter.middleware.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,+
|
|
1
|
+
{"version":3,"file":"decrypter.middleware.js","sourceRoot":"","sources":["../../src/middlewares/decrypter.middleware.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,+BAAsC;AACtC,uCAA4C;AAC5C,iDAA8C;AAC9C,kDAA+C;AAC/C,yDAAoD;AAGpD,2CAAoE;AAG7D,IAAM,mBAAmB,GAAzB,MAAM,mBAAmB;IAG5B,YAC6C,UAAuB,EACpB,aAA0B;QAD7B,eAAU,GAAV,UAAU,CAAa;QACpB,kBAAa,GAAb,aAAa,CAAa;QAEtE,IAAI,CAAC,SAAS,GAAG,IAAI,qBAAS,CAC1B,OAAO,CAAC,GAAG,CAAC,8BAA8B,CAC7C,CAAC;IACN,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,OAAgB,EAAE,QAAkB,EAAE,IAAkB;QAC9D,MAAM,YAAY,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAClE,OAAO,CAAC,GAAG,CAAC,gBAAgB,EAAE,YAAY,CAAC,CAAC;QAE5C,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;QAC3D,OAAO,CAAC,GAAG,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;QAElC,IAAI,OAAO,EAAE,CAAC;YACV,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YAC/C,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;YAE5B,IAAI,IAAI,EAAE,CAAC;gBACP,OAAO,CAAC,OAAO,CAAC,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC;gBAC9B,OAAO,CAAC,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;gBACtC,OAAO,CAAC,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC;gBACvC,OAAO,CAAC,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;gBACnC,OAAO,CAAC,OAAO,CAAC,SAAS,GAAG,IAAI,EAAE,SAAS,CAAC;gBAC5C,OAAO,CAAC,OAAO,CAAC,QAAQ,GAAG,IAAI,EAAE,QAAQ,CAAC;gBAC1C,OAAO,CAAC,OAAO,CAAC,OAAO,GAAG,YAAY,CAAC,SAAS,CAAC;gBACjD,OAAO,CAAC,OAAO,CAAC,SAAS,GAAG,YAAY,CAAC,MAAM,CAAC;gBAChD,OAAO,CAAC,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;gBACzC,OAAO,CAAC,OAAO,CAAC,OAAO,GAAG,YAAY,CAAC,OAAO,CAAC;gBAC/C,OAAO,CAAC,OAAO,CAAC,UAAU,GAAG,YAAY,CAAC,UAAU,CAAC;gBACrD,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,YAAY,CAAC,EAAE,CAAC;YAC7C,CAAC;QACL,CAAC;QACD,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QAClD,IAAI,EAAE,CAAC;IACX,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,KAAa;QACvB,IAAI,OAAO,CAAC,GAAG,CAAC,cAAc,IAAI,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;YACxE,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,QAAQ,CACjC,OAAO,EACP,OAAO,CAAC,GAAG,CAAC,cAAc,CAC7B,CAAC;YACF,OAAO,SAAS,CAAC,OAAO,CACpB,EAAE,KAAK,EAAE,EACT;gBACI,UAAU,EAAE;oBACR,GAAG,EAAE,CAAC;oBACN,SAAS,EAAE,CAAC;oBACZ,QAAQ,EAAE,CAAC;oBACX,KAAK,EAAE,CAAC;oBACR,QAAQ,EAAE,CAAC;oBACX,IAAI,EAAE,CAAC;iBACV;aACJ,CACJ,CAAC;QACN,CAAC;aAAM,CAAC;YACJ,MAAM,KAAK,GAAG,MAAM,IAAA,qBAAc,EAC9B,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,mBAAQ,CAAC,YAAY,EAAE;gBACxC,IAAI,EAAE;oBACF,KAAK,EAAE;wBACH,KAAK;qBACR;oBACD,wBAAwB,EAAE;wBACtB,KAAK;wBACL,WAAW;wBACX,UAAU;wBACV,OAAO;wBACP,UAAU;wBACV,MAAM;qBACT;oBACD,YAAY,EAAE,IAAI;oBAClB,SAAS,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,gBAAgB,EAAE,CAAC;iBAC1D;aACJ,CAAC,CACL,CAAC;YACF,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC;gBAAE,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC;QAC1C,CAAC;IACL,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,MAAW;QACxB,IACI,OAAO,CAAC,GAAG,CAAC,iBAAiB;YAC7B,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,OAAO,CAAC,WAAW,CAAC,EAC5C,CAAC;YACC,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,QAAQ,CACpC,UAAU,EACV,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAChC,CAAC;YACF,OAAO,YAAY,CAAC,OAAO,CACvB,EAAE,GAAG,EAAE,MAAM,EAAE,EACf;gBACI,UAAU,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE;aACnC,CACJ,CAAC;QACN,CAAC;aAAM,CAAC;YACJ,OAAO,IAAA,qBAAc,EACjB,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,mBAAQ,CAAC,cAAc,EAAE;gBAC7C,GAAG,EAAE,MAAM;aACd,CAAC,CACL,CAAC;QACN,CAAC;IACL,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,SAAiB,EAAE,UAAkB;QAChD,MAAM,aAAa,GAAG,OAAO,CAAC,GAAG,CAAC,SAAS,IAAI,UAAU,CAAC;QAC1D,MAAM,UAAU,GAAG,IAAA,2BAAgB,EAAC,aAAa,CAAC,CAAC;QACnD,OAAO,UAAU,CAAC,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;IAC/C,CAAC;CACJ,CAAA;AAlHY,kDAAmB;8BAAnB,mBAAmB;IAD/B,IAAA,mBAAU,GAAE;IAKJ,WAAA,IAAA,eAAM,EAAC,cAAc,CAAC,CAAA;IACtB,WAAA,IAAA,eAAM,EAAC,iBAAiB,CAAC,CAAA;qCAD2B,2BAAW;QACL,2BAAW;GALjE,mBAAmB,CAkH/B"}
|
|
@@ -26,7 +26,7 @@ let EventProfileMiddleware = class EventProfileMiddleware {
|
|
|
26
26
|
this.cachManager = new redis_client_1.RedisClient();
|
|
27
27
|
}
|
|
28
28
|
async use(request, response, next) {
|
|
29
|
-
const eventId = (0, getHeaderParam_1.getHeaderParam)(request.headers, '
|
|
29
|
+
const eventId = (0, getHeaderParam_1.getHeaderParam)(request.headers, 'event-id');
|
|
30
30
|
const eventProfileKey = events_1.Events.eventProfileKey(eventId);
|
|
31
31
|
let eventProfile = await this.cachManager.getData(eventProfileKey);
|
|
32
32
|
if (!eventProfile) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"event-profile.middleware.js","sourceRoot":"","sources":["../../src/middlewares/event-profile.middleware.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAmE;AACnE,yDAAmD;AAEnD,+BAAqC;AACrC,wDAAmD;AACnD,4DAAwD;AACxD,iDAA6C;AAC7C,4CAAwC;AAGjC,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IAGjC,YAAoD,MAAmB;QAAnB,WAAM,GAAN,MAAM,CAAa;QACrE,IAAI,CAAC,WAAW,GAAG,IAAI,0BAAW,EAAE,CAAA;IACtC,CAAC;IAED,KAAK,CAAC,GAAG,CACP,OAAgB,EAChB,QAAkB,EAClB,IAAkB;QAElB,MAAM,OAAO,GAAQ,IAAA,+BAAc,EAAC,OAAO,CAAC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"event-profile.middleware.js","sourceRoot":"","sources":["../../src/middlewares/event-profile.middleware.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAmE;AACnE,yDAAmD;AAEnD,+BAAqC;AACrC,wDAAmD;AACnD,4DAAwD;AACxD,iDAA6C;AAC7C,4CAAwC;AAGjC,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IAGjC,YAAoD,MAAmB;QAAnB,WAAM,GAAN,MAAM,CAAa;QACrE,IAAI,CAAC,WAAW,GAAG,IAAI,0BAAW,EAAE,CAAA;IACtC,CAAC;IAED,KAAK,CAAC,GAAG,CACP,OAAgB,EAChB,QAAkB,EAClB,IAAkB;QAElB,MAAM,OAAO,GAAQ,IAAA,+BAAc,EAAC,OAAO,CAAC,OAAO,EAAE,UAAU,CAAC,CAAA;QAChE,MAAM,eAAe,GAAG,eAAM,CAAC,eAAe,CAAC,OAAO,CAAC,CAAA;QACvD,IAAI,YAAY,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,eAAe,CAAC,CAAA;QAElE,IAAI,CAAC,YAAY,EAAE,CAAC;YAClB,YAAY,GAAG,MAAM,IAAA,qBAAc,EACjC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,mBAAQ,CAAC,eAAe,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CACjE,CAAA;YACD,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,eAAe,EAAE,YAAY,CAAC,CAAA;QAC/D,CAAC;QAED,OAAO,CAAC,OAAO,CAAC,YAAY,GAAG,YAAY,CAAA;QAC3C,IAAI,EAAE,CAAA;IACR,CAAC;CACF,CAAA;AA1BY,wDAAsB;iCAAtB,sBAAsB;IADlC,IAAA,mBAAU,GAAE;IAIE,WAAA,IAAA,eAAM,EAAC,aAAa,CAAC,CAAA;qCAA0B,2BAAW;GAH5D,sBAAsB,CA0BlC"}
|
|
@@ -14,11 +14,11 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
exports.SubscriptionSubtractorService = void 0;
|
|
16
16
|
const rxjs_1 = require("rxjs");
|
|
17
|
-
const subjects_1 = require("../events/subjects");
|
|
18
|
-
const getEndpoint_1 = require("../utils/getEndpoint");
|
|
19
|
-
const redis_client_1 = require("../utils/redis-client");
|
|
20
17
|
const common_1 = require("@nestjs/common");
|
|
21
18
|
const microservices_1 = require("@nestjs/microservices");
|
|
19
|
+
const redis_client_1 = require("../utils/redis-client");
|
|
20
|
+
const subjects_1 = require("../events/subjects");
|
|
21
|
+
const getEndpoint_1 = require("../utils/getEndpoint");
|
|
22
22
|
const endpoint_type_enum_1 = require("../types/endpoint-type.enum");
|
|
23
23
|
let SubscriptionSubtractorService = class SubscriptionSubtractorService {
|
|
24
24
|
constructor(client) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"subscription-subtractor.service.js","sourceRoot":"","sources":["../../src/services/subscription-subtractor.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,+BAAsC;AACtC,
|
|
1
|
+
{"version":3,"file":"subscription-subtractor.service.js","sourceRoot":"","sources":["../../src/services/subscription-subtractor.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,6 @@ export declare class SubscriptionValidatorService {
|
|
|
4
4
|
private readonly client;
|
|
5
5
|
private cacheManager;
|
|
6
6
|
constructor(client: ClientProxy);
|
|
7
|
-
validate(method: string, path: string, header: HeaderUser, totalRecipients?: number): Promise<any>;
|
|
7
|
+
validate(method: string, path: string, header: HeaderUser, totalRecipients?: number, fromMiddleware?: boolean): Promise<any>;
|
|
8
8
|
private isPermitted;
|
|
9
9
|
}
|
|
@@ -14,23 +14,18 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
exports.SubscriptionValidatorService = void 0;
|
|
16
16
|
const rxjs_1 = require("rxjs");
|
|
17
|
+
const common_1 = require("@nestjs/common");
|
|
18
|
+
const microservices_1 = require("@nestjs/microservices");
|
|
19
|
+
const redis_client_1 = require("../utils/redis-client");
|
|
17
20
|
const subjects_1 = require("../events/subjects");
|
|
18
21
|
const getEndpoint_1 = require("../utils/getEndpoint");
|
|
19
|
-
const redis_client_1 = require("../utils/redis-client");
|
|
20
|
-
const microservices_1 = require("@nestjs/microservices");
|
|
21
22
|
const endpoint_type_enum_1 = require("../types/endpoint-type.enum");
|
|
22
|
-
const common_1 = require("@nestjs/common");
|
|
23
23
|
let SubscriptionValidatorService = class SubscriptionValidatorService {
|
|
24
24
|
constructor(client) {
|
|
25
25
|
this.client = client;
|
|
26
26
|
this.cacheManager = new redis_client_1.RedisClient();
|
|
27
27
|
}
|
|
28
|
-
async validate(method, path, header, totalRecipients) {
|
|
29
|
-
console.log('*************** validate **************');
|
|
30
|
-
console.log('method: ', method);
|
|
31
|
-
console.log('path: ', path);
|
|
32
|
-
console.log('header: ', header);
|
|
33
|
-
console.log('totalRecipients: ', totalRecipients);
|
|
28
|
+
async validate(method, path, header, totalRecipients, fromMiddleware) {
|
|
34
29
|
const user = {
|
|
35
30
|
subject: subjects_1.Subjects.HasSubscription,
|
|
36
31
|
data: {
|
|
@@ -44,7 +39,7 @@ let SubscriptionValidatorService = class SubscriptionValidatorService {
|
|
|
44
39
|
let resp;
|
|
45
40
|
if (redisResponse) {
|
|
46
41
|
resp = JSON.parse(redisResponse);
|
|
47
|
-
|
|
42
|
+
return this.isPermitted(resp, method, path, totalRecipients, fromMiddleware);
|
|
48
43
|
}
|
|
49
44
|
else {
|
|
50
45
|
resp = await (0, rxjs_1.firstValueFrom)(this.client.send(user.subject, user.data));
|
|
@@ -53,51 +48,66 @@ let SubscriptionValidatorService = class SubscriptionValidatorService {
|
|
|
53
48
|
}
|
|
54
49
|
else {
|
|
55
50
|
await this.cacheManager.setData(redisKey, JSON.stringify(resp), 60);
|
|
56
|
-
|
|
51
|
+
return this.isPermitted(resp, method, path, totalRecipients, fromMiddleware);
|
|
57
52
|
}
|
|
58
53
|
}
|
|
59
54
|
}
|
|
60
|
-
async isPermitted(subscription, method, path, totalRecipients) {
|
|
55
|
+
async isPermitted(subscription, method, path, totalRecipients, fromMiddleware) {
|
|
61
56
|
const { features, remainingPoints } = subscription;
|
|
62
|
-
const { endpoint } = (0, getEndpoint_1.getEndpoint)(features, method, path);
|
|
57
|
+
const { endpoint, exceptionResp } = (0, getEndpoint_1.getEndpoint)(features, method, path, fromMiddleware);
|
|
58
|
+
console.log('exceptionResp: ', exceptionResp);
|
|
59
|
+
if (exceptionResp)
|
|
60
|
+
return;
|
|
63
61
|
if (!endpoint || endpoint?.isFree) {
|
|
64
62
|
return true;
|
|
65
63
|
}
|
|
64
|
+
console.log('endpoint.endpointType: ', endpoint.endpointType);
|
|
65
|
+
console.log('remainingPoints: ', remainingPoints);
|
|
66
|
+
console.log('Number((totalRecipients ?? 0) * endpoint.point): ', Number((totalRecipients ?? 0) * endpoint.point));
|
|
67
|
+
console.log('remainingPoints < Number((totalRecipients ?? 0) * endpoint.point): ', remainingPoints < Number((totalRecipients ?? 0) * endpoint.point));
|
|
68
|
+
let resp = undefined;
|
|
66
69
|
if (endpoint.endpointType === endpoint_type_enum_1.EndpointType.BINARY && !endpoint.isFree) {
|
|
67
|
-
|
|
70
|
+
resp = {
|
|
71
|
+
code: 'C-103',
|
|
68
72
|
statusCode: 403,
|
|
69
73
|
message: 'Please upgrade your subscription',
|
|
70
74
|
error: 'Forbidden',
|
|
71
75
|
description: 'Please upgrade your subscription',
|
|
72
|
-
}
|
|
76
|
+
};
|
|
73
77
|
}
|
|
74
78
|
else if (endpoint.endpointType === endpoint_type_enum_1.EndpointType.LIMIT &&
|
|
75
79
|
endpoint.limit === 0) {
|
|
76
|
-
|
|
80
|
+
resp = {
|
|
81
|
+
code: 'C-104',
|
|
77
82
|
statusCode: 402,
|
|
78
83
|
message: 'Limits exceeded',
|
|
79
84
|
error: 'Forbidden',
|
|
80
85
|
description: 'Limits exceeded, please renew your subscription or upgrade your plan',
|
|
81
|
-
}
|
|
86
|
+
};
|
|
82
87
|
}
|
|
83
88
|
else if (endpoint.endpointType === endpoint_type_enum_1.EndpointType.CREDIT &&
|
|
84
89
|
remainingPoints < endpoint.point) {
|
|
85
|
-
|
|
90
|
+
resp = {
|
|
91
|
+
code: 'C-105',
|
|
86
92
|
statusCode: 402,
|
|
87
93
|
message: 'Insufficient credit',
|
|
88
94
|
error: 'Forbidden',
|
|
89
95
|
description: 'Insufficient credits, please renew your subscription or upgrade your plan',
|
|
90
|
-
}
|
|
96
|
+
};
|
|
91
97
|
}
|
|
92
98
|
else if (endpoint.endpointType === endpoint_type_enum_1.EndpointType.CREDIT &&
|
|
93
99
|
remainingPoints < Number((totalRecipients ?? 0) * endpoint.point)) {
|
|
94
|
-
|
|
100
|
+
resp = {
|
|
101
|
+
code: 'C-106',
|
|
95
102
|
statusCode: 402,
|
|
96
103
|
message: 'Insufficient credit',
|
|
97
104
|
error: 'Forbidden',
|
|
98
105
|
description: 'Insufficient credits, please renew your subscription or upgrade your plan',
|
|
99
|
-
}
|
|
106
|
+
};
|
|
100
107
|
}
|
|
108
|
+
if (fromMiddleware)
|
|
109
|
+
throw new common_1.ForbiddenException(resp);
|
|
110
|
+
return resp;
|
|
101
111
|
}
|
|
102
112
|
};
|
|
103
113
|
exports.SubscriptionValidatorService = SubscriptionValidatorService;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"subscription-validator.service.js","sourceRoot":"","sources":["../../src/services/subscription-validator.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,+BAAsC;AACtC,
|
|
1
|
+
{"version":3,"file":"subscription-validator.service.js","sourceRoot":"","sources":["../../src/services/subscription-validator.service.ts"],"names":[],"mappings":"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"}
|