@aldb2b/common 1.0.533 → 1.0.535
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/entities/models/users/entities/users/user.entity.d.ts +1 -0
- package/build/entities/models/users/entities/users/user.entity.js +9 -0
- package/build/entities/models/users/entities/users/user.entity.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/tsconfig.tsbuildinfo +1 -1
- package/build/utils/getEndpoint.js +2 -1
- package/build/utils/getEndpoint.js.map +1 -1
- package/package.json +1 -1
|
@@ -57,6 +57,7 @@ import { EventInfo } from './event-info.entity';
|
|
|
57
57
|
import { Company, Contact } from '../../../companies';
|
|
58
58
|
import { RolePermission } from '../rolePermissions/role-permission.entity';
|
|
59
59
|
import { CustomModel } from '../../../../../db/CustomModel';
|
|
60
|
+
import { Event } from '../../../../../entities/models/events';
|
|
60
61
|
export declare class User {
|
|
61
62
|
_id: string;
|
|
62
63
|
email: string;
|
|
@@ -97,6 +97,9 @@ const userFactory = (connection, companyConnection, eventConnection) => {
|
|
|
97
97
|
'lastActive',
|
|
98
98
|
'deletedAt',
|
|
99
99
|
'deletedBy',
|
|
100
|
+
'lastLoggedInContactId',
|
|
101
|
+
'lastLoggedInCompanyId',
|
|
102
|
+
'lastLoggedInEventId',
|
|
100
103
|
'createdAt',
|
|
101
104
|
'updatedAt',
|
|
102
105
|
];
|
|
@@ -124,6 +127,9 @@ const userFactory = (connection, companyConnection, eventConnection) => {
|
|
|
124
127
|
'lastActive',
|
|
125
128
|
'deletedAt',
|
|
126
129
|
'deletedBy',
|
|
130
|
+
'lastLoggedInContactId',
|
|
131
|
+
'lastLoggedInCompanyId',
|
|
132
|
+
'lastLoggedInEventId',
|
|
127
133
|
'createdAt',
|
|
128
134
|
'updatedAt',
|
|
129
135
|
];
|
|
@@ -151,6 +157,9 @@ const userFactory = (connection, companyConnection, eventConnection) => {
|
|
|
151
157
|
'lastActive',
|
|
152
158
|
'deletedAt',
|
|
153
159
|
'deletedBy',
|
|
160
|
+
'lastLoggedInContactId',
|
|
161
|
+
'lastLoggedInCompanyId',
|
|
162
|
+
'lastLoggedInEventId',
|
|
154
163
|
'createdAt',
|
|
155
164
|
'updatedAt',
|
|
156
165
|
];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user.entity.js","sourceRoot":"","sources":["../../../../../../src/entities/models/users/entities/users/user.entity.ts"],"names":[],"mappings":";;;AAAA,uCAA6C;AAC7C,yDAA+C;AAC/C,sFAA4E;AAC5E,gFAAsE;AACtE,iGAA6F;AAC7F,qFAAiF;AACjF,+EAA2E;AAC3E,qFAAiF;AACjF,uDAAkD;AAClD,yDAA6D;AAC7D,2DAAgE;
|
|
1
|
+
{"version":3,"file":"user.entity.js","sourceRoot":"","sources":["../../../../../../src/entities/models/users/entities/users/user.entity.ts"],"names":[],"mappings":"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"}
|
|
@@ -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":"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"}
|