@meebon/meebon-crypto 1.2.21 → 1.3.0

package/dist/ExpressEncryptionMiddleware.d.ts

@@ -1,11 +1,43 @@
 import { RequestHandler } from 'express';
 import { MeebonCryptoKeyPair } from '../types/global';
 /**
- * Middleware for encrypting incoming request data and decrypting outgoing response data.
+ * Middleware to encrypt response bodies if the request header 'x-require-encryption' is present.
  *
- * @param {MeebonCryptoKeyPair} keys - An object containing the privateKey, publicKey, and forRequest flag.
- * @returns {RequestHandler} The Express middleware function.
+ * @param {Object} param - An object containing the public key.
+ * @param {string} param.publicKey - The public key used for encryption.
+ * @returns {RequestHandler} - The middleware function to handle encryption of response bodies.
+ *
+ * @example
+ * import express from 'express';
+ * import { encryptionMiddleware } from './path/to/ExpressEncryptionMiddleware';
+ *
+ * const app = express();
+ * const publicKey = 'your-public-key';
+ *
+ * app.use(encryptionMiddleware({ publicKey }));
+ *
+ * app.get('/data', (req, res) => {
+ *   res.json({ message: 'Hello, world!' });
+ * });
+ *
+ * app.listen(3000, () => {
+ *   console.log('Server is running on port 3000');
+ * });
+ */
+declare function encryptionMiddleware({ publicKey }: Omit<MeebonCryptoKeyPair, "privateKey">): RequestHandler;
+/**
+ * Middleware to decrypt the request body if it is encrypted.
+ *
+ * This middleware checks for the presence of the 'x-encrypted' header and
+ * attempts to decrypt the request body using the provided private key.
+ * If decryption is successful, the decrypted data is parsed as JSON and
+ * assigned to `req.body`. If decryption fails, a 400 status code with an
+ * error message is returned.
+ *
+ * @param {Object} param - The parameter object.
+ * @param {string} param.privateKey - The private key used for decryption.
+ * @returns {RequestHandler} The middleware function.
  */
-declare function EncryptionMiddleware({ privateKey, publicKey, forRequest }: MeebonCryptoKeyPair): RequestHandler;
-export { EncryptionMiddleware };
+declare function decryptMiddleware({ privateKey }: Omit<MeebonCryptoKeyPair, "publicKey">): RequestHandler;
+export { encryptionMiddleware, decryptMiddleware };
 //# sourceMappingURL=ExpressEncryptionMiddleware.d.ts.map

package/dist/ExpressEncryptionMiddleware.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ExpressEncryptionMiddleware.d.ts","sourceRoot":"","sources":["../lib/ExpressEncryptionMiddleware.ts"],"names":[],"mappings":"AACA,OAAO,EAAmC,cAAc,EAAE,MAAM,SAAS,CAAC;AAC1E,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAEtD;;;;;GAKG;AACH,iBAAS,oBAAoB,CAAC,EAAE,UAAU,EAAE,SAAS,EAAE,UAAU,EAAE,EAAE,mBAAmB,GAAG,cAAc,CAsCxG;AAED,OAAO,EAAE,oBAAoB,EAAE,CAAC"}
+{"version":3,"file":"ExpressEncryptionMiddleware.d.ts","sourceRoot":"","sources":["../lib/ExpressEncryptionMiddleware.ts"],"names":[],"mappings":"AACA,OAAO,EAAmC,cAAc,EAAE,MAAM,SAAS,CAAC;AAC1E,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAEtD;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,iBAAS,oBAAoB,CAAC,EAAE,SAAS,EAAE,EAAE,IAAI,CAAC,mBAAmB,EAAE,YAAY,CAAC,GAAG,cAAc,CA0BpG;AAID;;;;;;;;;;;;GAYG;AACH,iBAAS,iBAAiB,CAAC,EAAE,UAAU,EAAE,EAAE,IAAI,CAAC,mBAAmB,EAAE,WAAW,CAAC,GAAG,cAAc,CAYjG;AAED,OAAO,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,CAAC"}

package/dist/MeebonCrypto.d.ts

@@ -1,5 +1,5 @@
 import forge from 'node-forge';
