fix: pubnub.decrypt() function to return correct data format (#342)

* fix: pubnub.decrypt() function to return correct data format

* PubNub SDK v7.4.1 release.

---------

Co-authored-by: PubNub Release Bot <120067856+pubnub-release-bot@users.noreply.github.com>

.pubnub.yml

@@ -1,5 +1,10 @@
 ---
 changelog:
+  - date: 2023-10-17
+    version: v7.4.1
+    changes:
+      - type: bug
+        text: "Fixes issue of `pubnub.decrypt()` returning wrong data format."
   - date: 2023-10-16
     version: v7.4.0
     changes:
@@ -902,7 +907,7 @@ supported-platforms:
       - 'Ubuntu 14.04 and up'
       - 'Windows 7 and up'
     version: 'Pubnub Javascript for Node'
-version: '7.4.0'
+version: '7.4.1'
 sdks:
   - full-name: PubNub Javascript SDK
     short-name: Javascript
@@ -918,7 +923,7 @@ sdks:
           - distribution-type: source
             distribution-repository: GitHub release
             package-name: pubnub.js
-            location: https://github.com/pubnub/javascript/archive/refs/tags/v7.4.0.zip
+            location: https://github.com/pubnub/javascript/archive/refs/tags/v7.4.1.zip
             requires:
               - name: 'agentkeepalive'
                 min-version: '3.5.2'
@@ -1589,7 +1594,7 @@ sdks:
           - distribution-type: library
             distribution-repository: GitHub release
             package-name: pubnub.js
-            location: https://github.com/pubnub/javascript/releases/download/v7.4.0/pubnub.7.4.0.js
+            location: https://github.com/pubnub/javascript/releases/download/v7.4.1/pubnub.7.4.1.js
             requires:
               - name: 'agentkeepalive'
                 min-version: '3.5.2'

CHANGELOG.md

@@ -1,3 +1,9 @@
+## v7.4.1
+October 17 2023
+
+#### Fixed
+- Fixes issue of `pubnub.decrypt()` returning wrong data format.
+
 ## v7.4.0
 October 16 2023
 

README.md

@@ -28,8 +28,8 @@ Watch [Getting Started with PubNub JS SDK](https://app.dashcam.io/replay/64ee0d2
      npm install pubnub
      ```
    * or download one of our builds from our CDN: 
-     * https://cdn.pubnub.com/sdk/javascript/pubnub.7.4.0.js
-     * https://cdn.pubnub.com/sdk/javascript/pubnub.7.4.0.min.js
+     * https://cdn.pubnub.com/sdk/javascript/pubnub.7.4.1.js
+     * https://cdn.pubnub.com/sdk/javascript/pubnub.7.4.1.min.js
 
 2. Configure your keys:
 

dist/web/pubnub.js

@@ -791,7 +791,7 @@
             return this;
         };
         default_1.prototype.getVersion = function () {
-            return '7.4.0';
+            return '7.4.1';
         };
         default_1.prototype._addPnsdkSuffix = function (name, suffix) {
             this._PNSDKSuffix[name] = suffix;
@@ -7843,7 +7843,7 @@
             this.decrypt = function (data, key) {
                 if (typeof key === 'undefined' && cryptoModule) {
                     var decrypted = modules.cryptoModule.decrypt(data);
-                    return decrypted instanceof ArrayBuffer ? encode$1(decrypted) : decrypted;
+                    return decrypted instanceof ArrayBuffer ? JSON.parse(new TextDecoder().decode(decrypted)) : decrypted;
                 }
                 else {
                     return crypto.decrypt(data, key);

lib/core/components/config.js

@@ -177,7 +177,7 @@ var default_1 = /** @class */ (function () {
         return this;
     };
     default_1.prototype.getVersion = function () {
-        return '7.4.0';
+        return '7.4.1';
     };
     default_1.prototype._addPnsdkSuffix = function (name, suffix) {
         this._PNSDKSuffix[name] = suffix;

lib/core/pubnub-common.js

@@ -500,7 +500,7 @@ var default_1 = /** @class */ (function () {
         this.decrypt = function (data, key) {
             if (typeof key === 'undefined' && cryptoModule) {
                 var decrypted = modules.cryptoModule.decrypt(data);
-                return decrypted instanceof ArrayBuffer ? (0, base64_codec_1.encode)(decrypted) : decrypted;
+                return decrypted instanceof ArrayBuffer ? JSON.parse(new TextDecoder().decode(decrypted)) : decrypted;
             }
             else {
                 return crypto.decrypt(data, key);

package.json

@@ -1,6 +1,6 @@
 {
   "name": "pubnub",
-  "version": "7.4.0",
+  "version": "7.4.1",
   "author": "PubNub <support@pubnub.com>",
   "description": "Publish & Subscribe Real-time Messaging with PubNub",
   "scripts": {

src/core/components/config.js

@@ -350,7 +350,7 @@ export default class {
   }
 
   getVersion() {
-    return '7.4.0';
+    return '7.4.1';
   }
 
   _addPnsdkSuffix(name, suffix) {

src/core/pubnub-common.js

@@ -691,7 +691,7 @@ export default class {
     this.decrypt = function (data, key) {
       if (typeof key === 'undefined' && cryptoModule) {
         const decrypted = modules.cryptoModule.decrypt(data);
-        return decrypted instanceof ArrayBuffer ? encode(decrypted) : decrypted;
+        return decrypted instanceof ArrayBuffer ? JSON.parse(new TextDecoder().decode(decrypted)) : decrypted;
       } else {
         return crypto.decrypt(data, key);
       }

test/integration/components/crypto.test.js

@@ -23,4 +23,26 @@ describe('components/crypto useRandomIVs', () => {
 
     expect(decrypted).to.deep.equal(data);
   });
+
+  it('should be able to encrypt and decrypt a message with CryptoModule', () => {
+  const pubnub = new PubNub({
+    subscribeKey: 'demo-36',
+    publishKey: 'demo-36',
+    useRandomIVs: true,
+    cryptoModule: PubNub.CryptoModule.aesCbcCryptoModule({
+      cipherKey: 'abcd'
+    }),
+    uuid: 'myUUID',
+  });
+    const data = {
+      message:
+        'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.',
+    };
+    const plaintext = JSON.stringify(data);
+    const ciphertext = pubnub.encrypt(plaintext);
+
+    const decrypted = pubnub.decrypt(ciphertext);
+
+    expect(decrypted).to.deep.equal(data);
+  });
 });