REST endpoint for /colibri/muc-client/ids to get list of added muc cl…

…ient ids
shawnchin · May 27, 2021 · a42b631 · a42b631
1 parent abde4c3
commit a42b631
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 4 deletions.
diff --git a/jvb/src/main/java/org/jitsi/videobridge/rest/root/colibri/mucclient/MucClient.java b/jvb/src/main/java/org/jitsi/videobridge/rest/root/colibri/mucclient/MucClient.java
@@ -74,4 +74,12 @@ public Response removeMucClient(String requestBody) throws ParseException
         }
         return Response.status(HttpServletResponse.SC_BAD_REQUEST).build();
     }
+
+    @Path("/ids")
+    @GET
+    @Produces(MediaType.APPLICATION_JSON)
+    public String getIds()
+    {
+        return xmppConnection.getMucClientIds();
+    }
 }
diff --git a/jvb/src/main/kotlin/org/jitsi/videobridge/xmpp/XmppConnection.kt b/jvb/src/main/kotlin/org/jitsi/videobridge/xmpp/XmppConnection.kt
@@ -33,6 +33,7 @@ import org.jivesoftware.smack.packet.ExtensionElement
 import org.jivesoftware.smack.packet.IQ
 import org.jivesoftware.smack.packet.XMPPError
 import org.jivesoftware.smackx.iqversion.packet.Version
+import org.json.simple.JSONArray
 import org.json.simple.JSONObject
 import java.util.concurrent.atomic.AtomicBoolean
 
@@ -129,6 +130,17 @@ class XmppConnection : IQListener {
         return true
     }
 
+    /**
+     * Returns ids of [MucClient] that have been added.
+     * @return JSON string of the list of ids
+     */
+    fun getMucClientIds(): String {
+        val jsonArray = JSONArray()
+        mucClientManager.getMucClientIds().forEach { id -> jsonArray.add(id) }
+
+        return jsonArray.toJSONString()
+    }
+
     /**
      * Removes a {@link MucClient} with an ID described in JSON.
      * @param jsonObject the JSON which contains the ID of the client to remove.

diff --git a/jvb/src/test/kotlin/org/jitsi/videobridge/rest/root/colibri/mucclient/MucClientTest.kt b/jvb/src/test/kotlin/org/jitsi/videobridge/rest/root/colibri/mucclient/MucClientTest.kt
@@ -26,6 +26,7 @@ import org.glassfish.jersey.test.JerseyTest
 import org.glassfish.jersey.test.TestProperties
 import org.jitsi.videobridge.rest.MockBinder
 import org.jitsi.videobridge.xmpp.XmppConnection
+import org.json.simple.JSONArray
 import org.json.simple.JSONObject
 import org.junit.Test
 import javax.ws.rs.client.Entity
@@ -91,25 +92,37 @@ class MucClientTest : JerseyTest() {
     fun testRemoveMuc() {
         val jsonConfigSlot = slot<JSONObject>()
 
-        every { xmppConnection.addMucClient(capture(jsonConfigSlot)) } returns true
+        every { xmppConnection.removeMucClient(capture(jsonConfigSlot)) } returns true
 
         val json = JSONObject().apply {
             put("id", "id")
         }
 
-        val resp = target("$baseUrl/add").request().post(Entity.json(json.toJSONString()))
+        val resp = target("$baseUrl/remove").request().post(Entity.json(json.toJSONString()))
         resp.status shouldBe HttpStatus.OK_200
         jsonConfigSlot.captured shouldBe json
     }
 
     @Test
     fun testRemoveMucFailure() {
-        every { xmppConnection.addMucClient(any()) } returns false
+        every { xmppConnection.removeMucClient(any()) } returns false
 
         val json = JSONObject().apply {
             put("id", "id")
         }
-        val resp = target("$baseUrl/add").request().post(Entity.json(json.toJSONString()))
+        val resp = target("$baseUrl/remove").request().post(Entity.json(json.toJSONString()))
         resp.status shouldBe HttpStatus.BAD_REQUEST_400
     }
+
+    @Test
+    fun testGetIds() {
+        val fakeIds = JSONArray().apply {
+            add("id1")
+        }
+        every { xmppConnection.getMucClientIds() } returns fakeIds.toJSONString()
+
+        val resp = target("$baseUrl/ids").request().get()
+        resp.readEntity(String::class.java) shouldBe "[\"id1\"]"
+    }
+
 }