Develop (pubnub#138)

* fix POST for nativescript adapter over android * v4.21.6
heydayhealth · Oct 8, 2018 · 627b956 · 627b956
1 parent bb44dde
commit 627b956
Show file tree

Hide file tree

Showing 15 changed files with 49 additions and 22 deletions.
diff --git a/.pubnub.yml b/.pubnub.yml
@@ -1,11 +1,16 @@
 name: javascript
-version: 4.21.5
+version: 4.21.6
 schema: 1
 scm: github.com/pubnub/javascript
 files:
   - dist/web/pubnub.js
   - dist/web/pubnub.min.js
 changelog:
+  - version: v4.21.6
+    date: 2018-10-04
+    changes:
+      - type: bug
+        text: fix POST for nativescript adapter over android
   - version: v4.21.5
     date: 2018-08-06
     changes:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,15 @@
+## [v4.21.6](https://github.com/pubnub/javascript/tree/v4.21.6)
+  October-04-2018
+
+
+  [Full Changelog](https://github.com/pubnub/javascript/compare/v4.21.5...v4.21.6)
+
+
+
+- 🐛fix POST for nativescript adapter over android
+
+
+
 ## [v4.21.5](https://github.com/pubnub/javascript/tree/v4.21.5)
   August-06-2018
 

diff --git a/README.md b/README.md
@@ -20,5 +20,5 @@ please use the [master_3x](https://github.com/pubnub/javascript/tree/master_3x)
 
 ## CDN Links
 
-* https://cdn.pubnub.com/sdk/javascript/pubnub.4.21.5.min.js
-* https://cdn.pubnub.com/sdk/javascript/pubnub.4.21.5.js
+* https://cdn.pubnub.com/sdk/javascript/pubnub.4.21.6.min.js
+* https://cdn.pubnub.com/sdk/javascript/pubnub.4.21.6.js
diff --git a/dist/titanium/pubnub.js b/dist/titanium/pubnub.js
@@ -1,4 +1,4 @@
-/*! 4.21.5 / Consumer  */
+/*! 4.21.6 / Consumer  */
 (function webpackUniversalModuleDefinition(root, factory) {
 	if(typeof exports === 'object' && typeof module === 'object')
 		module.exports = factory();
@@ -586,7 +586,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	  }, {
 	    key: 'getVersion',
 	    value: function getVersion() {
-	      return '4.21.5';
+	      return '4.21.6';
 	    }
 	  }, {
 	    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.21.5 / Consumer  */
+/*! 4.21.6 / Consumer  */
 (function webpackUniversalModuleDefinition(root, factory) {
 	if(typeof exports === 'object' && typeof module === 'object')
 		module.exports = factory();
@@ -608,7 +608,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	  }, {
 	    key: 'getVersion',
 	    value: function getVersion() {
-	      return '4.21.5';
+	      return '4.21.6';
 	    }
 	  }, {
 	    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/lib/networking/modules/nativescript.js b/lib/networking/modules/nativescript.js
diff --git a/lib/networking/modules/nativescript.js.map b/lib/networking/modules/nativescript.js.map
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pubnub",
-  "version": "4.21.5",
+  "version": "4.21.6",
   "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
@@ -228,7 +228,7 @@ export default class {
   setSendBeaconConfig(val: boolean): this { this._useSendBeacon = val; return this; }
 
   getVersion(): string {
-    return '4.21.5';
+    return '4.21.6';
   }
 
   _decideUUID(providedUUID: string): string {

diff --git a/src/networking/modules/nativescript.js b/src/networking/modules/nativescript.js
@@ -30,13 +30,18 @@ function xdr(method: string, url: string, params: Object, body: string, endpoint
   let status: StatusAnnouncement = {};
   status.operation = endpoint.operation;
 
-  // $FlowFixMe
-  return HttpRequest({
+  const httpConfig = {
     method,
     url: buildUrl(url, params),
-    content: body,
     timeout: endpoint.timeout
-  }).then((response) => {
+  };
+
+  if (method === 'GET') {
+    httpConfig.content = body;
+  }
+
+  // $FlowFixMe
+  return HttpRequest(httpConfig).then((response) => {
     status.error = false;
 
     if (response.statusCode) {