diff --git a/api/tacticalrmm/agents/tests.py b/api/tacticalrmm/agents/tests.py index d52d31ee..8cd98ec5 100644 --- a/api/tacticalrmm/agents/tests.py +++ b/api/tacticalrmm/agents/tests.py @@ -522,7 +522,7 @@ class TestAgentViews(TacticalTestCase): 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 index b28e2b9f..69c688de 100644 --- a/api/tacticalrmm/agents/views.py +++ b/api/tacticalrmm/agents/views.py @@ -4,7 +4,7 @@ import os 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 from core.utils import ( @@ -224,7 +224,7 @@ class AgentMeshCentral(APIView): agent = get_object_or_404(Agent, agent_id=agent_id) core = get_core_settings() - 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" terminal = f"{core.mesh_site}/?login={token}&gotonode={agent.mesh_node_id}&viewmode=12&hide=31" diff --git a/api/tacticalrmm/requirements.txt b/api/tacticalrmm/requirements.txt index 5bba96db..e183751e 100644 --- a/api/tacticalrmm/requirements.txt +++ b/api/tacticalrmm/requirements.txt @@ -35,4 +35,4 @@ vine==5.0.0 websockets==10.2 zipp==3.8.0 drf_spectacular==0.22.0 -meshctrl==0.1.13 \ No newline at end of file +meshctrl==0.1.15 diff --git a/api/tacticalrmm/tacticalrmm/settings.py b/api/tacticalrmm/tacticalrmm/settings.py index 65e9138d..fc54364a 100644 --- a/api/tacticalrmm/tacticalrmm/settings.py +++ b/api/tacticalrmm/tacticalrmm/settings.py @@ -17,7 +17,7 @@ LINUX_AGENT_SCRIPT = BASE_DIR / "core" / "agent_linux.sh" 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