0.12.4 fix login token

amidaware · Apr 12, 2022 · 5e20a5c · 5e20a5c
1 parent f82b589
commit 5e20a5c
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/api/tacticalrmm/agents/tests.py b/api/tacticalrmm/agents/tests.py
@@ -519,7 +519,7 @@ def test_install_agent(self):
 
         self.check_not_authenticated("post", url)
 
-    @patch("meshctrl.utils.get_auth_token")
+    @patch("meshctrl.utils.get_login_token")
     def test_meshcentral_tabs(self, mock_token):
         url = f"{base_url}/{self.agent.agent_id}/meshcentral/"
         mock_token.return_value = "askjh1k238uasdhk487234jadhsajksdhasd"

diff --git a/api/tacticalrmm/agents/views.py b/api/tacticalrmm/agents/views.py
@@ -4,7 +4,7 @@
 import random
 import string
 import time
-from meshctrl.utils import get_auth_token
+from meshctrl.utils import get_login_token
 
 from core.models import CodeSignToken, CoreSettings
 from core.utils import get_mesh_ws_url, remove_mesh_agent, send_command_with_mesh
@@ -209,7 +209,7 @@ def get(self, request, agent_id):
         agent = get_object_or_404(Agent, agent_id=agent_id)
         core = CoreSettings.objects.first()
 
-        token = get_auth_token(user=core.mesh_username, key=core.mesh_token)
+        token = get_login_token(key=core.mesh_token, user=f"user//{core.mesh_username}")
 
         control = f"{core.mesh_site}/?login={token}&gotonode={agent.mesh_node_id}&viewmode=11&hide=31"  # type:ignore
         terminal = f"{core.mesh_site}/?login={token}&gotonode={agent.mesh_node_id}&viewmode=12&hide=31"  # type:ignore

diff --git a/api/tacticalrmm/requirements.txt b/api/tacticalrmm/requirements.txt
@@ -34,4 +34,4 @@ vine==5.0.0
 websockets==10.2
 zipp==3.8.0
 drf_spectacular==0.21.2
-meshctrl==0.1.13
+meshctrl==0.1.15
diff --git a/api/tacticalrmm/tacticalrmm/settings.py b/api/tacticalrmm/tacticalrmm/settings.py
@@ -17,7 +17,7 @@
 AUTH_USER_MODEL = "accounts.User"
 
 # latest release
-TRMM_VERSION = "0.12.3"
+TRMM_VERSION = "0.12.4"
 
 # bump this version everytime vue code is changed
 # to alert user they need to manually refresh their browser