From 34b52f852c24420499ee7a8434bd7f724d87f42b Mon Sep 17 00:00:00 2001 From: Ivan Sein Date: Tue, 3 Apr 2018 17:00:53 +0200 Subject: [PATCH] Fix new multi-session signaling endpoints. Signed-off-by: Ivan Sein --- appinfo/routes.php | 28 ++++++++++++++-------------- js/signaling.js | 4 ++-- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/appinfo/routes.php b/appinfo/routes.php index aea286b3b7..3be7b88767 100644 --- a/appinfo/routes.php +++ b/appinfo/routes.php @@ -34,37 +34,37 @@ return [ * Signaling */ [ - 'name' => 'Signaling#signaling', - 'url' => '/api/{apiVersion}/signaling/{token}', - 'verb' => 'POST', + 'name' => 'Signaling#getSettings', + 'url' => '/api/{apiVersion}/signaling/settings', + 'verb' => 'GET', 'requirements' => [ 'apiVersion' => 'v1', - 'token' => '^[a-z0-9]{4,30}$', ], ], [ - 'name' => 'Signaling#pullMessages', - 'url' => '/api/{apiVersion}/signaling/{token}', - 'verb' => 'GET', + 'name' => 'Signaling#backend', + 'url' => '/api/{apiVersion}/signaling/backend', + 'verb' => 'POST', 'requirements' => [ 'apiVersion' => 'v1', - 'token' => '^[a-z0-9]{4,30}$', ], ], [ - 'name' => 'Signaling#getSettings', - 'url' => '/api/{apiVersion}/signaling/settings', - 'verb' => 'GET', + 'name' => 'Signaling#signaling', + 'url' => '/api/{apiVersion}/signaling/messages/{token}', + 'verb' => 'POST', 'requirements' => [ 'apiVersion' => 'v1', + 'token' => '^[a-z0-9]{4,30}$', ], ], [ - 'name' => 'Signaling#backend', - 'url' => '/api/{apiVersion}/signaling/backend', - 'verb' => 'POST', + 'name' => 'Signaling#pullMessages', + 'url' => '/api/{apiVersion}/signaling/messages/{token}', + 'verb' => 'GET', 'requirements' => [ 'apiVersion' => 'v1', + 'token' => '^[a-z0-9]{4,30}$', ], ], diff --git a/js/signaling.js b/js/signaling.js index 0e1ffeac1b..fec958b443 100644 --- a/js/signaling.js +++ b/js/signaling.js @@ -341,7 +341,7 @@ OCA.Talk.Signaling.Internal.prototype._sendMessages = function(messages) { var defer = $.Deferred(); $.ajax({ - url: OC.linkToOCS('apps/spreed/api/v1/signaling', 2) + this.currentRoomToken, + url: OC.linkToOCS('apps/spreed/api/v1/signaling/messages', 2) + this.currentRoomToken, type: 'POST', data: {messages: JSON.stringify(messages)}, beforeSend: function (request) { @@ -417,7 +417,7 @@ // Connect to the messages endpoint and pull for new messages this.pullMessagesRequest = $.ajax({ - url: OC.linkToOCS('apps/spreed/api/v1/signaling', 2) + this.currentRoomToken, + url: OC.linkToOCS('apps/spreed/api/v1/signaling/messages', 2) + this.currentRoomToken, type: 'GET', dataType: 'json', beforeSend: function (request) {