Merge pull request #166 from pubnub/develop

Release v4.25.2
pubnub · Sep 4, 2019 · 87f2a6b · 87f2a6b
2 parents 9f6fc98 + 5cc45d7
commit 87f2a6b
Show file tree

Hide file tree

Showing 14 changed files with 43 additions and 24 deletions.
diff --git a/.pubnub.yml b/.pubnub.yml
@@ -1,5 +1,12 @@
 --- 
 changelog: 
+  - 
+    changes: 
+      - 
+        text: "Fix issue with subdomains ending in 'ps'"
+        type: bug
+    date: 2019-09-03
+    version: v4.25.2
   - 
     changes: 
       - 
@@ -723,4 +730,4 @@ supported-platforms:
       - "Ubuntu 14.04 and above"
       - "Windows 7, 8, 10"
     version: "Pubnub Javascript for Node"
-version: "4.25.1"
+version: "4.25.2"
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,12 +1,24 @@
-## [v4.25.1](https://github.com/pubnub/javascript/tree/v4.25.1)
+## [v4.25.2](https://github.com/pubnub/javascript/tree/v4.25.2)
+  August-23-2019
+
+
+  [Full Changelog](https://github.com/pubnub/javascript/compare/v4.25.1...v4.25.2)
+
+
+
+- ⭐ Fix issue with subdomains ending in 'ps'
+
+
+
+## [v4.25.1](https://github.com/pubnub/javascript/tree/v4.25.1)
   August-23-2019
 
 
   [Full Changelog](https://github.com/pubnub/javascript/compare/v4.25.0...v4.25.1)
 
 
 
-- ⭐ Fix regression: Fix titanium build to support recent version"
+- ⭐ Fix regression: Fix titanium build to support recent version
 
 
 
@@ -18,7 +30,7 @@
 
 
 
-- ⭐ Fix regression: Add Objects support for Users, Spaces and Memberships"
+- ⭐ Fix regression: Add Objects support for Users, Spaces and Memberships
 
 
 
@@ -30,7 +42,7 @@
 
 
 
-- ⭐ Fix regression: 'PubNub is not a constructor' in Node.js"
+- ⭐ Fix regression: 'PubNub is not a constructor' in Node.js
 
 
 

diff --git a/README.md b/README.md
@@ -22,5 +22,5 @@ please use the [master_3x](https://github.com/pubnub/javascript/tree/master_3x)
 
 
 
-* https://cdn.pubnub.com/sdk/javascript/pubnub.4.25.1.min.js
-* https://cdn.pubnub.com/sdk/javascript/pubnub.4.25.1.js
+* https://cdn.pubnub.com/sdk/javascript/pubnub.4.25.2.min.js
+* https://cdn.pubnub.com/sdk/javascript/pubnub.4.25.2.js
diff --git a/dist/titanium/pubnub.js b/dist/titanium/pubnub.js
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
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/index.js b/lib/networking/index.js
diff --git a/lib/networking/index.js.map b/lib/networking/index.js.map
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pubnub",
-  "version": "4.25.1",
+  "version": "4.25.2",
   "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
@@ -296,7 +296,7 @@ export default class {
   }
 
   getVersion(): string {
-    return '4.25.1';
+    return '4.25.2';
   }
 
   _decideUUID(providedUUID: string): string {

diff --git a/src/networking/index.js b/src/networking/index.js
@@ -44,7 +44,7 @@ export default class {
 
   nextOrigin(): string {
     // if a custom origin is supplied, use do not bother with shuffling subdomains
-    if (this._providedFQDN.indexOf('ps.') === -1) {
+    if (!this._providedFQDN.match(/ps\.pndsn\.com$/i)) {
       return this._providedFQDN;
     }
 
@@ -59,9 +59,9 @@ export default class {
     newSubDomain = this._currentSubDomain.toString();
 
     return this._providedFQDN.replace(
-      'ps.',
-      `ps${newSubDomain}.`
-    ); /* ensure ps. is used to replace, else https text will change */
+      'ps.pndsn.com',
+      `ps${newSubDomain}.pndsn.com`
+    );
   }
 
   hasModule(name: string) {