drapcode-utility 1.1.8 → 1.2.0

package/build/encryption/KMS.d.ts

@@ -4,11 +4,6 @@ export declare const processKMSEncryption: (config: AwsConfig, arn: string, plai
     data: string;
     message: string;
 }>;
-export declare const processKMSDecryption: (config: AwsConfig, cipherText: string, context: any) => Promise<{
-    status: string;
-    data: string;
-    message: string;
-}>;
 export declare const processKMSGenerateDataKey: (config: AwsConfig, arn: string) => Promise<{
     status: string;
     dataKey: string;

package/build/encryption/KMS.js

@@ -36,7 +36,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.processKMSGenerateDataKey = exports.processKMSDecryption = exports.processKMSEncryption = void 0;
+exports.processKMSGenerateDataKey = exports.processKMSEncryption = void 0;
 var client_kms_1 = require("@aws-sdk/client-kms");
 var processKMSEncryption = function (config, arn, plainText, context) { return __awaiter(void 0, void 0, void 0, function () {
     var accessKeyId, secretAccessKey, region, client, input, command, response, cipherText, error_1;
@@ -72,38 +72,8 @@ var processKMSEncryption = function (config, arn, plainText, context) { return _
     });
 }); };
 exports.processKMSEncryption = processKMSEncryption;
