drapcode-utility 1.5.4 → 1.5.6
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/encryption/KMS.js +1 -1
- package/build/encryption/crypt.js +3 -3
- package/build/encryption/file.js +4 -4
- package/build/encryption/index.js +22 -26
- package/build/encryption/model.d.ts +2 -2
- package/build/encryption/utility.js +7 -11
- package/build/format-fields/index.js +1 -1
- package/build/index.js +1 -5
- package/build/middlewares/error-logger.js +6 -6
- package/build/middlewares/interceptor-logger-new.js +6 -6
- package/build/middlewares/interceptor-logger.js +3 -3
- package/build/middlewares/redis/request-log.js +4 -4
- package/build/utils/check-error.js +8 -12
- package/build/utils/date-util.js +3 -3
- package/build/utils/prepare-query.js +9 -9
- package/build/utils/query-parser.js +50 -54
- package/build/utils/query-paser-new.js +44 -48
- package/build/utils/s3-util.js +25 -28
- package/build/utils/token.js +3 -3
- package/build/utils/util.d.ts +2 -2
- package/build/utils/util.js +62 -45
- package/build/utils/uuid-generator.js +2 -2
- package/package.json +3 -3
package/build/encryption/KMS.js
CHANGED
|
@@ -14,7 +14,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
14
14
|
function verb(n) { return function (v) { return step([n, v]); }; }
|
|
15
15
|
function step(op) {
|
|
16
16
|
if (f) throw new TypeError("Generator is already executing.");
|
|
17
|
-
while (
|
|
17
|
+
while (_) try {
|
|
18
18
|
if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
|
|
19
19
|
if (y = 0, t) op = [op[0] & 2, t.value];
|
|
20
20
|
switch (op[0]) {
|
|
@@ -14,7 +14,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
14
14
|
function verb(n) { return function (v) { return step([n, v]); }; }
|
|
15
15
|
function step(op) {
|
|
16
16
|
if (f) throw new TypeError("Generator is already executing.");
|
|
17
|
-
while (
|
|
17
|
+
while (_) try {
|
|
18
18
|
if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
|
|
19
19
|
if (y = 0, t) op = [op[0] & 2, t.value];
|
|
20
20
|
switch (op[0]) {
|
|
@@ -49,7 +49,7 @@ var encryptData = function (data, key) { return __awaiter(void 0, void 0, void 0
|
|
|
49
49
|
iv = Buffer.from("i4mboZDwaNEC38YCzi77lw==", "base64");
|
|
50
50
|
keyBuffer = Buffer.from(key, "base64");
|
|
51
51
|
cipher = crypto_1.default.createCipheriv(defaultAlgorithm, keyBuffer, iv);
|
|
52
|
-
encryptedDataBuffer = cipher.update(""
|
|
52
|
+
encryptedDataBuffer = cipher.update("" + data);
|
|
53
53
|
encryptedDataBuffer = Buffer.concat([encryptedDataBuffer, cipher.final()]);
|
|
54
54
|
result = encryptedDataBuffer.toString("base64");
|
|
55
55
|
return [2 /*return*/, handleExtraString(result, true)];
|
|
@@ -88,7 +88,7 @@ var handleExtraString = function (key, append) {
|
|
|
88
88
|
if (append) {
|
|
89
89
|
var start = crypto_1.default.randomBytes(2).toString("hex");
|
|
90
90
|
var end = crypto_1.default.randomBytes(2).toString("hex");
|
|
91
|
-
key = ""
|
|
91
|
+
key = "" + start + key + end;
|
|
92
92
|
return key;
|
|
93
93
|
}
|
|
94
94
|
else {
|
package/build/encryption/file.js
CHANGED
|
@@ -14,7 +14,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
14
14
|
function verb(n) { return function (v) { return step([n, v]); }; }
|
|
15
15
|
function step(op) {
|
|
16
16
|
if (f) throw new TypeError("Generator is already executing.");
|
|
17
|
-
while (
|
|
17
|
+
while (_) try {
|
|
18
18
|
if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
|
|
19
19
|
if (y = 0, t) op = [op[0] & 2, t.value];
|
|
20
20
|
switch (op[0]) {
|
|
@@ -58,11 +58,11 @@ var processFileEncryptionDecryption = function (data, encryption, decrypt) { ret
|
|
|
58
58
|
return [3 /*break*/, 6];
|
|
59
59
|
case 1:
|
|
60
60
|
if (!decrypt) return [3 /*break*/, 3];
|
|
61
|
-
return [4 /*yield*/,
|
|
61
|
+
return [4 /*yield*/, exports.decryptFile(data, dataKey)];
|
|
62
62
|
case 2:
|
|
63
63
|
_b = _c.sent();
|
|
64
64
|
return [3 /*break*/, 5];
|
|
65
|
-
case 3: return [4 /*yield*/,
|
|
65
|
+
case 3: return [4 /*yield*/, exports.encryptFile(data, dataKey)];
|
|
66
66
|
case 4:
|
|
67
67
|
_b = _c.sent();
|
|
68
68
|
_c.label = 5;
|
|
@@ -117,7 +117,7 @@ var decryptFile = function (encryptedFilePath, key) { return __awaiter(void 0, v
|
|
|
117
117
|
decipher = crypto_1.default.createDecipheriv(defaultAlgorithm, keyBuffer, iv);
|
|
118
118
|
decryptedBuffer = decipher.update(encryptedData);
|
|
119
119
|
decryptedBuffer = Buffer.concat([decryptedBuffer, decipher.final()]);
|
|
120
|
-
decryptedFilePath =
|
|
120
|
+
decryptedFilePath = encryptedFilePath.slice(0, -4) + ".dec";
|
|
121
121
|
return [4 /*yield*/, fs_1.default.promises.writeFile(decryptedFilePath, decryptedBuffer)];
|
|
122
122
|
case 2:
|
|
123
123
|
_a.sent();
|
|
@@ -14,7 +14,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
14
14
|
function verb(n) { return function (v) { return step([n, v]); }; }
|
|
15
15
|
function step(op) {
|
|
16
16
|
if (f) throw new TypeError("Generator is already executing.");
|
|
17
|
-
while (
|
|
17
|
+
while (_) try {
|
|
18
18
|
if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
|
|
19
19
|
if (y = 0, t) op = [op[0] & 2, t.value];
|
|
20
20
|
switch (op[0]) {
|
|
@@ -35,14 +35,10 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
35
35
|
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
36
36
|
}
|
|
37
37
|
};
|
|
38
|
-
var __spreadArray = (this && this.__spreadArray) || function (to, from
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
ar[i] = from[i];
|
|
43
|
-
}
|
|
44
|
-
}
|
|
45
|
-
return to.concat(ar || Array.prototype.slice.call(from));
|
|
38
|
+
var __spreadArray = (this && this.__spreadArray) || function (to, from) {
|
|
39
|
+
for (var i = 0, il = from.length, j = to.length; i < il; i++, j++)
|
|
40
|
+
to[j] = from[i];
|
|
41
|
+
return to;
|
|
46
42
|
};
|
|
47
43
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
48
44
|
exports.processKMSDecryption = exports.cryptFile = exports.drapcodeEncryptDecrypt = exports.decryptDataWithKMS = exports.encryptDataWithKMS = exports.createKMSDataKey = exports.processDataEncryptionDecryption = exports.processItemEncryptDecrypt = exports.crypt = void 0;
|
|
@@ -65,7 +61,7 @@ var crypt = function (data, fields, encryption, decrypt, encrypedRefCollections)
|
|
|
65
61
|
accessKeyId: accessKeyId,
|
|
66
62
|
secretAccessKey: secretAccessKey,
|
|
67
63
|
};
|
|
68
|
-
return [4 /*yield*/,
|
|
64
|
+
return [4 /*yield*/, exports.processKMSDecryption(config, encryption.dataKey, {})];
|
|
69
65
|
case 1:
|
|
70
66
|
plainTextData = _b.sent();
|
|
71
67
|
if (plainTextData.status === "FAILED") {
|
|
@@ -76,13 +72,13 @@ var crypt = function (data, fields, encryption, decrypt, encrypedRefCollections)
|
|
|
76
72
|
case 2:
|
|
77
73
|
if (!Array.isArray(data)) return [3 /*break*/, 4];
|
|
78
74
|
promises = data.map(function (item) {
|
|
79
|
-
return
|
|
75
|
+
return exports.processItemEncryptDecrypt(item, fields, encryption, decrypt, encrypedRefCollections);
|
|
80
76
|
});
|
|
81
77
|
return [4 /*yield*/, Promise.all(promises)];
|
|
82
78
|
case 3:
|
|
83
79
|
data = _b.sent();
|
|
84
80
|
return [3 /*break*/, 6];
|
|
85
|
-
case 4: return [4 /*yield*/,
|
|
81
|
+
case 4: return [4 /*yield*/, exports.processItemEncryptDecrypt(data, fields, encryption, decrypt, encrypedRefCollections)];
|
|
86
82
|
case 5:
|
|
87
83
|
data = _b.sent();
|
|
88
84
|
_b.label = 6;
|
|
@@ -109,16 +105,16 @@ var processItemEncryptDecrypt = function (item, fields, encryption, decrypt, enc
|
|
|
109
105
|
if (!(field && field.encrypted)) return [3 /*break*/, 2];
|
|
110
106
|
_c = item;
|
|
111
107
|
_d = fieldName;
|
|
112
|
-
return [4 /*yield*/,
|
|
108
|
+
return [4 /*yield*/, exports.processDataEncryptionDecryption(item[fieldName], encryption, decrypt)];
|
|
113
109
|
case 1:
|
|
114
110
|
_c[_d] = _j.sent();
|
|
115
111
|
_j.label = 2;
|
|
116
112
|
case 2:
|
|
117
113
|
if (!decrypt) return [3 /*break*/, 6];
|
|
118
|
-
if (!__spreadArray(__spreadArray([], drapcode_constant_1.onlyReferenceField
|
|
114
|
+
if (!__spreadArray(__spreadArray([], drapcode_constant_1.onlyReferenceField), [
|
|
119
115
|
drapcode_constant_1.FieldTypes.createdBy.id,
|
|
120
116
|
drapcode_constant_1.FieldTypes.belongsTo.id,
|
|
121
|
-
]
|
|
117
|
+
]).includes(field === null || field === void 0 ? void 0 : field.type)) return [3 /*break*/, 4];
|
|
122
118
|
refField = field;
|
|
123
119
|
if (!refField.refCollection &&
|
|
124
120
|
field.type === drapcode_constant_1.FieldTypes.createdBy.id) {
|
|
@@ -178,11 +174,11 @@ var processDataEncryptionDecryption = function (data, encryption, decrypt) { ret
|
|
|
178
174
|
return [3 /*break*/, 6];
|
|
179
175
|
case 1:
|
|
180
176
|
if (!decrypt) return [3 /*break*/, 3];
|
|
181
|
-
return [4 /*yield*/,
|
|
177
|
+
return [4 /*yield*/, crypt_1.decryptData(data, dataKey)];
|
|
182
178
|
case 2:
|
|
183
179
|
_b = _c.sent();
|
|
184
180
|
return [3 /*break*/, 5];
|
|
185
|
-
case 3: return [4 /*yield*/,
|
|
181
|
+
case 3: return [4 /*yield*/, crypt_1.encryptData(data, dataKey)];
|
|
186
182
|
case 4:
|
|
187
183
|
_b = _c.sent();
|
|
188
184
|
_c.label = 5;
|
|
@@ -203,7 +199,7 @@ var processReferenceItemDecrypt = function (data, encryption, decrypt, refField,
|
|
|
203
199
|
if (!refCollection) return [3 /*break*/, 2];
|
|
204
200
|
if (!Array.isArray(data)) return [3 /*break*/, 2];
|
|
205
201
|
promises = data.map(function (item) {
|
|
206
|
-
return
|
|
202
|
+
return exports.processItemEncryptDecrypt(item, refCollection.fields, encryption, decrypt);
|
|
207
203
|
});
|
|
208
204
|
return [4 /*yield*/, Promise.all(promises)];
|
|
209
205
|
case 1:
|
|
@@ -224,7 +220,7 @@ var processDynamicFieldDecrypt = function (data, encryption, decrypt, refField,
|
|
|
224
220
|
if (!(refCollectionField && refCollectionField.encrypted)) return [3 /*break*/, 2];
|
|
225
221
|
if (!Array.isArray(data)) return [3 /*break*/, 2];
|
|
226
222
|
promises = data.map(function (item) {
|
|
227
|
-
return
|
|
223
|
+
return exports.processDataEncryptionDecryption(item, encryption, decrypt);
|
|
228
224
|
});
|
|
229
225
|
return [4 /*yield*/, Promise.all(promises)];
|
|
230
226
|
case 1:
|
|
@@ -255,7 +251,7 @@ var createKMSDataKey = function (config, arn) { return __awaiter(void 0, void 0,
|
|
|
255
251
|
var dataKeyRes;
|
|
256
252
|
return __generator(this, function (_a) {
|
|
257
253
|
switch (_a.label) {
|
|
258
|
-
case 0: return [4 /*yield*/,
|
|
254
|
+
case 0: return [4 /*yield*/, KMS_1.processKMSGenerateDataKey(config, arn)];
|
|
259
255
|
case 1:
|
|
260
256
|
dataKeyRes = _a.sent();
|
|
261
257
|
return [2 /*return*/, dataKeyRes];
|
|
@@ -276,7 +272,7 @@ var encryptDataWithKMS = function (config, arn, plainText, context) { return __a
|
|
|
276
272
|
var cryptData;
|
|
277
273
|
return __generator(this, function (_a) {
|
|
278
274
|
switch (_a.label) {
|
|
279
|
-
case 0: return [4 /*yield*/,
|
|
275
|
+
case 0: return [4 /*yield*/, KMS_1.processKMSEncryption(config, arn, plainText, context)];
|
|
280
276
|
case 1:
|
|
281
277
|
cryptData = _a.sent();
|
|
282
278
|
return [2 /*return*/, cryptData];
|
|
@@ -296,7 +292,7 @@ var decryptDataWithKMS = function (config, cipherText, context) { return __await
|
|
|
296
292
|
var plainTextData;
|
|
297
293
|
return __generator(this, function (_a) {
|
|
298
294
|
switch (_a.label) {
|
|
299
|
-
case 0: return [4 /*yield*/,
|
|
295
|
+
case 0: return [4 /*yield*/, exports.processKMSDecryption(config, cipherText, context)];
|
|
300
296
|
case 1:
|
|
301
297
|
plainTextData = _a.sent();
|
|
302
298
|
return [2 /*return*/, plainTextData];
|
|
@@ -335,7 +331,7 @@ var drapcodeEncryptDecrypt = function (data, encrypt) { return __awaiter(void 0,
|
|
|
335
331
|
accessKeyId: accessKey,
|
|
336
332
|
secretAccessKey: secretKey,
|
|
337
333
|
};
|
|
338
|
-
return [4 /*yield*/,
|
|
334
|
+
return [4 /*yield*/, exports.processKMSDecryption(config, privateDataKey, {})];
|
|
339
335
|
case 1:
|
|
340
336
|
plainTextData = _a.sent();
|
|
341
337
|
if (plainTextData.status === "FAILED") {
|
|
@@ -345,13 +341,13 @@ var drapcodeEncryptDecrypt = function (data, encrypt) { return __awaiter(void 0,
|
|
|
345
341
|
response = null;
|
|
346
342
|
if (!encrypt) return [3 /*break*/, 3];
|
|
347
343
|
console.log("Encrypting");
|
|
348
|
-
return [4 /*yield*/,
|
|
344
|
+
return [4 /*yield*/, crypt_1.encryptData(data, publicKey)];
|
|
349
345
|
case 2:
|
|
350
346
|
response = _a.sent();
|
|
351
347
|
return [3 /*break*/, 5];
|
|
352
348
|
case 3:
|
|
353
349
|
console.log("Decrypting");
|
|
354
|
-
return [4 /*yield*/,
|
|
350
|
+
return [4 /*yield*/, crypt_1.decryptData(data, publicKey)];
|
|
355
351
|
case 4:
|
|
356
352
|
response = _a.sent();
|
|
357
353
|
_a.label = 5;
|
|
@@ -364,7 +360,7 @@ var cryptFile = function (filePath, encryption, decrypt) { return __awaiter(void
|
|
|
364
360
|
var data;
|
|
365
361
|
return __generator(this, function (_a) {
|
|
366
362
|
switch (_a.label) {
|
|
367
|
-
case 0: return [4 /*yield*/,
|
|
363
|
+
case 0: return [4 /*yield*/, file_1.processFileEncryptionDecryption(filePath, encryption, decrypt)];
|
|
368
364
|
case 1:
|
|
369
365
|
data = _a.sent();
|
|
370
366
|
return [2 /*return*/, data];
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
export type AwsConfig = {
|
|
1
|
+
export declare type AwsConfig = {
|
|
2
2
|
accessKeyId: string;
|
|
3
3
|
secretAccessKey: string;
|
|
4
4
|
region: string;
|
|
5
5
|
};
|
|
6
|
-
export type Encryption = {
|
|
6
|
+
export declare type Encryption = {
|
|
7
7
|
encryptionType: string;
|
|
8
8
|
algorithm: string;
|
|
9
9
|
dataKey: string;
|
|
@@ -1,12 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __spreadArray = (this && this.__spreadArray) || function (to, from
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
ar[i] = from[i];
|
|
7
|
-
}
|
|
8
|
-
}
|
|
9
|
-
return to.concat(ar || Array.prototype.slice.call(from));
|
|
2
|
+
var __spreadArray = (this && this.__spreadArray) || function (to, from) {
|
|
3
|
+
for (var i = 0, il = from.length, j = to.length; i < il; i++, j++)
|
|
4
|
+
to[j] = from[i];
|
|
5
|
+
return to;
|
|
10
6
|
};
|
|
11
7
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
8
|
exports.getEncryptedReferenceFieldsQuery = void 0;
|
|
@@ -14,11 +10,11 @@ var drapcode_constant_1 = require("drapcode-constant");
|
|
|
14
10
|
var getEncryptedReferenceFieldsQuery = function (collectionFields, projectId) {
|
|
15
11
|
var collectionsNamesArr = [];
|
|
16
12
|
collectionFields.map(function (field) {
|
|
17
|
-
if (__spreadArray(__spreadArray([], drapcode_constant_1.onlyReferenceField
|
|
13
|
+
if (__spreadArray(__spreadArray([], drapcode_constant_1.onlyReferenceField), [
|
|
18
14
|
drapcode_constant_1.FieldTypes.dynamic_option.id,
|
|
19
15
|
drapcode_constant_1.FieldTypes.createdBy.id,
|
|
20
16
|
drapcode_constant_1.FieldTypes.belongsTo.id,
|
|
21
|
-
]
|
|
17
|
+
]).includes(field.type)) {
|
|
22
18
|
if (!field.refCollection && field.type === drapcode_constant_1.FieldTypes.createdBy.id) {
|
|
23
19
|
collectionsNamesArr.push("user");
|
|
24
20
|
}
|
|
@@ -32,7 +28,7 @@ var getEncryptedReferenceFieldsQuery = function (collectionFields, projectId) {
|
|
|
32
28
|
{
|
|
33
29
|
$match: {
|
|
34
30
|
projectId: projectId,
|
|
35
|
-
collectionName: { $in: __spreadArray([], collectionsNamesArr
|
|
31
|
+
collectionName: { $in: __spreadArray([], collectionsNamesArr) },
|
|
36
32
|
fields: { $elemMatch: { encrypted: true } },
|
|
37
33
|
},
|
|
38
34
|
},
|
|
@@ -20,7 +20,7 @@ var formatField = function (itemData, fields) {
|
|
|
20
20
|
Object.keys(itemData).forEach(function (key) {
|
|
21
21
|
var field = fields.find(function (field) { return field.fieldName === key; });
|
|
22
22
|
newItemData[key] = field
|
|
23
|
-
?
|
|
23
|
+
? exports.getFormatFieldData(itemData[key], field.type)
|
|
24
24
|
: itemData[key];
|
|
25
25
|
});
|
|
26
26
|
return newItemData;
|
package/build/index.js
CHANGED
|
@@ -1,11 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
3
|
if (k2 === undefined) k2 = k;
|
|
4
|
-
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
4
|
+
Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
|
|
9
5
|
}) : (function(o, m, k, k2) {
|
|
10
6
|
if (k2 === undefined) k2 = k;
|
|
11
7
|
o[k2] = m[k];
|
|
@@ -32,16 +32,16 @@ var errorLogger = function (err, req, res, next) {
|
|
|
32
32
|
var originalUrl = req.originalUrl, method = req.method, body = req.body, params = req.params, query = req.query, db = req.db, projectName = req.projectName, projectId = req.projectId, ip = req.ip;
|
|
33
33
|
var PreviouseFilePath;
|
|
34
34
|
if (projectName) {
|
|
35
|
-
loggerPath =
|
|
36
|
-
PreviouseFilePath =
|
|
35
|
+
loggerPath = loggerPath + "/" + projectName + "/" + date_util_1.createLoggerDateFormat() + "/output";
|
|
36
|
+
PreviouseFilePath = loggerPath + "/" + projectName + "/" + date_util_1.createLoggerPreviouseDateFormat() + "/";
|
|
37
37
|
}
|
|
38
38
|
else if (projectId) {
|
|
39
|
-
loggerPath =
|
|
40
|
-
PreviouseFilePath =
|
|
39
|
+
loggerPath = loggerPath + "/" + projectId + "/" + date_util_1.createLoggerDateFormat() + "/output";
|
|
40
|
+
PreviouseFilePath = loggerPath + "/" + projectId + "/" + date_util_1.createLoggerPreviouseDateFormat() + "/";
|
|
41
41
|
}
|
|
42
42
|
else {
|
|
43
|
-
loggerPath =
|
|
44
|
-
PreviouseFilePath =
|
|
43
|
+
loggerPath = loggerPath + "/" + date_util_1.createLoggerDateFormat() + "/output";
|
|
44
|
+
PreviouseFilePath = loggerPath + "/" + date_util_1.createLoggerPreviouseDateFormat() + "/";
|
|
45
45
|
}
|
|
46
46
|
if (fs_1.default.existsSync(PreviouseFilePath)) {
|
|
47
47
|
fs_1.default.rmSync(PreviouseFilePath, { recursive: true, force: true });
|
|
@@ -27,16 +27,16 @@ var interceptLoggerNew = function (req, res, next) {
|
|
|
27
27
|
}
|
|
28
28
|
var PreviouseFilePath;
|
|
29
29
|
if (projectName) {
|
|
30
|
-
loggerPath =
|
|
31
|
-
PreviouseFilePath =
|
|
30
|
+
loggerPath = loggerPath + "/" + projectName + "/" + date_util_1.createLoggerDateFormat() + "/output";
|
|
31
|
+
PreviouseFilePath = loggerPath + "/" + projectName + "/" + date_util_1.createLoggerPreviouseDateFormat() + "/";
|
|
32
32
|
}
|
|
33
33
|
else if (projectId) {
|
|
34
|
-
loggerPath =
|
|
35
|
-
PreviouseFilePath =
|
|
34
|
+
loggerPath = loggerPath + "/" + projectId + "/" + date_util_1.createLoggerDateFormat() + "/output";
|
|
35
|
+
PreviouseFilePath = loggerPath + "/" + projectId + "/" + date_util_1.createLoggerPreviouseDateFormat() + "/";
|
|
36
36
|
}
|
|
37
37
|
else {
|
|
38
|
-
loggerPath =
|
|
39
|
-
PreviouseFilePath =
|
|
38
|
+
loggerPath = loggerPath + "/" + date_util_1.createLoggerDateFormat() + "/output";
|
|
39
|
+
PreviouseFilePath = loggerPath + "/" + date_util_1.createLoggerPreviouseDateFormat() + "/";
|
|
40
40
|
}
|
|
41
41
|
if (fs_1.default.existsSync(PreviouseFilePath)) {
|
|
42
42
|
fs_1.default.rmSync(PreviouseFilePath, { recursive: true, force: true });
|
|
@@ -21,13 +21,13 @@ var interceptLogger = function (req, res, next) {
|
|
|
21
21
|
reqObject["dbName"] = db.name;
|
|
22
22
|
}
|
|
23
23
|
if (projectName) {
|
|
24
|
-
loggerPath =
|
|
24
|
+
loggerPath = loggerPath + "/" + projectName + "/" + date_util_1.createLoggerDateFormat();
|
|
25
25
|
}
|
|
26
26
|
else if (projectId) {
|
|
27
|
-
loggerPath =
|
|
27
|
+
loggerPath = loggerPath + "/" + projectId + "/" + date_util_1.createLoggerDateFormat();
|
|
28
28
|
}
|
|
29
29
|
else {
|
|
30
|
-
loggerPath =
|
|
30
|
+
loggerPath = loggerPath + "/" + date_util_1.createLoggerDateFormat();
|
|
31
31
|
}
|
|
32
32
|
var logger = new drapcode_logger_1.FileLogger(loggerPath).createLogger();
|
|
33
33
|
var oldSend = res.send;
|
|
@@ -14,7 +14,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
14
14
|
function verb(n) { return function (v) { return step([n, v]); }; }
|
|
15
15
|
function step(op) {
|
|
16
16
|
if (f) throw new TypeError("Generator is already executing.");
|
|
17
|
-
while (
|
|
17
|
+
while (_) try {
|
|
18
18
|
if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
|
|
19
19
|
if (y = 0, t) op = [op[0] & 2, t.value];
|
|
20
20
|
switch (op[0]) {
|
|
@@ -47,7 +47,7 @@ var saveRequest = function (req, res) {
|
|
|
47
47
|
return __generator(this, function (_a) {
|
|
48
48
|
switch (_a.label) {
|
|
49
49
|
case 0:
|
|
50
|
-
req.body =
|
|
50
|
+
req.body = util_1.isEmpty(req.body) ? req.query : req.body;
|
|
51
51
|
ip = req.headers["x-forwarded-for"] ||
|
|
52
52
|
req.connection.remoteAddress ||
|
|
53
53
|
req.socket.remoteAddress ||
|
|
@@ -62,13 +62,13 @@ var saveRequest = function (req, res) {
|
|
|
62
62
|
response: JSON.stringify(res),
|
|
63
63
|
ipAddress: ip,
|
|
64
64
|
};
|
|
65
|
-
return [4 /*yield*/,
|
|
65
|
+
return [4 /*yield*/, drapcode_redis_1.redis_get_method("requestLog")];
|
|
66
66
|
case 1:
|
|
67
67
|
redisData = _a.sent();
|
|
68
68
|
if (!redisData)
|
|
69
69
|
redisData = [];
|
|
70
70
|
redisData.push(respObj);
|
|
71
|
-
return [4 /*yield*/,
|
|
71
|
+
return [4 /*yield*/, drapcode_redis_1.redis_set_method("requestLog", redisData)];
|
|
72
72
|
case 2:
|
|
73
73
|
_a.sent();
|
|
74
74
|
return [2 /*return*/];
|
|
@@ -14,7 +14,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
14
14
|
function verb(n) { return function (v) { return step([n, v]); }; }
|
|
15
15
|
function step(op) {
|
|
16
16
|
if (f) throw new TypeError("Generator is already executing.");
|
|
17
|
-
while (
|
|
17
|
+
while (_) try {
|
|
18
18
|
if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
|
|
19
19
|
if (y = 0, t) op = [op[0] & 2, t.value];
|
|
20
20
|
switch (op[0]) {
|
|
@@ -35,14 +35,10 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
35
35
|
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
36
36
|
}
|
|
37
37
|
};
|
|
38
|
-
var __spreadArray = (this && this.__spreadArray) || function (to, from
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
ar[i] = from[i];
|
|
43
|
-
}
|
|
44
|
-
}
|
|
45
|
-
return to.concat(ar || Array.prototype.slice.call(from));
|
|
38
|
+
var __spreadArray = (this && this.__spreadArray) || function (to, from) {
|
|
39
|
+
for (var i = 0, il = from.length, j = to.length; i < il; i++, j++)
|
|
40
|
+
to[j] = from[i];
|
|
41
|
+
return to;
|
|
46
42
|
};
|
|
47
43
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
48
44
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
@@ -118,7 +114,7 @@ var handleMultErrorConfig = function (error, result, status) {
|
|
|
118
114
|
var apiErrorMessage;
|
|
119
115
|
var apiErrorValue;
|
|
120
116
|
if (result && result !== "undefined" && result !== "null") {
|
|
121
|
-
console.log("handleMultErrorConfig result :>> "
|
|
117
|
+
console.log("handleMultErrorConfig result :>> " + Object.keys(result));
|
|
122
118
|
apiErrorMessage = lodash_1.default.get(result, message);
|
|
123
119
|
if (apiErrorMessage) {
|
|
124
120
|
console.log("*** utility 3 ***");
|
|
@@ -148,7 +144,7 @@ var handleMultErrorConfig = function (error, result, status) {
|
|
|
148
144
|
apiErrorValue = status;
|
|
149
145
|
}
|
|
150
146
|
console.log("apiErrorValue", apiErrorValue);
|
|
151
|
-
apiErrorValue = ""
|
|
147
|
+
apiErrorValue = "" + apiErrorValue;
|
|
152
148
|
console.log("apiErrorMessage", apiErrorMessage);
|
|
153
149
|
console.log("apiErrorValue", apiErrorValue);
|
|
154
150
|
if (value && apiErrorValue == value) {
|
|
@@ -185,7 +181,7 @@ var nestedValue = function (data, messages) {
|
|
|
185
181
|
messages.push(value);
|
|
186
182
|
}
|
|
187
183
|
else if (Array.isArray(value)) {
|
|
188
|
-
messages = __spreadArray(__spreadArray([], messages
|
|
184
|
+
messages = __spreadArray(__spreadArray([], messages), value);
|
|
189
185
|
}
|
|
190
186
|
else {
|
|
191
187
|
if (Object.keys(value).length) {
|
package/build/utils/date-util.js
CHANGED
|
@@ -29,11 +29,11 @@ exports.createLogsDateFormat = createLogsDateFormat;
|
|
|
29
29
|
var getDateValue = function (value, timezone) {
|
|
30
30
|
if (timezone === void 0) { timezone = ""; }
|
|
31
31
|
if (!value)
|
|
32
|
-
return
|
|
32
|
+
return exports.createLogsDateFormat(timezone);
|
|
33
33
|
var dateFormat = "YYYY-MM-DDTHH:mm:ss.SSS";
|
|
34
34
|
var _a = value.split(":"), type = _a[0], number = _a[1], unit = _a[2];
|
|
35
35
|
if (!["ADD", "SUB"].includes(type))
|
|
36
|
-
return
|
|
36
|
+
return exports.createLogsDateFormat(timezone);
|
|
37
37
|
var dateUnit = getDateUnit(unit);
|
|
38
38
|
var result;
|
|
39
39
|
if (type === "ADD") {
|
|
@@ -80,7 +80,7 @@ var timezoneDateParse = function (value, nextDay, prevDay) {
|
|
|
80
80
|
if (prevDay && value.length <= 10) {
|
|
81
81
|
timeZoneDate = timeZoneDate.subtract(1, "days");
|
|
82
82
|
}
|
|
83
|
-
console.log("If it was for end date "
|
|
83
|
+
console.log("If it was for end date " + nextDay + " then", timeZoneDate);
|
|
84
84
|
timeZoneDate = timeZoneDate.format("YYYY-MM-DDTHH:mm:ss");
|
|
85
85
|
console.log("Format Date into date string", timeZoneDate);
|
|
86
86
|
return new Date(timeZoneDate);
|
|
@@ -111,11 +111,11 @@ var prepareCreatedByLookup = function (lookupConfig, aggregateQuery, field) {
|
|
|
111
111
|
aggregateQuery.push({
|
|
112
112
|
$lookup: {
|
|
113
113
|
from: "user",
|
|
114
|
-
let: (_a = {}, _a[""
|
|
114
|
+
let: (_a = {}, _a["" + field.fieldName] = "$" + field.fieldName, _a),
|
|
115
115
|
pipeline: [
|
|
116
116
|
{
|
|
117
117
|
$match: {
|
|
118
|
-
$expr: { $eq: ["$uuid", "$$"
|
|
118
|
+
$expr: { $eq: ["$uuid", "$$" + field.fieldName] },
|
|
119
119
|
},
|
|
120
120
|
},
|
|
121
121
|
{ $project: { _id: 0, password: 0 } },
|
|
@@ -138,11 +138,11 @@ var prepareChildRefCreatedByLookup = function (collectionName, findCollInLookup,
|
|
|
138
138
|
{
|
|
139
139
|
$cond: {
|
|
140
140
|
if: {
|
|
141
|
-
$in: ["$$"
|
|
141
|
+
$in: ["$$" + field.fieldName, ["", null]],
|
|
142
142
|
},
|
|
143
143
|
then: [],
|
|
144
144
|
else: {
|
|
145
|
-
$ifNull: ["$$"
|
|
145
|
+
$ifNull: ["$$" + field.fieldName, []],
|
|
146
146
|
},
|
|
147
147
|
},
|
|
148
148
|
},
|
|
@@ -172,8 +172,8 @@ var prepareChildRefCreatedByLookup = function (collectionName, findCollInLookup,
|
|
|
172
172
|
}
|
|
173
173
|
aggregateQuery.push({
|
|
174
174
|
$lookup: {
|
|
175
|
-
from: ""
|
|
176
|
-
let: (_a = {}, _a[""
|
|
175
|
+
from: "" + collectionName,
|
|
176
|
+
let: (_a = {}, _a["" + field.fieldName] = "$" + field.fieldName, _a),
|
|
177
177
|
pipeline: pPipeline,
|
|
178
178
|
as: field.fieldName,
|
|
179
179
|
},
|
|
@@ -196,7 +196,7 @@ var commonLookupSetting = function (field, lookupConfig, aggregateQuery) {
|
|
|
196
196
|
if (field.type === "belongsTo") {
|
|
197
197
|
aggregateQuery.push({
|
|
198
198
|
$lookup: {
|
|
199
|
-
from: ""
|
|
199
|
+
from: "" + collectionName_1,
|
|
200
200
|
localField: field.fieldName,
|
|
201
201
|
foreignField: "uuid",
|
|
202
202
|
as: field.fieldName,
|
|
@@ -209,13 +209,13 @@ var commonLookupSetting = function (field, lookupConfig, aggregateQuery) {
|
|
|
209
209
|
});
|
|
210
210
|
}
|
|
211
211
|
else {
|
|
212
|
-
|
|
212
|
+
exports.prepareChildRefCreatedByLookup(collectionName_1, findCollInLookup, lookupConfig, field, aggregateQuery);
|
|
213
213
|
}
|
|
214
214
|
}
|
|
215
215
|
}
|
|
216
216
|
}
|
|
217
217
|
if (field.type === "createdBy") {
|
|
218
|
-
|
|
218
|
+
exports.prepareCreatedByLookup(lookupConfig, aggregateQuery, field);
|
|
219
219
|
}
|
|
220
220
|
};
|
|
221
221
|
exports.commonLookupSetting = commonLookupSetting;
|