-import { MeebonCryptoGenerateKeyPair, MeebonCryptoProps } from '../types/global';
+import { MeebonCryptoKeyPair, MeebonCryptoProps } from '../types/global';
 export declare class MeebonCrypto {
     protected privateKeyPem: string;
     protected publicKeyPem: string;
@@ -29,9 +29,9 @@ export declare class MeebonCrypto {
      * Generates an RSA key pair with the specified key size.
      *
      * @param {number} [length=3072] - The length of the RSA key in bits (defaults to 3072).
-     * @returns {MeebonCryptoGenerateKeyPair} An object containing the generated public and private keys in PEM format.
+     * @returns {MeebonCryptoKeyPair} An object containing the generated public and private keys in PEM format.
      */
-    static generateKeyPair(length?: number): MeebonCryptoGenerateKeyPair;
+    static generateKeyPair(length?: number): MeebonCryptoKeyPair;
     /**
      * Encrypts data with a provided public key.
      * @param {string} data - The data to encrypt.

package/dist/MeebonCrypto.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MeebonCrypto.d.ts","sourceRoot":"","sources":["../lib/MeebonCrypto.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,YAAY,CAAC;AAC/B,OAAO,EAAE,2BAA2B,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAEjF,qBAAa,YAAY;IACvB,SAAS,CAAC,aAAa,EAAE,MAAM,CAAC;IAChC,SAAS,CAAC,YAAY,EAAE,MAAM,CAAC;IAExB,UAAU,EAAE,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,UAAU,CAAC;IACrC,SAAS,EAAE,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,SAAS,CAAC;IAE1C,SAAS,CAAC,MAAM,EAAE,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,gBAAgB,CAAC;IAEjD,OAAO;IASP;;;;OAIG;WACW,IAAI,CAAC,KAAK,EAAE,iBAAiB,GAAG,YAAY;IAI1D;;;;OAIG;IACI,OAAO,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM;IAKzC;;;;OAIG;IACI,OAAO,CAAC,aAAa,EAAE,MAAM,GAAG,MAAM;IAK7C;;;;;OAKG;WACW,eAAe,CAAC,MAAM,GAAE,MAAa,GAAG,2BAA2B;IAQjF;;;;;;OAMG;WACW,WAAW,CACvB,IAAI,EAAE,MAAM,EACZ,SAAS,EAAE,MAAM,EACjB,MAAM,GAAE,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,gBAA6B,GAClD,MAAM;IAMT;;;;;;OAMG;WACW,WAAW,CACvB,aAAa,EAAE,MAAM,EACrB,UAAU,EAAE,MAAM,EAClB,MAAM,GAAE,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,gBAA6B,GAClD,MAAM;CAKV"}
+{"version":3,"file":"MeebonCrypto.d.ts","sourceRoot":"","sources":["../lib/MeebonCrypto.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,YAAY,CAAC;AAC/B,OAAO,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAEzE,qBAAa,YAAY;IACvB,SAAS,CAAC,aAAa,EAAE,MAAM,CAAC;IAChC,SAAS,CAAC,YAAY,EAAE,MAAM,CAAC;IAExB,UAAU,EAAE,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,UAAU,CAAC;IACrC,SAAS,EAAE,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,SAAS,CAAC;IAE1C,SAAS,CAAC,MAAM,EAAE,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,gBAAgB,CAAC;IAEjD,OAAO;IASP;;;;OAIG;WACW,IAAI,CAAC,KAAK,EAAE,iBAAiB,GAAG,YAAY;IAI1D;;;;OAIG;IACI,OAAO,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM;IAKzC;;;;OAIG;IACI,OAAO,CAAC,aAAa,EAAE,MAAM,GAAG,MAAM;IAK7C;;;;;OAKG;WACW,eAAe,CAAC,MAAM,GAAE,MAAa,GAAG,mBAAmB;IAQzE;;;;;;OAMG;WACW,WAAW,CACvB,IAAI,EAAE,MAAM,EACZ,SAAS,EAAE,MAAM,EACjB,MAAM,GAAE,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,gBAA6B,GAClD,MAAM;IAMT;;;;;;OAMG;WACW,WAAW,CACvB,aAAa,EAAE,MAAM,EACrB,UAAU,EAAE,MAAM,EAClB,MAAM,GAAE,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,gBAA6B,GAClD,MAAM;CAKV"}

package/dist/index.d.ts

@@ -1,4 +1,4 @@
 import { MeebonCrypto } from "./MeebonCrypto";
-import { EncryptionMiddleware } from "./ExpressEncryptionMiddleware";
-export { EncryptionMiddleware, MeebonCrypto };
+import { decryptMiddleware, encryptionMiddleware } from "./ExpressEncryptionMiddleware";
+export { decryptMiddleware, encryptionMiddleware, MeebonCrypto };
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../lib/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AACrE,OAAO,EAAE,oBAAoB,EAAE,YAAY,EAAE,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../lib/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AACxF,OAAO,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,YAAY,EAAE,CAAC"}

package/dist/index.js

@@ -43,7 +43,7 @@ var MeebonCrypto = class _MeebonCrypto {
    * Generates an RSA key pair with the specified key size.
    *
    * @param {number} [length=3072] - The length of the RSA key in bits (defaults to 3072).
-   * @returns {MeebonCryptoGenerateKeyPair} An object containing the generated public and private keys in PEM format.
+   * @returns {MeebonCryptoKeyPair} An object containing the generated public and private keys in PEM format.
    */
   static generateKeyPair(length = 3072) {
     const keyPair = forge.pki.rsa.generateKeyPair({ bits: length, e: 65537 });
@@ -79,41 +79,48 @@ var MeebonCrypto = class _MeebonCrypto {
 };
 
 // lib/ExpressEncryptionMiddleware.ts
-function EncryptionMiddleware({ privateKey, publicKey, forRequest }) {
+function encryptionMiddleware({ publicKey }) {
   return (req, res, next) => {
-    if (forRequest) {
-      if (req.body && req.body.data) {
-        try {
-          const plainText = JSON.stringify(req.body.data);
-          const encrypted = MeebonCrypto.decryptData(plainText, privateKey);
-          req.body.data = encrypted;
-        } catch (error) {
-          next(new Error(error?.message || "Encryption failed."));
-        }
+    const originalSend = res.send.bind(res);
+    const originalJson = res.json.bind(res);
+    res.send = function(body) {
+      if (req.headers["x-require-encryption"]) {
+        let bodyString = typeof body === "object" ? JSON.stringify(body) : body.toString();
+        const encryptedBody = MeebonCrypto.encryptData(bodyString, publicKey);
+        res.set("Content-Type", "text/plain");
+        return originalSend(encryptedBody);
+      } else {
+        return originalSend(body);
+      }
+    };
+    res.json = function(body) {
+      if (req.headers["x-require-encryption"]) {
+        const bodyString = JSON.stringify(body);
+        const encryptedBody = MeebonCrypto.encryptData(bodyString, publicKey);
+        res.set("Content-Type", "text/plain");
+        return originalSend(encryptedBody);
+      } else {
+        return originalJson(body);
+      }
+    };
+    next();
+  };
+}
+function decryptMiddleware({ privateKey }) {
+  return (req, res, next) => {
+    if (req.headers["x-encrypted"] && typeof req.body === "string") {
+      try {
+        const decryptedText = MeebonCrypto.decryptData(req.body, privateKey);
+        req.body = JSON.parse(decryptedText);
+      } catch (err) {
+        res.status(400).json({ error: "Invalid encrypted data" });
       }
-    } else {
-      const originalSend = res.send.bind(res);
-      res.send = (body) => {
-        let encryptData = body;
-        try {
-          if (encryptData?.data) {
-            const decrypted = MeebonCrypto.encryptData(encryptData.data, publicKey);
-            try {
-              encryptData.data = JSON.parse(decrypted);
-            } catch {
-              encryptData.data = decrypted;
-            }
-          }
-        } catch (error) {
-          next(new Error(error?.message || "Decryption failed."));
-        }
-        return originalSend(encryptData);
-      };
     }
     next();
   };
 }
 export {
-  EncryptionMiddleware,
-  MeebonCrypto
+  MeebonCrypto,
+  decryptMiddleware,
+  encryptionMiddleware
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@meebon/meebon-crypto",
-  "version": "1.2.21",
+  "version": "1.3.0",
   "description": "",
   "author": "kajalanS <103587022+kajalanS@users.noreply.github.com>",
   "homepage": "https://github.com/KsoftmHub/meebon-crypto?tab=readme-ov-file#getting-started",

package/types/global.d.ts

@@ -9,7 +9,4 @@ export interface MeebonCryptoProps {
 export interface MeebonCryptoKeyPair {
   privateKey: string;
   publicKey: string;
-  forRequest?: boolean;
 }
-
-export type MeebonCryptoGenerateKeyPair = Omit<MeebonCryptoKeyPair, "forRequest">;