diff options
author | Ryan Castner <castner.rr@gmail.com> | 2019-03-07 22:14:20 -0500 |
---|---|---|
committer | Ryan Castner <castner.rr@gmail.com> | 2019-03-07 22:14:20 -0500 |
commit | c7ca85ef31587e6ca02440a3cc0a8c4524c9a4d7 (patch) | |
tree | 5807e89ac8fe5d6dd1d587ba78985daadd957efa /actioncable | |
parent | a62683f3e4326b222b6ad95b8b2dfcc31026d227 (diff) | |
download | rails-c7ca85ef31587e6ca02440a3cc0a8c4524c9a4d7.tar.gz rails-c7ca85ef31587e6ca02440a3cc0a8c4524c9a4d7.tar.bz2 rails-c7ca85ef31587e6ca02440a3cc0a8c4524c9a4d7.zip |
feat(js): Dynamic Actioncable WebSocket URL
Allow createWebSocketURL fn to accept a function to generate the websocket URL rather than a string.
Diffstat (limited to 'actioncable')
-rw-r--r-- | actioncable/app/javascript/action_cable/index.js | 12 | ||||
-rw-r--r-- | actioncable/test/javascript/src/unit/action_cable_test.js | 8 |
2 files changed, 17 insertions, 3 deletions
diff --git a/actioncable/app/javascript/action_cable/index.js b/actioncable/app/javascript/action_cable/index.js index 659418396f..1fd391a2c9 100644 --- a/actioncable/app/javascript/action_cable/index.js +++ b/actioncable/app/javascript/action_cable/index.js @@ -30,14 +30,20 @@ export function getConfig(name) { } export function createWebSocketURL(url) { - if (url && !/^wss?:/i.test(url)) { + let webSocketURL + if (typeof url === 'function') { + webSocketURL = url() + } else { + webSocketURL = url + } + if (webSocketURL && !/^wss?:/i.test(webSocketURL)) { const a = document.createElement("a") - a.href = url + a.href = webSocketURL // Fix populating Location properties in IE. Otherwise, protocol will be blank. a.href = a.href a.protocol = a.protocol.replace("http", "ws") return a.href } else { - return url + return webSocketURL } } diff --git a/actioncable/test/javascript/src/unit/action_cable_test.js b/actioncable/test/javascript/src/unit/action_cable_test.js index 83426fa32e..c9d34abc6d 100644 --- a/actioncable/test/javascript/src/unit/action_cable_test.js +++ b/actioncable/test/javascript/src/unit/action_cable_test.js @@ -41,5 +41,13 @@ module("ActionCable", () => { assert.equal(consumer.url, testURL) }) + + test("uses function to generate URL", assert => { + const generateURL = () => { + return testURL + } + const consumer = ActionCable.createConsumer(generateURL) + assert.equal(consumer.url, testURL) + }) }) }) |