[change] Used single websocket route for both admin and non-admin #173

Closes #173
openwisp · Apr 13, 2023 · 6c2d8a4 · 6c2d8a4
1 parent 3aed89f
commit 6c2d8a4
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 27 deletions.
diff --git a/openwisp_network_topology/routing.py b/openwisp_network_topology/routing.py
@@ -3,13 +3,10 @@
 from . import consumers
 
 websocket_urlpatterns = [
-    # For topology admin view
+    # This route is used by both
+    # the admin and non-admin topology view
     re_path(
-        r'^admin/topology/topology/(?P<pk>[^/]+)/change/$',
+        r'^network-topology/topology/(?P<pk>[^/]+)/$',
         consumers.TopologyConsumer.as_asgi(),
     ),
-    # For topology non admin view
-    re_path(
-        r'^topology/topology/(?P<pk>[^/]+)/$', consumers.TopologyConsumer.as_asgi()
-    ),
 ]
diff --git a/openwisp_network_topology/templates/netjsongraph/netjsongraph-script.html b/openwisp_network_topology/templates/netjsongraph/netjsongraph-script.html
@@ -1,7 +1,8 @@
 <script>
     loadNetJsonGraph = (el='body', url='{{ graph_url }}') => {
         const history_url = '{{ history_url }}';
-        const wsUrl = `ws://${window.location.host}${window.location.pathname}`;
+        const wsProtocol = window.location.protocol === 'https:' ? 'wss:' : 'ws:';
+        const wsUrl = `${wsProtocol}//${window.location.host}/network-topology/topology/${getTopologyIdFromUrl()}/`;
         const socket = new WebSocket(wsUrl);
 
         const getDataParseOptions = (data) => {
@@ -168,6 +169,21 @@
         graph.render();
         window.initTopologyHistory(django.jQuery);
         return graph
+
+        // Utility function
+        function getTopologyIdFromUrl() {
+            let topologyId;
+            try {
+                topologyId = /\/((\w{4,12}-?)){5}\//.exec(window.location)[0];
+            } catch (error) {
+                try {
+                    topologyId = /\/(\d+)\//.exec(window.location)[0];
+                } catch (error) {
+                    throw error;
+                }
+            }
+            return topologyId.replace(/\//g, '');
+        }
     };
 
 </script>
diff --git a/openwisp_network_topology/tests/test_websockets.py b/openwisp_network_topology/tests/test_websockets.py
@@ -20,19 +20,11 @@ class TestTopologySockets(CreateGraphObjectsMixin, CreateOrgMixin):
     topology_model = Topology
     application = import_string(getattr(settings, 'ASGI_APPLICATION'))
 
-    async def _get_url(self, topology_id, admin_view):
-        non_admin_view_url = f'topology/topology/{topology_id}/'
-        admin_view_url = f'admin/topology/topology/{topology_id}/change/'
-        if not admin_view:
-            return non_admin_view_url
-        return admin_view_url
-
-    async def _get_communicator(self, admin_client, topology_id, admin_view=True):
-        url = await self._get_url(topology_id, admin_view)
+    async def _get_communicator(self, admin_client, topology_id):
         session_id = admin_client.cookies['sessionid'].value
         communicator = WebsocketCommunicator(
             self.application,
-            url,
+            path=f'network-topology/topology/{topology_id}/',
             headers=[
                 (
                     b'cookie',
@@ -135,13 +127,3 @@ async def test_topology_properties_update(self, admin_user, admin_client):
         assert response['topology'] is not None
         assert response['topology'] == expected_response
         await communicator.disconnect()
-
-    async def test_non_admin_view_consumer_connection(self, admin_user, admin_client):
-        org = await database_sync_to_async(self._create_org)()
-        t = await database_sync_to_async(self._create_topology)(organization=org)
-        communicator = await self._get_communicator(
-            admin_client, t.pk, admin_view=False
-        )
-        connected, _ = await communicator.connect()
-        assert connected is True
-        await communicator.disconnect()