-var processKMSDecryption = function (config, cipherText, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var accessKeyId, secretAccessKey, region, client, dcipherText, input, command, response, plainText, error_2;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
-            case 0:
-                _a.trys.push([0, 2, , 3]);
-                accessKeyId = config.accessKeyId, secretAccessKey = config.secretAccessKey, region = config.region;
-                client = new client_kms_1.KMSClient({
-                    region: region,
-                    credentials: { accessKeyId: accessKeyId, secretAccessKey: secretAccessKey },
-                });
-                dcipherText = Buffer.from(cipherText, "base64");
-                input = {
-                    CiphertextBlob: dcipherText,
-                    EncryptionContext: context,
-                };
-                command = new client_kms_1.DecryptCommand(input);
-                return [4 /*yield*/, client.send(command)];
-            case 1:
-                response = _a.sent();
-                plainText = Buffer.from(response.Plaintext).toString("base64");
-                return [2 /*return*/, { status: "SUCCESS", data: plainText, message: "" }];
-            case 2:
-                error_2 = _a.sent();
-                return [2 /*return*/, { status: "FAILED", data: "", message: error_2.message }];
-            case 3: return [2 /*return*/];
-        }
-    });
-}); };
-exports.processKMSDecryption = processKMSDecryption;
 var processKMSGenerateDataKey = function (config, arn) { return __awaiter(void 0, void 0, void 0, function () {
-    var accessKeyId, secretAccessKey, region, input, client, command, response, cipherText, error_3;
+    var accessKeyId, secretAccessKey, region, input, client, command, response, cipherText, error_2;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
@@ -124,10 +94,10 @@ var processKMSGenerateDataKey = function (config, arn) { return __awaiter(void 0
                 cipherText = Buffer.from(response.CiphertextBlob).toString("base64");
                 return [2 /*return*/, { status: "SUCCESS", dataKey: cipherText, message: "" }];
             case 2:
-                error_3 = _a.sent();
+                error_2 = _a.sent();
                 return [2 /*return*/, {
                         status: "FAILED",
-                        message: error_3.message,
+                        message: error_2.message,
                         dataKey: "",
                     }];
             case 3: return [2 /*return*/];

package/build/encryption/index.d.ts

@@ -46,7 +46,8 @@ export declare const drapcodeEncryptDecrypt: (data: string, encrypt: boolean) =>
     data: string;
     message: string;
 }>;
-export declare const cryptFile: (filePath: any, encryption: Encryption, decrypt: boolean) => Promise<string | {
+export declare const cryptFile: (filePath: any, encryption: Encryption, decrypt: boolean) => Promise<string>;
+export declare const processKMSDecryption: (config: AwsConfig, cipherText: string, context: any) => Promise<{
     status: string;
     data: string;
     message: string;

package/build/encryption/index.js

@@ -36,7 +36,8 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.cryptFile = exports.drapcodeEncryptDecrypt = exports.decryptDataWithKMS = exports.encryptDataWithKMS = exports.createKMSDataKey = exports.processDataEncryptionDecryption = exports.processItemEncryptDecrypt = exports.crypt = void 0;
+exports.processKMSDecryption = exports.cryptFile = exports.drapcodeEncryptDecrypt = exports.decryptDataWithKMS = exports.encryptDataWithKMS = exports.createKMSDataKey = exports.processDataEncryptionDecryption = exports.processItemEncryptDecrypt = exports.crypt = void 0;
+var client_kms_1 = require("@aws-sdk/client-kms");
 var crypt_1 = require("./crypt");
 var file_1 = require("./file");
 var KMS_1 = require("./KMS");
@@ -52,7 +53,7 @@ var crypt = function (data, fields, encryption, decrypt) { return __awaiter(void
                     accessKeyId: accessKeyId,
                     secretAccessKey: secretAccessKey,
                 };
-                return [4 /*yield*/, (0, KMS_1.processKMSDecryption)(config, encryption.dataKey, {})];
+                return [4 /*yield*/, (0, exports.processKMSDecryption)(config, encryption.dataKey, {})];
             case 1:
                 plainTextData = _b.sent();
                 if (plainTextData.status === "FAILED") {
@@ -201,7 +202,7 @@ var decryptDataWithKMS = function (config, cipherText, context) { return __await
     var plainTextData;
     return __generator(this, function (_a) {
         switch (_a.label) {
-            case 0: return [4 /*yield*/, (0, KMS_1.processKMSDecryption)(config, cipherText, context)];
+            case 0: return [4 /*yield*/, (0, exports.processKMSDecryption)(config, cipherText, context)];
             case 1:
                 plainTextData = _a.sent();
                 return [2 /*return*/, plainTextData];
@@ -240,7 +241,7 @@ var drapcodeEncryptDecrypt = function (data, encrypt) { return __awaiter(void 0,
                     accessKeyId: accessKey,
                     secretAccessKey: secretKey,
                 };
-                return [4 /*yield*/, (0, KMS_1.processKMSDecryption)(config, privateDataKey, {})];
+                return [4 /*yield*/, (0, exports.processKMSDecryption)(config, privateDataKey, {})];
             case 1:
                 plainTextData = _a.sent();
                 if (plainTextData.status === "FAILED") {
@@ -266,31 +267,44 @@ var drapcodeEncryptDecrypt = function (data, encrypt) { return __awaiter(void 0,
 }); };
 exports.drapcodeEncryptDecrypt = drapcodeEncryptDecrypt;
 var cryptFile = function (filePath, encryption, decrypt) { return __awaiter(void 0, void 0, void 0, function () {
-    var awsConfig, encryptionType, dataKey, accessKeyId, secretAccessKey, region, config, plainTextData, data;
+    var data;
     return __generator(this, function (_a) {
         switch (_a.label) {
-            case 0:
-                awsConfig = encryption.awsConfig, encryptionType = encryption.encryptionType, dataKey = encryption.dataKey;
-                if (!(encryptionType === "KMS")) return [3 /*break*/, 2];
-                accessKeyId = awsConfig.accessKeyId, secretAccessKey = awsConfig.secretAccessKey, region = awsConfig.region;
-                config = {
-                    region: region,
-                    accessKeyId: accessKeyId,
-                    secretAccessKey: secretAccessKey,
-                };
-                return [4 /*yield*/, (0, KMS_1.processKMSDecryption)(config, dataKey, {})];
+            case 0: return [4 /*yield*/, (0, file_1.processFileEncryptionDecryption)(filePath, encryption, decrypt)];
             case 1:
-                plainTextData = _a.sent();
-                if (plainTextData.status === "FAILED") {
-                    return [2 /*return*/, plainTextData];
-                }
-                encryption.dataKey = plainTextData.data;
-                _a.label = 2;
-            case 2: return [4 /*yield*/, (0, file_1.processFileEncryptionDecryption)(filePath, encryption, decrypt)];
-            case 3:
                 data = _a.sent();
                 return [2 /*return*/, data];
         }
     });
 }); };
 exports.cryptFile = cryptFile;
+var processKMSDecryption = function (config, cipherText, context) { return __awaiter(void 0, void 0, void 0, function () {
+    var accessKeyId, secretAccessKey, region, client, dcipherText, input, command, response, plainText, error_1;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0:
+                _a.trys.push([0, 2, , 3]);
+                accessKeyId = config.accessKeyId, secretAccessKey = config.secretAccessKey, region = config.region;
+                client = new client_kms_1.KMSClient({
+                    region: region,
+                    credentials: { accessKeyId: accessKeyId, secretAccessKey: secretAccessKey },
+                });
+                dcipherText = Buffer.from(cipherText, "base64");
+                input = {
+                    CiphertextBlob: dcipherText,
+                    EncryptionContext: context,
+                };
+                command = new client_kms_1.DecryptCommand(input);
+                return [4 /*yield*/, client.send(command)];
+            case 1:
+                response = _a.sent();
+                plainText = Buffer.from(response.Plaintext).toString("base64");
+                return [2 /*return*/, { status: "SUCCESS", data: plainText, message: "" }];
+            case 2:
+                error_1 = _a.sent();
+                return [2 /*return*/, { status: "FAILED", data: "", message: error_1.message }];
+            case 3: return [2 /*return*/];
+        }
+    });
+}); };
+exports.processKMSDecryption = processKMSDecryption;

package/build/utils/s3-util.d.ts

@@ -13,6 +13,10 @@ interface S3Config {
 }
 export declare const createS3Client: (awsConfig: AWSConfig) => S3Client | null;
 export declare const fileUploadToS3: (files: any, s3Client: S3Client, s3Config: S3Config, encryption: Encryption, options?: {}) => Promise<{
+    status: string;
+    data: string;
+    message: string;
+} | {
     originalname: any;
     mimetype: any;
     size: any;

package/build/utils/s3-util.js

@@ -56,6 +56,7 @@ var fs_1 = __importDefault(require("fs"));
 var mime_types_1 = __importDefault(require("mime-types"));
 var lib_storage_1 = require("@aws-sdk/lib-storage");
 var encryption_1 = require("../encryption");
+var encryption_2 = require("../encryption");
 var createS3Client = function (awsConfig) {
     if (!awsConfig) {
         return null;
@@ -74,11 +75,28 @@ exports.createS3Client = createS3Client;
 var fileUploadToS3 = function (files, s3Client, s3Config, encryption, options) {
     if (options === void 0) { options = {}; }
     return __awaiter(void 0, void 0, void 0, function () {
-        var fileOptions, s3Key, _a, _b, _c, _i, index, file, fileObj, fileObj;
+        var awsConfig, encryptionType, dataKey, accessKeyId, secretAccessKey, region, config, plainTextData, fileOptions, s3Key, _a, _b, _c, _i, index, file, fileObj, fileObj;
         return __generator(this, function (_d) {
             switch (_d.label) {
                 case 0:
-                    if (!Array.isArray(files)) return [3 /*break*/, 5];
+                    awsConfig = encryption.awsConfig, encryptionType = encryption.encryptionType, dataKey = encryption.dataKey;
+                    if (!(encryptionType === "KMS")) return [3 /*break*/, 2];
+                    accessKeyId = awsConfig.accessKeyId, secretAccessKey = awsConfig.secretAccessKey, region = awsConfig.region;
+                    config = {
+                        region: region,
+                        accessKeyId: accessKeyId,
+                        secretAccessKey: secretAccessKey,
+                    };
+                    return [4 /*yield*/, (0, encryption_2.processKMSDecryption)(config, dataKey, {})];
+                case 1:
+                    plainTextData = _d.sent();
+                    if (plainTextData.status === "FAILED") {
+                        return [2 /*return*/, plainTextData];
+                    }
+                    encryption.dataKey = plainTextData.data;
+                    _d.label = 2;
+                case 2:
+                    if (!Array.isArray(files)) return [3 /*break*/, 7];
                     console.log("I have multiple file");
                     fileOptions = [];
                     s3Key = s3Config.key;
@@ -87,34 +105,34 @@ var fileUploadToS3 = function (files, s3Client, s3Config, encryption, options) {
                     for (_c in _a)
                         _b.push(_c);
                     _i = 0;
-                    _d.label = 1;
-                case 1:
-                    if (!(_i < _b.length)) return [3 /*break*/, 4];
+                    _d.label = 3;
+                case 3:
+                    if (!(_i < _b.length)) return [3 /*break*/, 6];
                     _c = _b[_i];
-                    if (!(_c in _a)) return [3 /*break*/, 3];
+                    if (!(_c in _a)) return [3 /*break*/, 5];
                     index = _c;
                     file = files[index];
                     if (s3Config.append) {
                         s3Config.key = "".concat(s3Key, "/").concat(file.originalname);
                     }
                     return [4 /*yield*/, processFileUploadToS3(file, s3Client, s3Config, encryption, options, encryption ? true : false)];
-                case 2:
+                case 4:
                     fileObj = _d.sent();
                     if (fileObj) {
                         fileOptions.push(fileObj);
                     }
-                    _d.label = 3;
-                case 3:
-                    _i++;
-                    return [3 /*break*/, 1];
-                case 4: return [2 /*return*/, fileOptions];
+                    _d.label = 5;
                 case 5:
+                    _i++;
+                    return [3 /*break*/, 3];
+                case 6: return [2 /*return*/, fileOptions];
+                case 7:
                     console.log("I have single file");
                     if (s3Config.append) {
                         s3Config.key = "".concat(s3Config.key, "/").concat(files.originalname);
                     }
                     return [4 /*yield*/, processFileUploadToS3(files, s3Client, s3Config, encryption, options, encryption ? true : false)];
-                case 6:
+                case 8:
                     fileObj = _d.sent();
                     return [2 /*return*/, fileObj];
             }

package/build/utils/util.js

@@ -160,7 +160,7 @@ var stringToExpression = function (str) {
 };
 exports.stringToExpression = stringToExpression;
 var cleanCollectionAndFieldName = function (str) {
-    str = str.replace(/[^a-zA-Z0-9 ]/, "");
+    str = str.replace(/[^A-Za-z0-9\s_]/, "");
     return str;
 };
 exports.cleanCollectionAndFieldName = cleanCollectionAndFieldName;
@@ -224,7 +224,7 @@ var convertItemToArray = function (itemValue) {
 };
 exports.convertItemToArray = convertItemToArray;
 var validateAlphanumericString = function (str) {
-    if (/[^a-zA-Z0-9 ]/.test(str)) {
+    if (/[^A-Za-z0-9\s_]/.test(str)) {
         return "String should contain only numbers and letters";
     }
     return false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drapcode-utility",
-  "version": "1.1.8",
+  "version": "1.2.0",
   "description": "",
   "main": "build/index.js",
   "types": "build/index.d.ts",