Merge branch 'develop' into metadata_no_propagating

MaxPresman · web-flow · commit 3dfb80f32634 · 2017-04-20T09:56:16.000-07:00
diff --git a/.pubnub.yml b/.pubnub.yml
@@ -1,5 +1,5 @@
 name: javascript
-version: 4.8.0
+version: 4.9.0
 schema: 1
 scm: github.com/pubnub/javascript
 files:
diff --git a/README.md b/README.md
@@ -19,5 +19,5 @@ please use the [master_3x](https://github.com/pubnub/javascript/tree/master_3x)
 - If you **need help** or have a **general question**, contact <support@pubnub.com>
 
 ## CDN Links
-* https://cdn.pubnub.com/sdk/javascript/pubnub.4.8.0.min.js
-* https://cdn.pubnub.com/sdk/javascript/pubnub.4.8.0.js
+* https://cdn.pubnub.com/sdk/javascript/pubnub.4.9.0.min.js
+* https://cdn.pubnub.com/sdk/javascript/pubnub.4.9.0.js
diff --git a/dist/titanium/pubnub.js b/dist/titanium/pubnub.js
@@ -1,4 +1,4 @@
-/*! 4.8.0 / Consumer  */
+/*! 4.9.0 / Consumer  */
 (function webpackUniversalModuleDefinition(root, factory) {
 	if(typeof exports === 'object' && typeof module === 'object')
 		module.exports = factory();
@@ -788,7 +788,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	  }, {
 	    key: 'getVersion',
 	    value: function getVersion() {
-	      return '4.8.0';
+	      return '4.9.0';
 	    }
 	  }, {
 	    key: '_decideUUID',
diff --git a/dist/titanium/pubnub.min.js b/dist/titanium/pubnub.min.js
diff --git a/dist/web/pubnub.js b/dist/web/pubnub.js
@@ -1,4 +1,4 @@
-/*! 4.8.0 / Consumer  */
+/*! 4.9.0 / Consumer  */
 (function webpackUniversalModuleDefinition(root, factory) {
 	if(typeof exports === 'object' && typeof module === 'object')
 		module.exports = factory();
@@ -810,7 +810,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	  }, {
 	    key: 'getVersion',
 	    value: function getVersion() {
-	      return '4.8.0';
+	      return '4.9.0';
 	    }
 	  }, {
 	    key: '_decideUUID',
diff --git a/dist/web/pubnub.min.js b/dist/web/pubnub.min.js
diff --git a/lib/core/components/config.js b/lib/core/components/config.js
diff --git a/lib/core/components/config.js.map b/lib/core/components/config.js.map
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pubnub",
-  "version": "4.8.0",
+  "version": "4.9.0",
   "author": "PubNub <support@pubnub.com>",
   "description": "Publish & Subscribe Real-time Messaging with PubNub",
   "bin": {},
diff --git a/src/core/components/config.js b/src/core/components/config.js
@@ -109,7 +109,7 @@ export default class {
 
 
   /*
-    support custom encryption and decryption functions.
+    support customp encryption and decryption functions.
   */
   customEncrypt: Function // function to support custome encryption of messages
   customDecrypt: Function // function used to decrypt old version messages
@@ -205,7 +205,7 @@ export default class {
   setSendBeaconConfig(val: boolean): this { this._useSendBeacon = val; return this; }
 
   getVersion(): string {
-    return '4.8.0';
+    return '4.9.0';
   }
 
   _decideUUID(providedUUID: string): string {
diff --git a/src/core/components/cryptography/index.js b/src/core/components/cryptography/index.js
@@ -105,7 +105,7 @@ export default class {
     }
   }
 
-  decrypt(data: string, customCipherKey: ?string, options: ?Object): Object | string | null {
+  decrypt(data: Object, customCipherKey: ?string, options: ?Object): Object | string | null {
     if (this._config.customDecrypt) {
       return this._config.customDecrypt(data);
     } else {
diff --git a/src/core/pubnub-common.js b/src/core/pubnub-common.js
@@ -192,8 +192,8 @@ export default class {
     this.getSubscribedChannelGroups = subscriptionManager.getSubscribedChannelGroups.bind(subscriptionManager);
 
     // mount crypto
-    this.encrypt = crypto.pnEncrypt.bind(crypto);
-    this.decrypt = crypto.pnDecrypt.bind(crypto);
+    this.encrypt = crypto.encrypt.bind(crypto);
+    this.decrypt = crypto.decrypt.bind(crypto);
 
     /** config **/
     this.getAuthKey = modules.config.getAuthKey.bind(modules.config);
diff --git a/test/unit/common.test.js b/test/unit/common.test.js
@@ -4,6 +4,7 @@ import assert from 'assert';
 import sinon from 'sinon';
 import uuidGenerator from 'uuid';
 import PubNub from '../../src/node/index';
+import CryptoJS from '../../src/core/components/cryptography/hmac-sha256';
 
 describe('#core / mounting point', () => {
   beforeEach(() => {
@@ -42,4 +43,22 @@ describe('#core / mounting point', () => {
     let pn = new PubNub({});
     assert.deepEqual(pn.decrypt('TejX6F2JNqH/gIiGHWN4Cw==', 'customKey'), { hi: 'there' });
   });
+
+  it('supports custom encryption/decryption', () => {
+    let customEncrypt = (data) => {
+      let cipher = CryptoJS.AES.encrypt(JSON.stringify(data), 'customKey');
+      return cipher.toString();
+    };
+
+    let customDecrypt = (data) => {
+      let bytes = CryptoJS.AES.decrypt(data, 'customKey');
+      return JSON.parse(bytes.toString(CryptoJS.enc.Utf8));
+    };
+
+    let pn = new PubNub({ customEncrypt, customDecrypt });
+
+    let ciphertext = pn.encrypt({ hi: 'there' });
+
+    assert.deepEqual(pn.decrypt(ciphertext), { hi: 'there' });
+  });
 });

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "pubnub",`
`3`		`- "version": "4.8.0",`
	`3`	`+ "version": "4.9.0",`
`4`	`4`	`"author": "PubNub <support@pubnub.com>",`
`5`	`5`	`"description": "Publish & Subscribe Real-time Messaging with PubNub",`
`6`	`6`	`"bin": {},`