drapcode-utility 1.1.8 → 1.1.9
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 +2 -2
- package/build/encryption/file.js +4 -4
- package/build/encryption/index.js +15 -15
- package/build/encryption/model.d.ts +2 -2
- 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/query-parser.js +53 -57
- package/build/utils/query-paser-new.js +48 -52
- package/build/utils/s3-util.js +16 -19
- package/build/utils/util.d.ts +1 -1
- package/build/utils/util.js +13 -13
- package/build/utils/uuid-generator.js +2 -2
- package/package.json +1 -1
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]) {
|
|
@@ -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]) {
|
|
@@ -52,7 +52,7 @@ var crypt = function (data, fields, encryption, decrypt) { return __awaiter(void
|
|
|
52
52
|
accessKeyId: accessKeyId,
|
|
53
53
|
secretAccessKey: secretAccessKey,
|
|
54
54
|
};
|
|
55
|
-
return [4 /*yield*/,
|
|
55
|
+
return [4 /*yield*/, KMS_1.processKMSDecryption(config, encryption.dataKey, {})];
|
|
56
56
|
case 1:
|
|
57
57
|
plainTextData = _b.sent();
|
|
58
58
|
if (plainTextData.status === "FAILED") {
|
|
@@ -63,13 +63,13 @@ var crypt = function (data, fields, encryption, decrypt) { return __awaiter(void
|
|
|
63
63
|
case 2:
|
|
64
64
|
if (!Array.isArray(data)) return [3 /*break*/, 4];
|
|
65
65
|
promises = data.map(function (item) {
|
|
66
|
-
return
|
|
66
|
+
return exports.processItemEncryptDecrypt(item, fields, encryption, decrypt);
|
|
67
67
|
});
|
|
68
68
|
return [4 /*yield*/, Promise.all(promises)];
|
|
69
69
|
case 3:
|
|
70
70
|
data = _b.sent();
|
|
71
71
|
return [3 /*break*/, 6];
|
|
72
|
-
case 4: return [4 /*yield*/,
|
|
72
|
+
case 4: return [4 /*yield*/, exports.processItemEncryptDecrypt(data, fields, encryption, decrypt)];
|
|
73
73
|
case 5:
|
|
74
74
|
data = _b.sent();
|
|
75
75
|
_b.label = 6;
|
|
@@ -93,7 +93,7 @@ var processItemEncryptDecrypt = function (item, fields, encryption, decrypt) { r
|
|
|
93
93
|
if (!(field && field.encrypted)) return [3 /*break*/, 2];
|
|
94
94
|
_c = item;
|
|
95
95
|
_d = fieldName;
|
|
96
|
-
return [4 /*yield*/,
|
|
96
|
+
return [4 /*yield*/, exports.processDataEncryptionDecryption(item[fieldName], encryption, decrypt)];
|
|
97
97
|
case 1:
|
|
98
98
|
_c[_d] = _e.sent();
|
|
99
99
|
_e.label = 2;
|
|
@@ -133,11 +133,11 @@ var processDataEncryptionDecryption = function (data, encryption, decrypt) { ret
|
|
|
133
133
|
return [3 /*break*/, 6];
|
|
134
134
|
case 1:
|
|
135
135
|
if (!decrypt) return [3 /*break*/, 3];
|
|
136
|
-
return [4 /*yield*/,
|
|
136
|
+
return [4 /*yield*/, crypt_1.decryptData(data, dataKey)];
|
|
137
137
|
case 2:
|
|
138
138
|
_b = _c.sent();
|
|
139
139
|
return [3 /*break*/, 5];
|
|
140
|
-
case 3: return [4 /*yield*/,
|
|
140
|
+
case 3: return [4 /*yield*/, crypt_1.encryptData(data, dataKey)];
|
|
141
141
|
case 4:
|
|
142
142
|
_b = _c.sent();
|
|
143
143
|
_c.label = 5;
|
|
@@ -160,7 +160,7 @@ var createKMSDataKey = function (config, arn) { return __awaiter(void 0, void 0,
|
|
|
160
160
|
var dataKeyRes;
|
|
161
161
|
return __generator(this, function (_a) {
|
|
162
162
|
switch (_a.label) {
|
|
163
|
-
case 0: return [4 /*yield*/,
|
|
163
|
+
case 0: return [4 /*yield*/, KMS_1.processKMSGenerateDataKey(config, arn)];
|
|
164
164
|
case 1:
|
|
165
165
|
dataKeyRes = _a.sent();
|
|
166
166
|
return [2 /*return*/, dataKeyRes];
|
|
@@ -181,7 +181,7 @@ var encryptDataWithKMS = function (config, arn, plainText, context) { return __a
|
|
|
181
181
|
var cryptData;
|
|
182
182
|
return __generator(this, function (_a) {
|
|
183
183
|
switch (_a.label) {
|
|
184
|
-
case 0: return [4 /*yield*/,
|
|
184
|
+
case 0: return [4 /*yield*/, KMS_1.processKMSEncryption(config, arn, plainText, context)];
|
|
185
185
|
case 1:
|
|
186
186
|
cryptData = _a.sent();
|
|
187
187
|
return [2 /*return*/, cryptData];
|
|
@@ -201,7 +201,7 @@ var decryptDataWithKMS = function (config, cipherText, context) { return __await
|
|
|
201
201
|
var plainTextData;
|
|
202
202
|
return __generator(this, function (_a) {
|
|
203
203
|
switch (_a.label) {
|
|
204
|
-
case 0: return [4 /*yield*/,
|
|
204
|
+
case 0: return [4 /*yield*/, KMS_1.processKMSDecryption(config, cipherText, context)];
|
|
205
205
|
case 1:
|
|
206
206
|
plainTextData = _a.sent();
|
|
207
207
|
return [2 /*return*/, plainTextData];
|
|
@@ -240,7 +240,7 @@ var drapcodeEncryptDecrypt = function (data, encrypt) { return __awaiter(void 0,
|
|
|
240
240
|
accessKeyId: accessKey,
|
|
241
241
|
secretAccessKey: secretKey,
|
|
242
242
|
};
|
|
243
|
-
return [4 /*yield*/,
|
|
243
|
+
return [4 /*yield*/, KMS_1.processKMSDecryption(config, privateDataKey, {})];
|
|
244
244
|
case 1:
|
|
245
245
|
plainTextData = _a.sent();
|
|
246
246
|
if (plainTextData.status === "FAILED") {
|
|
@@ -250,13 +250,13 @@ var drapcodeEncryptDecrypt = function (data, encrypt) { return __awaiter(void 0,
|
|
|
250
250
|
response = null;
|
|
251
251
|
if (!encrypt) return [3 /*break*/, 3];
|
|
252
252
|
console.log("Encrypting");
|
|
253
|
-
return [4 /*yield*/,
|
|
253
|
+
return [4 /*yield*/, crypt_1.encryptData(data, publicKey)];
|
|
254
254
|
case 2:
|
|
255
255
|
response = _a.sent();
|
|
256
256
|
return [3 /*break*/, 5];
|
|
257
257
|
case 3:
|
|
258
258
|
console.log("Decrypting");
|
|
259
|
-
return [4 /*yield*/,
|
|
259
|
+
return [4 /*yield*/, crypt_1.decryptData(data, publicKey)];
|
|
260
260
|
case 4:
|
|
261
261
|
response = _a.sent();
|
|
262
262
|
_a.label = 5;
|
|
@@ -278,7 +278,7 @@ var cryptFile = function (filePath, encryption, decrypt) { return __awaiter(void
|
|
|
278
278
|
accessKeyId: accessKeyId,
|
|
279
279
|
secretAccessKey: secretAccessKey,
|
|
280
280
|
};
|
|
281
|
-
return [4 /*yield*/,
|
|
281
|
+
return [4 /*yield*/, KMS_1.processKMSDecryption(config, dataKey, {})];
|
|
282
282
|
case 1:
|
|
283
283
|
plainTextData = _a.sent();
|
|
284
284
|
if (plainTextData.status === "FAILED") {
|
|
@@ -286,7 +286,7 @@ var cryptFile = function (filePath, encryption, decrypt) { return __awaiter(void
|
|
|
286
286
|
}
|
|
287
287
|
encryption.dataKey = plainTextData.data;
|
|
288
288
|
_a.label = 2;
|
|
289
|
-
case 2: return [4 /*yield*/,
|
|
289
|
+
case 2: return [4 /*yield*/, file_1.processFileEncryptionDecryption(filePath, encryption, decrypt)];
|
|
290
290
|
case 3:
|
|
291
291
|
data = _a.sent();
|
|
292
292
|
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;
|
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);
|