@aldb2b/common 1.0.469 → 1.0.470
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.
|
@@ -1,13 +1,10 @@
|
|
|
1
1
|
import { NestMiddleware } from '@nestjs/common';
|
|
2
2
|
import { ClientProxy } from '@nestjs/microservices';
|
|
3
3
|
import { Request, Response, NextFunction } from 'express';
|
|
4
|
-
import { UserTermToken } from '../tokens/user-term-token.interface';
|
|
5
|
-
import { Encryptor } from '@aldb2b/common';
|
|
6
4
|
export declare class TermMiddleware implements NestMiddleware {
|
|
7
5
|
private readonly client;
|
|
8
|
-
private encryptor;
|
|
9
6
|
private cachManager;
|
|
10
|
-
|
|
7
|
+
private encryptor;
|
|
8
|
+
constructor(client: ClientProxy);
|
|
11
9
|
use(request: Request, response: Response, next: NextFunction): Promise<any>;
|
|
12
|
-
private isTermAccepted;
|
|
13
10
|
}
|
|
@@ -20,15 +20,14 @@ const subjects_1 = require("../events/subjects");
|
|
|
20
20
|
const redis_client_1 = require("../utils/redis-client");
|
|
21
21
|
const getHeaderParam_1 = require("../utils/getHeaderParam");
|
|
22
22
|
const get_term_keys_1 = require("../utils/get-term-keys");
|
|
23
|
-
const
|
|
23
|
+
const encryptor_1 = require("../utils/encryptor");
|
|
24
24
|
let TermMiddleware = class TermMiddleware {
|
|
25
|
-
constructor(client
|
|
25
|
+
constructor(client) {
|
|
26
26
|
this.client = client;
|
|
27
|
-
this.encryptor = encryptor;
|
|
28
27
|
this.cachManager = new redis_client_1.RedisClient();
|
|
28
|
+
this.encryptor = new encryptor_1.Encryptor(process.env.MEETING_REQUEST_KEY_SERIALIZER);
|
|
29
29
|
}
|
|
30
30
|
async use(request, response, next) {
|
|
31
|
-
let isAccepted = true;
|
|
32
31
|
let currentTermId;
|
|
33
32
|
const userId = (0, getHeaderParam_1.getHeaderParam)(request.headers, 'id');
|
|
34
33
|
const currentTermKey = (0, get_term_keys_1.getCurrentTermKey)();
|
|
@@ -37,46 +36,32 @@ let TermMiddleware = class TermMiddleware {
|
|
|
37
36
|
const userTermKey = (0, get_term_keys_1.getUserTermKeyById)(userId, currentTermId);
|
|
38
37
|
let userTermValue = await this.cachManager.getData(userTermKey);
|
|
39
38
|
if (!userTermValue) {
|
|
40
|
-
|
|
39
|
+
userTermValue = await (0, rxjs_1.firstValueFrom)(this.client.send(subjects_1.Subjects.GetCurrentUserTerm, {
|
|
40
|
+
userId: userId,
|
|
41
|
+
termId: currentTermId,
|
|
42
|
+
}));
|
|
43
|
+
if (userTermValue) {
|
|
44
|
+
await this.cachManager.setData(userTermKey, userTermValue);
|
|
45
|
+
}
|
|
46
|
+
else {
|
|
47
|
+
const userTermToken = this.encryptor.encrypt({
|
|
48
|
+
userId: userId,
|
|
49
|
+
termId: currentTermId,
|
|
50
|
+
});
|
|
51
|
+
return {
|
|
52
|
+
termId: currentTermId,
|
|
53
|
+
userTermToken: userTermToken,
|
|
54
|
+
};
|
|
55
|
+
}
|
|
41
56
|
}
|
|
42
57
|
}
|
|
43
|
-
|
|
44
|
-
currentTermId = await (0, rxjs_1.firstValueFrom)(this.client.send(subjects_1.Subjects.GetCurrentTerm, {}));
|
|
45
|
-
if (currentTermId) {
|
|
46
|
-
const userTermKey = (0, get_term_keys_1.getUserTermKeyById)(userId, currentTermId);
|
|
47
|
-
isAccepted = await this.isTermAccepted(userId, currentTermId, userTermKey);
|
|
48
|
-
}
|
|
49
|
-
}
|
|
50
|
-
if (isAccepted) {
|
|
51
|
-
return next();
|
|
52
|
-
}
|
|
53
|
-
else {
|
|
54
|
-
const userTermToken = this.encryptor.encrypt({
|
|
55
|
-
userId: userId,
|
|
56
|
-
termId: currentTermId,
|
|
57
|
-
});
|
|
58
|
-
return {
|
|
59
|
-
termId: currentTermId,
|
|
60
|
-
userTermToken: userTermToken,
|
|
61
|
-
};
|
|
62
|
-
}
|
|
63
|
-
}
|
|
64
|
-
async isTermAccepted(userId, termId, userTermKey) {
|
|
65
|
-
const userTermValue = await (0, rxjs_1.firstValueFrom)(this.client.send(subjects_1.Subjects.GetCurrentUserTerm, {
|
|
66
|
-
userId: userId,
|
|
67
|
-
termId: termId,
|
|
68
|
-
}));
|
|
69
|
-
if (userTermValue) {
|
|
70
|
-
await this.cachManager.setData(userTermKey, userTermValue);
|
|
71
|
-
}
|
|
58
|
+
next();
|
|
72
59
|
}
|
|
73
60
|
};
|
|
74
61
|
exports.TermMiddleware = TermMiddleware;
|
|
75
62
|
exports.TermMiddleware = TermMiddleware = __decorate([
|
|
76
63
|
(0, common_1.Injectable)(),
|
|
77
64
|
__param(0, (0, common_1.Inject)('USER_SERVICE')),
|
|
78
|
-
|
|
79
|
-
__metadata("design:paramtypes", [microservices_1.ClientProxy,
|
|
80
|
-
common_2.Encryptor])
|
|
65
|
+
__metadata("design:paramtypes", [microservices_1.ClientProxy])
|
|
81
66
|
], TermMiddleware);
|
|
82
67
|
//# sourceMappingURL=term.middleware.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"term.middleware.js","sourceRoot":"","sources":["../../src/middlewares/term.middleware.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAmE;AACnE,yDAAmD;AAEnD,+BAAqC;AACrC,iDAA6C;AAC7C,wDAAmD;AACnD,4DAAwD;AACxD,0DAA8E;AAE9E,
|
|
1
|
+
{"version":3,"file":"term.middleware.js","sourceRoot":"","sources":["../../src/middlewares/term.middleware.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAmE;AACnE,yDAAmD;AAEnD,+BAAqC;AACrC,iDAA6C;AAC7C,wDAAmD;AACnD,4DAAwD;AACxD,0DAA8E;AAE9E,kDAA8C;AAGvC,IAAM,cAAc,GAApB,MAAM,cAAc;IAGzB,YAAqD,MAAmB;QAAnB,WAAM,GAAN,MAAM,CAAa;QACtE,IAAI,CAAC,WAAW,GAAG,IAAI,0BAAW,EAAE,CAAA;QACpC,IAAI,CAAC,SAAS,GAAG,IAAI,qBAAS,CAC5B,OAAO,CAAC,GAAG,CAAC,8BAA8B,CAC3C,CAAA;IACH,CAAC;IAED,KAAK,CAAC,GAAG,CACP,OAAgB,EAChB,QAAkB,EAClB,IAAkB;QAElB,IAAI,aAAqB,CAAA;QACzB,MAAM,MAAM,GAAQ,IAAA,+BAAc,EAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,CAAA;QAEzD,MAAM,cAAc,GAAG,IAAA,iCAAiB,GAAE,CAAA;QAC1C,aAAa,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,cAAc,CAAC,CAAA;QAE9D,IAAI,aAAa,EAAE,CAAC;YAClB,MAAM,WAAW,GAAG,IAAA,kCAAkB,EAAC,MAAM,EAAE,aAAa,CAAC,CAAA;YAC7D,IAAI,aAAa,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,WAAW,CAAC,CAAA;YAC/D,IAAI,CAAC,aAAa,EAAE,CAAC;gBACnB,aAAa,GAAG,MAAM,IAAA,qBAAc,EAClC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,mBAAQ,CAAC,kBAAkB,EAAE;oBAC5C,MAAM,EAAE,MAAM;oBACd,MAAM,EAAE,aAAa;iBACtB,CAAC,CACH,CAAA;gBACD,IAAI,aAAa,EAAE,CAAC;oBAClB,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,WAAW,EAAE,aAAa,CAAC,CAAA;gBAC5D,CAAC;qBAAM,CAAC;oBACN,MAAM,aAAa,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC;wBAC3C,MAAM,EAAE,MAAM;wBACd,MAAM,EAAE,aAAa;qBACtB,CAAC,CAAA;oBACF,OAAO;wBACL,MAAM,EAAE,aAAa;wBACrB,aAAa,EAAE,aAAa;qBAC7B,CAAA;gBACH,CAAC;YACH,CAAC;QACH,CAAC;QAED,IAAI,EAAE,CAAA;IACR,CAAC;CACF,CAAA;AAhDY,wCAAc;yBAAd,cAAc;IAD1B,IAAA,mBAAU,GAAE;IAIE,WAAA,IAAA,eAAM,EAAC,cAAc,CAAC,CAAA;qCAA0B,2BAAW;GAH7D,cAAc,CAgD1B"}
|